agent-relay-orchestrator 0.39.0 → 0.40.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-orchestrator",
-  "version": "0.39.0",
+  "version": "0.40.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.24"
+    "agent-relay-sdk": "0.2.25"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/control.ts

@@ -4,7 +4,7 @@ import type { ManagedAgentReport, RelayClient, RelayCommand } from "./relay";
 import { handleSelfUpgrade } from "./self-upgrade";
 import { spawnAgent, stopSession, type SpawnOptions } from "./spawn";
 import { cleanupWorkspace, mergeWorkspace, pruneWorktrees, reconcileWorkspace, refreshWorkspaceDeps, workspacesRoot } from "./workspace-probe";
-import { armWorkspacePrAutoMerge } from "./workspace-pr";
+import { armWorkspacePrAutoMerge, mergeWorkspacePr } from "./workspace-pr";
 
 interface ControlHandler {
   handleCommand(command: RelayCommand): Promise<boolean>;
@@ -135,6 +135,17 @@ export function createControlHandler(
           prUrl: typeof command.params.prUrl === "string" ? command.params.prUrl : undefined,
         });
         await relay.updateCommand(command.id, result.autoMergeArmed ? "succeeded" : "failed", result as unknown as Record<string, unknown>, result.error);
+      } else if (command.type === "workspace.pr-merge") {
+        const rawPrNumber = command.params.prNumber;
+        const result = mergeWorkspacePr({
+          id: typeof command.params.workspaceId === "string" ? command.params.workspaceId : undefined,
+          repoRoot: typeof command.params.repoRoot === "string" ? command.params.repoRoot : undefined,
+          worktreePath: typeof command.params.worktreePath === "string" ? command.params.worktreePath : undefined,
+          branch: typeof command.params.branch === "string" ? command.params.branch : undefined,
+          prNumber: typeof rawPrNumber === "number" && Number.isSafeInteger(rawPrNumber) ? rawPrNumber : undefined,
+          prUrl: typeof command.params.prUrl === "string" ? command.params.prUrl : undefined,
+        });
+        await relay.updateCommand(command.id, result.relayMerged ? "succeeded" : "failed", result as unknown as Record<string, unknown>, result.error);
       } else if (command.type === "workspace.deps-refresh") {
         const result = refreshWorkspaceDeps(
           typeof command.params.repoRoot === "string" ? command.params.repoRoot : "",

package/src/workspace-pr.ts

@@ -9,6 +9,8 @@ interface PullRequestState {
   number?: number;
   reviewDecision?: PrReviewDecision;
   statusCheckRollup?: unknown[];
+  mergeable?: string;
+  mergeStateStatus?: string;
 }
 
 function prReviewDecision(value: unknown): PrReviewDecision | undefined {
@@ -17,7 +19,7 @@ function prReviewDecision(value: unknown): PrReviewDecision | undefined {
 
 export function prMergedState(cwd: string, branch: string | undefined): PullRequestState | undefined {
   if (!branch) return undefined;
-  const proc = Bun.spawnSync(["gh", "pr", "view", branch, "--json", "state,url,mergeCommit,number,reviewDecision,statusCheckRollup"], {
+  const proc = Bun.spawnSync(["gh", "pr", "view", branch, "--json", "state,url,mergeCommit,number,reviewDecision,statusCheckRollup,mergeable,mergeStateStatus"], {
     cwd,
     stdin: "ignore",
     stdout: "pipe",
@@ -33,12 +35,16 @@ export function prMergedState(cwd: string, branch: string | undefined): PullRequ
       number?: number;
       reviewDecision?: unknown;
       statusCheckRollup?: unknown;
+      mergeable?: unknown;
+      mergeStateStatus?: unknown;
     };
     if (!data.state) return undefined;
     const sha = data.mergeCommit?.oid;
     const number = typeof data.number === "number" && Number.isSafeInteger(data.number) ? data.number : undefined;
     const reviewDecision = prReviewDecision(data.reviewDecision);
     const statusCheckRollup = Array.isArray(data.statusCheckRollup) ? data.statusCheckRollup : undefined;
+    const mergeable = typeof data.mergeable === "string" ? data.mergeable : undefined;
+    const mergeStateStatus = typeof data.mergeStateStatus === "string" ? data.mergeStateStatus : undefined;
     return {
       state: data.state === "MERGED" ? "merged" : "open",
       url: data.url,
@@ -46,6 +52,8 @@ export function prMergedState(cwd: string, branch: string | undefined): PullRequ
       ...(number ? { number } : {}),
       ...(reviewDecision ? { reviewDecision } : {}),
       ...(statusCheckRollup ? { statusCheckRollup } : {}),
+      ...(mergeable ? { mergeable } : {}),
+      ...(mergeStateStatus ? { mergeStateStatus } : {}),
     };
   } catch {
     return undefined;
@@ -83,3 +91,35 @@ export function armWorkspacePrAutoMerge(input: {
   }
   return { workspaceId: input.id, status: "merge_planned", autoMergeArmed: true, prNumber: input.prNumber, prUrl: input.prUrl };
 }
+
+export function mergeWorkspacePr(input: {
+  id?: string;
+  repoRoot?: string;
+  worktreePath?: string;
+  branch?: string;
+  prNumber?: number;
+  prUrl?: string;
+}): { workspaceId?: string; status: "merge_planned"; relayMerged: boolean; prNumber?: number; prUrl?: string; error?: string } {
+  const cwd = input.worktreePath ? resolve(input.worktreePath) : input.repoRoot ? resolve(input.repoRoot) : undefined;
+  if (!cwd) return { workspaceId: input.id, status: "merge_planned", relayMerged: false, error: "worktreePath or repoRoot required" };
+  const target = input.prNumber ? String(input.prNumber) : input.prUrl ?? input.branch;
+  if (!target) return { workspaceId: input.id, status: "merge_planned", relayMerged: false, error: "prNumber, prUrl, or branch required" };
+  const proc = Bun.spawnSync(["gh", "pr", "merge", target, "--merge"], {
+    cwd,
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+    env: process.env,
+  });
+  if (proc.exitCode !== 0) {
+    return {
+      workspaceId: input.id,
+      status: "merge_planned",
+      relayMerged: false,
+      prNumber: input.prNumber,
+      prUrl: input.prUrl,
+      error: proc.stderr.toString().trim() || proc.stdout.toString().trim() || "gh pr merge failed",
+    };
+  }
+  return { workspaceId: input.id, status: "merge_planned", relayMerged: true, prNumber: input.prNumber, prUrl: input.prUrl };
+}

package/src/workspace-probe.ts

@@ -787,7 +787,7 @@ function applyPrMergeState(base: WorkspaceMergePreview, cwd: string, branch: str
   if (pr.url) base.prUrl = pr.url;
   if (pr.number) base.prNumber = pr.number;
   if (pr.reviewDecision) base.reviewDecision = pr.reviewDecision;
-  if (pr.statusCheckRollup) base.statusCheckRollup = pr.statusCheckRollup;
+  if (pr.statusCheckRollup) base.statusCheckRollup = pr.statusCheckRollup; if (pr.mergeable) base.mergeable = pr.mergeable; if (pr.mergeStateStatus) base.mergeStateStatus = pr.mergeStateStatus;
   if (pr.state !== "merged") return false;
   base.prMerged = true;
   if (pr.sha) base.prMergeSha = pr.sha;