@algosuite/vo-mcp 0.2.0-beta.55 → 0.2.0-beta.56

package/dist/runner-cli.js

@@ -1178,8 +1178,8 @@ async function walkManagedRoots(ownership, options, onLink) {
   const normalized = normalizeOwnership(ownership);
   let scannedEntries = 0;
   for (const rootPath of normalized.managedRoots) {
-    const present = await assertManagedRoot(rootPath, normalized.worktreeRoot, fsApi);
-    if (!present) continue;
+    const present2 = await assertManagedRoot(rootPath, normalized.worktreeRoot, fsApi);
+    if (!present2) continue;
     const stack = [rootPath];
     while (stack.length > 0) {
       const current = stack.pop();
@@ -3497,8 +3497,9 @@ async function mergeVerifiedPrRequest(req, prNumber, automationContext, onUnauth
       actionReceiptId: typeof json.action_receipt_id === "string" ? json.action_receipt_id : null
     };
   }
-  if (res.status === 503 && json?.error === "verify_unavailable") {
-    return { status: "retry", reason: json.reason || "verification unavailable" };
+  const captureStoreRetry = json?.action_status === "not_attempted" && (json?.error === "capture_preflight_unavailable" || json?.error === "decision_outcome_intent_failed");
+  if (res.status === 503 && (json?.error === "verify_unavailable" || json?.error === "merge_unavailable" || captureStoreRetry)) {
+    return { status: "retry", reason: json.reason || json.message || json.error || "verification unavailable" };
   }
   return {
     status: "blocked",
@@ -3604,6 +3605,64 @@ var init_claim_gate_notice = __esm({
   }
 });
 
+// ../../scripts/virtual-office/code-runner/control-plane-knowledge-context.mjs
+function isRetryableStatus(status) {
+  return status >= 500 && status <= 599;
+}
+function defaultSleep(ms) {
+  return new Promise((resolve3) => {
+    setTimeout(resolve3, ms);
+  });
+}
+async function getTaskKnowledgeContextRequest(req, taskId, { query } = {}, {
+  taskRequestTimeoutMs,
+  invalidateToken = () => {
+  },
+  sleep: sleep3 = defaultSleep,
+  log: log2 = () => {
+  }
+} = {}) {
+  const body = {};
+  if (typeof query === "string" && query.trim()) body.query = query;
+  const path22 = `/api/v1/code-task/${encodeURIComponent(taskId)}/knowledge-context`;
+  const timeoutMs = Math.max(Number(taskRequestTimeoutMs) || 0, MIN_KNOWLEDGE_CONTEXT_TIMEOUT_MS);
+  for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt += 1) {
+    let res;
+    let cause;
+    try {
+      res = await req("POST", path22, body, { timeoutMs });
+    } catch (err) {
+      cause = err;
+    }
+    if (!cause) {
+      if (res.status === 401) {
+        invalidateToken();
+        throw new Error("knowledge-context unauthorized (401)");
+      }
+      if (res.status === 404) return null;
+      if (res.ok) return res.json();
+      if (!isRetryableStatus(res.status)) {
+        throw new Error(`knowledge-context failed: HTTP ${res.status}`);
+      }
+      cause = new Error(`knowledge-context failed: HTTP ${res.status}`);
+    }
+    if (attempt === MAX_ATTEMPTS) throw cause;
+    const delayMs = RETRY_DELAYS_MS[attempt - 1];
+    log2(`knowledge-context attempt ${attempt}/${MAX_ATTEMPTS} failed (${cause.message}); retrying in ${delayMs}ms`);
+    await sleep3(delayMs);
+  }
+  throw new Error("knowledge-context retry loop exited unexpectedly");
+}
+var MIN_KNOWLEDGE_CONTEXT_TIMEOUT_MS, RETRY_DELAYS_MS, MAX_ATTEMPTS;
+var init_control_plane_knowledge_context = __esm({
+  "../../scripts/virtual-office/code-runner/control-plane-knowledge-context.mjs"() {
+    "use strict";
+    MIN_KNOWLEDGE_CONTEXT_TIMEOUT_MS = 15e3;
+    RETRY_DELAYS_MS = [2e3, 6e3];
+    MAX_ATTEMPTS = RETRY_DELAYS_MS.length + 1;
+  }
+});
+
 // src/runner/control-plane-auth-stub.mjs
 var control_plane_auth_stub_exports = {};
 __export(control_plane_auth_stub_exports, {
@@ -3647,7 +3706,8 @@ function createControlPlaneClient({
     6e4
   ),
   runnerId,
-  runnerInstanceId
+  runnerInstanceId,
+  sleep: sleep3
 } = {}) {
   const resolvedBaseUrl = baseUrl ?? env2.VO_CONTROL_PLANE_URL ?? "";
   if (!resolvedBaseUrl) throw new Error("VO_CONTROL_PLANE_URL is required for the code-runner daemon");
@@ -3828,17 +3888,16 @@ function createControlPlaneClient({
       if (!res.ok) throw new Error(`attachment download failed: HTTP ${res.status}`);
       return Buffer.from(await res.arrayBuffer());
     },
+    // Raised per-attempt timeout (>=15s) + bounded retry — see control-plane-knowledge-context.mjs.
     async getTaskKnowledgeContext(taskId, { query } = {}) {
-      const body = {};
-      if (typeof query === "string" && query.trim()) body.query = query;
-      const res = await taskReq("POST", `/api/v1/code-task/${encodeURIComponent(taskId)}/knowledge-context`, body);
-      if (res.status === 401) {
-        cachedFirebaseToken = null;
-        throw new Error("knowledge-context unauthorized (401)");
-      }
-      if (res.status === 404) return null;
-      if (!res.ok) throw new Error(`knowledge-context failed: HTTP ${res.status}`);
-      return res.json();
+      return getTaskKnowledgeContextRequest(req, taskId, { query }, {
+        taskRequestTimeoutMs,
+        invalidateToken: () => {
+          cachedFirebaseToken = null;
+        },
+        sleep: sleep3,
+        log: (m) => console.warn(`[code-runner ${(/* @__PURE__ */ new Date()).toISOString()}] ${m}`)
+      });
     },
     /** Weekly Claude token usage report — see control-plane-weekly-tokens.mjs. */
     async postWeeklyTokens(report) {
@@ -3992,6 +4051,7 @@ var init_control_plane_client = __esm({
     init_control_plane_weekly_tokens();
     init_control_plane_telemetry_relay();
     init_claim_gate_notice();
+    init_control_plane_knowledge_context();
     cachedFirebaseToken = null;
     ClaimAuthorityChangedError = class extends Error {
       constructor() {
@@ -8876,7 +8936,7 @@ function selectDueEntries({ entries = [], now, alreadyDispatched = /* @__PURE__
     if (!code_task_id) continue;
     if (seen.has(code_task_id)) continue;
     const stableAttempts = Number(attemptsByKey[stableTaskKey(e)] || 0);
-    if (Math.max(typeof attempts === "number" ? attempts : 0, stableAttempts) >= MAX_ATTEMPTS) {
+    if (Math.max(typeof attempts === "number" ? attempts : 0, stableAttempts) >= MAX_ATTEMPTS2) {
       exhausted.push(e);
       continue;
     }
@@ -8912,11 +8972,11 @@ function reconcileQueue({ entries = [], dispatchedIds = /* @__PURE__ */ new Set(
     return true;
   });
 }
-var MAX_ATTEMPTS, MAX_DISPATCH_PER_RUN, NULL_RESUME_AFTER_BACKOFF_MS;
+var MAX_ATTEMPTS2, MAX_DISPATCH_PER_RUN, NULL_RESUME_AFTER_BACKOFF_MS;
 var init_rate_limit_resume_scheduler_core = __esm({
   "../../scripts/virtual-office/code-runner/rate-limit-resume-scheduler-core.mjs"() {
     "use strict";
-    MAX_ATTEMPTS = 3;
+    MAX_ATTEMPTS2 = 3;
     MAX_DISPATCH_PER_RUN = 10;
     NULL_RESUME_AFTER_BACKOFF_MS = 15 * 60 * 1e3;
   }
@@ -8943,7 +9003,7 @@ function bumpAttempts(store, key, sourceTaskId, nowIso) {
   store[key] = {
     count: (typeof prior.count === "number" ? prior.count : 0) + 1,
     lastSeen: nowIso,
-    resumedTaskIds: [...resumedTaskIds, sourceTaskId].slice(-MAX_ATTEMPTS)
+    resumedTaskIds: [...resumedTaskIds, sourceTaskId].slice(-MAX_ATTEMPTS2)
   };
 }
 function pruneAttemptsStore(store, nowIso) {
@@ -8995,7 +9055,7 @@ async function runLockedScheduler({
   await writeResumeAttempts(attemptsPath, pruneAttemptsStore(attemptsStore, nowIso));
   await writeResumeQueue(queuePath, kept);
   if (exhausted.length > 0) {
-    log2(`WARN: ${exhausted.length} task(s) reached the ${MAX_ATTEMPTS}-continuation spend ceiling and remain queued for operator review: ${exhausted.map((entry) => entry.code_task_id).join(", ")}`);
+    log2(`WARN: ${exhausted.length} task(s) reached the ${MAX_ATTEMPTS2}-continuation spend ceiling and remain queued for operator review: ${exhausted.map((entry) => entry.code_task_id).join(", ")}`);
   }
   if (due.length >= MAX_DISPATCH_PER_RUN) {
     log2(`WARN: hit the per-run dispatch cap (${MAX_DISPATCH_PER_RUN}); more tasks remain queued`);
@@ -10446,39 +10506,6 @@ var init_pr_watcher_failure_confirmation = __esm({
   }
 });
 
-// ../../scripts/virtual-office/code-runner/superseded-pr-source.mjs
-function supersededSourcePrNumber(prompt) {
-  const text = String(prompt || "");
-  if (text.includes(CI_FIX_MARKER)) {
-    const match = text.match(/\bPR:\s*#(\d+)\b/u);
-    return match ? Number(match[1]) : null;
-  }
-  const repairMatch = text.match(/^REPAIR MISSION:\s*PR\s+#(\d+)\b/iu);
-  if (repairMatch) return Number(repairMatch[1]);
-  const recoverySupersedeMatch = text.match(
-    /^VO_RECOVERY_FROM_CODE_TASK:\s*[0-9a-f-]{36}\n\nSupersede draft PR #(\d+) from a fresh current origin\/main branch\b/iu
-  );
-  if (recoverySupersedeMatch) return Number(recoverySupersedeMatch[1]);
-  const restoredContextMatch = text.match(
-    /^(?:The previous run reached its max-turn cap after opening a partial draft PR\.|The previous run left a draft PR\.)\nThe HQ runner will restore the existing draft PR context before you start \(draft PR https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/(\d+), PR #(\d+)\)\. Continue that work and finish it\./u
-  );
-  if (restoredContextMatch) {
-    return restoredContextMatch[1] === restoredContextMatch[2] ? Number(restoredContextMatch[1]) : null;
-  }
-  const continuationMatch = text.match(
-    /^(?:The previous run reached its max-turn cap after opening a partial draft PR\.|The previous run left a draft PR\.)\nContinue the work already started on the branch for PR #(\d+) \(draft PR https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/(\d+)\); check it out and finish it\./u
-  );
-  if (!continuationMatch || continuationMatch[1] !== continuationMatch[2]) return null;
-  return Number(continuationMatch[1]);
-}
-var CI_FIX_MARKER;
-var init_superseded_pr_source = __esm({
-  "../../scripts/virtual-office/code-runner/superseded-pr-source.mjs"() {
-    "use strict";
-    CI_FIX_MARKER = "[VO-CI-FIX]";
-  }
-});
-
 // ../../scripts/virtual-office/code-runner/error-message.mjs
 function boundedErrorMessage(error, maxLength = 240) {
   try {
@@ -10513,9 +10540,52 @@ function mergeEnqueueActive(entry, nowMs = Date.now()) {
   if (!at) return true;
   return nowMs - at < MERGE_ENQUEUE_TTL_MS;
 }
+function migrateLegacyMergeState(entry, nowMs = Date.now()) {
+  if (!entry) return false;
+  if (entry.mergeEnqueued === true && !(Number(entry.mergeEnqueuedAt) > 0)) {
+    entry.mergeEnqueuedAt = nowMs;
+    return true;
+  }
+  const exhausted = entry.mergeRetryExhausted === true || (Number(entry.mergeAttempts) || 0) >= 3 || (Number(entry.mergeErrors) || 0) >= 3;
+  if (entry.mergeTerminal === true || mergeEnqueueActive(entry, nowMs) || !exhausted) return false;
+  entry.mergeRetryExhausted = true;
+  entry.mergeTerminal = true;
+  entry.mergeBlockReason ||= "Legacy watcher state exhausted 3 automatic merge attempts without a terminal result.";
+  return true;
+}
 function isTerminalResumeRefusal(error) {
   return typeof error?.code === "string" && TERMINAL_RESUME_REFUSALS.includes(error.code);
 }
+async function reportPendingMergeExhaustion({
+  entry,
+  now,
+  reportBlocker,
+  taskId,
+  prNumber,
+  log: log2 = () => {
+  }
+}) {
+  if (!entry.mergeRetryExhausted || entry.mergeEscalatedAt || typeof reportBlocker !== "function") return false;
+  const lastError = boundedErrorMessage(entry.mergeRetryReason || entry.mergeBlockReason);
+  try {
+    await reportBlocker({
+      taskId,
+      message: `PR #${prNumber} automatic merge verification exhausted its bounded retry budget; operator review is required. Last error: ${lastError}`
+    });
+    entry.mergeEscalatedAt = now();
+    return true;
+  } catch (reportError) {
+    log2(`watch: pr #${prNumber} merge escalation failed; terminal state retained: ${boundedErrorMessage(reportError)}`);
+    return false;
+  }
+}
+async function scheduleMergeRetry(input) {
+  await scheduleCoordinationRetry({ ...input, kind: "merge" });
+  return {
+    terminal: input.entry.mergeTerminal === true,
+    escalated: await reportPendingMergeExhaustion(input)
+  };
+}
 async function scheduleCoordinationRetry({
   entry,
   kind,
@@ -10534,10 +10604,21 @@ async function scheduleCoordinationRetry({
     log2(`watch: pr #${prNumber} automatic continuation refused by the plane (${error.code}); no retry \u2014 operator may resume explicitly with a larger cap`);
     return;
   }
-  const errorsKey = kind === "resume" ? "resumeErrors" : "enqueueErrors";
-  const attemptsKey = kind === "resume" ? "resumeAttempts" : "fixAttempts";
+  const errorsKey = kind === "resume" ? "resumeErrors" : kind === "merge" ? "mergeErrors" : "enqueueErrors";
+  const attemptsKey = kind === "resume" ? "resumeAttempts" : kind === "merge" ? "mergeAttempts" : "fixAttempts";
   entry[errorsKey] = (entry[errorsKey] || 0) + 1;
-  entry[attemptsKey] = Math.max(0, (entry[attemptsKey] || 1) - 1);
+  if (kind === "merge") {
+    entry.mergeRetryReason = boundedErrorMessage(error);
+    if (entry[errorsKey] >= 3) {
+      entry.mergeTerminal = true;
+      entry.mergeRetryExhausted = true;
+      entry.mergeBlockReason = `Automatic merge verification remained unavailable after 3 attempts: ${entry.mergeRetryReason}`;
+      delete entry.nextRetryAt;
+      log2(`watch: pr #${prNumber} merge retry cap reached \u2014 terminal and operator review required`);
+      return;
+    }
+  }
+  if (kind !== "merge") entry[attemptsKey] = Math.max(0, (entry[attemptsKey] || 1) - 1);
   const delay2 = Math.min(MAX_BACKOFF_MS2, 3e4 * 2 ** Math.min(7, entry[errorsKey] - 1));
   entry.nextRetryAt = now() + delay2;
   if (entry[errorsKey] >= 3 && !entry.coordinationEscalatedAt && typeof reportBlocker === "function") {
@@ -10646,16 +10727,87 @@ var init_watcher_state = __esm({
 function normalizedRepo(repo) {
   return String(repo || "").trim().toLowerCase();
 }
+function present(value) {
+  return value !== null && value !== void 0 && value !== "";
+}
 function watcherKey(state, repo, prNumber) {
+  const targetRepo = normalizedRepo(repo);
+  for (const [key, entry] of Object.entries(state)) {
+    if (watcherPrNumber(key, entry) !== Number(prNumber)) continue;
+    if (normalizedRepo(entry?.repo) === targetRepo) return key;
+  }
   const legacy = String(prNumber);
   const existing = state[legacy];
-  if (!existing || normalizedRepo(existing.repo) === normalizedRepo(repo)) return legacy;
-  return `${normalizedRepo(repo)}#${prNumber}`;
+  if (!existing) return legacy;
+  return `${targetRepo}#${prNumber}`;
 }
 function watcherPrNumber(stateKey, entry) {
   const value = Number(entry?.prNumber ?? String(stateKey).split("#").at(-1));
   return Number.isInteger(value) && value > 0 ? value : null;
 }
+function collapseDuplicateWatcherEntries(state) {
+  const keeperBySubject = /* @__PURE__ */ new Map();
+  let collapsed = 0;
+  for (const [key, entry] of Object.entries(state)) {
+    if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue;
+    const repo = normalizedRepo(entry.repo);
+    const prNumber = watcherPrNumber(key, entry);
+    if (!repo || !prNumber) continue;
+    const subject = `${repo}#${prNumber}`;
+    const keeperKey = keeperBySubject.get(subject);
+    if (!keeperKey) {
+      keeperBySubject.set(subject, key);
+      continue;
+    }
+    const keeper = state[keeperKey];
+    let identityConflict = false;
+    for (const field of ["taskId", "operatorId", "tenantId"]) {
+      const current = keeper[field];
+      const duplicate = entry[field];
+      if (!present(current) && present(duplicate)) keeper[field] = duplicate;
+      else if (present(current) && present(duplicate) && current !== duplicate) identityConflict = true;
+    }
+    if (keeper.operatorId === "admin" && present(keeper.tenantId)) identityConflict = true;
+    for (const field of ["fixAttempts", "mergeAttempts", "mergeErrors", "resumeAttempts"]) {
+      const current = Number(keeper[field]);
+      const duplicate = Number(entry[field]);
+      const total = (Number.isSafeInteger(current) && current > 0 ? current : 0) + (Number.isSafeInteger(duplicate) && duplicate > 0 ? duplicate : 0);
+      keeper[field] = Math.min(Number.MAX_SAFE_INTEGER, total);
+    }
+    for (const [field, value] of Object.entries(entry)) {
+      if (["taskId", "operatorId", "tenantId"].includes(field)) continue;
+      if (!present(keeper[field]) && present(value)) keeper[field] = value;
+    }
+    if (entry.allowFixDispatch === false) keeper.allowFixDispatch = false;
+    const continuationExhausted = keeper.continuationExhausted === true || entry.continuationExhausted === true;
+    keeper.continuationExhausted = continuationExhausted;
+    keeper.needsContinuation = !continuationExhausted && (keeper.needsContinuation === true || entry.needsContinuation === true);
+    if (entry.mergeEnqueued === true) {
+      keeper.mergeEnqueued = true;
+      if ((Number(entry.mergeEnqueuedAt) || 0) > (Number(keeper.mergeEnqueuedAt) || 0)) {
+        keeper.mergeEnqueuedAt = entry.mergeEnqueuedAt;
+        keeper.mergeActionReceiptId = entry.mergeActionReceiptId ?? null;
+      }
+    }
+    if (entry.mergeTerminal === true && keeper.mergeTerminal !== true) {
+      keeper.mergeTerminal = true;
+      keeper.mergeBlockReason = entry.mergeBlockReason || "verification refused";
+    }
+    if ((Number(keeper.mergeErrors) || 0) >= 3) {
+      keeper.mergeRetryExhausted = true;
+      keeper.mergeTerminal = true;
+      keeper.mergeBlockReason ||= `Duplicate watcher history exhausted ${keeper.mergeErrors} automatic merge retries.`;
+    }
+    if (identityConflict) {
+      keeper.automationContextConflict = true;
+      keeper.mergeTerminal = true;
+      keeper.mergeBlockReason = "Duplicate watcher entries disagree on automation attribution.";
+    }
+    delete state[key];
+    collapsed += 1;
+  }
+  return collapsed;
+}
 function deleteWatcherEntry(state, repo, prNumber) {
   const targetRepo = normalizedRepo(repo);
   for (const [key, entry] of Object.entries(state)) {
@@ -10670,6 +10822,46 @@ var init_watcher_key = __esm({
   }
 });
 
+// ../../scripts/virtual-office/code-runner/watcher-merge-authority.mjs
+function nonEmptyString(value) {
+  return typeof value === "string" && value.length > 0;
+}
+function resolveWatcherMergeAuthority(entry = {}) {
+  if (entry.automationContextConflict === true) {
+    return {
+      kind: "blocked",
+      reason: "Watcher automation attribution conflicts with the durable code task."
+    };
+  }
+  if (String(entry.repo || "").trim().toLowerCase() !== CANONICAL_WATCHER_MERGE_REPO) {
+    return {
+      kind: "blocked",
+      reason: "Watcher merge target is not the canonical Nexus repository."
+    };
+  }
+  const taskId = entry.taskId;
+  const operatorId = entry.operatorId;
+  const tenantId = entry.tenantId;
+  if (nonEmptyString(taskId) && operatorId === "admin" && (tenantId === null || tenantId === void 0)) {
+    return { kind: "legacy-admin", context: void 0 };
+  }
+  if (nonEmptyString(taskId) && nonEmptyString(operatorId) && nonEmptyString(tenantId)) {
+    return { kind: "scoped", context: { taskId, operatorId, tenantId } };
+  }
+  return {
+    kind: "blocked",
+    reason: INCOMPLETE_WATCHER_AUTHORITY_REASON
+  };
+}
+var INCOMPLETE_WATCHER_AUTHORITY_REASON, CANONICAL_WATCHER_MERGE_REPO;
+var init_watcher_merge_authority = __esm({
+  "../../scripts/virtual-office/code-runner/watcher-merge-authority.mjs"() {
+    "use strict";
+    INCOMPLETE_WATCHER_AUTHORITY_REASON = "Watcher automation attribution is incomplete; merge was not attempted.";
+    CANONICAL_WATCHER_MERGE_REPO = "algosuite-ai/nexus";
+  }
+});
+
 // ../../scripts/virtual-office/code-runner/watcher-adoption.mjs
 async function adoptPrOpenedTasks(tasks, {
   stateFile,
@@ -10690,7 +10882,38 @@ async function adoptPrOpenedTasks(tasks, {
       if (repos.size > 0 && !repos.has(task.repo.toLowerCase())) continue;
       if (operators.size > 0 && !operators.has(task.operator_id)) continue;
       const key = watcherKey(state, task.repo, task.pr_number);
-      if (state[key]) continue;
+      const existing = state[key];
+      if (existing) {
+        let changed = false;
+        let conflict = false;
+        for (const [field, durable] of [
+          ["taskId", task.code_task_id],
+          ["operatorId", task.operator_id],
+          ["tenantId", task.tenant_id]
+        ]) {
+          const comparable = durable === null || typeof durable === "string" && durable.length > 0;
+          if (!comparable) continue;
+          const current = existing[field];
+          if ((current === null || current === void 0 || current === "") && durable !== null) {
+            existing[field] = durable;
+            changed = true;
+          } else if (current !== null && current !== void 0 && current !== "" && current !== durable) {
+            conflict = true;
+          }
+        }
+        if (conflict && existing.automationContextConflict !== true) {
+          existing.automationContextConflict = true;
+          changed = true;
+        }
+        if (!conflict && existing.mergeTerminal === true && existing.mergeBlockReason === INCOMPLETE_WATCHER_AUTHORITY_REASON && resolveWatcherMergeAuthority(existing).kind !== "blocked") {
+          delete existing.mergeTerminal;
+          delete existing.mergeBlockReason;
+          existing.mergeAttempts = 0;
+          changed = true;
+        }
+        if (changed) adopted += 1;
+        continue;
+      }
       const partial = String(task.result || "").includes(PARTIAL_PR_CONTINUATION_MARKER);
       const repairChain = task.repair_chain ?? {
         root_pr_number: task.repair_pr_number ?? task.pr_number,
@@ -10726,6 +10949,7 @@ var init_watcher_adoption = __esm({
     init_watcher_state();
     init_partial_pr_continuation();
     init_watcher_key();
+    init_watcher_merge_authority();
   }
 });
 
@@ -10757,6 +10981,39 @@ var init_watcher_github_token = __esm({
   }
 });
 
+// ../../scripts/virtual-office/code-runner/superseded-pr-source.mjs
+function supersededSourcePrNumber(prompt) {
+  const text = String(prompt || "");
+  if (text.includes(CI_FIX_MARKER)) {
+    const match = text.match(/\bPR:\s*#(\d+)\b/u);
+    return match ? Number(match[1]) : null;
+  }
+  const repairMatch = text.match(/^REPAIR MISSION:\s*PR\s+#(\d+)\b/iu);
+  if (repairMatch) return Number(repairMatch[1]);
+  const recoverySupersedeMatch = text.match(
+    /^VO_RECOVERY_FROM_CODE_TASK:\s*[0-9a-f-]{36}\n\nSupersede draft PR #(\d+) from a fresh current origin\/main branch\b/iu
+  );
+  if (recoverySupersedeMatch) return Number(recoverySupersedeMatch[1]);
+  const restoredContextMatch = text.match(
+    /^(?:The previous run reached its max-turn cap after opening a partial draft PR\.|The previous run left a draft PR\.)\nThe HQ runner will restore the existing draft PR context before you start \(draft PR https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/(\d+), PR #(\d+)\)\. Continue that work and finish it\./u
+  );
+  if (restoredContextMatch) {
+    return restoredContextMatch[1] === restoredContextMatch[2] ? Number(restoredContextMatch[1]) : null;
+  }
+  const continuationMatch = text.match(
+    /^(?:The previous run reached its max-turn cap after opening a partial draft PR\.|The previous run left a draft PR\.)\nContinue the work already started on the branch for PR #(\d+) \(draft PR https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/(\d+)\); check it out and finish it\./u
+  );
+  if (!continuationMatch || continuationMatch[1] !== continuationMatch[2]) return null;
+  return Number(continuationMatch[1]);
+}
+var CI_FIX_MARKER;
+var init_superseded_pr_source = __esm({
+  "../../scripts/virtual-office/code-runner/superseded-pr-source.mjs"() {
+    "use strict";
+    CI_FIX_MARKER = "[VO-CI-FIX]";
+  }
+});
+
 // ../../scripts/virtual-office/code-runner/ci-fix-prompt.mjs
 function buildCiFixPrompt({ prNumber, repo, branch, headSha, failedChecks, prPatch, failedLogs }) {
   return [
@@ -11038,6 +11295,7 @@ async function runWatchCycleUnlocked({
   stateFile = DEFAULT_STATE_FILE
 }) {
   const state = await readWatcherState(stateFile);
+  collapseDuplicateWatcherEntries(state);
   const prNumbers = Object.keys(state);
   let checked = 0;
   let fixed = 0;
@@ -11063,6 +11321,7 @@ async function runWatchCycleUnlocked({
     }
     checked += 1;
     const pr = parsePrCiStatus(view);
+    migrateLegacyMergeState(entry, now());
     entry.lastCi = pr.ci;
     const confirmation = observeRepairFailure(entry, pr, now());
     const proposedAction = decideWatchAction(
@@ -11133,10 +11392,30 @@ async function runWatchCycleUnlocked({
           mergeBlocked += 1;
           log2(`watch: pr #${prNumber} verification blocked merge: ${entry.mergeBlockReason}`);
         } else {
-          log2(`watch: pr #${prNumber} verification unavailable; retry ${entry.mergeAttempts}/3`);
+          const retry = await scheduleMergeRetry({
+            entry,
+            now,
+            reportBlocker,
+            taskId: entry.taskId,
+            prNumber,
+            error: new Error(outcome.reason || "verification unavailable"),
+            log: log2
+          });
+          if (retry.terminal) mergeBlocked += 1;
+          if (retry.escalated) escalated += 1;
         }
       } catch (err) {
-        log2(`watch: pr #${prNumber} gated merge failed (${entry.mergeAttempts}/3): ${err.message}`);
+        const retry = await scheduleMergeRetry({
+          entry,
+          now,
+          reportBlocker,
+          taskId: entry.taskId,
+          prNumber,
+          error: err,
+          log: log2
+        });
+        if (retry.terminal) mergeBlocked += 1;
+        if (retry.escalated) escalated += 1;
       }
     } else if (action === "fix") {
       entry.fixAttempts = (entry.fixAttempts || 0) + 1;
@@ -11169,6 +11448,7 @@ async function runWatchCycleUnlocked({
       }
     } else {
       entry.lastCheckedAt = now();
+      if (await reportPendingMergeExhaustion({ entry, now, reportBlocker, taskId: entry.taskId, prNumber, log: log2 })) escalated += 1;
       const repairCapped = pr.ci === "failing" && ((entry.fixAttempts || 0) >= maxFixAttempts || entry.allowFixDispatch === false);
       if ((repairCapped || entry.continuationExhausted) && !entry.escalatedAt) {
         try {
@@ -11226,7 +11506,7 @@ function makeWatchRunner({
       repairChainMax,
       repairBudgetUsd
     });
-    if (adopted > 0) log2(`watch: adopted ${adopted} open task PR(s) from the control plane`);
+    if (adopted > 0) log2(`watch: adopted or reconciled ${adopted} open task PR(s) from the control plane`);
     return runWatchCycle({
       viewPr: watchView,
       enqueueFix: async ({ prNumber, repo, branch, headSha, failedChecks, failedCheckLinks, repairChain, operatorId }) => {
@@ -11268,13 +11548,10 @@ function makeWatchRunner({
         return result;
       },
       mergePr: (prNumber, entry) => {
-        const context = {
-          taskId: entry.taskId,
-          operatorId: entry.operatorId,
-          tenantId: entry.tenantId
-        };
-        const complete = Object.values(context).every((value) => typeof value === "string" && value.length > 0);
-        return client.mergeVerifiedPr(prNumber, complete ? context : void 0);
+        const authority = resolveWatcherMergeAuthority(entry);
+        if (authority.kind === "blocked")
+          return Promise.resolve({ status: "blocked", reason: authority.reason });
+        return client.mergeVerifiedPr(prNumber, authority.context);
       },
       log: log2,
       maxFixAttempts,
@@ -11291,7 +11568,6 @@ var init_pr_watcher = __esm({
     init_check_run_latest();
     init_ci_repair_evidence();
     init_pr_watcher_failure_confirmation();
-    init_superseded_pr_source();
     init_watcher_coordination();
     init_watcher_adoption();
     init_watcher_key();
@@ -11300,6 +11576,7 @@ var init_pr_watcher = __esm({
     init_pr_watcher_github();
     init_enqueue_autonomous_code_task();
     init_watcher_state();
+    init_watcher_merge_authority();
     init_superseded_pr_source();
     init_ci_fix_prompt();
     DEFAULT_STATE_FILE = join14(homedir9(), ".vo", "dispatched-prs.json");
@@ -13110,9 +13387,16 @@ function makeSafeProgress(log2) {
 function runnerStagePatch(stage, message, extra = {}) {
   return { stage, message, ...extra };
 }
+function preservedReceiptLines(run, slicedBodyText) {
+  const full = `${String(run?.summary || "")}
+${String(run?.lastAgentMessage || "")}`;
+  const found = [...new Set((full.match(RECEIPT_LINE_RE) || []).map((line) => line.trim()))];
+  const missing = found.filter((line) => !String(slicedBodyText || "").includes(line));
+  return missing.length ? ["", "### Consensus evidence (preserved past truncation)", "", ...missing.map((line) => redactSecrets(line))] : [];
+}
 function buildPrBody(task, run, files, { armAutoMerge = false } = {}) {
   const governedStakes = matchGovernedStakes({ prompt: String(task.prompt || "") });
-  return [
+  const slicedSections = [
     "## AlgoHQ Command Center \u2014 Code-from-Anywhere task",
     "",
     `- **Task:** \`${task.code_task_id}\``,
@@ -13135,7 +13419,12 @@ function buildPrBody(task, run, files, { armAutoMerge = false } = {}) {
     "",
     // A budget/turn-capped run ends with no assistant text (summary = the bare
     // subtype); its LAST message is the honest report the operator needs.
-    ...run.lastAgentMessage ? ["### Last agent message before the cap", "", redactSecrets(String(run.lastAgentMessage)).slice(0, 2e3), ""] : [],
+    ...run.lastAgentMessage ? ["### Last agent message before the cap", "", redactSecrets(String(run.lastAgentMessage)).slice(0, 2e3), ""] : []
+  ];
+  return [
+    ...slicedSections,
+    // Receipt lines the slices dropped — the gate reads only this body.
+    ...preservedReceiptLines(run, slicedSections.join("\n")),
     "---",
     armAutoMerge ? "_Opened by the AlgoHQ code-runner daemon. After CI passes, the watcher must obtain a durable consensus receipt and merge the exact verified SHA._" : "_Opened by the AlgoHQ code-runner daemon. This PR awaits the verify-before-act gate / operator review \u2014 it is NOT auto-merged._"
   ].filter((l) => l !== "").join("\n");
@@ -13153,11 +13442,13 @@ async function mintRunnerGithubTokens({ client, taskId, log: log2, repo = null,
   if (!agentReadToken) log2(`task ${taskId}: no GitHub read access for the agent (${reason}); it cannot read a private repo`);
   return { publishToken, agentReadToken };
 }
+var RECEIPT_LINE_RE;
 var init_task_helpers = __esm({
   "../../scripts/virtual-office/code-runner/task-helpers.mjs"() {
     "use strict";
     init_redact_tokens();
     init_methodology_composer();
+    RECEIPT_LINE_RE = /receipt id:\s*[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/giu;
   }
 });