@coreplane/switchboard 1.231.0 → 1.232.0

package/dist/cli.js

@@ -9369,6 +9369,13 @@ function wakeWaitBudget(commandBudgetMs) {
   if (commandBudgetMs === void 0 || !Number.isFinite(commandBudgetMs)) return WAKE_WAIT_MAX_MS;
   return Math.max(0, Math.min(WAKE_WAIT_MAX_MS, Math.trunc(commandBudgetMs)));
 }
+function saysContainerGone(data) {
+  if (data.reason === "runtime-replaced") return true;
+  return data.needs === "attach" && typeof data.error === "string" && data.error.startsWith("worktree-missing:");
+}
+function containerGoneMessage(error) {
+  return `${error.trim()}; the command was not run again`;
+}
 function sandboxRestartedMessage(woke) {
   const secs2 = Math.round(woke.waitedMs / 1e3);
   return `the resident container exited under a rollout and woke from its snapshot after ${secs2}s; the worktree was recreated at ${woke.ref}@${woke.sha.slice(0, 7)}, so uncommitted changes and unpushed commits from earlier in this run are gone`;
@@ -9629,10 +9636,11 @@ var init_resident = __esm({
         this.opts = opts;
       }
       opts;
-      /** Consecutive `runtime-replaced` outcomes with no successful op between
-       *  them. One is a deploy that swapped the resident isolate under a command
-       *  (routine, recoverable); two in a row is a flapping resident and becomes
-       *  infra so the runner's fail-fast still has teeth. */
+      /** Consecutive `runtime-replaced` answers on the idempotent routes (/read,
+       *  /write) with no successful op between them. One is a deploy that swapped
+       *  the resident isolate under a call (routine: re-attach and re-issue); two
+       *  in a row is a flapping resident and becomes infra. /exec never counts
+       *  here: its `runtime-replaced` is the typed restart (`opWithReattach`). */
       runtimeReplacedStreak = 0;
       lastBinding;
       /** The thread's binding as the resident answered it on the most recent
@@ -9807,15 +9815,20 @@ var init_resident = __esm({
           return { released: false, reason: err2 instanceof Error ? err2.message : String(err2) };
         }
       }
-      /** Run a route; on needs:"attach" (evicted/recycled worktree, in-body for
+      /** Run a route; on needs:"attach" for an evicted worktree (in-body for
        *  /exec, 409 for /read //write) re-attach ONCE and retry, then fail legibly.
        *
-       *  A `reason:"runtime-replaced"` answer (the resident isolate was swapped by
-       *  a deploy while the op ran) also re-attaches once — proving the new isolate
-       *  serves this thread — but the op is re-issued only for the idempotent
-       *  routes (/read, /write). /exec is handed back to the caller as-is: the
-       *  command may have started, so it is never blind-retried. Two such answers
-       *  with no success between them are infra (a flapping resident).
+       *  An answer saying the container under the thread is gone
+       *  (`saysContainerGone`: `reason:"runtime-replaced"`, the isolate was swapped
+       *  by a deploy while the op ran; `worktree-missing`, the container disk was
+       *  recycled since the last attach) is, on /exec, the typed
+       *  `ExecSandboxRestartedError` at once — the word the pi harness keys on
+       *  (harness-pi item 16) — before any recovery, so nothing the recovery
+       *  meets can hide it; the command may have started and is never re-issued.
+       *  On the idempotent routes (/read, /write) a `runtime-replaced` re-attaches
+       *  once — proving the new isolate serves this thread — and re-issues the op;
+       *  two such answers with no success between them are infra (a flapping
+       *  resident).
        *
        *  A refusal naming a container that just exited (item 65) waits for the
        *  wake first (`awaitWake`): the refusal came before the command started, so
@@ -9834,6 +9847,10 @@ var init_resident = __esm({
           ),
           { kind: "infra", code: "attach" }
         );
+        const goneUnderThread = (data) => {
+          if (route3 === "/exec" && saysContainerGone(data))
+            throw new ExecSandboxRestartedError(containerGoneMessage(String(data.error)), 0);
+        };
         let r = await this.call(route3, body, callTimeoutMs, signal2, span);
         if (isContainerRolling(r.data.error)) {
           const woke = await this.awaitWake(route3, String(r.data.error), { signal: signal2, budgetMs: opts.waitBudgetMs, span });
@@ -9848,19 +9865,19 @@ var init_resident = __esm({
             );
           }
         }
+        goneUnderThread(r.data);
         if (r.data.needs === "attach") {
           await this.attach(span);
           r = await this.call(route3, body, callTimeoutMs, signal2, span);
+          goneUnderThread(r.data);
           if (r.data.needs === "attach") throw stillGone(r.data);
         }
         if (r.data.reason === "runtime-replaced") {
           this.noteRuntimeReplaced(route3, r.data);
           await this.attach(span);
-          if (route3 === "/read" || route3 === "/write") {
-            r = await this.call(route3, body, callTimeoutMs, signal2, span);
-            if (r.data.reason === "runtime-replaced") this.noteRuntimeReplaced(route3, r.data);
-            if (r.data.needs === "attach") throw stillGone(r.data);
-          }
+          r = await this.call(route3, body, callTimeoutMs, signal2, span);
+          if (r.data.reason === "runtime-replaced") this.noteRuntimeReplaced(route3, r.data);
+          if (r.data.needs === "attach") throw stillGone(r.data);
         }
         if (typeof r.data.error !== "string" || !r.data.error) this.runtimeReplacedStreak = 0;
         return r;
@@ -9944,10 +9961,6 @@ var init_resident = __esm({
         if (status3 === 400 && typeof data.error === "string" && data.error && data.needs === void 0) {
           throw new Error(`resident /exec: ${data.error}`);
         }
-        if (data.reason === "runtime-replaced") {
-          return `${String(data.error)}
-The command may have started; re-check its effects (e.g. git status, the files it writes) before re-running it.`;
-        }
         if (typeof data.error === "string" && data.error) {
           throw classifyError(new ExecInfraError(`resident /exec: ${data.error}`), { kind: "infra" });
         }
@@ -25072,7 +25085,8 @@ async function findOpenPrByHead(repo, branch2) {
   return {
     number: first.number,
     htmlUrl: first.html_url,
-    ...first.head?.sha ? { headSha: first.head.sha } : {}
+    ...first.head?.sha ? { headSha: first.head.sha } : {},
+    ..."auto_merge" in first ? { autoMergeEnabled: first.auto_merge !== null } : {}
   };
 }
 async function findMergedPrByHead(repo, branch2) {
@@ -25182,7 +25196,6 @@ async function fetchRepoShipInfo(repo) {
   const data = await res.json().catch(() => null);
   if (!data || typeof data !== "object") return void 0;
   return {
-    ...typeof data.allow_auto_merge === "boolean" ? { allowAutoMerge: data.allow_auto_merge } : {},
     ...typeof data.default_branch === "string" && data.default_branch ? { defaultBranch: data.default_branch } : {}
   };
 }
@@ -25247,7 +25260,8 @@ async function fetchPullRequestFacts(pr) {
     sameRepoHead,
     ...typeof data.base?.ref === "string" && data.base.ref ? { baseRef: data.base.ref } : {},
     ...typeof data.html_url === "string" ? { htmlUrl: data.html_url } : {},
-    ...typeof data.title === "string" && data.title ? { title: data.title } : {}
+    ...typeof data.title === "string" && data.title ? { title: data.title } : {},
+    ..."auto_merge" in data ? { autoMergeEnabled: data.auto_merge !== null } : {}
   };
 }
 async function mergePullRequest(pr, opts) {
@@ -25584,7 +25598,7 @@ async function resolveRepoContext(msg, history = [], probe, residentSlugs, recor
     const inherited = inheritedPr(thread, records, repo);
     if (inherited) {
       const head = await openPrHeadSha(inherited);
-      if ("sha" in head) {
+      if (!("reason" in head)) {
         out.pr = inherited.number;
         out.headSha = head.sha;
         if (head.base) out.baseRef = head.base;
@@ -25599,6 +25613,9 @@ async function resolveRepoContext(msg, history = [], probe, residentSlugs, recor
         }
       } else {
         out.prUnpostable = { number: inherited.number, reason: head.reason };
+        if (inherited.source === "record" && head.reason === "closed" && head.sha !== void 0) {
+          out.closedRecordPr = { number: inherited.number, headSha: head.sha, merged: head.merged };
+        }
       }
     }
   }
@@ -25609,8 +25626,14 @@ function ownPrOf(ctx) {
   return { number: ctx.pr, ref: ctx.ref };
 }
 function recordPrOf(ctx) {
-  if (!ctx.prFromRecord || ctx.pr === void 0 || ctx.headSha === void 0) return void 0;
-  return { number: ctx.pr, headSha: ctx.headSha };
+  if (ctx.prFromRecord && ctx.pr !== void 0 && ctx.headSha !== void 0) {
+    return { number: ctx.pr, headSha: ctx.headSha, state: "open" };
+  }
+  if (ctx.closedRecordPr !== void 0) {
+    const { number, headSha, merged } = ctx.closedRecordPr;
+    return { number, headSha, state: merged ? "merged" : "closed" };
+  }
+  return void 0;
 }
 function inheritedPr(thread, records, repo) {
   const turn = thread.pr && thread.pr.repo === repo ? { repo, number: thread.pr.number, source: "turn", at: thread.prAt } : void 0;
@@ -25620,7 +25643,8 @@ function inheritedPr(thread, records, repo) {
 }
 async function openPrHeadSha(pr) {
   const head = await prHead(pr).catch(() => void 0);
-  if (head?.state === "closed") return { reason: "closed" };
+  if (head?.state === "closed")
+    return { reason: "closed", ...head.sha ? { sha: head.sha } : {}, merged: head.merged };
   if (head?.state === "open" && head.sha) {
     return {
       sha: head.sha,
@@ -25686,9 +25710,17 @@ async function prHead(pr) {
   const headRepo = data.head?.repo?.full_name?.toLowerCase();
   const ref = data.head?.ref && headRepo === pr.repo ? validRef(data.head.ref) : void 0;
   const state = data.state === "open" || data.state === "closed" ? data.state : void 0;
-  const sha = ref !== void 0 ? preferRefTip(`${pr.repo}#${pr.number}`, prSha, await headRefTipSha(pr.repo, ref, headers), ref) : prSha;
+  const sha = ref !== void 0 && state !== "closed" ? preferRefTip(`${pr.repo}#${pr.number}`, prSha, await headRefTipSha(pr.repo, ref, headers), ref) : prSha;
   const size = sha === prSha ? prSizeOf(data) : void 0;
-  return { ref, sha, base, ...size ? { size } : {}, state, ...facts2 ? { facts: facts2 } : {} };
+  return {
+    ref,
+    sha,
+    base,
+    ...size ? { size } : {},
+    state,
+    merged: data.merged === true,
+    ...facts2 ? { facts: facts2 } : {}
+  };
 }
 function prSizeOf(data) {
   const n2 = (x) => typeof x === "number" && Number.isInteger(x) && x >= 0;
@@ -32445,13 +32477,13 @@ function removeScript(dir) {
   return `rm -rf ${shellQuote(dir)}`;
 }
 function stdoutOf(operation, out) {
-  const exit = parseExitPrefix(out);
-  if (exit.failed || RUNTIME_WORD.test(out)) throw new PiContainerError(operation, out);
+  if (RUNTIME_WORD.test(out)) throw new PiContainerRuntimeReplacedError(operation, out);
+  if (parseExitPrefix(out).failed) throw new PiContainerError(operation, out);
   const cut = out.indexOf(STDERR_MARK);
   const stdout = cut >= 0 ? out.slice(0, cut) : out;
   return stdout === "(no output)" ? "" : stdout;
 }
-var PiContainerError, WRITE_CHUNK_CHARS, INLINE_LINE_CHARS, LOG_READ_BYTES, MESSAGE_UPDATE_MARK, LOG_FILTER, IDENTITY_WORD, STDERR_MARK, RUNTIME_WORD, OP_TIMEOUT_MS, ExecPiContainer;
+var PiContainerError, WRITE_CHUNK_CHARS, INLINE_LINE_CHARS, LOG_READ_BYTES, MESSAGE_UPDATE_MARK, LOG_FILTER, IDENTITY_WORD, STDERR_MARK, RUNTIME_WORD, PiContainerRuntimeReplacedError, OP_TIMEOUT_MS, ExecPiContainer;
 var init_container = __esm({
   "../../src/core/harness/pi/container.ts"() {
     "use strict";
@@ -32473,7 +32505,13 @@ var init_container = __esm({
     LOG_FILTER = `grep --line-buffered -v ${shellQuote(MESSAGE_UPDATE_MARK)}`;
     IDENTITY_WORD = /^[A-Za-z0-9-]{1,64}$/;
     STDERR_MARK = "\n--- stderr ---\n";
-    RUNTIME_WORD = /^(?:runtime-unreachable:|runtime-replaced)/;
+    RUNTIME_WORD = /\bruntime-(?:unreachable|replaced)\b/;
+    PiContainerRuntimeReplacedError = class extends PiContainerError {
+      constructor(operation, detail) {
+        super(operation, detail);
+        this.name = "PiContainerRuntimeReplacedError";
+      }
+    };
     OP_TIMEOUT_MS = 6e4;
     ExecPiContainer = class {
       constructor(executor) {
@@ -33614,10 +33652,8 @@ function settlementAnswer(s) {
   return { content: [{ type: "text", text: settlementText(s) }], isError: true };
 }
 function saysContainerReplaced(err2) {
-  if (err2 instanceof ExecSandboxRestartedError) return true;
-  if (!(err2 instanceof Error)) return false;
-  const text = err2.message.replace(/^pi container: [a-z]+ failed — /, "").replace(/^exit \d+: /, "");
-  return /^(?:runtime-unreachable:|runtime-replaced)/.test(text);
+  if (err2 instanceof ExecSandboxRestartedError || err2 instanceof PiContainerRuntimeReplacedError) return true;
+  return err2 instanceof Error && RUNTIME_WORD.test(err2.message);
 }
 function replacedCallNote(tool) {
   return `The container running pi was replaced while this ${tool} call was in flight; its result was lost \u2014 re-check its effects before re-running it.`;
@@ -34254,6 +34290,7 @@ var init_harness = __esm({
     init_runEvents();
     init_threadAdmission();
     init_bridge2();
+    init_container();
     init_mirror();
     init_process();
     init_protocol();
@@ -34719,14 +34756,30 @@ async function runCodingPrPostStep(input) {
   const candidates = [target.baseRef, target.bindingRef, target.resolvedRef];
   const base = prDescription ? await resolveBaseRefLazy(candidates, repo, input.fetchRepoInfo) : resolveBaseRef(candidates, void 0);
   const pushedBranch = branch2 !== void 0 && branch2 !== base && pushed;
-  if (prDescription && branch2 !== void 0 && branch2 === base && target.ownPr !== void 0) {
-    const { number, headSha: prHead2 } = target.ownPr;
+  const ownPr = target.ownPr;
+  const pushedPastOwnPr = ownPr !== void 0 && pushed && headSha !== void 0 && !sameCommit2(headSha, ownPr.headSha) ? headSha : void 0;
+  if (prDescription && ownPr !== void 0 && ownPr.state !== "open" && pushedPastOwnPr !== void 0 && branch2 !== void 0) {
+    const url = `https://github.com/${repo}/pull/${ownPr.number}`;
+    console.log(
+      `[pr-post] ${logKey} skipped: ${branchLog} was pushed past the thread's ${ownPr.state} ${repo}#${ownPr.number} (its head ${ownPr.headSha.slice(0, 7)}, the workspace at ${pushedPastOwnPr.slice(0, 7)}) \u2014 a new PR is needed`
+    );
+    input.publish({
+      type: "run_note",
+      kind: "pr_not_opened",
+      summary: `no PR opened: ${branch2} was pushed past the thread's ${ownPr.state} pull request #${ownPr.number}; the new commits need a new pull request`,
+      at: systemClock()
+    });
+    return `\u26A0\uFE0F A PR description was submitted and \`${branch2}\`${branchNote} was pushed to \`${pushedPastOwnPr.slice(0, 7)}\`, but this thread's pull request ${url} is ${ownPr.state} and that branch is its head \u2014 the new commits need a new pull request, so nothing was edited: compare & open manually: ${compareUrl}`;
+  }
+  if (prDescription && ownPr !== void 0 && (branch2 === base || ownPr.state !== "open")) {
+    const { number, headSha: prHead2, state } = ownPr;
     const url = `https://github.com/${repo}/pull/${number}`;
+    const standing = state === "open" ? "" : ` (${state})`;
     try {
       const body = renderPrDescriptionMarkdown(prDescription, { repo, headSha: prHead2 });
       await input.updatePullRequest(repo, number, { title: prDescription.title, body });
       console.log(
-        `[pr-post] ${logKey} updated ${repo}#${number} \u2014 the thread's own pull request, nothing pushed (workspace on ${branchLog}; rendered at its head ${prHead2.slice(0, 7)})`
+        `[pr-post] ${logKey} updated ${repo}#${number} \u2014 the thread's own pull request${standing}, nothing pushed past its head (workspace on ${branchLog}; rendered at its head ${prHead2.slice(0, 7)})`
       );
       input.publish({ type: "pr_opened", url, number, created: false, at: systemClock() });
       input.publish({
@@ -34734,7 +34787,7 @@ async function runCodingPrPostStep(input) {
         ...submittedPrDescriptionArtifact(prDescription, { repo, pr: number, headSha: prHead2, body }),
         at: systemClock()
       });
-      return `\u{1F500} PR updated: ${url} \u2014 body re-rendered at \`${prHead2.slice(0, 7)}\``;
+      return state === "open" ? `\u{1F500} PR updated: ${url} \u2014 body re-rendered at \`${prHead2.slice(0, 7)}\`` : `\u{1F500} PR updated: ${url} \u2014 body re-rendered at \`${prHead2.slice(0, 7)}\` (the pull request is ${state}; its description was edited in place)`;
     } catch (err2) {
       const reason2 = err2 instanceof Error ? err2.message : String(err2);
       console.error(`[pr-post] ${logKey} update failed for ${repo}#${number}: ${reason2}`);
@@ -35677,151 +35730,6 @@ var init_runLoop = __esm({
   }
 });
 
-// ../../src/core/ship/preflight.ts
-function shipTaskText(requestText, repo) {
-  let t = requestText.replace(/<((?:https?):\/\/[^|>\s]+)(?:\|[^>]*)?>/gi, " $1 ");
-  t = t.replace(/https?:\/\/\S+/gi, " ");
-  const slug = repo.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  t = t.replace(new RegExp(`\\bin\\s+${slug}\\s*:?`, "gi"), " ");
-  t = t.replace(new RegExp(`\\b${slug}(#\\d+)?\\b`, "gi"), " ");
-  t = t.replace(/\b[a-z0-9][\w.-]*\/[\w.-]+#\d+\b/gi, " ");
-  return t.replace(/\s+/g, " ").trim().replace(/^[:,\-—.\s]+/, "").trim();
-}
-async function shipPreflight(input) {
-  const { repoCtx } = input;
-  if (!input.channelId.startsWith("slack:") && !input.channelId.startsWith("cli:")) {
-    const base = input.runsBase?.trim();
-    const page2 = base ? `${base.replace(/\/+$/, "")}/runs` : "the bot's /runs page";
-    return refuse2(
-      "channel",
-      "not started (Slack/CLI only)",
-      `\u{1F6AB} \`agent:ship\` runs only from Slack or the CLI \u2014 this adapter is single-shot and cannot hold a pipeline-length run. Start it there instead, and watch pipelines on the run page (${page2}).`
-    );
-  }
-  const missing = ["ship", "coding", "review"].filter((a) => !input.gates.canRunAgent(a));
-  if (missing.length > 0) {
-    return refuse2(
-      `permission (${missing.join(", ")})`,
-      "not started (permissions)",
-      `\u{1F6AB} Running \`ship\` drives \`coding\` and \`review\` child rounds, and you're not on the allowlist for ${missing.map((a) => `\`${a}\``).join(", ")}. Ask ${input.gates.adminsHint()} for access.`
-    );
-  }
-  const repo = repoCtx.repo;
-  if (!repo) {
-    return refuse2(
-      "no repo",
-      "not started (no repository)",
-      "\u{1F6AB} `agent:ship` needs a target repository \u2014 name it in the request, e.g. `agent:ship in owner/repo: <task>`."
-    );
-  }
-  const info = await input.repoInfo(repo).catch(() => void 0);
-  if (info?.allowAutoMerge !== false) {
-    const reason2 = info?.allowAutoMerge === true ? `auto-merge is enabled on \`${repo}\` \u2014 ship's approving LGTM triggers the org auto-approve workflow, and with auto-merge on the PR would merge with no human. Disable auto-merge on the repo to use ship.` : `could not verify that auto-merge is disabled on \`${repo}\` (the repository lookup failed or answered without the setting) \u2014 refusing fail-closed.`;
-    return refuse2("auto-merge", "not started (auto-merge)", `\u{1F6AB} ${reason2}`);
-  }
-  const task = shipTaskText(input.requestText, repo);
-  if (repoCtx.prUnpostable?.reason === "unreachable") {
-    return refuse2(
-      "thread PR unreachable",
-      "not started (PR unverifiable)",
-      `\u{1F6AB} This thread names PR ${repo}#${repoCtx.prUnpostable.number} but it could not be fetched to run ship's entry checks \u2014 refusing fail-closed. Retry in a moment, or check the PR on GitHub.`
-    );
-  }
-  if (repoCtx.pr !== void 0) {
-    const where = `${repo}#${repoCtx.pr}`;
-    const facts2 = await input.prFacts({ repo, number: repoCtx.pr }).catch(() => void 0);
-    const fallThrough = !facts2 && task !== "" && repoCtx.prFromMessage === true;
-    if (!facts2 && !fallThrough) {
-      return refuse2(
-        "PR facts unavailable",
-        "not started (PR unverifiable)",
-        `\u{1F6AB} Could not fetch ${where} to run ship's entry checks (open? bot-authored? same-repo head?) \u2014 refusing fail-closed. Retry in a moment.`
-      );
-    }
-    if (facts2) {
-      const self = facts2.state === "open" ? await input.selfIdentity().catch(() => void 0) : void 0;
-      if (facts2.state === "open" && !self) {
-        return refuse2(
-          "own identity unavailable",
-          "not started (identity unverifiable)",
-          `\u{1F6AB} Could not resolve the GitHub identity this bot acts as, so whether ${where} is ship's to drive cannot be judged \u2014 refusing fail-closed. Retry in a moment.`
-        );
-      }
-      const author = facts2.author;
-      const shipAuthored = self !== void 0 && author?.login === self.login && author?.id === self.id;
-      if (facts2.state === "open" && !(task && !shipAuthored)) {
-        if (task) {
-          return refuse2(
-            "new task over open PR",
-            "not started (open PR)",
-            `\u{1F6AB} This thread's PR ${where} is still open \u2014 a new task over it is refused. Re-issue \`agent:ship\` with only the PR URL to resume its review loop, or finish/close ${where} and start the new task in a fresh thread.`
-          );
-        }
-        if (!shipAuthored) {
-          return refuse2(
-            "human-authored PR",
-            "not started (not ship's PR)",
-            `\u{1F6AB} ${where} was not authored by \`${self.login}\` (this bot) \u2014 it is not ship's to drive. Use \`agent:review\` for a one-off review, or drive the loop manually.`
-          );
-        }
-        if (!facts2.sameRepoHead) {
-          return refuse2(
-            "fork-head PR",
-            "not started (fork head)",
-            `\u{1F6AB} ${where}'s head branch lives on a fork, not on \`${repo}\` \u2014 ship cannot drive it.`
-          );
-        }
-        const branch2 = facts2.headRef ?? repoCtx.ref;
-        if (!branch2) {
-          return refuse2(
-            "head branch unknown",
-            "not started (head branch unknown)",
-            `\u{1F6AB} Could not determine ${where}'s head branch, so ship cannot bind the thread's worktree to it \u2014 refusing fail-closed.`
-          );
-        }
-        return {
-          ok: true,
-          entry: {
-            repo,
-            branch: branch2,
-            // The PR's OWN base wins on resume: a ship PR opened against a
-            // non-default base must not run its re-reviews (or re-open a closed
-            // PR) against the default branch. repoCtx.baseRef carries the same
-            // fact when the thread context resolved the PR; the default branch
-            // is the last resort.
-            base: resolveBaseRef([facts2.baseRef, repoCtx.baseRef], info.defaultBranch),
-            resume: {
-              pr: repoCtx.pr,
-              headSha: facts2.headSha ?? repoCtx.headSha,
-              ...facts2.htmlUrl !== void 0 ? { url: facts2.htmlUrl } : {}
-            }
-          }
-        };
-      }
-    }
-  }
-  if (!task) {
-    return refuse2(
-      "no task",
-      "not started (no task)",
-      `\u{1F6AB} Nothing to ship: give ship a task (\`agent:ship in ${repo}: <task>\`), or name an open ship PR by URL to resume its review loop.`
-    );
-  }
-  const ref = repoCtx.ref && !repoCtx.refFromPr && repoCtx.ref.toLowerCase() !== repo.toLowerCase() ? repoCtx.ref : void 0;
-  return {
-    ok: true,
-    entry: { repo, base: resolveBaseRef([ref], info.defaultBranch) }
-  };
-}
-var refuse2;
-var init_preflight = __esm({
-  "../../src/core/ship/preflight.ts"() {
-    "use strict";
-    init_githubPulls();
-    refuse2 = (where, card, reply) => ({ ok: false, where, card, reply });
-  }
-});
-
 // ../../src/core/ship/coordinator.ts
 function shipInterruptedNote(prUrl2) {
   const stands = prUrl2 ? `Its work stands on GitHub: ${prUrl2}.` : "Whatever it pushed stands on its pipeline branch; no PR was opened yet.";
@@ -36072,6 +35980,142 @@ var init_coordinator = __esm({
   }
 });
 
+// ../../src/core/ship/preflight.ts
+function shipTaskText(requestText, repo) {
+  let t = requestText.replace(/<((?:https?):\/\/[^|>\s]+)(?:\|[^>]*)?>/gi, " $1 ");
+  t = t.replace(/https?:\/\/\S+/gi, " ");
+  const slug = repo.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  t = t.replace(new RegExp(`\\bin\\s+${slug}\\s*:?`, "gi"), " ");
+  t = t.replace(new RegExp(`\\b${slug}(#\\d+)?\\b`, "gi"), " ");
+  t = t.replace(/\b[a-z0-9][\w.-]*\/[\w.-]+#\d+\b/gi, " ");
+  return t.replace(/\s+/g, " ").trim().replace(/^[:,\-—.\s]+/, "").trim();
+}
+async function shipPreflight(input) {
+  const { repoCtx } = input;
+  if (!input.channelId.startsWith("slack:") && !input.channelId.startsWith("cli:")) {
+    const base = input.runsBase?.trim();
+    const page2 = base ? `${base.replace(/\/+$/, "")}/runs` : "the bot's /runs page";
+    return refuse2(
+      "channel",
+      "not started (Slack/CLI only)",
+      `\u{1F6AB} \`agent:ship\` runs only from Slack or the CLI \u2014 this adapter is single-shot and cannot hold a pipeline-length run. Start it there instead, and watch pipelines on the run page (${page2}).`
+    );
+  }
+  const missing = ["ship", "coding", "review"].filter((a) => !input.gates.canRunAgent(a));
+  if (missing.length > 0) {
+    return refuse2(
+      `permission (${missing.join(", ")})`,
+      "not started (permissions)",
+      `\u{1F6AB} Running \`ship\` drives \`coding\` and \`review\` child rounds, and you're not on the allowlist for ${missing.map((a) => `\`${a}\``).join(", ")}. Ask ${input.gates.adminsHint()} for access.`
+    );
+  }
+  const repo = repoCtx.repo;
+  if (!repo) {
+    return refuse2(
+      "no repo",
+      "not started (no repository)",
+      "\u{1F6AB} `agent:ship` needs a target repository \u2014 name it in the request, e.g. `agent:ship in owner/repo: <task>`."
+    );
+  }
+  const info = await input.repoInfo(repo).catch(() => void 0);
+  const task = shipTaskText(input.requestText, repo);
+  const seeded = parseShipPlanRequest(task) !== void 0;
+  if (!seeded && repoCtx.prUnpostable?.reason === "unreachable") {
+    return refuse2(
+      "thread PR unreachable",
+      "not started (PR unverifiable)",
+      `\u{1F6AB} This thread names PR ${repo}#${repoCtx.prUnpostable.number} but it could not be fetched to run ship's entry checks \u2014 refusing fail-closed. Retry in a moment, or check the PR on GitHub.`
+    );
+  }
+  if (repoCtx.pr !== void 0 && !seeded) {
+    const where = `${repo}#${repoCtx.pr}`;
+    const contextCase = task !== "" && repoCtx.prFromMessage === true;
+    if (!contextCase) {
+      const facts2 = await input.prFacts({ repo, number: repoCtx.pr }).catch(() => void 0);
+      if (!facts2) {
+        return refuse2(
+          "PR facts unavailable",
+          "not started (PR unverifiable)",
+          `\u{1F6AB} Could not fetch ${where} to run ship's entry checks (open? same-repo head?) \u2014 refusing fail-closed. Retry in a moment.`
+        );
+      }
+      if (facts2.state === "open") {
+        if (!facts2.sameRepoHead) {
+          return refuse2(
+            "fork-head PR",
+            "not started (fork head)",
+            `\u{1F6AB} ${where}'s head branch lives on a fork, not on \`${repo}\` \u2014 ship cannot drive it.`
+          );
+        }
+        const branch2 = facts2.headRef ?? repoCtx.ref;
+        if (!branch2) {
+          return refuse2(
+            "head branch unknown",
+            "not started (head branch unknown)",
+            `\u{1F6AB} Could not determine ${where}'s head branch, so ship cannot bind the thread's worktree to it \u2014 refusing fail-closed.`
+          );
+        }
+        const base = resolveBaseRef([facts2.baseRef, repoCtx.baseRef], info?.defaultBranch);
+        const autoMerge = facts2.autoMergeEnabled !== void 0 ? { autoMergeEnabled: facts2.autoMergeEnabled } : {};
+        if (task) {
+          return {
+            ok: true,
+            entry: {
+              repo,
+              branch: branch2,
+              base,
+              adopt: { pr: repoCtx.pr, ...facts2.htmlUrl !== void 0 ? { url: facts2.htmlUrl } : {} },
+              ...autoMerge
+            }
+          };
+        }
+        return {
+          ok: true,
+          entry: {
+            repo,
+            branch: branch2,
+            base,
+            resume: {
+              pr: repoCtx.pr,
+              headSha: facts2.headSha ?? repoCtx.headSha,
+              ...facts2.htmlUrl !== void 0 ? { url: facts2.htmlUrl } : {}
+            },
+            ...autoMerge
+          }
+        };
+      }
+      if (!task) {
+        return refuse2(
+          "closed resume target",
+          "not started (PR closed)",
+          `\u{1F6AB} ${where} is closed \u2014 there is no review loop to resume. Give ship a task to start fresh work.`
+        );
+      }
+    }
+  }
+  if (!task) {
+    return refuse2(
+      "no task",
+      "not started (no task)",
+      `\u{1F6AB} Nothing to ship: give ship a task (\`agent:ship in ${repo}: <task>\`), or name an open ship PR by URL to resume its review loop.`
+    );
+  }
+  const ref = repoCtx.ref && !repoCtx.refFromPr && repoCtx.ref.toLowerCase() !== repo.toLowerCase() ? repoCtx.ref : void 0;
+  return {
+    ok: true,
+    entry: { repo, base: resolveBaseRef([ref], info?.defaultBranch) }
+  };
+}
+var refuse2;
+var init_preflight = __esm({
+  "../../src/core/ship/preflight.ts"() {
+    "use strict";
+    init_githubPulls();
+    init_coordinator();
+    refuse2 = (where, card, reply) => ({ ok: false, where, card, reply });
+  }
+});
+
 // ../../src/core/coordinator/handOff.ts
 async function plan(deps, input) {
   const { entry, msg } = input;
@@ -36116,7 +36160,9 @@ async function plan(deps, input) {
         identity: identity2,
         merge: "person",
         ...entry.resume !== void 0 ? { resume: entry.resume } : {},
-        ...entry.branch !== void 0 ? { entryBranch: entry.branch } : {}
+        ...entry.adopt !== void 0 ? { adopt: entry.adopt } : {},
+        ...entry.branch !== void 0 ? { entryBranch: entry.branch } : {},
+        ...entry.autoMergeEnabled !== void 0 ? { autoMergeEnabled: entry.autoMergeEnabled } : {}
       }
     };
   }
@@ -36173,9 +36219,10 @@ function planWhere(p, units, mergedBefore) {
   if (p.path !== void 0)
     return `${head} Each unit runs in a thread of its own in this channel under your grants; this card follows the plan and its summary lands in this thread.`;
   const branch2 = units[0]?.branch ?? "";
-  const prUrl2 = p.resume?.url ?? (p.resume !== void 0 ? `https://github.com/${p.identity.repo}/pull/${p.resume.pr}` : void 0);
-  const runs = p.resume !== void 0 ? `the review loop of ${prUrl2} resumes at its next review round on \`${branch2}\` in this thread under your grants \u2014 no new coding round first` : `the unit runs on \`${branch2}\` in this thread under your grants`;
-  return `${head} ${runs}; this card follows it and the report lands here.`;
+  const url = (of) => of?.url ?? (of !== void 0 ? `https://github.com/${p.identity.repo}/pull/${of.pr}` : void 0);
+  const runs = p.resume !== void 0 ? `the review loop of ${url(p.resume)} resumes at its next review round on \`${branch2}\` in this thread under your grants \u2014 no new coding round first` : p.adopt !== void 0 ? `the unit adopts ${url(p.adopt)}: it runs on \`${branch2}\` \u2014 the pull request's own head \u2014 in this thread under your grants, no new branch` : `the unit runs on \`${branch2}\` in this thread under your grants`;
+  const autoMerge = p.autoMergeEnabled ? " Auto-merge is on for this pull request: the approval merges it once checks pass." : "";
+  return `${head} ${runs}; this card follows it and the report lands here.${autoMerge}`;
 }
 async function handOffToCoordinator(deps, input) {
   const log = deps.log ?? console.log;
@@ -36452,7 +36499,6 @@ async function runShipBranch(deps, msg, io, ctx) {
       gates: { canRunAgent: (a) => deps.config.canRunAgent(msg.userId, a), adminsHint: () => deps.config.adminsHint() },
       repoInfo: deps.fetchRepoShipInfo ?? fetchRepoShipInfo,
       prFacts: deps.fetchPrFacts ?? fetchPullRequestFacts,
-      selfIdentity: deps.fetchSelfIdentity ?? resolveGithubIdentity,
       runsBase: process.env.PUBLIC_BASE_URL
     })
   );
@@ -36682,7 +36728,6 @@ var init_ship = __esm({
     "use strict";
     init_trace();
     init_githubPulls();
-    init_githubApp();
     init_secrets2();
     init_handOff();
     init_instancesClient();
@@ -40486,7 +40531,7 @@ var init_threadTurns = __esm({
     "use strict";
     init_reply();
     APP_FOOTER_RE = /(?:^|\s)(?:\*Sent using\*|Sent using)\s+<@[A-Z0-9]+(?:\|[^>]*)?>(?:\s*\[[^\]\n]*\])?\s*$/;
-    RELAY_FOOTER_RE = /(?:^|\s)Sent by Claude in <#([CGD][A-Z0-9_]+)(?:\|[^>]*)?>\s*(?:·|•|-|—)\s*<(https?:\/\/[^|>\s]+)(?:\|[^>]*)?>\s*$/;
+    RELAY_FOOTER_RE = /(?:^|\s)Sent by Claude in <#([CGD][A-Z0-9_]+)(?:\|[^>]*)?>(?:\s+on behalf of <@([A-Z0-9]+)(?:\|[^>]*)?>)?\s*(?:·|•|-|—)\s*<(https?:\/\/[^|>\s]+)(?:\|[^>]*)?>\s*$/;
   }
 });
 
@@ -41257,12 +41302,35 @@ var init_lookups = __esm({
 });
 
 // ../../src/channels/slack/requester.ts
+function textOfBlocks(blocks) {
+  if (!blocks) return "";
+  const out = [];
+  const walk2 = (b) => {
+    if (typeof b.text === "string") out.push(b.text);
+    else if (b.text && typeof b.text.text === "string") out.push(b.text.text);
+    for (const e of b.elements ?? []) walk2(e);
+  };
+  for (const b of blocks) {
+    const before = out.length;
+    walk2(b);
+    if (out.length > before) out.push("\n");
+  }
+  return out.join("").replace(/\n+$/, "");
+}
+function rawTextOf(text, blocks) {
+  const base = text ?? "";
+  const fromBlocks = textOfBlocks(blocks);
+  if (!fromBlocks) return base;
+  const extra = fromBlocks.split("\n").map((l) => l.trim()).filter((l) => l.length > 0 && !base.includes(l));
+  return extra.length > 0 ? `${base}
+${extra.join("\n")}` : base;
+}
 function parseRelayFooter(text) {
   const m = RELAY_FOOTER_RE.exec(text);
   if (!m) return void 0;
   let url;
   try {
-    url = new URL(m[2].replaceAll("&amp;", "&"));
+    url = new URL(m[3].replaceAll("&amp;", "&"));
   } catch {
     return void 0;
   }
@@ -41272,7 +41340,7 @@ function parseRelayFooter(text) {
   if (!ts) return void 0;
   const threadTs = url.searchParams.get("thread_ts") ?? `${ts[1]}.${ts[2]}`;
   if (!THREAD_TS.test(threadTs)) return void 0;
-  return { channel: parts[1], threadTs };
+  return { channel: parts[1], threadTs, ...m[2] ? { onBehalfOf: m[2] } : {} };
 }
 function rememberParent(key, user) {
   relayParentCache.set(key, user);
@@ -41302,6 +41370,7 @@ async function resolveSlackRequester(client, ev) {
   const poster = ev.poster ?? {};
   const relay = parseRelayFooter(ev.text);
   if (relay) {
+    if (relay.onBehalfOf) return personRequester(relay.onBehalfOf, "relay-footer", poster);
     const user = await threadParentUser(client, relay.channel, relay.threadTs);
     if (user) return personRequester(user, "relay-footer", poster);
   }
@@ -41552,7 +41621,7 @@ function createSlackApp(deps) {
         channel: event.channel,
         user: event.user,
         poster: posterOf(posted),
-        rawText: event.text ?? "",
+        rawText: rawTextOf(event.text, posted.blocks),
         text: stripMention(event.text ?? "", botUserId),
         ts: event.ts,
         threadTs: event.thread_ts ?? event.ts,
@@ -41579,7 +41648,7 @@ function createSlackApp(deps) {
         channel: m.channel,
         user: m.user,
         poster: posterOf(m),
-        rawText: m.text ?? "",
+        rawText: rawTextOf(m.text, m.blocks),
         text: stripMention(m.text ?? "", botUserId),
         ts: m.ts,
         threadTs: m.thread_ts ?? m.ts,
@@ -45393,6 +45462,9 @@ async function prCheck(body, deps) {
         prNumber: open2.number,
         url: open2.htmlUrl,
         ...open2.headSha !== void 0 ? { headSha: open2.headSha } : {},
+        // The pull request's own auto-merge fact (agent-ship item 9), so a
+        // merge_ready ending can name it at the approved head.
+        ...open2.autoMergeEnabled !== void 0 ? { autoMergeEnabled: open2.autoMergeEnabled } : {},
         at
       });
     }