diff --git a/internal/app/archied/main.go b/internal/app/archied/main.go index 5264e0057..44fcea0ce 100644 --- a/internal/app/archied/main.go +++ b/internal/app/archied/main.go @@ -408,6 +408,9 @@ func Run() int { //nolint:cyclop // the composition root's setup sequence is del if err := b.setupLLMAndChat(); err != nil { return 1 } + if err := b.buildTreesAndIdentities(ctx); err != nil { + return 1 + } if !b.setupGateways(ctx, args.cfgPath, args.overlayPath) { return 1 } @@ -418,9 +421,6 @@ func Run() int { //nolint:cyclop // the composition root's setup sequence is del if err := b.loadPlugins(); err != nil { return 1 } - if err := b.buildTreesAndIdentities(ctx); err != nil { - return 1 - } if err := b.registerNATSRPC(); err != nil { return 1 diff --git a/internal/app/archied/pr_review.go b/internal/app/archied/pr_review.go index dbc2596c5..188538b1c 100644 --- a/internal/app/archied/pr_review.go +++ b/internal/app/archied/pr_review.go @@ -239,6 +239,9 @@ func (b *boot) prReviewer() gateway.ChatPRReviewer { if b.chatPRReviewer != nil { return b.chatPRReviewer } + if b.trees == nil { + return nil + } forgeReader, _ := b.forgeClient.(forge.PullRequestReader) if forgeReader == nil { return nil diff --git a/internal/app/archied/pr_review_test.go b/internal/app/archied/pr_review_test.go index edc1348a3..a0a35369d 100644 --- a/internal/app/archied/pr_review_test.go +++ b/internal/app/archied/pr_review_test.go @@ -8,6 +8,8 @@ import ( "github.com/samcharles93/archie-core/internal/config" "github.com/samcharles93/archie-core/internal/domain/workflow" "github.com/samcharles93/archie-core/internal/forge" + "github.com/samcharles93/archie-core/internal/gateway" + "github.com/samcharles93/archie-core/internal/worktree" ) func TestSplitOwnerRepo(t *testing.T) { @@ -176,9 +178,14 @@ func (reviewCapableForge) GetPullRequest(context.Context, string, string, int) ( // TestPrReviewerIsMemoized pins the cross-channel single-flight fix: every // gateway must share one prReviewer so a review of the same PR requested from -// two channels at once deduplicates instead of running twice. +// two channels at once deduplicates instead of running twice. The boot must +// own a worktree manager: a reviewer without one can never run and must not be +// produced (see TestPrReviewerNilWithoutTrees). func TestPrReviewerIsMemoized(t *testing.T) { - b := &boot{forgeClient: reviewCapableForge{Forge: forge.NewNoop(slog.New(slog.DiscardHandler))}} + b := &boot{ + forgeClient: reviewCapableForge{Forge: forge.NewNoop(slog.New(slog.DiscardHandler))}, + trees: &worktree.Manager{}, + } first := b.prReviewer() if first == nil { @@ -188,3 +195,35 @@ func TestPrReviewerIsMemoized(t *testing.T) { t.Fatal("prReviewer() returned distinct instances; channels would not share the in-flight set") } } + +// TestPrReviewerNilWithoutTrees pins the producer-side invariant: a PR-capable +// forge without a worktree manager must yield no reviewer. The standalone +// Gateway never builds trees, and the daemon used to capture b.trees before it +// was assigned, so both advertised a review_pr tool that always failed. +func TestPrReviewerNilWithoutTrees(t *testing.T) { + b := &boot{forgeClient: reviewCapableForge{Forge: forge.NewNoop(slog.New(slog.DiscardHandler))}} + + if got := b.prReviewer(); got != nil { + t.Fatalf("prReviewer() with no worktree manager = %T, want nil", got) + } +} + +// TestReviewPRToolRegisteredOnlyWithWorkingReviewer composes the real boot +// wiring (boot.prReviewer -> gateway.ReviewTools) and asserts review_pr is +// advertised only when the reviewer can actually run. +func TestReviewPRToolRegisteredOnlyWithWorkingReviewer(t *testing.T) { + logger := slog.New(slog.DiscardHandler) + b := &boot{ + forgeClient: reviewCapableForge{Forge: forge.NewNoop(logger)}, + log: logger, + } + + if entries := gateway.ReviewTools(b.prReviewer(), "archie"); len(entries) != 0 { + t.Fatalf("ReviewTools with no worktree manager = %d entries, want 0", len(entries)) + } + + b.trees = &worktree.Manager{} + if entries := gateway.ReviewTools(b.prReviewer(), "archie"); len(entries) != 1 { + t.Fatalf("ReviewTools with a worktree manager = %d entries, want 1", len(entries)) + } +}