@coreplane/switchboard 1.225.0 → 1.226.1

package/dist/cli.js

@@ -11448,25 +11448,7 @@ var init_config3 = __esm({
   }
 });
 
-// ../../src/providers/types.ts
-function toolResultText(content) {
-  if (typeof content === "string") return content;
-  return content.map((p) => {
-    if (p.type === "text") return p.text;
-    if (p.type === "image") return `[image ${p.mediaType}, ${base64Bytes(p.data)} bytes]`;
-    return `[document ${p.name ?? "document"} (${p.mediaType}), ${base64Bytes(p.data)} bytes]`;
-  }).join("\n");
-}
-function capToolResultContent(content, cap = MAX_TOOL_RESULT_CHARS) {
-  const capText = (text) => text.length > cap ? `${text.slice(0, cap)}
-\u2026[tool result truncated: ${text.length - cap} of ${text.length} characters cut \u2014 ask for a narrower slice]` : text;
-  if (typeof content === "string") return capText(content);
-  return content.map((p) => p.type === "text" ? { ...p, text: capText(p.text) } : p);
-}
-function base64Bytes(b64) {
-  const padding = b64.endsWith("==") ? 2 : b64.endsWith("=") ? 1 : 0;
-  return Math.floor(b64.length * 3 / 4) - padding;
-}
+// ../../src/core/provider.ts
 function parseModelRef(ref) {
   const i = ref.indexOf("/");
   if (i === -1) {
@@ -11474,11 +11456,10 @@ function parseModelRef(ref) {
   }
   return { provider: ref.slice(0, i), model: ref.slice(i + 1) };
 }
-var MAX_TOOL_RESULT_CHARS, ANTHROPIC_API_KEY_ENV;
-var init_types2 = __esm({
-  "../../src/providers/types.ts"() {
+var ANTHROPIC_API_KEY_ENV;
+var init_provider = __esm({
+  "../../src/core/provider.ts"() {
     "use strict";
-    MAX_TOOL_RESULT_CHARS = 12e4;
     ANTHROPIC_API_KEY_ENV = "ANTHROPIC_API_KEY";
   }
 });
@@ -11608,7 +11589,7 @@ var init_anthropic = __esm({
   "../../src/providers/anthropic.ts"() {
     "use strict";
     init_secrets2();
-    init_types2();
+    init_provider();
     AnthropicProvider = class {
       name;
       client;
@@ -15954,7 +15935,7 @@ function isRunEvent(v) {
     case "skill_use":
       return typeof o.skill === "string" && typeof o.agent === "string" && typeof o.bodyBytes === "number";
     case "artifact":
-      return (o.direction === "in" || o.direction === "out") && typeof o.key === "string" && typeof o.name === "string" && typeof o.size === "number" && typeof o.contentType === "string" && o.url === void 0;
+      return (o.direction === "in" && typeof o.messageId === "string" || o.direction === "out" && typeof o.callId === "string") && typeof o.key === "string" && typeof o.name === "string" && typeof o.size === "number" && typeof o.contentType === "string" && o.url === void 0;
     case "review_artifact":
       if (o.artifact === "pr_description") {
         return (o.origin === "submitted" || o.origin === "parsed") && typeof o.repo === "string" && typeof o.pr === "number" && typeof o.title === "string" && typeof o.body === "string" && Array.isArray(o.tour);
@@ -16733,7 +16714,7 @@ var init_connect = __esm({
 
 // ../../src/mcp/types.ts
 var McpError;
-var init_types3 = __esm({
+var init_types2 = __esm({
   "../../src/mcp/types.ts"() {
     "use strict";
     McpError = class extends Error {
@@ -16828,7 +16809,7 @@ var MCP_PROTOCOL_VERSION, MCP_REQUEST_TIMEOUT_MS, MCP_MAX_RESPONSE_BYTES, MCP_MA
 var init_client = __esm({
   "../../src/mcp/client.ts"() {
     "use strict";
-    init_types3();
+    init_types2();
     MCP_PROTOCOL_VERSION = "2025-06-18";
     MCP_REQUEST_TIMEOUT_MS = 3e4;
     MCP_MAX_RESPONSE_BYTES = 2 * 1024 * 1024;
@@ -17543,7 +17524,7 @@ var init_bridge = __esm({
   "../../src/mcp/bridge.ts"() {
     "use strict";
     init_commandRegistry();
-    init_types3();
+    init_types2();
     init_classify();
     MCP_TOOL_NAME_MAX = 64;
     MCP_TOOL_PREFIX = "mcp__";
@@ -18113,23 +18094,31 @@ var init_service = __esm({
       callbackUrl() {
         return `${(this.opts.publicBaseUrl ?? "").replace(/\/+$/, "")}/mcp/oauth/callback`;
       }
-      /** In-flight refreshes by server id, so N concurrent runs refresh once. */
+      /** Refreshes by server id, keyed by the expiry of the credential that
+       *  triggered them, so N concurrent runs refresh once. A settled entry stays:
+       *  a run whose credential read raced the store write joins it instead of
+       *  refreshing again. A failed refresh is dropped so the next run retries; a
+       *  newer expiry (the refreshed set aging into the skew) starts a new one. */
       refreshing = /* @__PURE__ */ new Map();
       /** A usable access token for the run: the stored one while it lives, else
        *  a refreshed set (stored back, the cached client dropped so it is rebuilt
        *  with the new header). */
       freshOAuth(serverId, cred) {
         if (!needsRefresh(cred, this.now())) return Promise.resolve(cred);
-        let inflight = this.refreshing.get(serverId);
-        if (!inflight) {
-          inflight = (async () => {
-            const next = await refreshCredential(this.opts.fetch, cred, this.now());
-            await this.storeOAuth(serverId, next);
-            return next;
-          })().finally(() => this.refreshing.delete(serverId));
-          this.refreshing.set(serverId, inflight);
-        }
-        return inflight;
+        const seed = cred.expiresAt ?? 0;
+        const hit = this.refreshing.get(serverId);
+        if (hit && hit.seed >= seed) return hit.done;
+        const done = (async () => {
+          const next = await refreshCredential(this.opts.fetch, cred, this.now());
+          await this.storeOAuth(serverId, next);
+          return next;
+        })();
+        const entry = { seed, done };
+        this.refreshing.set(serverId, entry);
+        done.catch(() => {
+          if (this.refreshing.get(serverId) === entry) this.refreshing.delete(serverId);
+        });
+        return done;
       }
       // ---- the run-time view ----------------------------------------------------------
       /** Servers a run may use: every tier's entries whose agents include the
@@ -18841,7 +18830,7 @@ var init_authz = __esm({
 });
 
 // ../../src/core/llmOutput/types.ts
-var init_types4 = __esm({
+var init_types3 = __esm({
   "../../src/core/llmOutput/types.ts"() {
     "use strict";
   }
@@ -18900,10 +18889,26 @@ var init_markdown = __esm({
 });
 
 // ../../src/core/llmOutput/json.ts
-function stripJsonFence(text) {
-  const trimmed = text.trim();
-  const fenced = /^```(?:json)?\s*([\s\S]*?)\s*```$/i.exec(trimmed);
-  return fenced ? fenced[1] : trimmed;
+function extractJson(text) {
+  const start3 = text.search(/[[{]/);
+  if (start3 === -1) return text.trim();
+  let depth = 0;
+  let inString = false;
+  for (let i = start3; i < text.length; i++) {
+    const ch = text[i];
+    if (inString) {
+      if (ch === "\\") i++;
+      else if (ch === '"') inString = false;
+    } else if (ch === '"') {
+      inString = true;
+    } else if (ch === "{" || ch === "[") {
+      depth++;
+    } else if (ch === "}" || ch === "]") {
+      depth--;
+      if (depth === 0) return text.slice(start3, i + 1);
+    }
+  }
+  return text.slice(start3);
 }
 function jsonValueEquals(a, b) {
   if (Object.is(a, b)) return true;
@@ -18923,7 +18928,7 @@ function jsonOutput(schema, opts = {}) {
     parse(raw) {
       let value;
       try {
-        value = JSON.parse(stripJsonFence(raw));
+        value = JSON.parse(extractJson(raw));
       } catch (err2) {
         const observed = `not valid JSON: ${err2 instanceof Error ? err2.message : String(err2)}`;
         return { ok: false, failure: { kind: "syntax", observed } };
@@ -18956,7 +18961,7 @@ var init_json = __esm({
 var init_llmOutput = __esm({
   "../../src/core/llmOutput/index.ts"() {
     "use strict";
-    init_types4();
+    init_types3();
     init_markdown();
     init_json();
   }
@@ -19085,6 +19090,8 @@ function placeCandidate(cand, actor, origin, keys, scopeOf) {
 async function reflect(deps) {
   const warn = deps.onWarn ?? (() => {
   });
+  const info = deps.onInfo ?? (() => {
+  });
   try {
     const query = `${deps.request} ${deps.answer}`.slice(0, MAX_RETRIEVE_QUERY_CHARS);
     const existing = (await Promise.all(
@@ -19102,11 +19109,18 @@ async function reflect(deps) {
     const reply = result.content.filter((p) => p.type === "text").map((p) => p.text).join("");
     const prov = { sourceThreadKey: deps.sourceThreadKey, sourceRunId: deps.sourceRunId };
     const parsed = parseReflection(reply, prov, new Set(existing.map((r) => r.id)));
+    const truncated = result.stopReason === "max_tokens" ? `truncated at ${REFLECTION_MAX_TOKENS} max tokens` : void 0;
+    const stopNote = truncated ?? (result.stopReason === "end_turn" ? void 0 : `stop: ${result.stopReason}`);
     if (!parsed.ok) {
-      warn(`reflection output rejected (${parsed.error}); nothing written`);
+      const why = truncated ?? (stopNote ? `${parsed.error}; ${stopNote}` : parsed.error);
+      warn(`reflection output rejected (${why}); nothing written`);
+      return;
+    }
+    const outcomeTail = stopNote ? ` (${stopNote})` : "";
+    if (parsed.candidates.length === 0) {
+      info(`reflection: nothing to write${outcomeTail}`);
       return;
     }
-    if (parsed.candidates.length === 0) return;
     const scopeOf = new Map(existing.map((r) => [r.id, r.scopeKey]));
     const origin = deps.originChannelVisibility ?? "unknown";
     const byScope = /* @__PURE__ */ new Map();
@@ -19135,6 +19149,10 @@ async function reflect(deps) {
     if (dropped.length > 0)
       warn(`write denied by policy, ${dropped.length} candidate(s) dropped: ${dropped.join(", ")}`);
     for (const [scopeKey, records] of byScope) await deps.store.write(scopeKey, records);
+    const written = [...byScope.values()].flat();
+    const facts2 = written.filter((r) => r.kind === "fact").length;
+    const summary = written.some((r) => r.kind === "summary") ? ", summary" : "";
+    info(`reflection wrote ${facts2} fact(s)${summary}${outcomeTail}`);
   } catch (err2) {
     warn(`reflection failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
   }
@@ -19346,6 +19364,7 @@ var init_buildStore2 = __esm({
 function scheduleReflection(input) {
   if (!input.cfg?.enabled || !shouldReflect(input.gate)) return;
   const warn = (m) => console.warn(`[memory] ${input.threadKey} ${m}`);
+  const info = (m) => console.log(`[memory] ${input.threadKey} ${m}`);
   let provider;
   let model;
   try {
@@ -19369,7 +19388,8 @@ function scheduleReflection(input) {
       answer: input.answer,
       sourceThreadKey: input.threadKey,
       sourceRunId: input.runId,
-      onWarn: warn
+      onWarn: warn,
+      onInfo: info
     })
   );
 }
@@ -19397,7 +19417,7 @@ async function memoryContextBlock(organization, cfg, injected, query, userId, sc
 var init_memory = __esm({
   "../../src/core/memory/index.ts"() {
     "use strict";
-    init_types2();
+    init_provider();
     init_scorer();
     init_scope();
     init_stores();
@@ -22641,6 +22661,7 @@ function durableInboxMessage(msg, text, at, from) {
     ...msg.userName !== void 0 ? { userName: msg.userName } : {},
     ...msg.sourceUrl !== void 0 ? { sourceUrl: msg.sourceUrl } : {},
     ...msg.channelName !== void 0 ? { channelName: msg.channelName } : {},
+    ...msg.messageId !== void 0 ? { messageId: msg.messageId } : {},
     ...from !== void 0 ? { fromRunId: from.runId } : {},
     // Staged references are metadata (record 0033) — a few hundred bytes each —
     // so they ride the base row and survive the restart whatever the
@@ -22681,6 +22702,7 @@ function messageFromInbox(stored, fallbackAt) {
   const userName = str7("userName");
   const sourceUrl = str7("sourceUrl");
   const channelName = str7("channelName");
+  const messageId = str7("messageId");
   const fromRunId = str7("fromRunId");
   const at = typeof m.at === "number" && Number.isFinite(m.at) ? m.at : fallbackAt;
   const images = attachmentsFromInbox(m.images);
@@ -22697,6 +22719,7 @@ ${note}` : text,
     ...userName !== void 0 ? { userName } : {},
     ...sourceUrl !== void 0 ? { sourceUrl } : {},
     ...channelName !== void 0 ? { channelName } : {},
+    ...messageId !== void 0 ? { messageId } : {},
     ...images ? { images } : {},
     ...documents ? { documents } : {},
     ...staged ? { staged } : {}
@@ -22735,6 +22758,9 @@ var init_inboxMessage = __esm({
 });
 
 // ../../src/core/threadAdmission.ts
+function followUpMessageId(input) {
+  return input.messageId ?? (input.ledgerSeq !== void 0 ? `inbox-${input.ledgerSeq}` : `at-${input.at}`);
+}
 function decideFollowUp(live, requested) {
   if (requested.agent !== void 0 && requested.agent !== live.agent)
     return { kind: "refuse", reason: "agent_mismatch", requestedAgent: requested.agent };
@@ -23127,6 +23153,7 @@ function followUpOf(msg, text, at, opts) {
     ...msg.images !== void 0 ? { images: msg.images } : {},
     ...msg.documents !== void 0 ? { documents: msg.documents } : {},
     ...msg.staged !== void 0 ? { staged: msg.staged } : {},
+    ...msg.messageId !== void 0 ? { messageId: msg.messageId } : {},
     at,
     ...opts.ledgerSeq !== void 0 ? { ledgerSeq: opts.ledgerSeq } : {},
     ...opts.from !== void 0 ? { from: opts.from } : {},
@@ -24798,6 +24825,16 @@ var init_runRegistry = __esm({
   }
 });
 
+// ../../src/core/types.ts
+function messageIdOf(msg, runId3) {
+  return msg.messageId ?? runId3;
+}
+var init_types4 = __esm({
+  "../../src/core/types.ts"() {
+    "use strict";
+  }
+});
+
 // ../../src/core/dispatch/fastPath.ts
 function isInlineRunCommand(id) {
   return id.startsWith("friction.") || id === "memory.forget" || /^repo\.(onboard|offboard|rebuild|reconfigure|test|build)$/.test(id) || /^mcp\.(add|connect|remove)$/.test(id);
@@ -24884,7 +24921,12 @@ async function runInlineCommandRun(deps, msg, command2, io, execute, ending, tra
   );
   trace.bindRun(run2.id, (e) => registry.publish(run2.id, e));
   io.runStarted?.({ id: run2.id });
-  registry.publish(run2.id, { type: "input", text: redactSecrets(msg.text), at: clock3() });
+  registry.publish(run2.id, {
+    type: "input",
+    text: redactSecrets(msg.text),
+    messageId: messageIdOf(msg, run2.id),
+    at: clock3()
+  });
   registry.publish(run2.id, { type: "run_meta", agent: COMMAND_RUN_AGENT, traceId: root.traceId, at: clock3() });
   let result;
   try {
@@ -24969,6 +25011,7 @@ var init_fastPath = __esm({
     init_commandChat();
     init_commandSurface();
     init_runRegistry();
+    init_types4();
     init_record();
     init_reply();
   }
@@ -25139,379 +25182,247 @@ var init_resolve = __esm({
     init_registry();
     init_profile();
     init_directives();
-    init_types2();
+    init_provider();
     init_factory();
     init_githubRepoProbe();
     init_repoContext();
   }
 });
 
-// ../../src/core/prDescription.ts
-import { z as z20 } from "zod";
-function parsePrDescription(input) {
-  return PrDescriptionSchema.parse(input);
-}
-function redactPrDescription(d) {
-  return mapStringLeaves(d, redactSecrets);
+// ../../src/artifacts/contentType.ts
+function contentTypeFor(name) {
+  const dot = name.lastIndexOf(".");
+  if (dot < 0 || dot === name.length - 1) return OCTET_STREAM;
+  return BY_EXTENSION[name.slice(dot + 1).toLowerCase()] ?? OCTET_STREAM;
 }
-function mapStringLeaves(value, fn) {
-  if (typeof value === "string") return fn(value);
-  if (Array.isArray(value)) return value.map((v) => mapStringLeaves(v, fn));
-  if (typeof value === "object" && value !== null) {
-    return Object.fromEntries(Object.entries(value).map(([key, v]) => [key, mapStringLeaves(v, fn)]));
+var BY_EXTENSION, OCTET_STREAM, INLINE_IMAGE_TYPES;
+var init_contentType = __esm({
+  "../../src/artifacts/contentType.ts"() {
+    "use strict";
+    BY_EXTENSION = {
+      png: "image/png",
+      jpg: "image/jpeg",
+      jpeg: "image/jpeg",
+      gif: "image/gif",
+      webp: "image/webp",
+      svg: "image/svg+xml",
+      pdf: "application/pdf",
+      mp4: "video/mp4",
+      webm: "video/webm",
+      mov: "video/quicktime",
+      mp3: "audio/mpeg",
+      wav: "audio/wav",
+      txt: "text/plain",
+      md: "text/markdown",
+      csv: "text/csv",
+      json: "application/json",
+      html: "text/html",
+      zip: "application/zip",
+      gz: "application/gzip",
+      tar: "application/x-tar"
+    };
+    OCTET_STREAM = "application/octet-stream";
+    INLINE_IMAGE_TYPES = /* @__PURE__ */ new Set(["image/png", "image/jpeg", "image/gif", "image/webp"]);
   }
-  return value;
-}
-function encodeGithubPathSegments(path) {
-  return path.split("/").map(encodeURIComponent).join("/");
+});
+
+// ../../src/artifacts/keys.ts
+function safeBasename(name) {
+  const segments2 = name.split(/[\\/]+/).filter((s) => s.length > 0);
+  const last = segments2[segments2.length - 1] ?? "";
+  const reduced = last.replace(SAFE, "_").replace(/\.{2,}/g, "_").replace(/_+/g, "_");
+  if (reduced === "" || /^[._-]+$/.test(reduced)) return "file";
+  return reduced;
 }
-function anchorUrl(ctx, a) {
-  return `https://github.com/${ctx.repo}/blob/${ctx.headSha}/${encodeGithubPathSegments(a.path)}#L${a.from}-L${a.to}`;
+function threadKeySafe(threadKey) {
+  return threadKey.replace(/:/g, "-").replace(SAFE, "_");
 }
-function cell2(s) {
-  return s.replace(/\\/g, "\\\\").replace(/\|/g, "\\|").replace(/\s*\n\s*/g, " ");
+function outboundKey(runId3, seq, name) {
+  return `runs/${runId3}/out/${seq}-${safeBasename(name)}`;
 }
-function renderPrDescriptionMarkdown(desc, ctx) {
-  if (!REPO_RE.test(ctx.repo))
-    throw new Error(`renderPrDescriptionMarkdown: repo must be owner/name, got "${ctx.repo}"`);
-  if (!SHA_RE2.test(ctx.headSha))
-    throw new Error(`renderPrDescriptionMarkdown: headSha must be a full 40-char lowercase sha, got "${ctx.headSha}"`);
-  const out = [];
-  out.push("## TL;DR", "", desc.tldr, "");
-  out.push("## What & why", "", desc.whatWhy, "");
-  out.push("## Tour", "");
-  desc.tour.forEach((step, i) => {
-    out.push(`### ${i + 1}. ${step.title}`, "", step.description, "");
-    if (step.lookFor) out.push(`**Look for:** ${step.lookFor}`, "");
-    out.push(anchorUrl(ctx, step.anchor), "");
-  });
-  out.push(`### ${desc.tour.length + 1}. Remaining changes`, "");
-  if (desc.remaining.length === 0) out.push("- none \u2014 every touched file is covered by a step above", "");
-  else {
-    for (const r of desc.remaining) out.push(`- \`${r.path}\` \u2014 ${r.note}`);
-    out.push("");
-  }
-  out.push("## Decisions", "");
-  for (const d of desc.decisions) out.push(`- **${d.title.replace(/\.?$/, ".")}** ${d.rationale}`);
-  out.push("");
-  out.push("## Risks & implications", "", desc.risks, "");
-  out.push("## Validation", "");
-  if (desc.validation.summary) out.push(desc.validation.summary, "");
-  out.push("| Criterion | Proof |", "|---|---|");
-  for (const c of desc.validation.criteria) out.push(`| ${cell2(c.criterion)} | ${cell2(c.proof)} |`);
-  out.push("", GENERATED_FOOTER, "");
-  return out.join("\n");
+function inboundKey(threadKey, messageTs, index, name) {
+  return `threads/${threadKeySafe(threadKey)}/in/${messageTs}/${index}-${safeBasename(name)}`;
 }
-function parsePrDescriptionMarkdown(body) {
-  const problems = [];
-  const lines = body.replace(/\r\n?/g, "\n").split("\n").filter((l) => l.trim() !== GENERATED_FOOTER);
-  const fenced = fenceMask(lines);
-  const sections = splitSections(lines, fenced, problems);
-  const description = { tour: [] };
-  const tldr = sections.get("tldr");
-  if (tldr) setProse(description, "tldr", tldr, problems);
-  else {
-    problems.push("no `## TL;DR` section \u2014 the tldr is the body's first paragraph");
-    const first = firstParagraph(lines, fenced);
-    if (first) description.tldr = first;
-  }
-  const whatWhy = sections.get("whatWhy");
-  if (whatWhy) setProse(description, "whatWhy", whatWhy, problems);
-  const tour = sections.get("tour");
-  if (tour) {
-    const parsed = parseTour(tour.lines, fenced.slice(tour.start, tour.start + tour.lines.length), problems);
-    description.tour = parsed.tour;
-    if (parsed.remaining) description.remaining = parsed.remaining;
-  }
-  const decisions = sections.get("decisions");
-  if (decisions) description.decisions = parseDecisions(decisions.lines, problems);
-  const risks = sections.get("risks");
-  if (risks) setProse(description, "risks", risks, problems);
-  const validation = sections.get("validation");
-  if (validation) description.validation = parseValidation(validation.lines, problems);
-  for (const [key, heading] of SECTIONS) {
-    if (key === "tldr" || sections.has(key)) continue;
-    problems.push(`no \`## ${heading}\` section`);
+var SAFE;
+var init_keys = __esm({
+  "../../src/artifacts/keys.ts"() {
+    "use strict";
+    SAFE = /[^A-Za-z0-9._-]+/g;
   }
-  return { description, complete: problems.length === 0, problems };
+});
+
+// ../../src/tools/attach.ts
+function transferBudgetMs(size) {
+  return Math.ceil(size / TRANSFER_FLOOR_BYTES_PER_MS) + TRANSFER_SETUP_MS;
 }
-function fenceMask(lines) {
-  let open2;
-  return lines.map((l) => {
-    const m = /^\s*(`{3,}|~{3,})/.exec(l);
-    if (m && (open2 === void 0 || m[1][0] === open2[0])) {
-      const wasOpen = open2 !== void 0;
-      open2 = wasOpen ? void 0 : m[1];
-      return true;
-    }
-    return open2 !== void 0;
-  });
+function fileNameOf2(path) {
+  const segments2 = path.split("/").filter(Boolean);
+  return segments2[segments2.length - 1] ?? path;
 }
-function splitSections(lines, fenced, problems) {
-  const byHeading = new Map(SECTIONS.map(([key, heading]) => [heading.toLowerCase(), key]));
-  const out = /* @__PURE__ */ new Map();
-  let current;
-  lines.forEach((line3, i) => {
-    const m = fenced[i] ? null : HEADING_RE.exec(line3);
-    if (m && m[1] === "##") {
-      const key = byHeading.get(m[2].replace(/\s+/g, " ").toLowerCase());
-      if (key === void 0)
-        current = void 0;
-      else if (out.has(key)) {
-        problems.push(`duplicate \`## ${SECTIONS.find(([k]) => k === key)[1]}\` section \u2014 the first one stands`);
-        current = void 0;
-      } else {
-        current = { start: i + 1, lines: [] };
-        out.set(key, current);
-      }
-      return;
-    }
-    current?.lines.push(line3);
-  });
-  return out;
+function putCommandFor(path, contentType, url) {
+  return `curl -fsS -T ${shellQuote(path)} -H ${shellQuote(`Content-Type: ${contentType}`)} -o /dev/null -w ${shellQuote(PUT_REPORT_FORMAT)} ${shellQuote(url)}`;
 }
-function firstParagraph(lines, fenced) {
-  const para = [];
-  for (let i = 0; i < lines.length; i++) {
-    const l = lines[i];
-    if (l.trim() === "") {
-      if (para.length) break;
-      continue;
-    }
-    if (fenced[i] || para.length === 0 && HEADING_RE.test(l)) continue;
-    para.push(l.trim());
-  }
-  return para.length ? para.join("\n") : void 0;
+function parsePutReport(output) {
+  const m = /(\d{3}) (\d{1,15})\s*$/.exec(output);
+  return m ? { httpCode: Number(m[1]), sentBytes: Number(m[2]) } : null;
 }
-function setProse(description, key, section, problems) {
-  const text = section.lines.join("\n").trim();
-  if (text === "") problems.push(`\`## ${SECTIONS.find(([k]) => k === key)[1]}\` section is empty`);
-  else description[key] = text;
+function postCommandFor(path, url) {
+  return `curl -fsS --upload-file ${shellQuote(path)} -X POST ${shellQuote(url)}`;
 }
-function parseTour(lines, fenced, problems) {
-  const steps = [];
-  let preamble = "";
-  lines.forEach((line3, i) => {
-    const m = fenced[i] ? null : STEP_RE.exec(line3);
-    if (m) steps.push({ label: m[1] ?? String(steps.length + 1), title: m[2], lines: [] });
-    else if (steps.length) steps[steps.length - 1].lines.push(line3);
-    else preamble += line3;
-  });
-  if (preamble.trim() !== "") problems.push("Tour: text before the first `### N.` step is ignored");
-  const isRemaining = (title) => /^remaining changes$/i.test(title);
-  const tour = [];
-  let remaining;
-  for (const step of steps) {
-    if (isRemaining(step.title)) {
-      remaining = parseRemaining(step.lines, problems);
-      continue;
-    }
-    const parsed = parseStep(step, problems);
-    if (parsed) tour.push(parsed);
+async function attachThroughStore(path, name, lead, artifacts, ctx) {
+  const exec = (command2, timeoutMs2) => {
+    const opts = { timeoutMs: timeoutMs2, ...ctx.signal ? { signal: ctx.signal } : {} };
+    return ctx.executor.exec(command2, opts);
+  };
+  const callId = ctx.callId;
+  if (callId === void 0) return "error: attach_file was run without its call id \u2014 the file cannot be recorded";
+  const statOut = await exec(statCommandFor(shellQuote(path)), STAT_TIMEOUT_MS);
+  if (parseExitPrefix(statOut).failed) return `error: could not read ${path}: ${statOut.trim()}`;
+  const size = parseByteSize(statOut);
+  if (size === null) return `error: could not measure ${path}: ${statOut.trim()}`;
+  if (size === 0) return `error: ${path} is empty \u2014 nothing to attach`;
+  if (size > MAX_ARTIFACT_BYTES) {
+    return `error: ${path} is ${size} bytes; attach_file takes files up to ${MAX_ARTIFACT_BYTES} bytes (1 GiB) \u2014 link to the file instead`;
   }
-  if (!steps.some((s) => !isRemaining(s.title))) problems.push("Tour has no steps");
-  if (remaining === void 0) problems.push("Tour has no `Remaining changes` step");
-  return { tour, ...remaining ? { remaining } : {} };
-}
-function parseStep(step, problems) {
-  const where = `step ${step.label} (${step.title})`;
-  let link;
-  const descLines = [];
-  const lookForLines = [];
-  let inLookFor = false;
-  for (const line3 of step.lines) {
-    const m = PERMALINK_RE.exec(line3.trim());
-    if (m) {
-      if (link) problems.push(`${where}: more than one permalink \u2014 the first is the anchor`);
-      else link = m;
-      inLookFor = false;
-      continue;
-    }
-    const lf = LOOK_FOR_RE.exec(line3.trim());
-    if (lf) {
-      lookForLines.push(lf[1]);
-      inLookFor = true;
-      continue;
-    }
-    if (inLookFor) {
-      if (line3.trim() === "") inLookFor = false;
-      else lookForLines.push(line3.trim());
-      continue;
-    }
-    descLines.push(line3);
+  let timeoutMs = BASH_TIMEOUT_MAX_MS;
+  if (ctx.remainingMs) {
+    const budget = bashBudgetWithinRun(BASH_TIMEOUT_MAX_MS, ctx.remainingMs());
+    if (budget.kind === "exhausted") return `error: ${budget.note}`;
+    if (budget.kind === "clipped") timeoutMs = budget.timeoutMs;
   }
-  if (!link) {
-    problems.push(`${where}: no permalink line \u2014 dropped`);
-    return void 0;
+  const needed = transferBudgetMs(size);
+  if (needed > timeoutMs) {
+    return `error: ${name} is ${size} bytes and needs about ${secs(needed)}s to move at ${TRANSFER_FLOOR_BYTES_PER_MS} KB/s; the run has ${secs(timeoutMs)}s of command budget left \u2014 write up what you have and link to the file instead`;
   }
-  let path;
+  const contentType = contentTypeFor(name);
+  const key = outboundKey(artifacts.runId, artifacts.nextSeq(), name);
+  const putUrl = await artifacts.store.presignPut(key, contentType);
+  const putOut = await exec(putCommandFor(path, contentType, putUrl), timeoutMs);
+  if (parseExitPrefix(putOut).failed) {
+    return `error: the upload of ${name} to the artifact store failed: ${putOut.trim()}`;
+  }
+  const report2 = parsePutReport(putOut);
+  const curlSaid = report2 ? `; curl reported HTTP ${report2.httpCode} after sending ${report2.sentBytes} bytes` : "";
+  const head = await artifacts.store.head(key);
+  if (!head) {
+    return `error: the artifact store holds nothing under ${key} after the upload of ${name}${curlSaid} \u2014 nothing was posted`;
+  }
+  if (head.size !== size) {
+    return `error: the artifact store holds ${head.size} bytes for ${name}, not the ${size} measured${curlSaid} \u2014 nothing was posted`;
+  }
+  ctx.publish?.({ type: "artifact", direction: "out", key, name, size, contentType, callId });
+  if (!ctx.uploadTicket) {
+    const link = artifacts.artifactUrl?.(key);
+    const where = link ? ` \u2014 ${link}` : ` is on the run page as ${key}`;
+    await artifacts.reply(`${lead}
+\u{1F4CE} ${name} (${size} bytes)${where}`);
+    return `attached ${name} (${size} bytes) to the run page as ${key}; this conversation's channel takes no file uploads, so the lead and the file's link were posted instead`;
+  }
+  const kept = "the file is kept on the run page";
+  let ticket;
   try {
-    path = link[2].split("/").map(decodeURIComponent).join("/");
-  } catch {
-    problems.push(`${where}: permalink path is not valid percent-encoding \u2014 dropped`);
-    return void 0;
+    ticket = await ctx.uploadTicket({ name, size });
+  } catch (err2) {
+    return `error: the channel refused an upload ticket for ${name}: ${describe2(err2)}; ${kept}`;
   }
-  const from = Number(link[3]);
-  const anchor = TourAnchorSchema.safeParse({ path, from, to: link[4] === void 0 ? from : Number(link[4]) });
-  if (!anchor.success) {
-    const issue = anchor.error.issues[0];
-    problems.push(`${where}: ${["anchor", ...issue.path].join(".")} ${issue.message} \u2014 dropped`);
-    return void 0;
+  const postOut = await exec(postCommandFor(path, ticket.url), timeoutMs);
+  if (parseExitPrefix(postOut).failed) {
+    return `error: the upload of ${name} to the channel failed: ${postOut.trim()}; ${kept}`;
   }
-  const lookFor = lookForLines.join("\n").trim();
-  return {
-    title: step.title,
-    // A parsed step may carry an empty description (a human's heading +
-    // permalink): this is a read-back, not a submission the schema gates.
-    description: descLines.join("\n").replace(/\n{3,}/g, "\n\n").trim(),
-    ...lookFor ? { lookFor } : {},
-    anchor: { ...anchor.data, sha: link[1] }
-  };
-}
-function parseRemaining(lines, problems) {
-  const out = [];
-  for (const raw of lines) {
-    const line3 = raw.trim();
-    if (line3 === "" || REMAINING_NONE_RE.test(line3)) continue;
-    const m = REMAINING_LINE_RE.exec(line3);
-    if (m) out.push({ path: m[1], note: m[2].trim() });
-    else if (!line3.startsWith("-") && out.length) out[out.length - 1].note += `
-${line3}`;
-    else problems.push(`Remaining changes: unrecognized line \`${line3}\``);
+  try {
+    await ticket.complete(lead);
+  } catch (err2) {
+    return `error: the channel refused to complete the upload of ${name}: ${describe2(err2)}; ${kept}`;
   }
-  return out;
+  return `attached ${name} (${size} bytes) to the conversation and the run page`;
 }
-function parseDecisions(lines, problems) {
-  const out = [];
-  for (const raw of lines) {
-    const line3 = raw.trim();
-    if (line3 === "") continue;
-    const m = DECISION_RE.exec(line3);
-    if (m) out.push({ title: m[1].replace(/\.$/, ""), rationale: m[2].trim() });
-    else if (!line3.startsWith("-") && out.length) out[out.length - 1].rationale += `
-${line3}`;
-    else problems.push(`Decisions: unrecognized line \`${line3}\``);
+var MAX_ARTIFACT_BYTES, TRANSFER_FLOOR_BYTES_PER_MS, TRANSFER_SETUP_MS, STAT_TIMEOUT_MS, describe2, secs, PUT_REPORT_FORMAT, attachFileTool;
+var init_attach = __esm({
+  "../../src/tools/attach.ts"() {
+    "use strict";
+    init_contentType();
+    init_keys();
+    init_runEvents();
+    init_bashTimeout();
+    init_binaryRead();
+    init_shellQuote();
+    MAX_ARTIFACT_BYTES = 1073741824;
+    TRANSFER_FLOOR_BYTES_PER_MS = 1024;
+    TRANSFER_SETUP_MS = 1e4;
+    STAT_TIMEOUT_MS = 3e4;
+    describe2 = (err2) => err2 instanceof Error ? err2.message : String(err2);
+    secs = (ms) => Math.max(0, Math.round(ms / 1e3));
+    PUT_REPORT_FORMAT = "\\n%{http_code} %{size_upload}";
+    attachFileTool = {
+      name: "attach_file",
+      failsInText: true,
+      description: `Post a file from the workspace into the conversation so the person sees it inline \u2014 a screenshot (e.g. from \`playwright screenshot\`), a rendered PDF, a recording, a log. Use it whenever you produce an image worth showing: a link to a file is not a picture. Whole files only: up to ${MAX_ARTIFACT_BYTES} bytes (1 GiB) where the artifact store is configured, ${MAX_READ_BYTES} bytes otherwise \u2014 the result says which.`,
+      inputSchema: {
+        type: "object",
+        properties: {
+          path: { type: "string", description: "Relative path of the file in the workspace" },
+          comment: {
+            type: "string",
+            description: "One line posted with the file saying what it shows (default: the file name)"
+          }
+        },
+        required: ["path"]
+      },
+      async run(input, ctx) {
+        const path = String(input.path ?? "").trim();
+        if (!path) return "error: path is required";
+        const name = fileNameOf2(path);
+        const lead = typeof input.comment === "string" && input.comment.trim() ? input.comment.trim() : name;
+        if (ctx.artifacts) return attachThroughStore(path, name, lead, ctx.artifacts, ctx);
+        if (!ctx.attach) {
+          return "attach_file is not available here: this conversation's channel takes no file uploads \u2014 link to the file instead";
+        }
+        const readBytes = ctx.executor.readBytes?.bind(ctx.executor);
+        if (!readBytes) {
+          return "attach_file is not available here: this workspace cannot hand files over \u2014 link to the file instead";
+        }
+        let bytes;
+        try {
+          bytes = await readBytes(path);
+        } catch (err2) {
+          return `error: could not read ${path}: ${describe2(err2)}`;
+        }
+        if (bytes.byteLength === 0) return `error: ${path} is empty \u2014 nothing to attach`;
+        try {
+          await ctx.attach({ name, bytes, lead });
+        } catch (err2) {
+          return `error: the channel refused the upload of ${name}: ${describe2(err2)}`;
+        }
+        return `attached ${name} (${bytes.byteLength} bytes) to the conversation`;
+      }
+    };
   }
-  return out;
+});
+
+// ../../src/core/diffDigest.ts
+function basename2(p) {
+  const i = p.lastIndexOf("/");
+  return i === -1 ? p : p.slice(i + 1);
 }
-function parseValidation(lines, problems) {
-  const summary = [];
-  const criteria = [];
-  let header4 = false;
-  for (const raw of lines) {
-    const line3 = raw.trim();
-    if (!header4) {
-      if (TABLE_HEADER_RE.test(line3)) header4 = true;
-      else summary.push(raw);
+function decodeGitQuoted(s) {
+  const bytes = [];
+  for (let i = 0; i < s.length; i++) {
+    if (s[i] === "\\" && i + 1 < s.length) {
+      const oct = s.slice(i + 1).match(/^[0-7]{1,3}/)?.[0];
+      if (oct) {
+        bytes.push(parseInt(oct, 8) & 255);
+        i += oct.length;
+        continue;
+      }
+      const simple = { t: 9, n: 10, r: 13, '"': 34, "\\": 92 };
+      const nx = s[i + 1];
+      bytes.push(nx in simple ? simple[nx] : nx.charCodeAt(0) & 255);
+      i += 1;
       continue;
     }
-    if (line3 === "" || TABLE_RULE_RE.test(line3)) continue;
-    const cells = splitCells(line3);
-    if (cells.length >= 2) criteria.push({ criterion: cells[0], proof: cells[1] });
-    else problems.push(`Validation: unrecognized table line \`${line3}\``);
+    bytes.push(s.charCodeAt(i) & 255);
   }
-  if (!header4) problems.push("Validation: no `| Criterion | Proof |` table");
-  const text = summary.join("\n").trim();
-  return { ...text ? { summary: text } : {}, criteria };
-}
-function splitCells(row) {
-  const cells = [];
-  let cur = "";
-  const inner = row.replace(/^\|/, "").replace(/\|$/, "");
-  for (let i = 0; i < inner.length; i++) {
-    const ch = inner[i];
-    if (ch === "\\" && i + 1 < inner.length) {
-      cur += inner[++i];
-    } else if (ch === "|") {
-      cells.push(cur.trim());
-      cur = "";
-    } else cur += ch;
-  }
-  cells.push(cur.trim());
-  return cells;
-}
-var line2, prose, TourAnchorSchema, TourStepSchema, PrDescriptionSchema, REPO_RE, SHA_RE2, GENERATED_FOOTER, SECTIONS, PERMALINK_RE, HEADING_RE, STEP_RE, LOOK_FOR_RE, REMAINING_LINE_RE, REMAINING_NONE_RE, DECISION_RE, TABLE_HEADER_RE, TABLE_RULE_RE;
-var init_prDescription = __esm({
-  "../../src/core/prDescription.ts"() {
-    "use strict";
-    init_redact();
-    line2 = z20.string().trim().min(1).refine((s) => !/[\r\n]/.test(s), "must be a single line (no embedded newlines)");
-    prose = z20.string().trim().min(1);
-    TourAnchorSchema = z20.object({
-      // Repo-relative: no leading `/`, no `..` SEGMENT (a filename like `a..b.ts` is fine).
-      path: z20.string().trim().min(1).refine((p) => !p.startsWith("/") && !p.split("/").includes(".."), "path must be repo-relative"),
-      from: z20.number().int().positive(),
-      to: z20.number().int().positive()
-    }).refine((a) => a.to >= a.from, "to must be >= from");
-    TourStepSchema = z20.object({
-      title: line2,
-      description: prose,
-      lookFor: prose.optional(),
-      anchor: TourAnchorSchema
-    });
-    PrDescriptionSchema = z20.object({
-      /** The PR title's single source. Metadata for the PR's own title field —
-       *  never rendered into the body (GitHub shows the title itself). */
-      title: line2,
-      tldr: prose,
-      whatWhy: prose,
-      tour: z20.array(TourStepSchema).min(1),
-      /** Every touched file the Tour steps did not cover, one line each. */
-      remaining: z20.array(z20.object({ path: line2, note: prose })),
-      decisions: z20.array(z20.object({ title: line2, rationale: prose })).min(1),
-      risks: prose,
-      validation: z20.object({
-        summary: prose.optional(),
-        criteria: z20.array(z20.object({ criterion: prose, proof: prose })).min(1)
-      })
-    });
-    REPO_RE = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/;
-    SHA_RE2 = /^[0-9a-f]{40}$/;
-    GENERATED_FOOTER = "\u{1F916} Generated with [Claude Code](https://claude.com/claude-code)";
-    SECTIONS = [
-      ["tldr", "TL;DR"],
-      ["whatWhy", "What & why"],
-      ["tour", "Tour"],
-      ["decisions", "Decisions"],
-      ["risks", "Risks & implications"],
-      ["validation", "Validation"]
-    ];
-    PERMALINK_RE = /^https:\/\/github\.com\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+\/blob\/([0-9a-f]{7,40})\/([^#\s]+)#L(\d+)(?:-L(\d+))?$/;
-    HEADING_RE = /^(#{1,6})\s+(.+?)\s*$/;
-    STEP_RE = /^###\s+(?:(\d+)\.\s+)?(.+?)\s*$/;
-    LOOK_FOR_RE = /^\*\*Look for:\*\*\s*(.*)$/;
-    REMAINING_LINE_RE = /^-\s+`([^`]+)`\s+—\s*(.*)$/;
-    REMAINING_NONE_RE = /^-\s+none\b/i;
-    DECISION_RE = /^-\s+\*\*(.+?)\*\*\s*(.*)$/;
-    TABLE_HEADER_RE = /^\|\s*criterion\s*\|\s*proof\s*\|$/i;
-    TABLE_RULE_RE = /^\|?\s*:?-{3,}:?\s*\|/;
-  }
-});
-
-// ../../src/core/diffDigest.ts
-function basename2(p) {
-  const i = p.lastIndexOf("/");
-  return i === -1 ? p : p.slice(i + 1);
-}
-function decodeGitQuoted(s) {
-  const bytes = [];
-  for (let i = 0; i < s.length; i++) {
-    if (s[i] === "\\" && i + 1 < s.length) {
-      const oct = s.slice(i + 1).match(/^[0-7]{1,3}/)?.[0];
-      if (oct) {
-        bytes.push(parseInt(oct, 8) & 255);
-        i += oct.length;
-        continue;
-      }
-      const simple = { t: 9, n: 10, r: 13, '"': 34, "\\": 92 };
-      const nx = s[i + 1];
-      bytes.push(nx in simple ? simple[nx] : nx.charCodeAt(0) & 255);
-      i += 1;
-      continue;
-    }
-    bytes.push(s.charCodeAt(i) & 255);
-  }
-  return Buffer.from(bytes).toString("utf8");
+  return Buffer.from(bytes).toString("utf8");
 }
 function unquotePath(raw) {
   const s = raw.trim();
@@ -25646,10 +25557,71 @@ var init_diffDigest = __esm({
   }
 });
 
+// ../../src/tools/diffDigest.ts
+var NAME_STATUS_MARK, NAME_STATUS_MARK_LINE, OUTPUT_CUT_RE, diffDigestTool;
+var init_diffDigest2 = __esm({
+  "../../src/tools/diffDigest.ts"() {
+    "use strict";
+    init_diffDigest();
+    init_shellQuote();
+    NAME_STATUS_MARK = "@@diff_digest:name-status@@";
+    NAME_STATUS_MARK_LINE = /^@@diff_digest:name-status@@$/m;
+    OUTPUT_CUT_RE = /^\.\.\.\[truncated \d+ chars\]$/m;
+    diffDigestTool = {
+      sideEffectFree: true,
+      name: "diff_digest",
+      description: "Summarize the current branch's whole change against a base ref as a compact digest: per-file +adds/-dels, totals, and risky-file flags (migrations/schema, auth/permission, whole-file deletions, lockfiles, very large files). This is a DISTILLED summary, not the raw diff \u2014 use it to shape a PR description, or to orient before a review. Runs `git diff --numstat` and `--name-status` over the merge-base range `<base>...HEAD` in the workspace, so it covers every file however large the change; base defaults to the repo's default branch (origin/HEAD). The totals it states are the whole change \u2014 a diff you read that shows fewer files or lines was cut short.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          base: {
+            type: "string",
+            description: "Base ref to diff against (e.g. 'main' or a SHA). Defaults to the repo's default branch via origin/HEAD."
+          }
+        }
+      },
+      async run(input, ctx) {
+        const base = String(input.base ?? "").trim();
+        const baseName = base || "origin/HEAD";
+        if (base.startsWith("-")) {
+          return "diff_digest: base ref may not start with '-' (rejected to prevent git option injection).";
+        }
+        const baseExpr = base ? shellQuote(base) : '"$(git rev-parse --abbrev-ref origin/HEAD 2>/dev/null || echo origin/main)"';
+        const range = `--end-of-options ${baseExpr}...HEAD`;
+        const listing = `git diff --numstat ${range} && echo ${NAME_STATUS_MARK} && git diff --name-status ${range}`;
+        let raw = await ctx.executor.exec(listing);
+        const incomplete = () => {
+          const reason = "the file listing exceeded the executor's output cap";
+          ctx.onDigest?.({ complete: false, base: baseName, reason });
+          return `diff_digest: ${reason} \u2014 the digest cannot state totals for this change (base \`${baseName}\`). Read the diff file by file (\`git diff --name-only ${baseName}...HEAD\`).`;
+        };
+        if (OUTPUT_CUT_RE.test(raw)) return incomplete();
+        let marker = NAME_STATUS_MARK_LINE.exec(raw);
+        if (!marker) {
+          const shallow = (await ctx.executor.exec("git rev-parse --is-shallow-repository")).trim() === "true";
+          if (shallow) {
+            await ctx.executor.exec('git fetch --unshallow --quiet origin "+refs/heads/*:refs/remotes/origin/*"');
+            raw = await ctx.executor.exec(listing);
+            if (OUTPUT_CUT_RE.test(raw)) return incomplete();
+            marker = NAME_STATUS_MARK_LINE.exec(raw);
+          }
+        }
+        if (!marker) {
+          return `diff_digest: could not compute the diff (base \`${baseName}\`).
+${raw.trim()}`;
+        }
+        const digest = distillDiffStats(raw.slice(0, marker.index), raw.slice(marker.index + marker[0].length));
+        ctx.onDigest?.({ complete: true, base: baseName, totals: digest.totals });
+        return digest.text;
+      }
+    };
+  }
+});
+
 // ../../src/tools/github.ts
 function repoOf(input) {
   const raw = String(input.repo ?? "").trim().replace(/\.git$/i, "");
-  if (!REPO_RE2.test(raw))
+  if (!REPO_RE.test(raw))
     return {
       error: `repo must be an owner/name slug (got ${JSON.stringify(raw)}); github_repos lists the repos you can reach.`
     };
@@ -25697,12 +25669,12 @@ function writeGate(tool, ctx, repo) {
     return `${tool}: you are not allowed to write to ${repo} (it is restricted and you hold no grant for it) \u2014 say so to the user instead of retrying.`;
   return void 0;
 }
-var REPO_RE2, UNAVAILABLE, MAX_TREE_ENTRIES, MAX_ISSUE_BODY_SHOWN, githubReposTool, githubFileTool, githubTreeTool, githubSearchCodeTool, githubIssueListTool, githubIssueGetTool, githubIssueCreateTool, githubIssueUpdateTool, githubIssueCommentTool, githubIssueDeleteTool, GITHUB_READ_TOOLS, GITHUB_ISSUE_WRITE_TOOLS;
+var REPO_RE, UNAVAILABLE, MAX_TREE_ENTRIES, MAX_ISSUE_BODY_SHOWN, githubReposTool, githubFileTool, githubTreeTool, githubSearchCodeTool, githubIssueListTool, githubIssueGetTool, githubIssueCreateTool, githubIssueUpdateTool, githubIssueCommentTool, githubIssueDeleteTool, GITHUB_READ_TOOLS, GITHUB_ISSUE_WRITE_TOOLS;
 var init_github = __esm({
   "../../src/tools/github.ts"() {
     "use strict";
     init_githubApi();
-    REPO_RE2 = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?\/[A-Za-z0-9](?:[A-Za-z0-9._-]{0,98}[A-Za-z0-9])?$/;
+    REPO_RE = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?\/[A-Za-z0-9](?:[A-Za-z0-9._-]{0,98}[A-Za-z0-9])?$/;
     UNAVAILABLE = "GitHub tools are not available in this context.";
     MAX_TREE_ENTRIES = 300;
     MAX_ISSUE_BODY_SHOWN = 6e3;
@@ -26059,321 +26031,52 @@ ${url}`;
   }
 });
 
-// ../../src/tools/skills.ts
-var listSkillsTool, useSkillTool;
-var init_skills = __esm({
-  "../../src/tools/skills.ts"() {
-    "use strict";
-    listSkillsTool = {
-      sideEffectFree: true,
-      name: "list_skills",
-      description: "List the skills available to you: each is a reusable methodology you can load into context with use_skill. Returns each skill's name and a one-line description. The same list is also in your system prompt.",
-      inputSchema: {
-        type: "object",
-        properties: {}
-      },
-      async run(_input, ctx) {
-        if (!ctx.skills) return "Skills are not available in this context.";
-        const metas = ctx.skills.list(ctx.agentName ?? "");
-        if (metas.length === 0) return "No skills are available to you.";
-        return metas.map((m) => `- ${m.name}: ${m.description}`).join("\n");
-      }
+// ../../src/core/dispatch/awaitChildren.ts
+function decideWait(inputs) {
+  const { children, now, budgetEndsAt, timeoutAt, stop, followUpPending } = inputs;
+  if ([...children.values()].every(isTerminal)) return { kind: "end", why: "all_ended" };
+  if (stop !== void 0) return { kind: "end", why: "stop" };
+  if (followUpPending) return { kind: "end", why: "follow_up" };
+  if (now >= budgetEndsAt) return { kind: "end", why: "budget" };
+  if (timeoutAt !== void 0 && now >= timeoutAt) return { kind: "end", why: "timeout" };
+  return { kind: "wait", until: Math.min(budgetEndsAt, timeoutAt ?? Number.POSITIVE_INFINITY) };
+}
+function budgetEndOf(now, remainingMs) {
+  return now + remainingMs - RUN_DEADLINE_RESERVE_MS;
+}
+function sleepUnlessAborted(ms, signal2) {
+  return new Promise((resolve12) => {
+    if (signal2?.aborted) return resolve12();
+    const done = () => {
+      clearTimeout(timer);
+      signal2?.removeEventListener("abort", done);
+      resolve12();
     };
-    useSkillTool = {
-      sideEffectFree: true,
-      name: "use_skill",
-      description: "Load a skill's full instructions into your context by name (get names from list_skills or your system prompt). Returns the skill body \u2014 read it and follow it for the work at hand.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          name: { type: "string", description: "The skill name to load (e.g. code-review-and-quality)" }
-        },
-        required: ["name"]
-      },
-      async run(input, ctx) {
-        if (!ctx.skills) return "Skills are not available in this context.";
-        const name = String(input.name ?? "").trim();
-        if (!name) return "use_skill: provide a skill `name` (see list_skills).";
-        const skill = ctx.skills.get(name);
-        const inScope = skill && skill.agents.includes(ctx.agentName ?? "");
-        if (!skill || !inScope) {
-          const available = ctx.skills.list(ctx.agentName ?? "").map((m) => m.name);
-          return `use_skill: no skill named "${name}" is available to you.` + (available.length > 0 ? ` Available: ${available.join(", ")}.` : "");
+    const timer = setTimeout(done, ms);
+    signal2?.addEventListener("abort", done, { once: true });
+  });
+}
+function waitCapabilityFor(deps) {
+  return {
+    stopRequested: () => deps.control.requested,
+    followUpsPending: () => deps.inbox.size,
+    watch: (ids, onChange) => {
+      let replaying = true;
+      const unsubscribe = deps.registry.subscribeIndex((event) => {
+        if (event.type === "removed") {
+          if (ids.has(event.id)) onChange();
+          return;
         }
-        ctx.publish?.({
-          type: "skill_use",
-          skill: skill.name,
-          description: skill.description,
-          agent: ctx.agentName ?? "",
-          ...skill.source ? { source: skill.source } : {},
-          ...skill.upstream ? { upstream: { repo: skill.upstream.repo, commit: skill.upstream.commit } } : {},
-          bodyBytes: Buffer.byteLength(skill.body, "utf8")
-        });
-        const footer = skill.source ? `
-
-_(Skill source: ${skill.source})_` : "";
-        return `# Skill: ${skill.name}
-
-${skill.body}${footer}`;
-      }
-    };
-  }
-});
-
-// ../../src/artifacts/contentType.ts
-function contentTypeFor(name) {
-  const dot = name.lastIndexOf(".");
-  if (dot < 0 || dot === name.length - 1) return OCTET_STREAM;
-  return BY_EXTENSION[name.slice(dot + 1).toLowerCase()] ?? OCTET_STREAM;
-}
-var BY_EXTENSION, OCTET_STREAM, INLINE_IMAGE_TYPES;
-var init_contentType = __esm({
-  "../../src/artifacts/contentType.ts"() {
-    "use strict";
-    BY_EXTENSION = {
-      png: "image/png",
-      jpg: "image/jpeg",
-      jpeg: "image/jpeg",
-      gif: "image/gif",
-      webp: "image/webp",
-      svg: "image/svg+xml",
-      pdf: "application/pdf",
-      mp4: "video/mp4",
-      webm: "video/webm",
-      mov: "video/quicktime",
-      mp3: "audio/mpeg",
-      wav: "audio/wav",
-      txt: "text/plain",
-      md: "text/markdown",
-      csv: "text/csv",
-      json: "application/json",
-      html: "text/html",
-      zip: "application/zip",
-      gz: "application/gzip",
-      tar: "application/x-tar"
-    };
-    OCTET_STREAM = "application/octet-stream";
-    INLINE_IMAGE_TYPES = /* @__PURE__ */ new Set(["image/png", "image/jpeg", "image/gif", "image/webp"]);
-  }
-});
-
-// ../../src/artifacts/keys.ts
-function safeBasename(name) {
-  const segments2 = name.split(/[\\/]+/).filter((s) => s.length > 0);
-  const last = segments2[segments2.length - 1] ?? "";
-  const reduced = last.replace(SAFE, "_").replace(/\.{2,}/g, "_").replace(/_+/g, "_");
-  if (reduced === "" || /^[._-]+$/.test(reduced)) return "file";
-  return reduced;
-}
-function threadKeySafe(threadKey) {
-  return threadKey.replace(/:/g, "-").replace(SAFE, "_");
-}
-function outboundKey(runId3, seq, name) {
-  return `runs/${runId3}/out/${seq}-${safeBasename(name)}`;
-}
-function inboundKey(threadKey, messageTs, index, name) {
-  return `threads/${threadKeySafe(threadKey)}/in/${messageTs}/${index}-${safeBasename(name)}`;
-}
-var SAFE;
-var init_keys = __esm({
-  "../../src/artifacts/keys.ts"() {
-    "use strict";
-    SAFE = /[^A-Za-z0-9._-]+/g;
-  }
-});
-
-// ../../src/tools/attach.ts
-function transferBudgetMs(size) {
-  return Math.ceil(size / TRANSFER_FLOOR_BYTES_PER_MS) + TRANSFER_SETUP_MS;
-}
-function fileNameOf2(path) {
-  const segments2 = path.split("/").filter(Boolean);
-  return segments2[segments2.length - 1] ?? path;
-}
-function putCommandFor(path, contentType, url) {
-  return `curl -fsS -T ${shellQuote(path)} -H ${shellQuote(`Content-Type: ${contentType}`)} -o /dev/null -w ${shellQuote(PUT_REPORT_FORMAT)} ${shellQuote(url)}`;
-}
-function parsePutReport(output) {
-  const m = /(\d{3}) (\d{1,15})\s*$/.exec(output);
-  return m ? { httpCode: Number(m[1]), sentBytes: Number(m[2]) } : null;
-}
-function postCommandFor(path, url) {
-  return `curl -fsS --upload-file ${shellQuote(path)} -X POST ${shellQuote(url)}`;
-}
-async function attachThroughStore(path, name, lead, artifacts, ctx) {
-  const exec = (command2, timeoutMs2) => {
-    const opts = { timeoutMs: timeoutMs2, ...ctx.signal ? { signal: ctx.signal } : {} };
-    return ctx.executor.exec(command2, opts);
-  };
-  const statOut = await exec(statCommandFor(shellQuote(path)), STAT_TIMEOUT_MS);
-  if (parseExitPrefix(statOut).failed) return `error: could not read ${path}: ${statOut.trim()}`;
-  const size = parseByteSize(statOut);
-  if (size === null) return `error: could not measure ${path}: ${statOut.trim()}`;
-  if (size === 0) return `error: ${path} is empty \u2014 nothing to attach`;
-  if (size > MAX_ARTIFACT_BYTES) {
-    return `error: ${path} is ${size} bytes; attach_file takes files up to ${MAX_ARTIFACT_BYTES} bytes (1 GiB) \u2014 link to the file instead`;
-  }
-  let timeoutMs = BASH_TIMEOUT_MAX_MS;
-  if (ctx.remainingMs) {
-    const budget = bashBudgetWithinRun(BASH_TIMEOUT_MAX_MS, ctx.remainingMs());
-    if (budget.kind === "exhausted") return `error: ${budget.note}`;
-    if (budget.kind === "clipped") timeoutMs = budget.timeoutMs;
-  }
-  const needed = transferBudgetMs(size);
-  if (needed > timeoutMs) {
-    return `error: ${name} is ${size} bytes and needs about ${secs(needed)}s to move at ${TRANSFER_FLOOR_BYTES_PER_MS} KB/s; the run has ${secs(timeoutMs)}s of command budget left \u2014 write up what you have and link to the file instead`;
-  }
-  const contentType = contentTypeFor(name);
-  const key = outboundKey(artifacts.runId, artifacts.nextSeq(), name);
-  const putUrl = await artifacts.store.presignPut(key, contentType);
-  const putOut = await exec(putCommandFor(path, contentType, putUrl), timeoutMs);
-  if (parseExitPrefix(putOut).failed) {
-    return `error: the upload of ${name} to the artifact store failed: ${putOut.trim()}`;
-  }
-  const report2 = parsePutReport(putOut);
-  const curlSaid = report2 ? `; curl reported HTTP ${report2.httpCode} after sending ${report2.sentBytes} bytes` : "";
-  const head = await artifacts.store.head(key);
-  if (!head) {
-    return `error: the artifact store holds nothing under ${key} after the upload of ${name}${curlSaid} \u2014 nothing was posted`;
-  }
-  if (head.size !== size) {
-    return `error: the artifact store holds ${head.size} bytes for ${name}, not the ${size} measured${curlSaid} \u2014 nothing was posted`;
-  }
-  ctx.publish?.({ type: "artifact", direction: "out", key, name, size, contentType });
-  if (!ctx.uploadTicket) {
-    const link = artifacts.artifactUrl?.(key);
-    const where = link ? ` \u2014 ${link}` : ` is on the run page as ${key}`;
-    await artifacts.reply(`${lead}
-\u{1F4CE} ${name} (${size} bytes)${where}`);
-    return `attached ${name} (${size} bytes) to the run page as ${key}; this conversation's channel takes no file uploads, so the lead and the file's link were posted instead`;
-  }
-  const kept = "the file is kept on the run page";
-  let ticket;
-  try {
-    ticket = await ctx.uploadTicket({ name, size });
-  } catch (err2) {
-    return `error: the channel refused an upload ticket for ${name}: ${describe2(err2)}; ${kept}`;
-  }
-  const postOut = await exec(postCommandFor(path, ticket.url), timeoutMs);
-  if (parseExitPrefix(postOut).failed) {
-    return `error: the upload of ${name} to the channel failed: ${postOut.trim()}; ${kept}`;
-  }
-  try {
-    await ticket.complete(lead);
-  } catch (err2) {
-    return `error: the channel refused to complete the upload of ${name}: ${describe2(err2)}; ${kept}`;
-  }
-  return `attached ${name} (${size} bytes) to the conversation and the run page`;
-}
-var MAX_ARTIFACT_BYTES, TRANSFER_FLOOR_BYTES_PER_MS, TRANSFER_SETUP_MS, STAT_TIMEOUT_MS, describe2, secs, PUT_REPORT_FORMAT, attachFileTool;
-var init_attach = __esm({
-  "../../src/tools/attach.ts"() {
-    "use strict";
-    init_contentType();
-    init_keys();
-    init_runEvents();
-    init_bashTimeout();
-    init_binaryRead();
-    init_shellQuote();
-    MAX_ARTIFACT_BYTES = 1073741824;
-    TRANSFER_FLOOR_BYTES_PER_MS = 1024;
-    TRANSFER_SETUP_MS = 1e4;
-    STAT_TIMEOUT_MS = 3e4;
-    describe2 = (err2) => err2 instanceof Error ? err2.message : String(err2);
-    secs = (ms) => Math.max(0, Math.round(ms / 1e3));
-    PUT_REPORT_FORMAT = "\\n%{http_code} %{size_upload}";
-    attachFileTool = {
-      name: "attach_file",
-      failsInText: true,
-      description: `Post a file from the workspace into the conversation so the person sees it inline \u2014 a screenshot (e.g. from \`playwright screenshot\`), a rendered PDF, a recording, a log. Use it whenever you produce an image worth showing: a link to a file is not a picture. Whole files only: up to ${MAX_ARTIFACT_BYTES} bytes (1 GiB) where the artifact store is configured, ${MAX_READ_BYTES} bytes otherwise \u2014 the result says which.`,
-      inputSchema: {
-        type: "object",
-        properties: {
-          path: { type: "string", description: "Relative path of the file in the workspace" },
-          comment: {
-            type: "string",
-            description: "One line posted with the file saying what it shows (default: the file name)"
-          }
-        },
-        required: ["path"]
-      },
-      async run(input, ctx) {
-        const path = String(input.path ?? "").trim();
-        if (!path) return "error: path is required";
-        const name = fileNameOf2(path);
-        const lead = typeof input.comment === "string" && input.comment.trim() ? input.comment.trim() : name;
-        if (ctx.artifacts) return attachThroughStore(path, name, lead, ctx.artifacts, ctx);
-        if (!ctx.attach) {
-          return "attach_file is not available here: this conversation's channel takes no file uploads \u2014 link to the file instead";
-        }
-        const readBytes = ctx.executor.readBytes?.bind(ctx.executor);
-        if (!readBytes) {
-          return "attach_file is not available here: this workspace cannot hand files over \u2014 link to the file instead";
-        }
-        let bytes;
-        try {
-          bytes = await readBytes(path);
-        } catch (err2) {
-          return `error: could not read ${path}: ${describe2(err2)}`;
-        }
-        if (bytes.byteLength === 0) return `error: ${path} is empty \u2014 nothing to attach`;
-        try {
-          await ctx.attach({ name, bytes, lead });
-        } catch (err2) {
-          return `error: the channel refused the upload of ${name}: ${describe2(err2)}`;
-        }
-        return `attached ${name} (${bytes.byteLength} bytes) to the conversation`;
-      }
-    };
-  }
-});
-
-// ../../src/core/dispatch/awaitChildren.ts
-function decideWait(inputs) {
-  const { children, now, budgetEndsAt, timeoutAt, stop, followUpPending } = inputs;
-  if ([...children.values()].every(isTerminal)) return { kind: "end", why: "all_ended" };
-  if (stop !== void 0) return { kind: "end", why: "stop" };
-  if (followUpPending) return { kind: "end", why: "follow_up" };
-  if (now >= budgetEndsAt) return { kind: "end", why: "budget" };
-  if (timeoutAt !== void 0 && now >= timeoutAt) return { kind: "end", why: "timeout" };
-  return { kind: "wait", until: Math.min(budgetEndsAt, timeoutAt ?? Number.POSITIVE_INFINITY) };
-}
-function budgetEndOf(now, remainingMs) {
-  return now + remainingMs - RUN_DEADLINE_RESERVE_MS;
-}
-function sleepUnlessAborted(ms, signal2) {
-  return new Promise((resolve12) => {
-    if (signal2?.aborted) return resolve12();
-    const done = () => {
-      clearTimeout(timer);
-      signal2?.removeEventListener("abort", done);
-      resolve12();
-    };
-    const timer = setTimeout(done, ms);
-    signal2?.addEventListener("abort", done, { once: true });
-  });
-}
-function waitCapabilityFor(deps) {
-  return {
-    stopRequested: () => deps.control.requested,
-    followUpsPending: () => deps.inbox.size,
-    watch: (ids, onChange) => {
-      let replaying = true;
-      const unsubscribe = deps.registry.subscribeIndex((event) => {
-        if (event.type === "removed") {
-          if (ids.has(event.id)) onChange();
-          return;
-        }
-        if (!event.run.finished) return;
-        if (ids.has(event.run.id)) onChange();
-        else if (!replaying && deps.runId !== void 0 && event.run.parentRunId === deps.runId) onChange();
-      });
-      replaying = false;
-      return unsubscribe;
-    },
-    now: deps.clock,
-    sleep: deps.sleep ?? sleepUnlessAborted
-  };
+        if (!event.run.finished) return;
+        if (ids.has(event.run.id)) onChange();
+        else if (!replaying && deps.runId !== void 0 && event.run.parentRunId === deps.runId) onChange();
+      });
+      replaying = false;
+      return unsubscribe;
+    },
+    now: deps.clock,
+    sleep: deps.sleep ?? sleepUnlessAborted
+  };
 }
 var AWAIT_POLL_MS, isTerminal, ChildrenWatch;
 var init_awaitChildren = __esm({
@@ -27093,7 +26796,8 @@ async function copyStaged(files, deps) {
           key,
           name: file.name,
           size: file.size,
-          contentType: file.type
+          contentType: file.type,
+          messageId: file.messageId
         });
         return { file, basename: basename4, key };
       } catch (err2) {
@@ -27152,7 +26856,8 @@ function stageThreadArtifacts(artifacts, deps) {
       key: a.key,
       name: a.name,
       size: a.size,
-      contentType: a.contentType
+      contentType: a.contentType,
+      messageId: deps.messageId
     });
     outcomes.push({ file, basename: basename4, key: a.key, earlier: true });
   }
@@ -27458,145 +27163,444 @@ var init_session = __esm({
   }
 });
 
-// ../../src/tools/workspace.ts
-import { z as z21 } from "zod";
-var bashTool, readFileTool, writeFileTool, NAME_STATUS_MARK, NAME_STATUS_MARK_LINE, OUTPUT_CUT_RE, diffDigestTool, submitVerdictTool, submitDispositionsTool, submitPrDescriptionTool, handoffEntry, submitHandoffTool, updateStatusTool, TOOLSETS;
-var init_workspace = __esm({
-  "../../src/tools/workspace.ts"() {
+// ../../src/tools/skills.ts
+var listSkillsTool, useSkillTool;
+var init_skills = __esm({
+  "../../src/tools/skills.ts"() {
     "use strict";
-    init_prDescription();
-    init_handoff();
-    init_reviewVerdict();
-    init_bashTimeout();
-    init_executor();
-    init_shellQuote();
-    init_diffDigest();
-    init_web();
-    init_github();
-    init_skills();
-    init_attach();
-    init_runs2();
-    init_session();
-    bashTool = {
-      name: "bash",
-      description: "Run a bash command in the workspace directory. Use for git, gh, tests, builds, and inspecting files. Commands time out after 5 minutes (300000 ms) by default; pass timeoutMs when a command legitimately needs longer \u2014 a full test suite, a large build \u2014 up to the 1200000 ms (20 minute) maximum; a command is also clipped to the run's own remaining time, so it can never outlive the run. Output is truncated at 30k characters.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          command: { type: "string", description: "The bash command to run" },
-          timeoutMs: {
-            type: "integer",
-            description: "Optional timeout in milliseconds for this command (default 300000 = 5 min; max 1200000 = 20 min). Values outside [1000, 1200000] are clamped."
-          }
-        },
-        required: ["command"]
-      },
-      async run(input, ctx) {
-        const requested = input.timeoutMs;
-        let timeoutMs = typeof requested === "number" && Number.isFinite(requested) ? clampBashTimeout(requested) : void 0;
-        let clipNote = "";
-        if (ctx.remainingMs) {
-          const budget = bashBudgetWithinRun(timeoutMs ?? BASH_TIMEOUT_MS, ctx.remainingMs());
-          if (budget.kind === "exhausted") return `exit 124:
-${budget.note}`;
-          if (budget.kind === "clipped") {
-            timeoutMs = budget.timeoutMs;
-            clipNote = budget.note;
-          }
-        }
-        const opts = {
-          ...ctx.signal ? { signal: ctx.signal } : {},
-          ...timeoutMs !== void 0 ? { timeoutMs } : {}
-        };
-        const out = await ctx.executor.exec(
-          String(input.command ?? ""),
-          opts.signal !== void 0 || opts.timeoutMs !== void 0 ? opts : void 0
-        );
-        return clipNote ? `${out}
-${clipNote}` : out;
-      }
-    };
-    readFileTool = {
+    listSkillsTool = {
       sideEffectFree: true,
-      name: "read_file",
-      description: "Read a file from the workspace. Path is relative to the workspace root.",
+      name: "list_skills",
+      description: "List the skills available to you: each is a reusable methodology you can load into context with use_skill. Returns each skill's name and a one-line description. The same list is also in your system prompt.",
       inputSchema: {
         type: "object",
-        properties: {
-          path: { type: "string", description: "Relative path to the file" }
-        },
-        required: ["path"]
+        properties: {}
       },
-      run(input, ctx) {
-        return ctx.executor.readFile(String(input.path ?? ""));
+      async run(_input, ctx) {
+        if (!ctx.skills) return "Skills are not available in this context.";
+        const metas = ctx.skills.list(ctx.agentName ?? "");
+        if (metas.length === 0) return "No skills are available to you.";
+        return metas.map((m) => `- ${m.name}: ${m.description}`).join("\n");
       }
     };
-    writeFileTool = {
-      name: "write_file",
-      description: "Write a file in the workspace (creates parent directories). Path is relative to the workspace root.",
+    useSkillTool = {
+      sideEffectFree: true,
+      name: "use_skill",
+      description: "Load a skill's full instructions into your context by name (get names from list_skills or your system prompt). Returns the skill body \u2014 read it and follow it for the work at hand.",
       inputSchema: {
         type: "object",
         properties: {
-          path: { type: "string", description: "Relative path to the file" },
-          content: { type: "string", description: "Full file contents" }
+          name: { type: "string", description: "The skill name to load (e.g. code-review-and-quality)" }
         },
-        required: ["path", "content"]
+        required: ["name"]
       },
-      run(input, ctx) {
-        return ctx.executor.writeFile(String(input.path ?? ""), String(input.content ?? ""));
+      async run(input, ctx) {
+        if (!ctx.skills) return "Skills are not available in this context.";
+        const name = String(input.name ?? "").trim();
+        if (!name) return "use_skill: provide a skill `name` (see list_skills).";
+        const skill = ctx.skills.get(name);
+        const inScope = skill && skill.agents.includes(ctx.agentName ?? "");
+        if (!skill || !inScope) {
+          const available = ctx.skills.list(ctx.agentName ?? "").map((m) => m.name);
+          return `use_skill: no skill named "${name}" is available to you.` + (available.length > 0 ? ` Available: ${available.join(", ")}.` : "");
+        }
+        ctx.publish?.({
+          type: "skill_use",
+          skill: skill.name,
+          description: skill.description,
+          agent: ctx.agentName ?? "",
+          ...skill.source ? { source: skill.source } : {},
+          ...skill.upstream ? { upstream: { repo: skill.upstream.repo, commit: skill.upstream.commit } } : {},
+          bodyBytes: Buffer.byteLength(skill.body, "utf8")
+        });
+        const footer = skill.source ? `
+
+_(Skill source: ${skill.source})_` : "";
+        return `# Skill: ${skill.name}
+
+${skill.body}${footer}`;
       }
     };
-    NAME_STATUS_MARK = "@@diff_digest:name-status@@";
-    NAME_STATUS_MARK_LINE = /^@@diff_digest:name-status@@$/m;
-    OUTPUT_CUT_RE = /^\.\.\.\[truncated \d+ chars\]$/m;
-    diffDigestTool = {
-      sideEffectFree: true,
-      name: "diff_digest",
-      description: "Summarize the current branch's whole change against a base ref as a compact digest: per-file +adds/-dels, totals, and risky-file flags (migrations/schema, auth/permission, whole-file deletions, lockfiles, very large files). This is a DISTILLED summary, not the raw diff \u2014 use it to shape a PR description, or to orient before a review. Runs `git diff --numstat` and `--name-status` over the merge-base range `<base>...HEAD` in the workspace, so it covers every file however large the change; base defaults to the repo's default branch (origin/HEAD). The totals it states are the whole change \u2014 a diff you read that shows fewer files or lines was cut short.",
+  }
+});
+
+// ../../src/tools/status.ts
+var updateStatusTool;
+var init_status2 = __esm({
+  "../../src/tools/status.ts"() {
+    "use strict";
+    updateStatusTool = {
+      name: "update_status",
+      description: "Update the short user-facing status checklist shown while you work. Call it right after planning (all items pending) and again whenever an item's state changes. Format: one item per line, prefixed with a state marker: \u2713 done, \u2731 in progress, \u25CB pending. Keep it to 3-6 short outcome-oriented items (what, not how \u2014 never raw commands).",
       inputSchema: {
         type: "object",
         properties: {
-          base: {
+          checklist: {
             type: "string",
-            description: "Base ref to diff against (e.g. 'main' or a SHA). Defaults to the repo's default branch via origin/HEAD."
+            description: "The full checklist, one '\u2713|\u2731|\u25CB item' per line (replaces the previous one)"
           }
-        }
+        },
+        required: ["checklist"]
       },
       async run(input, ctx) {
-        const base = String(input.base ?? "").trim();
-        const baseName = base || "origin/HEAD";
-        if (base.startsWith("-")) {
-          return "diff_digest: base ref may not start with '-' (rejected to prevent git option injection).";
-        }
-        const baseExpr = base ? shellQuote(base) : '"$(git rev-parse --abbrev-ref origin/HEAD 2>/dev/null || echo origin/main)"';
-        const range = `--end-of-options ${baseExpr}...HEAD`;
-        const listing = `git diff --numstat ${range} && echo ${NAME_STATUS_MARK} && git diff --name-status ${range}`;
-        let raw = await ctx.executor.exec(listing);
-        const incomplete = () => {
-          const reason = "the file listing exceeded the executor's output cap";
-          ctx.onDigest?.({ complete: false, base: baseName, reason });
-          return `diff_digest: ${reason} \u2014 the digest cannot state totals for this change (base \`${baseName}\`). Read the diff file by file (\`git diff --name-only ${baseName}...HEAD\`).`;
-        };
-        if (OUTPUT_CUT_RE.test(raw)) return incomplete();
-        let marker = NAME_STATUS_MARK_LINE.exec(raw);
-        if (!marker) {
-          const shallow = (await ctx.executor.exec("git rev-parse --is-shallow-repository")).trim() === "true";
-          if (shallow) {
-            await ctx.executor.exec('git fetch --unshallow --quiet origin "+refs/heads/*:refs/remotes/origin/*"');
-            raw = await ctx.executor.exec(listing);
-            if (OUTPUT_CUT_RE.test(raw)) return incomplete();
-            marker = NAME_STATUS_MARK_LINE.exec(raw);
-          }
-        }
-        if (!marker) {
-          return `diff_digest: could not compute the diff (base \`${baseName}\`).
-${raw.trim()}`;
-        }
-        const digest = distillDiffStats(raw.slice(0, marker.index), raw.slice(marker.index + marker[0].length));
-        ctx.onDigest?.({ complete: true, base: baseName, totals: digest.totals });
-        return digest.text;
+        ctx.reportProgress?.(String(input.checklist ?? ""));
+        return "status updated";
       }
     };
+  }
+});
+
+// ../../src/core/prDescription.ts
+import { z as z20 } from "zod";
+function parsePrDescription(input) {
+  return PrDescriptionSchema.parse(input);
+}
+function redactPrDescription(d) {
+  return mapStringLeaves(d, redactSecrets);
+}
+function mapStringLeaves(value, fn) {
+  if (typeof value === "string") return fn(value);
+  if (Array.isArray(value)) return value.map((v) => mapStringLeaves(v, fn));
+  if (typeof value === "object" && value !== null) {
+    return Object.fromEntries(Object.entries(value).map(([key, v]) => [key, mapStringLeaves(v, fn)]));
+  }
+  return value;
+}
+function encodeGithubPathSegments(path) {
+  return path.split("/").map(encodeURIComponent).join("/");
+}
+function anchorUrl(ctx, a) {
+  return `https://github.com/${ctx.repo}/blob/${ctx.headSha}/${encodeGithubPathSegments(a.path)}#L${a.from}-L${a.to}`;
+}
+function cell2(s) {
+  return s.replace(/\\/g, "\\\\").replace(/\|/g, "\\|").replace(/\s*\n\s*/g, " ");
+}
+function renderPrDescriptionMarkdown(desc, ctx) {
+  if (!REPO_RE2.test(ctx.repo))
+    throw new Error(`renderPrDescriptionMarkdown: repo must be owner/name, got "${ctx.repo}"`);
+  if (!SHA_RE2.test(ctx.headSha))
+    throw new Error(`renderPrDescriptionMarkdown: headSha must be a full 40-char lowercase sha, got "${ctx.headSha}"`);
+  const out = [];
+  out.push("## TL;DR", "", desc.tldr, "");
+  out.push("## What & why", "", desc.whatWhy, "");
+  out.push("## Tour", "");
+  desc.tour.forEach((step, i) => {
+    out.push(`### ${i + 1}. ${step.title}`, "", step.description, "");
+    if (step.lookFor) out.push(`**Look for:** ${step.lookFor}`, "");
+    out.push(anchorUrl(ctx, step.anchor), "");
+  });
+  out.push(`### ${desc.tour.length + 1}. Remaining changes`, "");
+  if (desc.remaining.length === 0) out.push("- none \u2014 every touched file is covered by a step above", "");
+  else {
+    for (const r of desc.remaining) out.push(`- \`${r.path}\` \u2014 ${r.note}`);
+    out.push("");
+  }
+  out.push("## Decisions", "");
+  for (const d of desc.decisions) out.push(`- **${d.title.replace(/\.?$/, ".")}** ${d.rationale}`);
+  out.push("");
+  out.push("## Risks & implications", "", desc.risks, "");
+  out.push("## Validation", "");
+  if (desc.validation.summary) out.push(desc.validation.summary, "");
+  out.push("| Criterion | Proof |", "|---|---|");
+  for (const c of desc.validation.criteria) out.push(`| ${cell2(c.criterion)} | ${cell2(c.proof)} |`);
+  out.push("", GENERATED_FOOTER, "");
+  return out.join("\n");
+}
+function parsePrDescriptionMarkdown(body) {
+  const problems = [];
+  const lines = body.replace(/\r\n?/g, "\n").split("\n").filter((l) => l.trim() !== GENERATED_FOOTER);
+  const fenced = fenceMask(lines);
+  const sections = splitSections(lines, fenced, problems);
+  const description = { tour: [] };
+  const tldr = sections.get("tldr");
+  if (tldr) setProse(description, "tldr", tldr, problems);
+  else {
+    problems.push("no `## TL;DR` section \u2014 the tldr is the body's first paragraph");
+    const first = firstParagraph(lines, fenced);
+    if (first) description.tldr = first;
+  }
+  const whatWhy = sections.get("whatWhy");
+  if (whatWhy) setProse(description, "whatWhy", whatWhy, problems);
+  const tour = sections.get("tour");
+  if (tour) {
+    const parsed = parseTour(tour.lines, fenced.slice(tour.start, tour.start + tour.lines.length), problems);
+    description.tour = parsed.tour;
+    if (parsed.remaining) description.remaining = parsed.remaining;
+  }
+  const decisions = sections.get("decisions");
+  if (decisions) description.decisions = parseDecisions(decisions.lines, problems);
+  const risks = sections.get("risks");
+  if (risks) setProse(description, "risks", risks, problems);
+  const validation = sections.get("validation");
+  if (validation) description.validation = parseValidation(validation.lines, problems);
+  for (const [key, heading] of SECTIONS) {
+    if (key === "tldr" || sections.has(key)) continue;
+    problems.push(`no \`## ${heading}\` section`);
+  }
+  return { description, complete: problems.length === 0, problems };
+}
+function fenceMask(lines) {
+  let open2;
+  return lines.map((l) => {
+    const m = /^\s*(`{3,}|~{3,})/.exec(l);
+    if (m && (open2 === void 0 || m[1][0] === open2[0])) {
+      const wasOpen = open2 !== void 0;
+      open2 = wasOpen ? void 0 : m[1];
+      return true;
+    }
+    return open2 !== void 0;
+  });
+}
+function splitSections(lines, fenced, problems) {
+  const byHeading = new Map(SECTIONS.map(([key, heading]) => [heading.toLowerCase(), key]));
+  const out = /* @__PURE__ */ new Map();
+  let current;
+  lines.forEach((line3, i) => {
+    const m = fenced[i] ? null : HEADING_RE.exec(line3);
+    if (m && m[1] === "##") {
+      const key = byHeading.get(m[2].replace(/\s+/g, " ").toLowerCase());
+      if (key === void 0)
+        current = void 0;
+      else if (out.has(key)) {
+        problems.push(`duplicate \`## ${SECTIONS.find(([k]) => k === key)[1]}\` section \u2014 the first one stands`);
+        current = void 0;
+      } else {
+        current = { start: i + 1, lines: [] };
+        out.set(key, current);
+      }
+      return;
+    }
+    current?.lines.push(line3);
+  });
+  return out;
+}
+function firstParagraph(lines, fenced) {
+  const para = [];
+  for (let i = 0; i < lines.length; i++) {
+    const l = lines[i];
+    if (l.trim() === "") {
+      if (para.length) break;
+      continue;
+    }
+    if (fenced[i] || para.length === 0 && HEADING_RE.test(l)) continue;
+    para.push(l.trim());
+  }
+  return para.length ? para.join("\n") : void 0;
+}
+function setProse(description, key, section, problems) {
+  const text = section.lines.join("\n").trim();
+  if (text === "") problems.push(`\`## ${SECTIONS.find(([k]) => k === key)[1]}\` section is empty`);
+  else description[key] = text;
+}
+function parseTour(lines, fenced, problems) {
+  const steps = [];
+  let preamble = "";
+  lines.forEach((line3, i) => {
+    const m = fenced[i] ? null : STEP_RE.exec(line3);
+    if (m) steps.push({ label: m[1] ?? String(steps.length + 1), title: m[2], lines: [] });
+    else if (steps.length) steps[steps.length - 1].lines.push(line3);
+    else preamble += line3;
+  });
+  if (preamble.trim() !== "") problems.push("Tour: text before the first `### N.` step is ignored");
+  const isRemaining = (title) => /^remaining changes$/i.test(title);
+  const tour = [];
+  let remaining;
+  for (const step of steps) {
+    if (isRemaining(step.title)) {
+      remaining = parseRemaining(step.lines, problems);
+      continue;
+    }
+    const parsed = parseStep(step, problems);
+    if (parsed) tour.push(parsed);
+  }
+  if (!steps.some((s) => !isRemaining(s.title))) problems.push("Tour has no steps");
+  if (remaining === void 0) problems.push("Tour has no `Remaining changes` step");
+  return { tour, ...remaining ? { remaining } : {} };
+}
+function parseStep(step, problems) {
+  const where = `step ${step.label} (${step.title})`;
+  let link;
+  const descLines = [];
+  const lookForLines = [];
+  let inLookFor = false;
+  for (const line3 of step.lines) {
+    const m = PERMALINK_RE.exec(line3.trim());
+    if (m) {
+      if (link) problems.push(`${where}: more than one permalink \u2014 the first is the anchor`);
+      else link = m;
+      inLookFor = false;
+      continue;
+    }
+    const lf = LOOK_FOR_RE.exec(line3.trim());
+    if (lf) {
+      lookForLines.push(lf[1]);
+      inLookFor = true;
+      continue;
+    }
+    if (inLookFor) {
+      if (line3.trim() === "") inLookFor = false;
+      else lookForLines.push(line3.trim());
+      continue;
+    }
+    descLines.push(line3);
+  }
+  if (!link) {
+    problems.push(`${where}: no permalink line \u2014 dropped`);
+    return void 0;
+  }
+  let path;
+  try {
+    path = link[2].split("/").map(decodeURIComponent).join("/");
+  } catch {
+    problems.push(`${where}: permalink path is not valid percent-encoding \u2014 dropped`);
+    return void 0;
+  }
+  const from = Number(link[3]);
+  const anchor = TourAnchorSchema.safeParse({ path, from, to: link[4] === void 0 ? from : Number(link[4]) });
+  if (!anchor.success) {
+    const issue = anchor.error.issues[0];
+    problems.push(`${where}: ${["anchor", ...issue.path].join(".")} ${issue.message} \u2014 dropped`);
+    return void 0;
+  }
+  const lookFor = lookForLines.join("\n").trim();
+  return {
+    title: step.title,
+    // A parsed step may carry an empty description (a human's heading +
+    // permalink): this is a read-back, not a submission the schema gates.
+    description: descLines.join("\n").replace(/\n{3,}/g, "\n\n").trim(),
+    ...lookFor ? { lookFor } : {},
+    anchor: { ...anchor.data, sha: link[1] }
+  };
+}
+function parseRemaining(lines, problems) {
+  const out = [];
+  for (const raw of lines) {
+    const line3 = raw.trim();
+    if (line3 === "" || REMAINING_NONE_RE.test(line3)) continue;
+    const m = REMAINING_LINE_RE.exec(line3);
+    if (m) out.push({ path: m[1], note: m[2].trim() });
+    else if (!line3.startsWith("-") && out.length) out[out.length - 1].note += `
+${line3}`;
+    else problems.push(`Remaining changes: unrecognized line \`${line3}\``);
+  }
+  return out;
+}
+function parseDecisions(lines, problems) {
+  const out = [];
+  for (const raw of lines) {
+    const line3 = raw.trim();
+    if (line3 === "") continue;
+    const m = DECISION_RE.exec(line3);
+    if (m) out.push({ title: m[1].replace(/\.$/, ""), rationale: m[2].trim() });
+    else if (!line3.startsWith("-") && out.length) out[out.length - 1].rationale += `
+${line3}`;
+    else problems.push(`Decisions: unrecognized line \`${line3}\``);
+  }
+  return out;
+}
+function parseValidation(lines, problems) {
+  const summary = [];
+  const criteria = [];
+  let header4 = false;
+  for (const raw of lines) {
+    const line3 = raw.trim();
+    if (!header4) {
+      if (TABLE_HEADER_RE.test(line3)) header4 = true;
+      else summary.push(raw);
+      continue;
+    }
+    if (line3 === "" || TABLE_RULE_RE.test(line3)) continue;
+    const cells = splitCells(line3);
+    if (cells.length >= 2) criteria.push({ criterion: cells[0], proof: cells[1] });
+    else problems.push(`Validation: unrecognized table line \`${line3}\``);
+  }
+  if (!header4) problems.push("Validation: no `| Criterion | Proof |` table");
+  const text = summary.join("\n").trim();
+  return { ...text ? { summary: text } : {}, criteria };
+}
+function splitCells(row) {
+  const cells = [];
+  let cur = "";
+  const inner = row.replace(/^\|/, "").replace(/\|$/, "");
+  for (let i = 0; i < inner.length; i++) {
+    const ch = inner[i];
+    if (ch === "\\" && i + 1 < inner.length) {
+      cur += inner[++i];
+    } else if (ch === "|") {
+      cells.push(cur.trim());
+      cur = "";
+    } else cur += ch;
+  }
+  cells.push(cur.trim());
+  return cells;
+}
+var line2, prose, TourAnchorSchema, TourStepSchema, PrDescriptionSchema, REPO_RE2, SHA_RE2, GENERATED_FOOTER, SECTIONS, PERMALINK_RE, HEADING_RE, STEP_RE, LOOK_FOR_RE, REMAINING_LINE_RE, REMAINING_NONE_RE, DECISION_RE, TABLE_HEADER_RE, TABLE_RULE_RE;
+var init_prDescription = __esm({
+  "../../src/core/prDescription.ts"() {
+    "use strict";
+    init_redact();
+    line2 = z20.string().trim().min(1).refine((s) => !/[\r\n]/.test(s), "must be a single line (no embedded newlines)");
+    prose = z20.string().trim().min(1);
+    TourAnchorSchema = z20.object({
+      // Repo-relative: no leading `/`, no `..` SEGMENT (a filename like `a..b.ts` is fine).
+      path: z20.string().trim().min(1).refine((p) => !p.startsWith("/") && !p.split("/").includes(".."), "path must be repo-relative"),
+      from: z20.number().int().positive(),
+      to: z20.number().int().positive()
+    }).refine((a) => a.to >= a.from, "to must be >= from");
+    TourStepSchema = z20.object({
+      title: line2,
+      description: prose,
+      lookFor: prose.optional(),
+      anchor: TourAnchorSchema
+    });
+    PrDescriptionSchema = z20.object({
+      /** The PR title's single source. Metadata for the PR's own title field —
+       *  never rendered into the body (GitHub shows the title itself). */
+      title: line2,
+      tldr: prose,
+      whatWhy: prose,
+      tour: z20.array(TourStepSchema).min(1),
+      /** Every touched file the Tour steps did not cover, one line each. */
+      remaining: z20.array(z20.object({ path: line2, note: prose })),
+      decisions: z20.array(z20.object({ title: line2, rationale: prose })).min(1),
+      risks: prose,
+      validation: z20.object({
+        summary: prose.optional(),
+        criteria: z20.array(z20.object({ criterion: prose, proof: prose })).min(1)
+      })
+    });
+    REPO_RE2 = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/;
+    SHA_RE2 = /^[0-9a-f]{40}$/;
+    GENERATED_FOOTER = "\u{1F916} Generated with [Claude Code](https://claude.com/claude-code)";
+    SECTIONS = [
+      ["tldr", "TL;DR"],
+      ["whatWhy", "What & why"],
+      ["tour", "Tour"],
+      ["decisions", "Decisions"],
+      ["risks", "Risks & implications"],
+      ["validation", "Validation"]
+    ];
+    PERMALINK_RE = /^https:\/\/github\.com\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+\/blob\/([0-9a-f]{7,40})\/([^#\s]+)#L(\d+)(?:-L(\d+))?$/;
+    HEADING_RE = /^(#{1,6})\s+(.+?)\s*$/;
+    STEP_RE = /^###\s+(?:(\d+)\.\s+)?(.+?)\s*$/;
+    LOOK_FOR_RE = /^\*\*Look for:\*\*\s*(.*)$/;
+    REMAINING_LINE_RE = /^-\s+`([^`]+)`\s+—\s*(.*)$/;
+    REMAINING_NONE_RE = /^-\s+none\b/i;
+    DECISION_RE = /^-\s+\*\*(.+?)\*\*\s*(.*)$/;
+    TABLE_HEADER_RE = /^\|\s*criterion\s*\|\s*proof\s*\|$/i;
+    TABLE_RULE_RE = /^\|?\s*:?-{3,}:?\s*\|/;
+  }
+});
+
+// ../../src/tools/submit.ts
+import { z as z21 } from "zod";
+var submitVerdictTool, submitDispositionsTool, submitPrDescriptionTool, handoffEntry, submitHandoffTool;
+var init_submit = __esm({
+  "../../src/tools/submit.ts"() {
+    "use strict";
+    init_prDescription();
+    init_reviewVerdict();
+    init_handoff();
     submitVerdictTool = {
       name: "submit_verdict",
       failsInText: true,
@@ -27817,22 +27821,92 @@ ${raw.trim()}`;
         return `handoff recorded: ${count(h.deviations.length, "deviation", "deviations")}, ${count(h.followUps.length, "follow-up", "follow-ups")}, ${h.unproven.length} unproven; a later call replaces this one`;
       }
     };
-    updateStatusTool = {
-      name: "update_status",
-      description: "Update the short user-facing status checklist shown while you work. Call it right after planning (all items pending) and again whenever an item's state changes. Format: one item per line, prefixed with a state marker: \u2713 done, \u2731 in progress, \u25CB pending. Keep it to 3-6 short outcome-oriented items (what, not how \u2014 never raw commands).",
+  }
+});
+
+// ../../src/tools/workspace.ts
+var bashTool, readFileTool, writeFileTool, TOOLSETS;
+var init_workspace = __esm({
+  "../../src/tools/workspace.ts"() {
+    "use strict";
+    init_bashTimeout();
+    init_executor();
+    init_attach();
+    init_diffDigest2();
+    init_github();
+    init_runs2();
+    init_session();
+    init_skills();
+    init_status2();
+    init_submit();
+    init_web();
+    bashTool = {
+      name: "bash",
+      description: "Run a bash command in the workspace directory. Use for git, gh, tests, builds, and inspecting files. Commands time out after 5 minutes (300000 ms) by default; pass timeoutMs when a command legitimately needs longer \u2014 a full test suite, a large build \u2014 up to the 1200000 ms (20 minute) maximum; a command is also clipped to the run's own remaining time, so it can never outlive the run. Output is truncated at 30k characters.",
       inputSchema: {
         type: "object",
         properties: {
-          checklist: {
-            type: "string",
-            description: "The full checklist, one '\u2713|\u2731|\u25CB item' per line (replaces the previous one)"
+          command: { type: "string", description: "The bash command to run" },
+          timeoutMs: {
+            type: "integer",
+            description: "Optional timeout in milliseconds for this command (default 300000 = 5 min; max 1200000 = 20 min). Values outside [1000, 1200000] are clamped."
           }
         },
-        required: ["checklist"]
+        required: ["command"]
       },
       async run(input, ctx) {
-        ctx.reportProgress?.(String(input.checklist ?? ""));
-        return "status updated";
+        const requested = input.timeoutMs;
+        let timeoutMs = typeof requested === "number" && Number.isFinite(requested) ? clampBashTimeout(requested) : void 0;
+        let clipNote = "";
+        if (ctx.remainingMs) {
+          const budget = bashBudgetWithinRun(timeoutMs ?? BASH_TIMEOUT_MS, ctx.remainingMs());
+          if (budget.kind === "exhausted") return `exit 124:
+${budget.note}`;
+          if (budget.kind === "clipped") {
+            timeoutMs = budget.timeoutMs;
+            clipNote = budget.note;
+          }
+        }
+        const opts = {
+          ...ctx.signal ? { signal: ctx.signal } : {},
+          ...timeoutMs !== void 0 ? { timeoutMs } : {}
+        };
+        const out = await ctx.executor.exec(
+          String(input.command ?? ""),
+          opts.signal !== void 0 || opts.timeoutMs !== void 0 ? opts : void 0
+        );
+        return clipNote ? `${out}
+${clipNote}` : out;
+      }
+    };
+    readFileTool = {
+      sideEffectFree: true,
+      name: "read_file",
+      description: "Read a file from the workspace. Path is relative to the workspace root.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          path: { type: "string", description: "Relative path to the file" }
+        },
+        required: ["path"]
+      },
+      run(input, ctx) {
+        return ctx.executor.readFile(String(input.path ?? ""));
+      }
+    };
+    writeFileTool = {
+      name: "write_file",
+      description: "Write a file in the workspace (creates parent directories). Path is relative to the workspace root.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          path: { type: "string", description: "Relative path to the file" },
+          content: { type: "string", description: "Full file contents" }
+        },
+        required: ["path", "content"]
+      },
+      run(input, ctx) {
+        return ctx.executor.writeFile(String(input.path ?? ""), String(input.content ?? ""));
       }
     };
     TOOLSETS = {
@@ -28292,7 +28366,7 @@ var init_route = __esm({
     init_registry();
     init_workspace();
     init_config2();
-    init_types2();
+    init_provider();
     init_redact();
     init_statusCardFrame();
     init_spawn();
@@ -28309,6 +28383,33 @@ var init_route = __esm({
   }
 });
 
+// ../../src/core/chatMessage.ts
+function toolResultText(content) {
+  if (typeof content === "string") return content;
+  return content.map((p) => {
+    if (p.type === "text") return p.text;
+    if (p.type === "image") return `[image ${p.mediaType}, ${base64Bytes(p.data)} bytes]`;
+    return `[document ${p.name ?? "document"} (${p.mediaType}), ${base64Bytes(p.data)} bytes]`;
+  }).join("\n");
+}
+function capToolResultContent(content, cap = MAX_TOOL_RESULT_CHARS) {
+  const capText = (text) => text.length > cap ? `${text.slice(0, cap)}
+\u2026[tool result truncated: ${text.length - cap} of ${text.length} characters cut \u2014 ask for a narrower slice]` : text;
+  if (typeof content === "string") return capText(content);
+  return content.map((p) => p.type === "text" ? { ...p, text: capText(p.text) } : p);
+}
+function base64Bytes(b64) {
+  const padding = b64.endsWith("==") ? 2 : b64.endsWith("=") ? 1 : 0;
+  return Math.floor(b64.length * 3 / 4) - padding;
+}
+var MAX_TOOL_RESULT_CHARS;
+var init_chatMessage = __esm({
+  "../../src/core/chatMessage.ts"() {
+    "use strict";
+    MAX_TOOL_RESULT_CHARS = 12e4;
+  }
+});
+
 // ../../src/execution/tracingExecutor.ts
 var TracingExecutor;
 var init_tracingExecutor = __esm({
@@ -28507,7 +28608,12 @@ async function runLoop(opts, now, note, emit, agentSpan) {
         ...input.userName ? { user: input.userName } : {},
         ...input.from ? { run: input.from.runId } : {}
       };
-      emit({ type: "input", text: redactSecrets(input.text), ...Object.keys(source2).length > 0 ? { source: source2 } : {} });
+      emit({
+        type: "input",
+        text: redactSecrets(input.text),
+        messageId: followUpMessageId(input),
+        ...Object.keys(source2).length > 0 ? { source: source2 } : {}
+      });
       note("follow_up", `follow-up folded in: ${redactSecrets(followUpSnippet(input))}`);
     }
     const prompt = followUpPrompt(inputs, { superseded });
@@ -28554,13 +28660,14 @@ ${stagedLine}` : prompt }];
       }
       const ctx = callSpan ? {
         ...toolContext,
+        callId: tu.id,
         span: callSpan,
         executor: new TracingExecutor(execTracker, callSpan, opts.backend),
         publish: (e) => emit(withSpanId(e, callSpan.id)),
         // The GitHub client as a view under this call: its requests and any
         // token mint become `github.*` children (docs/reference/specs/tracing.md item 23).
         ...toolContext.github?.api.withSpan ? { github: { ...toolContext.github, api: toolContext.github.api.withSpan(callSpan) } } : {}
-      } : toolContext;
+      } : { ...toolContext, callId: tu.id };
       try {
         const output = await untilHardStop(tool.run(tu.input ?? {}, ctx));
         const text2 = toolResultText(output);
@@ -28899,7 +29006,7 @@ var MAX_CONSECUTIVE_INFRA_FAILURES, HardStopError, HARD_STOP_MESSAGE, wrapUpNote
 var init_runner = __esm({
   "../../src/runner.ts"() {
     "use strict";
-    init_types2();
+    init_chatMessage();
     init_runEvents();
     init_threadAdmission();
     init_executor();
@@ -29295,42 +29402,42 @@ async function settle(input, span) {
         }
         verdict = void 0;
         reviewHead = current;
-        const system = input.composeSystem({ sha: current, verified: worktreeMoved });
+        const followUpText = rereviewFollowUp({
+          where,
+          reviewed: expected,
+          current,
+          move,
+          before: classified.before,
+          after: classified.after,
+          worktreeMoved
+        });
         input.messages.push(
           { role: "assistant", content: [{ type: "text", text: answer }] },
-          {
-            role: "user",
-            content: [
-              {
-                type: "text",
-                text: rereviewFollowUp({
-                  where,
-                  reviewed: expected,
-                  current,
-                  move,
-                  before: classified.before,
-                  after: classified.after,
-                  worktreeMoved
-                })
-              }
-            ]
-          }
+          { role: "user", content: [{ type: "text", text: followUpText }] }
         );
-        answer = await runAgent({
+        const toolContext = {
+          ...turn.toolContext,
+          onVerdict: (v) => {
+            verdict = v;
+          }
+        };
+        answer = turn.followUp ? await turn.followUp({
+          text: followUpText,
+          maxTurns: turn.agent.maxTurns,
+          maxMinutes: turn.agent.maxMinutes,
+          toolContext,
+          ...span ? { span } : {}
+        }) : await runAgent({
           provider: turn.provider,
           model: turn.model,
           agent: turn.agent,
           messages: input.messages,
-          system,
+          // Recomposed at the new head, so the prompt does not contradict the follow-up.
+          system: input.composeSystem({ sha: current, verified: worktreeMoved }),
           effort: turn.effort,
           ...span ? { span } : {},
           ...turn.backend ? { backend: turn.backend } : {},
-          toolContext: {
-            ...turn.toolContext,
-            onVerdict: (v) => {
-              verdict = v;
-            }
-          },
+          toolContext,
           ...turn.extraTools && turn.extraTools.length > 0 ? { extraTools: turn.extraTools } : {},
           onProgress: turn.onProgress,
           onEvent: turn.onEvent,
@@ -30390,7 +30497,8 @@ async function registerRun(deps, ctx) {
   trace.bindRun(run2.id, (e) => registry.publish(run2.id, e));
   const publishText = (type, text, source3, raw) => {
     const redacted = redactSecrets(text);
-    const event = { type, text: redacted, ...source3 ? { source: source3 } : {}, at: clock3() };
+    const body = { text: redacted, ...source3 ? { source: source3 } : {}, at: clock3() };
+    const event = type === "input" ? { type, messageId: messageIdOf(msg, run2.id), ...body } : { type, ...body };
     const withRaw = raw !== void 0 ? { ...event, raw: redactSecrets(raw) } : event;
     registry.publish(run2.id, utf8ByteLength(JSON.stringify(withRaw)) <= MAX_EVENT_BYTES ? withRaw : event);
     console.log(`[event] ${msg.threadKey} type=${type} bytes=${utf8ByteLength(redacted)}`);
@@ -30689,7 +30797,7 @@ var init_provision = __esm({
     init_resident();
     init_memory();
     init_runBearers();
-    init_types2();
+    init_provider();
     init_skills2();
     init_source();
     init_configAwareness();
@@ -30701,6 +30809,7 @@ var init_provision = __esm({
     init_inboxMessage();
     init_statusCardFrame();
     init_statusCoalescer();
+    init_types4();
     init_record();
     init_reply();
     init_messages();
@@ -31665,6 +31774,7 @@ var init_bridge2 = __esm({
     PiBridge = class {
       constructor(deps) {
         this.deps = deps;
+        this.agentSpan = deps.agentSpan;
       }
       deps;
       /** Model turns that did work, the guard's count — the loop's rule: a turn whose every call is `update_status` is bookkeeping. */
@@ -31686,6 +31796,24 @@ var init_bridge2 = __esm({
        *  were vetted by the bot generation that died, and this one never heard. */
       judgeGate = true;
       summarizationRetries = 0;
+      /** The span a starting call's `tool.<name>` opens under: the run's
+       *  `run.agent` for the loop, a follow-up turn's own for its duration
+       *  (`under`; harness-pi item 14). */
+      agentSpan;
+      /** From here on, new tool spans hang under `span` — a follow-up turn's
+       *  `run.agent`, opened under the caller's span the way the native loop's
+       *  would be (tracing.md item 17); `undefined` opens none. */
+      under(span) {
+        this.agentSpan = span;
+      }
+      /** A new prompt is about to be sent on the session (harness-pi item 14): the
+       *  reply pi settled the last loop on is not this turn's answer, so the
+       *  answer state starts over — what pi settles on next is the turn's. */
+      newPrompt() {
+        this.answerText = void 0;
+        this.heldAnswer = void 0;
+        this.assistantStartedAt = void 0;
+      }
       /** The gate saw this call: the extension's `tool_call` hook asked the bot
        *  for it, whatever the answer. Called from the authorize route, before pi
        *  runs the tool — so it always precedes the call's `tool_execution_end`. */
@@ -31794,7 +31922,7 @@ var init_bridge2 = __esm({
       onToolStart(event) {
         const tool = str5(event.toolName);
         const callId = str5(event.toolCallId);
-        const span = this.deps.agentSpan?.start(`tool.${tool}`);
+        const span = this.agentSpan?.start(`tool.${tool}`);
         this.openTools.set(callId, { span, tool, judged: this.judgeGate });
         this.toolCalls++;
         const input = isRecord3(event.args) ? event.args : void 0;
@@ -32317,7 +32445,7 @@ function ledgerTailOf(resume) {
 function settlementAnswer(s) {
   return { content: [{ type: "text", text: settlementText(s) }], isError: true };
 }
-async function runPiHarness(deps, run2) {
+async function runPiHarnessOpen(deps, run2) {
   const { container, clock: clock3 } = deps;
   const now = () => clock3();
   const agentSpan = run2.span?.start("run.agent");
@@ -32412,6 +32540,26 @@ async function runPiHarness(deps, run2) {
     save();
   };
   let catchingUp = false;
+  const clearWriteUp = () => {
+    writeUp = void 0;
+    writeUpAt = void 0;
+  };
+  let followUps = 0;
+  let sessionEnded = false;
+  const end = async () => {
+    if (sessionEnded) return;
+    sessionEnded = true;
+    transport?.close();
+    bridge.closeOpenSpans(
+      hardStopped ? "the run was hard-stopped" : bypass ? "the run was stopped: a tool call bypassed the gate" : "the run ended"
+    );
+    save();
+    forget();
+    if (pid !== void 0) await container.kill(pid).catch(() => {
+    });
+    if (paths !== void 0) await container.remove(paths).catch(() => {
+    });
+  };
   try {
     const recorded = run2.resume?.facts;
     let reattached = false;
@@ -32551,7 +32699,12 @@ async function runPiHarness(deps, run2) {
           ...input.userName ? { user: input.userName } : {},
           ...input.from ? { run: input.from.runId } : {}
         };
-        emit({ type: "input", text: redactSecrets(input.text), ...Object.keys(source2).length > 0 ? { source: source2 } : {} });
+        emit({
+          type: "input",
+          text: redactSecrets(input.text),
+          messageId: followUpMessageId(input),
+          ...Object.keys(source2).length > 0 ? { source: source2 } : {}
+        });
         note("follow_up", `follow-up folded in: ${redactSecrets(followUpSnippet(input))}`);
       }
       const images = inputs.flatMap(
@@ -32689,33 +32842,137 @@ ${stagedLine}` : prompt,
       check();
       if (hardStopped) break;
     }
+    let answer;
     if (hardStopped) {
       note("stopped", hardStopNote(), "hard");
-      return HARD_STOP_MESSAGE;
-    }
-    if (bypass) throw bypass;
-    if (!settled) {
-      const tail2 = await container.tail(paths.errLog, 2e3);
-      throw new Error(`pi exited before the run settled${tail2.trim() ? `: ${redactAndCap(tail2.trim(), 400)}` : ""}`);
-    }
-    if (providerError !== void 0) throw new Error(`the model call failed: ${providerError}`);
-    const text = bridge.answer() ?? "";
-    if (writeUp?.kind === "time") return timeBudgetAnswer(text, run2.agent.maxMinutes);
-    if (writeUp?.kind === "turns") return turnGuardAnswer(text, writeUp.pace);
-    if (writeUp?.kind === "soft" || stopMode === "soft") return softStopAnswer(text);
-    return text || "_(no response)_";
-  } finally {
-    transport?.close();
-    bridge.closeOpenSpans(
-      hardStopped ? "the run was hard-stopped" : bypass ? "the run was stopped: a tool call bypassed the gate" : "the run ended"
-    );
-    save();
-    forget();
-    if (pid !== void 0) await container.kill(pid).catch(() => {
-    });
-    if (paths !== void 0) await container.remove(paths).catch(() => {
-    });
-    agentSpan?.end(hardStopped || bypass ? "error" : "ok");
+      answer = HARD_STOP_MESSAGE;
+    } else {
+      if (bypass) throw bypass;
+      if (!settled) {
+        const tail2 = await container.tail(paths.errLog, 2e3);
+        throw new Error(`pi exited before the run settled${tail2.trim() ? `: ${redactAndCap(tail2.trim(), 400)}` : ""}`);
+      }
+      if (providerError !== void 0) throw new Error(`the model call failed: ${providerError}`);
+      const text = bridge.answer() ?? "";
+      answer = writeUp?.kind === "time" ? timeBudgetAnswer(text, run2.agent.maxMinutes) : writeUp?.kind === "turns" ? turnGuardAnswer(text, writeUp.pace) : writeUp?.kind === "soft" || stopMode === "soft" ? softStopAnswer(text) : text || "_(no response)_";
+    }
+    agentSpan?.end(hardStopped ? "error" : "ok");
+    const rpc = transport;
+    const root = paths;
+    const followUp = async (input) => {
+      if (sessionEnded) throw new Error("the pi session has ended: no follow-up turn can run on it");
+      const turnSpan = input.span?.start("run.agent");
+      if (turnSpan) deps.bearers?.reparent(run2.runId, turnSpan);
+      bridge.under(turnSpan);
+      bridge.newPrompt();
+      const runContext = live.toolContext;
+      live.toolContext = input.toolContext;
+      const turnDeadline = now() + input.maxMinutes * 6e4;
+      input.toolContext.remainingMs = () => turnDeadline - now();
+      const turnsBefore = bridge.turns;
+      clearWriteUp();
+      const id = `${ids.prompt}:follow-up:${++followUps}`;
+      let turnSettled = false;
+      let turnError;
+      let turnFailed = false;
+      const turnCheck = () => {
+        if (run2.control?.requested === "hard") {
+          if (!hardStopped) {
+            hardStopped = true;
+            rpc.send({ type: "abort" });
+          }
+          return;
+        }
+        if (writeUp) {
+          if (writeUpAt !== void 0 && now() - writeUpAt >= (deps.finaleTimeoutMs ?? FINALE_TIMEOUT_MS2)) {
+            writeUpAt = void 0;
+            run2.onProgress?.("finale timed out \u2014 closing the turn without a write-up");
+            rpc.send({ type: "abort" });
+          }
+          return;
+        }
+        if (run2.control?.requested === "soft") {
+          note("stopped", softStopNote(), "soft");
+          startWriteUp({ kind: "soft" }, SOFT_STOP_INSTRUCTION);
+          return;
+        }
+        if (now() >= turnDeadline) {
+          note("time_budget_exhausted", timeBudgetNote());
+          startWriteUp({ kind: "time" }, timeBudgetInstruction());
+          return;
+        }
+        const turns = bridge.turns - turnsBefore;
+        if (turns >= input.maxTurns) {
+          const pace = turnGuardPace(turns, input.maxMinutes * 6e4 - (turnDeadline - now()));
+          note("turn_budget_exhausted", turnGuardNote(pace));
+          startWriteUp({ kind: "turns", pace }, turnGuardInstruction(pace));
+        }
+      };
+      try {
+        rpc.send({ id, type: "prompt", message: input.text });
+        turnCheck();
+        for (; ; ) {
+          pending2 ??= iterator.next();
+          const tick = deps.sleep(deps.tickMs ?? 1e3).then(() => "tick");
+          const next = await Promise.race([pending2, tick]);
+          if (next === "tick") {
+            turnCheck();
+            if (hardStopped) break;
+            continue;
+          }
+          pending2 = void 0;
+          if (next.done) break;
+          const event = parsePiLine(next.value);
+          if (!event) continue;
+          const obs = bridge.observe(event);
+          for (const reply of obs.replies) rpc.send(reply);
+          if (obs.gateBypassed) {
+            bypass = new GateBypassed(obs.gateBypassed.tool, obs.gateBypassed.callId);
+            note("harness_error", `${bypass.message} \u2014 the turn is stopped`);
+            rpc.send({ type: "abort" });
+            break;
+          }
+          if (obs.response?.id === id && obs.response.success === false)
+            throw new PromptRefused(String(obs.response.error ?? "no reason"));
+          if (obs.providerError !== void 0) turnError = obs.providerError;
+          if (obs.settled) {
+            turnSettled = true;
+            break;
+          }
+          turnCheck();
+          if (hardStopped) break;
+        }
+        if (hardStopped) {
+          note("stopped", hardStopNote(), "hard");
+          return HARD_STOP_MESSAGE;
+        }
+        if (bypass) throw bypass;
+        if (!turnSettled) {
+          const tail2 = await container.tail(root.errLog, 2e3);
+          throw new Error(
+            `pi exited before the turn settled${tail2.trim() ? `: ${redactAndCap(tail2.trim(), 400)}` : ""}`
+          );
+        }
+        if (turnError !== void 0) throw new Error(`the model call failed: ${turnError}`);
+        const text = bridge.answer() ?? "";
+        if (writeUp?.kind === "time") return timeBudgetAnswer(text, input.maxMinutes);
+        if (writeUp?.kind === "turns") return turnGuardAnswer(text, writeUp.pace);
+        if (writeUp?.kind === "soft") return softStopAnswer(text);
+        return text || "_(no response)_";
+      } catch (err2) {
+        turnFailed = true;
+        throw err2;
+      } finally {
+        live.toolContext = runContext;
+        bridge.under(void 0);
+        turnSpan?.end(hardStopped || bypass || turnFailed ? "error" : "ok");
+      }
+    };
+    return { answer, followUp, end };
+  } catch (err2) {
+    agentSpan?.end("error");
+    await end();
+    throw err2;
   }
 }
 var NATIVE_WORKSPACE_TOOLS, FINALE_TIMEOUT_MS2, CALL_SEEN_WAIT_MS, CALL_SEEN_TICK_MS, CONTINUE_PROMPT, PromptRefused, GateBypassed;
@@ -33346,37 +33603,49 @@ async function runDescriptionTurn(input) {
   turn.onEvent({ type: "run_note", kind: "description_turn", summary, at: systemClock() });
   turn.onProgress(`re-evaluating the description of ${t.repo}#${t.pr.number} at ${t.headSha.slice(0, 7)}`);
   let submitted;
+  const followUpText = descriptionFollowUp(t);
   input.messages.push(
     { role: "assistant", content: [{ type: "text", text: input.answer }] },
-    { role: "user", content: [{ type: "text", text: descriptionFollowUp(t) }] }
+    { role: "user", content: [{ type: "text", text: followUpText }] }
   );
   const agent = {
     ...turn.agent,
     maxTurns: Math.min(turn.agent.maxTurns, DESCRIPTION_TURN_MAX_TURNS),
     maxMinutes: Math.min(turn.agent.maxMinutes, DESCRIPTION_TURN_MAX_MINUTES)
   };
+  const toolContext = {
+    ...turn.toolContext,
+    onPrDescription: (d) => {
+      submitted = d;
+      turn.toolContext.onPrDescription?.(d);
+    }
+  };
   try {
-    await runAgent({
-      provider: turn.provider,
-      model: turn.model,
-      agent,
-      messages: input.messages,
-      ...input.system !== void 0 ? { system: input.system } : {},
-      ...turn.effort !== void 0 ? { effort: turn.effort } : {},
-      ...input.span ? { span: input.span } : {},
-      ...turn.backend ? { backend: turn.backend } : {},
-      toolContext: {
-        ...turn.toolContext,
-        onPrDescription: (d) => {
-          submitted = d;
-          turn.toolContext.onPrDescription?.(d);
-        }
-      },
-      ...turn.extraTools && turn.extraTools.length > 0 ? { extraTools: turn.extraTools } : {},
-      onProgress: turn.onProgress,
-      onEvent: turn.onEvent,
-      control: turn.control
-    });
+    if (turn.followUp) {
+      await turn.followUp({
+        text: followUpText,
+        maxTurns: agent.maxTurns,
+        maxMinutes: agent.maxMinutes,
+        toolContext,
+        ...input.span ? { span: input.span } : {}
+      });
+    } else {
+      await runAgent({
+        provider: turn.provider,
+        model: turn.model,
+        agent,
+        messages: input.messages,
+        ...input.system !== void 0 ? { system: input.system } : {},
+        ...turn.effort !== void 0 ? { effort: turn.effort } : {},
+        ...input.span ? { span: input.span } : {},
+        ...turn.backend ? { backend: turn.backend } : {},
+        toolContext,
+        ...turn.extraTools && turn.extraTools.length > 0 ? { extraTools: turn.extraTools } : {},
+        onProgress: turn.onProgress,
+        onEvent: turn.onEvent,
+        control: turn.control
+      });
+    }
   } catch (err2) {
     console.error(`[description-turn] ${logKey} turn failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
   }
@@ -33574,6 +33843,7 @@ async function runLoop2(deps, ctx) {
   let carried;
   let runFailed = false;
   let runDiagnosis;
+  let piSession;
   const releaseWorkspace = (span) => round2.release({ hardStopped: run2.control.requested === "hard", ...span ? { span } : {} });
   const attachFile = io.attachFile?.bind(io);
   const uploadTicket = io.uploadTicket?.bind(io);
@@ -33676,7 +33946,7 @@ async function runLoop2(deps, ctx) {
           )
         )
       ];
-      answer = await runPiHarness(
+      piSession = await runPiHarnessOpen(
         {
           container: deps.harness.containerFor?.(executor, profile.machine) ?? piContainerFor(executor, profile.machine),
           bearer: ctx.bearer,
@@ -33728,6 +33998,7 @@ async function runLoop2(deps, ctx) {
           } : {}
         }
       );
+      answer = piSession.answer;
     } else {
       answer = await runAgent({
         provider,
@@ -33784,7 +34055,8 @@ async function runLoop2(deps, ctx) {
           onProgress,
           onEvent,
           control: run2.control,
-          ...round2.selection.backend ? { backend: round2.selection.backend } : {}
+          ...round2.selection.backend ? { backend: round2.selection.backend } : {},
+          ...piSession ? { followUp: piSession.followUp } : {}
         },
         fetchPrHead: deps.fetchPrHead ?? currentPrHeadSha,
         fetchPrCommits: deps.fetchPrCommits ?? prCommitsSince,
@@ -33864,7 +34136,8 @@ async function runLoop2(deps, ctx) {
               onProgress,
               onEvent,
               control: run2.control,
-              ...round2.selection.backend ? { backend: round2.selection.backend } : {}
+              ...round2.selection.backend ? { backend: round2.selection.backend } : {},
+              ...piSession ? { followUp: piSession.followUp } : {}
             },
             logKey: msg.threadKey
           })
@@ -33872,6 +34145,7 @@ async function runLoop2(deps, ctx) {
         if (!run2.control.hardSignal.aborted) await observeWorkspaceNow();
       }
     }
+    await piSession?.end();
     if (prDescription) {
       registry.publish(run2.id, {
         type: "pr_description",
@@ -33932,6 +34206,7 @@ async function runLoop2(deps, ctx) {
       );
   } catch (err2) {
     runFailed = true;
+    await piSession?.end();
     await root.span("post.workspace_release", (span) => releaseWorkspace(span));
     throw err2;
   } finally {
@@ -34022,7 +34297,7 @@ var init_runLoop = __esm({
     "use strict";
     init_profile();
     init_runner();
-    init_types2();
+    init_provider();
     init_workspace();
     init_select();
     init_botHostContainer();
@@ -35099,7 +35374,11 @@ async function runShipBranch(deps, msg, io, ctx) {
   io.runStarted?.({ id: run2.id });
   const publishText = (type, text, source3) => {
     const redacted = redactSecrets(text);
-    registry.publish(run2.id, { type, text: redacted, ...source3 ? { source: source3 } : {}, at: clock3() });
+    const body = { text: redacted, ...source3 ? { source: source3 } : {}, at: clock3() };
+    registry.publish(
+      run2.id,
+      type === "input" ? { type, messageId: messageIdOf(msg, run2.id), ...body } : { type, ...body }
+    );
     console.log(`[event] ${msg.threadKey} type=${type} bytes=${utf8ByteLength(redacted)}`);
   };
   const humanize = isMrkdwnChannel(msg.channelId);
@@ -35297,6 +35576,7 @@ var init_ship = __esm({
     init_run2();
     init_runRegistry();
     init_statusCardFrame();
+    init_types4();
   }
 });
 
@@ -35571,6 +35851,16 @@ function sessionSeed(input) {
   const summary = compactions.length ? compactions[compactions.length - 1].entry.summary : void 0;
   const logFrom = start3 < 0 ? from + transcript.turns : from + start3 + compactions.length;
   const kept = start3 < 0 ? [] : transcript.messages.slice(start3).map(withoutThinking);
+  if (kept.length > 0 && kept[0].role === "user") {
+    const first = kept[0];
+    const orphans = first.content.filter((p) => p.type === "tool_result").length;
+    if (orphans > 0) {
+      kept[0] = { ...first, content: first.content.filter((p) => p.type !== "tool_result") };
+      notes.push(
+        orphans === 1 ? "session seed: one tool result answering a call before the cut was dropped from the tail's first turn" : `session seed: ${orphans} tool results answering calls before the cut were dropped from the tail's first turn`
+      );
+    }
+  }
   if (kept.length === 0) {
     notes.push(
       transcript.turns === 0 ? "session seed: the log's newest turn alone is over the seed budget \u2014 the run starts from the request" : "session seed: no user text turn in the tail within the seed budget \u2014 the run starts from the request"
@@ -36036,7 +36326,11 @@ async function dispatch(deps, msg, io, opts = {}) {
     const earlierStaged = threadAssets && agent.machine !== "none" ? threadAssets.then(
       (assets) => stageThreadArtifacts(
         assets.filter((a) => a.direction === "in"),
-        { nextIndex: nextStagedIndex, publish: (e) => registry.publish(runId3, e) }
+        {
+          nextIndex: nextStagedIndex,
+          messageId: messageIdOf(msg, runId3),
+          publish: (e) => registry.publish(runId3, e)
+        }
       )
     ) : void 0;
     const reservation = await reserveRun(deps, {
@@ -36446,6 +36740,7 @@ var init_dispatcher = __esm({
     init_runsService();
     init_runRegistry();
     init_runEnding();
+    init_types4();
     activeRuns = 0;
   }
 });
@@ -37583,7 +37878,7 @@ var OpenAICompatProvider;
 var init_openaiCompat = __esm({
   "../../src/providers/openaiCompat.ts"() {
     "use strict";
-    init_types2();
+    init_chatMessage();
     init_secrets2();
     OpenAICompatProvider = class {
       name;
@@ -37827,7 +38122,7 @@ var ANTHROPIC_BASE_URL, ZERO_RATES, ZERO_USAGE, CONTEXT_WINDOW, PiAiProviders, P
 var init_piAi = __esm({
   "../../src/core/harness/piAi.ts"() {
     "use strict";
-    init_types2();
+    init_provider();
     init_secrets2();
     init_clock();
     ANTHROPIC_BASE_URL = "https://api.anthropic.com";
@@ -38114,7 +38409,7 @@ var init_mcp2 = __esm({
     init_sealed();
     init_secretStore();
     init_service();
-    init_types3();
+    init_types2();
     init_registry2();
     init_client();
     init_fake();
@@ -39232,6 +39527,7 @@ async function receiveSlackMessage(client, ev, span, policy) {
     userId: `${PLATFORM}:${ev.user}`,
     threadKey: `${PLATFORM}:${ev.channel}:${ev.threadTs}`,
     text: ev.text + note,
+    messageId: ev.ts,
     channelName,
     userName,
     sourceUrl: team ? slackPermalink(team, ev.channel, ev.ts, ev.threadTs) : void 0,
@@ -43022,7 +43318,7 @@ var init_modelProxy = __esm({
     "use strict";
     init_anthropic();
     init_openaiCompat();
-    init_types2();
+    init_provider();
     init_http();
     ANTHROPIC_MESSAGES_PATH = "/v1/messages";
     OPENAI_CHAT_COMPLETIONS_PATH = "/v1/chat/completions";
@@ -43351,7 +43647,9 @@ async function runRelayedTool(harness, ask, opts = {}) {
       ...base.github?.api.withSpan ? { github: { ...base.github, api: base.github.api.withSpan(span) } } : {}
     } : { ...base, publish: (e) => harness.emit(e) },
     ...opts.signal && !base.signal ? { signal: opts.signal } : {},
-    ...readConversation && harness.callSeen ? { conversation: () => harness.callSeen(ask.toolCallId).then(() => readConversation()) } : {}
+    ...readConversation && harness.callSeen ? { conversation: () => harness.callSeen(ask.toolCallId).then(() => readConversation()) } : {},
+    // After the spreads, so the call's own id can never be shadowed by one on the base context.
+    callId: ask.toolCallId
   };
   try {
     const input = typeof ask.input === "object" && ask.input !== null ? ask.input : {};
@@ -43385,7 +43683,7 @@ var init_relay = __esm({
   "../../src/core/harness/pi/relay.ts"() {
     "use strict";
     init_tracingExecutor();
-    init_types2();
+    init_chatMessage();
     init_awaitChildren();
     init_runEvents();
     init_toolRules();