@algosuite/vo-mcp 0.2.0-beta.59 → 0.2.0-beta.60

package/dist/runner-cli.js

@@ -16056,12 +16056,29 @@ function loadCodeRunnerConfig(env2 = process.env, { log: log2 = () => {
     // drafts; the repair that landed (#9984) cost $2.36. Ceiling/override behaviour unchanged.
     watchRepairBudgetUsd: Math.max(0.25, Math.min(10, Number(env2.VO_CODE_RUNNER_REPAIR_BUDGET_USD ?? 5) || 5)),
     watchIntervalSec: Math.max(30, Number(env2.VO_CODE_RUNNER_WATCH_SEC ?? 60) || 60),
+    // See the merge-ownership table at the top of this file. Two flags, two
+    // owners; the GitHub one is strict opt-in so it can never win by default.
     armAutoMerge: env2.VO_CODE_RUNNER_ARM_AUTOMERGE !== "0",
+    armGhAutoMerge: env2.VO_CODE_RUNNER_ARM_GH_AUTOMERGE === "1",
     controlEnabled: env2.VO_CODE_RUNNER_CONTROL !== "0",
     controlPort: Math.max(1, Number(env2.VO_CODE_RUNNER_CONTROL_PORT ?? 7787) || 7787),
     appOrigin: env2.VO_APP_ORIGIN || "https://algosuite.ai"
   };
 }
+function mergeOwner(cfg) {
+  return cfg && cfg.armGhAutoMerge ? "github-auto" : "watcher-gated";
+}
+function describeMergeOwnership(cfg, { watchCyclesEnabled = false, once: once2 = false } = {}) {
+  const ownerLine = mergeOwner(cfg) === "github-auto" ? "merge-owner=github-auto \u2014 publish arms `gh pr merge --auto` (VO_CODE_RUNNER_ARM_GH_AUTOMERGE=1); GitHub merges on green CI and NO consensus receipt is recorded" : "merge-owner=watcher-gated \u2014 publish does not arm GitHub auto-merge (VO_CODE_RUNNER_ARM_GH_AUTOMERGE=1 to opt in); merges go through the control plane, which records the consensus receipt";
+  let watcherLine = "PR watcher OFF (VO_CODE_RUNNER_WATCH=0)";
+  if (watchCyclesEnabled) {
+    const merge = cfg.armAutoMerge ? "receipt-gated merge enabled" : "merge disabled (VO_CODE_RUNNER_ARM_AUTOMERGE=0)";
+    watcherLine = `PR watcher ON \u2014 auto-fix ${cfg.watchMaxFix}/PR; ${merge}; every ${cfg.watchIntervalSec}s (VO_CODE_RUNNER_WATCH=0 to disable)`;
+  } else if (once2) {
+    watcherLine = "PR watcher bypassed for --once; dispatched PRs remain tracked";
+  }
+  return [ownerLine, watcherLine];
+}
 var parseList;
 var init_daemon_config = __esm({
   "../../scripts/virtual-office/code-runner/daemon-config.mjs"() {
@@ -16401,6 +16418,7 @@ async function processOneTask(client, task, cfg, runnerInstanceId, swarmAdmissio
       return;
     }
     await safeProgress(client, id, runnerStagePatch("opening_pr", `opening PR for ${files.length} changed file(s)`));
+    log(`task ${id}: publishing with merge-owner=${mergeOwner(cfg)}`);
     const closesSource = publicationTarget.supersedesPrNumber ? `
 
 Closes #${publicationTarget.supersedesPrNumber}` : "";
@@ -16411,8 +16429,8 @@ Closes #${publicationTarget.supersedesPrNumber}` : "";
       githubToken,
       allowAmbientGithubFallback: cfg.allowAmbientGithub,
       draft: partial,
-      armAutoMerge: false,
-      // watcher waits for green CI, then uses exact-SHA consensus merge
+      armAutoMerge: cfg.armGhAutoMerge,
+      // default OFF: the watcher waits for green CI, then uses the exact-SHA receipt-gated merge
       ...publicationTarget,
       deferSupersededPrCleanup: true
     });
@@ -16520,12 +16538,7 @@ async function main({ env: env2 = process.env, once: once2 = false } = {}) {
     `up as ${cfg.runnerId} \u2192 ${env2.VO_CONTROL_PLANE_URL} (agent ${cfg.agent} [${cfg.runnerBin}], concurrency ${capacityController.current()}/${cfg.maxConcurrency}, poll ${cfg.pollSec}s, once=${once2})`
   );
   for (const line of describeClaimScoping(cfg, env2)) log(line);
-  log(
-    cfg.armAutoMerge ? "PR auto-merge arming ON for complete PRs (default; VO_CODE_RUNNER_ARM_AUTOMERGE=0 to disable)" : "PR auto-merge arming OFF (VO_CODE_RUNNER_ARM_AUTOMERGE=0)"
-  );
-  log(
-    watchCyclesEnabled ? `PR watcher ON \u2014 auto-fix ${cfg.watchMaxFix}/PR; ${cfg.armAutoMerge ? "receipt-gated merge enabled" : "merge disabled"}; every ${cfg.watchIntervalSec}s (VO_CODE_RUNNER_WATCH=0 to disable)` : once2 ? "PR watcher bypassed for --once; dispatched PRs remain tracked" : "PR watcher OFF (VO_CODE_RUNNER_WATCH=0)"
-  );
+  for (const line of describeMergeOwnership(cfg, { watchCyclesEnabled, once: once2 })) log(line);
   const runWatch = makeWatchRunner({
     client,
     log,