agent-relay-orchestrator 0.37.0 → 0.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-orchestrator",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "description": "Agent Relay orchestrator — manages agent lifecycle across hosts",
   "type": "module",
   "bin": {
@@ -16,7 +16,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "agent-relay-sdk": "0.2.22"
+    "agent-relay-sdk": "0.2.23"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/control.ts

@@ -120,6 +120,7 @@ export function createControlHandler(
           push: command.params.push !== false,
           prTitle: typeof command.params.prTitle === "string" ? command.params.prTitle : undefined,
           prBody: typeof command.params.prBody === "string" ? command.params.prBody : undefined,
+          autoMerge: command.params.autoMerge === "on-green" || command.params.autoMerge === "on-approval" || command.params.autoMerge === "manual" ? command.params.autoMerge : undefined,
         });
         await relay.updateCommand(command.id, "succeeded", result as unknown as Record<string, unknown>);
       } else if (command.type === "workspace.deps-refresh") {

package/src/workspace-probe.ts

@@ -715,6 +715,11 @@ interface WorkspaceMergeInput {
   push?: boolean;
   prTitle?: string;
   prBody?: string;
+  /** Auto-merge policy for pr-strategy lands (#305).
+   *  - "on-green": arm GitHub auto-merge after PR creation (default).
+   *  - "on-approval": open PR, do NOT arm; reviewer pipeline arms it later.
+   *  - "manual": open PR, do NOT arm (today's legacy behavior). */
+  autoMerge?: "on-green" | "on-approval" | "manual";
 }
 
 /** Behind-count of HEAD relative to `base`, from inside `worktreePath`. */
@@ -913,7 +918,12 @@ export function mergeWorkspace(input: WorkspaceMergeInput): WorkspaceMergeResult
   if (!input.worktreePath) return { strategy: "rebase-ff", merged: false, status: "review_requested", error: "worktreePath required", workspaceId: input.id };
   const worktreePath = resolve(input.worktreePath);
   const repoRoot = input.repoRoot ? resolve(input.repoRoot) : worktreePath;
-  const branch = input.branch ?? shortBranch(git(["symbolic-ref", "--quiet", "--short", "HEAD"], worktreePath).stdout || undefined);
+  // Probe the live HEAD branch first — it's the authoritative source. Fall back to the
+  // DB-recorded branch only when the live probe fails (detached HEAD, missing worktree, etc.).
+  // This fixes #232: a stale DB branch value (non-null mismatch) would pass through the
+  // `input.branch ?? ...` guard unchanged and cause git to attempt merging a non-existent ref.
+  const liveBranch = shortBranch(git(["symbolic-ref", "--quiet", "--short", "HEAD"], worktreePath).stdout || undefined);
+  const branch = liveBranch ?? input.branch;
   const preview = previewWorkspaceMerge({ worktreePath, baseRef: input.baseRef, baseSha: input.baseSha, strategy: input.strategy });
   const strategy = preview.strategy;
   const head = (field: Partial<WorkspaceMergeResult>): WorkspaceMergeResult => ({ workspaceId: input.id, strategy, merged: false, status: "review_requested", branch, baseRef: preview.baseRef, ...field });
@@ -995,15 +1005,45 @@ function mergePr(
   const body = input.prBody || `Automated PR for agent workspace branch \`${branch}\`.`;
   const args = ["pr", "create", "--head", branch, "--title", title, "--body", body];
   if (base) args.push("--base", base);
-  const proc = Bun.spawnSync(["gh", ...args], { cwd: worktreePath, stdin: "ignore", stdout: "pipe", stderr: "pipe" });
+  // Pass process.env explicitly so runtime env mutations (e.g. test PATH injection)
+  // are visible to the child process.  Bun's default is the startup-time env snapshot.
+  const proc = Bun.spawnSync(["gh", ...args], { cwd: worktreePath, stdin: "ignore", stdout: "pipe", stderr: "pipe", env: process.env });
   const stdout = proc.stdout.toString().trim();
   if (proc.exitCode !== 0) {
     return head({ status: "review_requested", error: proc.stderr.toString().trim() || "gh pr create failed" });
   }
   const prUrl = stdout.split("\n").map((line) => line.trim()).find((line) => /^https?:\/\//.test(line));
-  // PR opened: work is on its way out but not landed. Keep the worktree/branch
-  // alive for the PR; record the plan with the URL.
-  return head({ status: "merge_planned", prUrl, error: undefined });
+
+  // Auto-merge policy (#305). Treat absent as "on-green" so new lands always terminate.
+  const autoMerge = input.autoMerge ?? "on-green";
+
+  if (autoMerge === "on-approval") {
+    // Reviewer pipeline arms auto-merge later — don't arm here.
+    return head({ status: "merge_planned", prUrl, awaitingApproval: true, error: undefined });
+  }
+
+  if (autoMerge === "manual") {
+    // Legacy behavior: open the PR and stop — a human merges.
+    return head({ status: "merge_planned", prUrl, error: undefined });
+  }
+
+  // "on-green" (default): arm GitHub auto-merge. Use --merge (repo's merge style).
+  // Never throw — if arming fails (repo has auto-merge disabled) we still return
+  // merge_planned so the relay reconcile scan can finalize when the PR merges.
+  const mergeTarget = prUrl ?? branch!;
+  const armProc = Bun.spawnSync(["gh", "pr", "merge", mergeTarget, "--auto", "--merge"], {
+    cwd: worktreePath,
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+    env: process.env,
+  });
+  if (armProc.exitCode !== 0) {
+    // Arm failed (e.g. repo has auto-merge disabled) — return merge_planned so the
+    // reconcile scan still finalizes when the PR is merged by a human.
+    return head({ status: "merge_planned", prUrl, autoMergeArmed: false, error: undefined });
+  }
+  return head({ status: "merge_planned", prUrl, autoMergeArmed: true, error: undefined });
 }
 
 // Identity stamped on the merge commit a no-ff land records (#287). The merge is a