fix(archied): build the Gateway's worktree manager so it serves review_pr
boot.prReviewer returns nil without a worktree manager, and a nil reviewer omits review_pr from every channel's tool set. RunGateway never called buildTreesAndIdentities, so the Gateway resolved a nil reviewer and no channel could review a PR. Extract the manager's construction into boot.buildWorktreeManager, called by buildTreesAndIdentities (daemon, unchanged field-for-field) and by startGatewayRuntime before setupGatewayChat. The Gateway does not call buildTreesAndIdentities: that also registers daemon identity runners the Gateway must not own, and PR review only needs a clone of the PR head, which worktree.Manager.CheckoutPR does from the forge. Pin the ordering by source position in composition_order_test.go, alongside the memory-engine ordering the same function already carries, and pin both compositions behaviourally in worktree_manager_composition_test.go: the Gateway's step must yield a reviewer that advertises review_pr, and the daemon must still build its root manager plus one runner per identity with a distinct WorkDir. Correct docs/prds/operator-pr-review.md, which still asserted the daemon supplies ChatPRReviewer and holds the review in-flight set.
This commit is contained in:
5 files changed
+164
-13
No files matched your search
@@ -50,18 +50,20 @@ planner/builder.
|
|||||||
|
|
||||||
4. **Command.** A gateway tool `review_pr` (toolset `tasks`) bound to the
|
4. **Command.** A gateway tool `review_pr` (toolset `tasks`) bound to the
|
||||||
channel's identity at construction — the model never names an identity,
|
channel's identity at construction — the model never names an identity,
|
||||||
matching `task_spawn`/`task_action`. The daemon supplies `ChatPRReviewer`,
|
matching `task_spawn`/`task_action`. The Gateway process serves it: it
|
||||||
a narrow gateway interface; the daemon adapter maps `workflow.ReviewReport`
|
composes the worktree manager it needs to materialise the PR head, and the
|
||||||
into a gateway-owned result shape (gateway states what it needs, the daemon
|
composition root supplies `ChatPRReviewer`, a narrow gateway interface
|
||||||
adapts — the `ChatTaskActor` pattern).
|
whose adapter maps `workflow.ReviewReport` into a gateway-owned result
|
||||||
|
shape (gateway states what it needs, the composition root adapts — the
|
||||||
|
`ChatTaskActor` pattern).
|
||||||
|
|
||||||
5. **Authorization.** Identity-scoped repository allow-list, the
|
5. **Authorization.** Identity-scoped repository allow-list, the
|
||||||
`task_spawn` rule: a chat identity may only review a repo in its
|
`task_spawn` rule: a chat identity may only review a repo in its
|
||||||
`TaskProfile.Repos`. `identity == nil` denotes an authenticated dashboard
|
`TaskProfile.Repos`. `identity == nil` denotes an authenticated dashboard
|
||||||
operator who may review any configured repository.
|
operator who may review any configured repository.
|
||||||
|
|
||||||
6. **Determinism.** One review per (owner, repo, number) at a time: the daemon
|
6. **Determinism.** One review per (owner, repo, number) at a time: the
|
||||||
holds an in-flight set; a concurrent request for the same PR returns
|
Gateway holds an in-flight set; a concurrent request for the same PR returns
|
||||||
"review already in progress" rather than launching a second reviewer and
|
"review already in progress" rather than launching a second reviewer and
|
||||||
racing on the snapshot.
|
racing on the snapshot.
|
||||||
|
|
||||||
|
|||||||
@@ -811,6 +811,27 @@ func (b *boot) loadPlugins() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// buildWorktreeManager composes the process-wide worktree manager from the
|
||||||
|
// resolved primary forge credential and the loaded config. Both process roots
|
||||||
|
// own one: the daemon works tasks in it, and the Gateway materialises a pull
|
||||||
|
// request head in it when an operator asks for a review (boot.prReviewer
|
||||||
|
// refuses to build a reviewer without one, so a Gateway that skips this step
|
||||||
|
// advertises no review_pr). It reads only, so it has nothing to report.
|
||||||
|
//
|
||||||
|
// Identity managers are not built here: buildTreesAndIdentities builds one per
|
||||||
|
// identity, each in its own WorkDir, because the Gateway must not own daemon
|
||||||
|
// identity runners.
|
||||||
|
func (b *boot) buildWorktreeManager() {
|
||||||
|
cfg := b.cfg
|
||||||
|
b.trees = &worktree.Manager{
|
||||||
|
WorkDir: cfg.WorkDir,
|
||||||
|
Token: b.token,
|
||||||
|
BotUser: cfg.BotUser,
|
||||||
|
BotEmail: cfg.BotEmail,
|
||||||
|
BaseURL: cfg.Forge.Host,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// buildTreesAndIdentities composes the worktree manager and the
|
// buildTreesAndIdentities composes the worktree manager and the
|
||||||
// multi-identity runners. Each configured identity gets its own forge
|
// multi-identity runners. Each configured identity gets its own forge
|
||||||
// client (its own token, possibly its own forge type/host) and its own
|
// client (its own token, possibly its own forge type/host) and its own
|
||||||
@@ -820,13 +841,7 @@ func (b *boot) loadPlugins() error {
|
|||||||
// unchanged.
|
// unchanged.
|
||||||
func (b *boot) buildTreesAndIdentities(ctx context.Context) error {
|
func (b *boot) buildTreesAndIdentities(ctx context.Context) error {
|
||||||
cfg, log := b.cfg, b.log
|
cfg, log := b.cfg, b.log
|
||||||
b.trees = &worktree.Manager{
|
b.buildWorktreeManager()
|
||||||
WorkDir: cfg.WorkDir,
|
|
||||||
Token: b.token,
|
|
||||||
BotUser: cfg.BotUser,
|
|
||||||
BotEmail: cfg.BotEmail,
|
|
||||||
BaseURL: cfg.Forge.Host,
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, idCfg := range cfg.Identities {
|
for _, idCfg := range cfg.Identities {
|
||||||
// Same reasoning as the primary forge: one identity whose credential is
|
// Same reasoning as the primary forge: one identity whose credential is
|
||||||
|
|||||||
@@ -32,3 +32,29 @@ func TestStartGatewayRuntimeSetsUpMemoryBeforeGatewayChat(t *testing.T) {
|
|||||||
t.Fatal("startGatewayRuntime wires setupGatewayChat before setupMemoryEngine; the turn runner would capture a nil memory engine")
|
t.Fatal("startGatewayRuntime wires setupGatewayChat before setupMemoryEngine; the turn runner would capture a nil memory engine")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestStartGatewayRuntimeBuildsWorktreeManagerBeforeGatewayChat pins the
|
||||||
|
// Gateway's own worktree-manager ordering. The Gateway owns PR review, so
|
||||||
|
// startGatewayRuntime must compose the process-wide worktree manager before
|
||||||
|
// setupGatewayChat resolves boot.prReviewer: prReviewer returns nil without a
|
||||||
|
// manager, and a nil reviewer omits review_pr from every channel's tool set
|
||||||
|
// (internal/gateway/review_tools.go). The Gateway deliberately does not call
|
||||||
|
// buildTreesAndIdentities -- that also registers daemon identity runners it
|
||||||
|
// must not own -- so nothing at runtime connects the manager to this
|
||||||
|
// composition phase except the call this asserts on.
|
||||||
|
func TestStartGatewayRuntimeBuildsWorktreeManagerBeforeGatewayChat(t *testing.T) {
|
||||||
|
fileset := token.NewFileSet()
|
||||||
|
file, err := parser.ParseFile(fileset, "gateway.go", nil, 0)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
run := methodBody(t, file, "startGatewayRuntime")
|
||||||
|
trees := methodCallPosition(run, "buildWorktreeManager")
|
||||||
|
chat := methodCallPosition(run, "setupGatewayChat")
|
||||||
|
if trees == token.NoPos || chat == token.NoPos {
|
||||||
|
t.Fatalf("startGatewayRuntime call positions: buildWorktreeManager=%v setupGatewayChat=%v, want both present", trees, chat)
|
||||||
|
}
|
||||||
|
if chat < trees {
|
||||||
|
t.Fatal("startGatewayRuntime wires setupGatewayChat before buildWorktreeManager; the Gateway would resolve a nil reviewer and never advertise review_pr")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -142,6 +142,14 @@ func (b *boot) startGatewayRuntime(ctx context.Context, actor gateway.ChatTaskAc
|
|||||||
b.addCleanup(b.bus.Close)
|
b.addCleanup(b.bus.Close)
|
||||||
b.capabilityHost = plugin.NewHost()
|
b.capabilityHost = plugin.NewHost()
|
||||||
b.startRateLimiter(ctx, b.cfg.Chat.RateLimit)
|
b.startRateLimiter(ctx, b.cfg.Chat.RateLimit)
|
||||||
|
// The Gateway owns PR review (docs/prds/operator-pr-review.md §4), so it
|
||||||
|
// composes the process-wide worktree manager before setupGatewayChat
|
||||||
|
// resolves boot.prReviewer: prReviewer returns nil without a manager, and
|
||||||
|
// a nil reviewer omits review_pr from every channel's tool set. The
|
||||||
|
// manager is the only part of the daemon's tree composition the Gateway
|
||||||
|
// takes -- it must not own identity runners, so it does not call
|
||||||
|
// buildTreesAndIdentities.
|
||||||
|
b.buildWorktreeManager()
|
||||||
// setupMemoryEngine must run before setupGatewayChat: setupGatewayChat
|
// setupMemoryEngine must run before setupGatewayChat: setupGatewayChat
|
||||||
// constructs the turn runner, which captures b.memEngines at
|
// constructs the turn runner, which captures b.memEngines at
|
||||||
// construction time (see the identical ordering note in main.go's Run).
|
// construction time (see the identical ordering note in main.go's Run).
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package archied
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/samcharles93/archie-core/internal/config"
|
||||||
|
"github.com/samcharles93/archie-core/internal/forge"
|
||||||
|
"github.com/samcharles93/archie-core/internal/gateway"
|
||||||
|
"github.com/samcharles93/archie-core/internal/secret"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestGatewayWorktreeManagerAdvertisesReviewPR composes the Gateway's own
|
||||||
|
// tree step with the reviewer and the review tool: whatever
|
||||||
|
// buildWorktreeManager produces must be enough for boot.prReviewer to yield a
|
||||||
|
// reviewer and for ReviewTools to advertise review_pr. The call-order
|
||||||
|
// assertion in composition_order_test.go proves the Gateway makes this step;
|
||||||
|
// this proves the step is sufficient, so a manager built without the forge
|
||||||
|
// credential or the configured work dir cannot pass as wired.
|
||||||
|
func TestGatewayWorktreeManagerAdvertisesReviewPR(t *testing.T) {
|
||||||
|
const token = "gateway-forge-token"
|
||||||
|
cfg := config.Config{
|
||||||
|
WorkDir: t.TempDir(),
|
||||||
|
BotUser: "archie-bot",
|
||||||
|
BotEmail: "bot@example.test",
|
||||||
|
Forge: config.Forge{Host: "https://forge.example.test"},
|
||||||
|
}
|
||||||
|
b := &boot{
|
||||||
|
cfg: cfg,
|
||||||
|
cfgHolder: config.NewHolder(cfg),
|
||||||
|
token: token,
|
||||||
|
log: slog.New(slog.DiscardHandler),
|
||||||
|
forgeClient: reviewCapableForge{Forge: forge.NewNoop(slog.New(slog.DiscardHandler))},
|
||||||
|
}
|
||||||
|
|
||||||
|
b.buildWorktreeManager()
|
||||||
|
|
||||||
|
if b.trees.WorkDir != cfg.WorkDir {
|
||||||
|
t.Errorf("worktree manager WorkDir = %q, want the configured %q", b.trees.WorkDir, cfg.WorkDir)
|
||||||
|
}
|
||||||
|
if b.trees.BaseURL != cfg.Forge.Host {
|
||||||
|
t.Errorf("worktree manager BaseURL = %q, want the configured forge host %q", b.trees.BaseURL, cfg.Forge.Host)
|
||||||
|
}
|
||||||
|
if b.trees.Token != token {
|
||||||
|
t.Errorf("worktree manager Token = %q, want the resolved forge token %q", b.trees.Token, token)
|
||||||
|
}
|
||||||
|
|
||||||
|
reviewer := b.prReviewer()
|
||||||
|
if reviewer == nil {
|
||||||
|
t.Fatal("prReviewer() = nil after the Gateway's worktree-manager step; review_pr would never be advertised")
|
||||||
|
}
|
||||||
|
if !hasReviewPRTool(gateway.ReviewTools(reviewer, "archie")) {
|
||||||
|
t.Fatal("review_pr not advertised after the Gateway's worktree-manager step")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestBuildTreesAndIdentitiesBuildsRootManagerAndIdentityRunners pins the
|
||||||
|
// daemon's tree composition, which the shared buildWorktreeManager must not
|
||||||
|
// change: the daemon still owns the process-wide manager *and* one runner per
|
||||||
|
// configured identity, each with its own WorkDir so concurrent identities
|
||||||
|
// never clone into the same directory. The Gateway takes only the manager, so
|
||||||
|
// this is the assertion that keeps the two roots apart.
|
||||||
|
func TestBuildTreesAndIdentitiesBuildsRootManagerAndIdentityRunners(t *testing.T) {
|
||||||
|
workDir := t.TempDir()
|
||||||
|
cfg := config.Config{
|
||||||
|
WorkDir: workDir,
|
||||||
|
BotUser: "archie-bot",
|
||||||
|
BotEmail: "bot@example.test",
|
||||||
|
Forge: config.Forge{Host: "https://forge.example.test"},
|
||||||
|
Identities: []config.IdentityConfig{{
|
||||||
|
Name: "archie",
|
||||||
|
BotUser: "archie-identity",
|
||||||
|
}},
|
||||||
|
}
|
||||||
|
b := &boot{
|
||||||
|
cfg: cfg,
|
||||||
|
token: "daemon-forge-token",
|
||||||
|
log: slog.New(slog.DiscardHandler),
|
||||||
|
secrets: secret.NewRegistry(),
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := b.buildTreesAndIdentities(t.Context()); err != nil {
|
||||||
|
t.Fatalf("buildTreesAndIdentities = %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if b.trees == nil {
|
||||||
|
t.Fatal("b.trees = nil; the daemon would work no task")
|
||||||
|
}
|
||||||
|
if b.trees.WorkDir != workDir || b.trees.Token != b.token {
|
||||||
|
t.Errorf("root worktree manager = {WorkDir:%q Token:%q}, want {%q %q}", b.trees.WorkDir, b.trees.Token, workDir, b.token)
|
||||||
|
}
|
||||||
|
if got := len(b.identityRunners); got != 1 {
|
||||||
|
t.Fatalf("identityRunners = %d, want 1", got)
|
||||||
|
}
|
||||||
|
wantIdentityDir := filepath.Join(workDir, "identity-archie")
|
||||||
|
if got := b.identityRunners[0].Trees.WorkDir; got != wantIdentityDir {
|
||||||
|
t.Errorf("identity worktree manager WorkDir = %q, want %q", got, wantIdentityDir)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user