@cabane/companion 0.6.168 → 0.6.170

package/dist/runtime.js

@@ -3056,9 +3056,15 @@ var resolvedMcpServerSchema = z8.union([
 var resolvedMcpServersSchema = z8.record(z8.string(), resolvedMcpServerSchema);
 var hostInjectedServersSchema = z8.record(z8.string(), z8.unknown());
 var turnRequestSchema = z8.object({
-  // Server-composed system prompt (core + capability prose + adapter addendum +
-  // charter). One string to the adapter.
+  // Server-composed standing instructions: the core segment (body, tool naming, identity, agent
+  // charter) and, after it, the conversation segment (workspace and room charters, skill indexes,
+  // roster). One string to the adapter, current as of this dispatch.
   systemPrompt: z8.string(),
+  // The same text as its two ordered segments, so an adapter that writes standing text into the
+  // conversation (Codex's input preamble) can tell which half changed. `systemPrompt` is
+  // `joinStanding(standing)`. Optional: absent from an API older than the split, where
+  // `systemPrompt` is the core alone and the conversation material rides `prompt`.
+  standing: z8.object({ core: z8.string(), conversation: z8.string() }).optional(),
   // Server-composed per-turn user text (anchor reminder + the triggering message).
   prompt: z8.string(),
   // The multi-block user-message body (text + vision).
@@ -3106,6 +3112,16 @@ var turnRequestSchema = z8.object({
   })
 });
 
+// packages/agent-runtime/src/standing.ts
+var STANDING_SEPARATOR = "\n\n---\n\n";
+function joinStanding(segments) {
+  const conversation = segments.conversation.trim();
+  return conversation.length > 0 ? `${segments.core}${STANDING_SEPARATOR}${conversation}` : segments.core;
+}
+function standingSegments(req) {
+  return req.standing ?? { core: req.systemPrompt, conversation: "" };
+}
+
 // packages/agent-runtime/src/conformance.ts
 import { z as z9 } from "zod";
 var conformanceFixtureSchema = z9.object({
@@ -4988,7 +5004,6 @@ async function* decodeOpencodeStream(events, ctx) {
   let reason;
   let settled = false;
   const userMessageIds = /* @__PURE__ */ new Set();
-  if (ctx.skipMessageId) userMessageIds.add(ctx.skipMessageId);
   for await (const ev of events) {
     if (ctx.signal.aborted) return;
     if (ev.type === "message.updated") {
@@ -5148,8 +5163,6 @@ function buildRunSpec(req, resumeSessionId) {
     parts: buildParts(req),
     tools,
     allowAllHostTools,
-    // Fresh session → mint + send a client id; resumed → let opencode mint it.
-    sendClientMessageId: resumeSessionId == null,
     ...dialect.agent ? { agent: dialect.agent } : {},
     mcp: buildMcp(req),
     // Every server this turn installs with a credential resolved into it: a remote one's
@@ -5308,14 +5321,12 @@ function createHttpOpencodeTransport(opts) {
           created = true;
         }
         await installMcp(doFetch, base, spec, signal);
-        const userMessageId = spec.sendClientMessageId ? newOpencodeMessageId() : null;
         const promptRes = await doFetch(
           `${base}/session/${encodeURIComponent(sessionId)}/prompt_async`,
           {
             method: "POST",
             headers: { "content-type": "application/json" },
             body: JSON.stringify({
-              ...userMessageId ? { messageID: userMessageId } : {},
               ...spec.model ? { model: spec.model } : {},
               system: spec.systemPrompt,
               parts: spec.parts,
@@ -5341,7 +5352,6 @@ function createHttpOpencodeTransport(opts) {
           sessionId,
           created,
           directory: spec.directory,
-          userMessageId,
           // The lock is released when this stream finishes draining.
           events: releaseAfter(parseSseStream(eventRes.body, sessionId, signal), release)
         };
@@ -5449,9 +5459,6 @@ function belongsToSession(ev, sessionId) {
   if (typeof infoSid === "string") return infoSid === sessionId;
   return true;
 }
-function newOpencodeMessageId() {
-  return `msg_${crypto.randomUUID().replace(/-/g, "")}`;
-}
 function trimSlash(s) {
   return s.endsWith("/") ? s.slice(0, -1) : s;
 }
@@ -5503,8 +5510,7 @@ function createOpencodeAdapter(deps = {}) {
       }
       yield* decodeOpencodeStream(result.events, {
         signal,
-        sessionId: result.sessionId,
-        skipMessageId: result.userMessageId
+        sessionId: result.sessionId
       });
     }
   };
@@ -5903,8 +5909,7 @@ var OPENCODE_CONFORMANCE_FIXTURES = [
     ]
   },
   {
-    // On a resumed turn the transport mints no client message id (doing so no-ops the turn), so the
-    // decoder gets no `skipMessageId`. It learns the user-message id from the stream — the
+    // On resume, as on a fresh turn, the decoder learns the user-message id from the stream:
     // `message.updated` user frame precedes the echoed part — and drops the echo, so the injected
     // per-turn context can't leak into Steps. Only the reply surfaces; no session event.
     name: "session resume \u2014 prompt echo filtered via stream-derived user id",
@@ -6125,7 +6130,14 @@ function fingerprintPrompt(prompt) {
   return `${prompt.length}.${(fnv >>> 0).toString(36)}.${(djb >>> 0).toString(36)}`;
 }
 function encodeSession3(state) {
-  return JSON.stringify(state);
+  return JSON.stringify({
+    threadId: state.threadId,
+    cwd: state.cwd,
+    promptFingerprint: state.promptFingerprint,
+    conversationFingerprint: state.conversationFingerprint ?? null,
+    compactions: state.compactions ?? null,
+    usageBaseline: state.usageBaseline
+  });
 }
 function decideResume3(stored, currentCwd) {
   if (!stored) return { fresh: true, reason: "no_session" };
@@ -6146,6 +6158,8 @@ function decideResume3(stored, currentCwd) {
   return {
     resume: state.threadId,
     promptFingerprint: typeof state.promptFingerprint === "string" ? state.promptFingerprint : null,
+    conversationFingerprint: typeof state.conversationFingerprint === "string" ? state.conversationFingerprint : null,
+    compactions: typeof state.compactions === "number" && Number.isInteger(state.compactions) && state.compactions >= 0 ? state.compactions : null,
     usageBaseline: readUsageBaseline(state.usageBaseline)
   };
 }
@@ -6178,6 +6192,7 @@ async function* decodeCodexStream(events, ctx) {
   let usage;
   let cumulativeUsage;
   let threadIdForSession = ctx.resumedThreadId;
+  let lastState = ctx.storedState ?? null;
   let settled = false;
   function* flushInterim() {
     const sealed = sealHeld2(held, false);
@@ -6193,14 +6208,14 @@ async function* decodeCodexStream(events, ctx) {
         const state = encodeSession3({
           threadId,
           cwd: ctx.cwd ?? "",
-          promptFingerprint: ctx.promptFingerprint ?? null,
-          // The baseline this turn inherited, carried through unchanged. This early write records the
-          // thread id even if the turn dies mid-stream; it can't yet know what the turn will spend. The
-          // closing write records the new baseline.
+          promptFingerprint: ctx.heldStanding?.promptFingerprint ?? null,
+          conversationFingerprint: ctx.heldStanding?.conversationFingerprint ?? null,
+          compactions: ctx.heldStanding?.compactions ?? null,
           usageBaseline: ctx.usageBaseline ?? null
         });
         if (threadId !== ctx.resumedThreadId || state !== ctx.storedState) {
           sessionEmitted = true;
+          lastState = state;
           yield {
             type: "session",
             state,
@@ -6299,14 +6314,16 @@ async function* decodeCodexStream(events, ctx) {
     if (sealed) yield sealed;
     reason = "no_terminal";
   }
-  if (ok && cumulativeUsage && threadIdForSession) {
+  if (ok && threadIdForSession) {
     const closing = encodeSession3({
       threadId: threadIdForSession,
       cwd: ctx.cwd ?? "",
       promptFingerprint: ctx.promptFingerprint ?? null,
-      usageBaseline: cumulativeUsage
+      conversationFingerprint: ctx.conversationFingerprint ?? null,
+      compactions: ctx.compactions ?? null,
+      usageBaseline: cumulativeUsage ?? ctx.usageBaseline ?? null
     });
-    yield { type: "session", state: closing };
+    if (closing !== lastState) yield { type: "session", state: closing };
   }
   const resolvedConfig = ctx.resolvedReasoningEffort ? { reasoningEffort: ctx.resolvedReasoningEffort } : void 0;
   yield {
@@ -6376,15 +6393,27 @@ var ENV_ENVELOPE_KEYS = [
   "CABANE_CONVERSATION_TITLE",
   "CABANE_HOST_ACCESS"
 ];
-function buildRunSpec2(req, resumeThreadId, instructionsFile = null, threadPromptFingerprint = null, imagePaths = []) {
+function buildRunSpec2(req, resumeThreadId, instructionsFile = null, threadStanding = null, imagePaths = []) {
   const { policy, config } = req;
   const directory = req.local.cwd ?? "";
   const dialect = readCodexDialect(config.runtimeOptions);
   const baseInstructionsFile = !policy.hostFs && instructionsFile ? instructionsFile : null;
   const model = config.model ? parseCodexModel(config.model) : null;
-  const promptFingerprint = fingerprintPrompt(req.systemPrompt);
-  const threadHasThisPrompt = resumeThreadId !== null && threadPromptFingerprint !== null && threadPromptFingerprint === promptFingerprint;
-  const promptRidesInput = baseInstructionsFile === null && !threadHasThisPrompt;
+  const segments = standingSegments(req);
+  const conversationText = segments.conversation.trim();
+  const fingerprints = {
+    core: fingerprintPrompt(segments.core),
+    conversation: conversationText.length > 0 ? fingerprintPrompt(conversationText) : null
+  };
+  const resumed = resumeThreadId !== null;
+  const held = resumed ? threadStanding : null;
+  const viaInput = baseInstructionsFile === null;
+  const preamble = {
+    core: viaInput && (held?.core ?? null) !== fingerprints.core,
+    // Compared both ways: a held segment that is now empty differs from it, and nothing held
+    // equals nothing to send.
+    conversation: viaInput && (held?.conversation ?? null) !== fingerprints.conversation
+  };
   return {
     resumeThreadId,
     directory,
@@ -6393,9 +6422,9 @@ function buildRunSpec2(req, resumeThreadId, instructionsFile = null, threadPromp
     skipGitRepoCheck: true,
     ...dialect.modelReasoningEffort ? { modelReasoningEffort: dialect.modelReasoningEffort } : {},
     baseInstructionsFile,
-    input: withImages(buildInput(req, promptRidesInput), imagePaths),
-    promptRidesInput,
-    promptFingerprint,
+    input: withImages(buildInput(req, segments, preamble, resumed), imagePaths),
+    preamble,
+    fingerprints,
     config: buildConfig(req, baseInstructionsFile),
     secretEnv: codexSecretEnv(req)
   };
@@ -6411,12 +6440,26 @@ function codexSecretEnv(req) {
   }
   return Object.keys(env).length > 0 ? env : null;
 }
-function buildInput(req, promptRidesInput) {
+var CORE_REPLACES = "Your standing instructions changed since an earlier copy in this conversation, or that copy may have been compacted away. This copy replaces every earlier one: where they differ, this one holds, and anything an earlier copy said that this one does not no longer applies.";
+var CONVERSATION_REPLACES = "This conversation's standing context \u2014 its charters, skill indexes and roster \u2014 changed since an earlier copy in this conversation, or that copy may have been compacted away. This copy replaces every earlier one, including charters and skills an earlier turn carried in its own text: where they differ, this one holds, and anything an earlier copy said that this one does not no longer applies.";
+function buildInput(req, segments, preamble, resumed) {
   const userText = req.content.filter((b) => b.type === "text").map((b) => b.text).join("\n\n");
   const body = userText.trim().length > 0 ? userText : req.prompt;
-  if (!promptRidesInput) return body;
-  const system = req.systemPrompt.trim();
-  return system.length > 0 ? `${system}
+  const standing = [];
+  if (!resumed) {
+    if (preamble.core) standing.push(joinStanding(segments).trim());
+  } else {
+    if (preamble.core) standing.push(`${CORE_REPLACES}
+
+${segments.core.trim()}`);
+    if (preamble.conversation) {
+      standing.push(`${CONVERSATION_REPLACES}
+
+${segments.conversation.trim()}`.trim());
+    }
+  }
+  const lead = standing.filter((s) => s.length > 0);
+  return lead.length > 0 ? `${lead.join("\n\n---\n\n")}
 
 ${body}` : body;
 }
@@ -6628,7 +6671,6 @@ function createCodexAdapter(deps = {}) {
       const directory = req.local.cwd ?? "";
       const decision = decideResume3(req.session, directory);
       const resumeThreadId = "resume" in decision ? decision.resume : null;
-      const threadPromptFingerprint = "resume" in decision ? decision.promptFingerprint : null;
       const threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
       if ("fresh" in decision && decision.reason === "cwd_mismatch") {
         deps.onWarn?.(
@@ -6645,6 +6687,32 @@ function createCodexAdapter(deps = {}) {
           degraded = false;
         }
       }
+      let compactions = 0;
+      let threadStanding = null;
+      if ("resume" in decision) {
+        compactions = deps.countCompactions ? await deps.countCompactions(decision.resume) : null;
+        if (signal.aborted) return;
+        if (compactions === null) {
+          deps.onWarn?.(
+            "codex adapter: the thread's compaction count could not be read \u2014 re-sending the standing instructions (ENG210)",
+            { threadId: decision.resume }
+          );
+        } else if (decision.compactions === compactions) {
+          threadStanding = {
+            core: decision.promptFingerprint,
+            conversation: decision.conversationFingerprint
+          };
+        } else if (decision.compactions !== null && compactions > decision.compactions) {
+          deps.onWarn?.(
+            "codex adapter: the thread compacted since the last turn \u2014 re-sending the standing instructions (ENG210)",
+            {
+              threadId: decision.resume,
+              compactions,
+              compactionsSince: compactions - decision.compactions
+            }
+          );
+        }
+      }
       let instructions = null;
       if (!req.policy.hostFs) {
         if (!deps.writeInstructionsFile) {
@@ -6689,7 +6757,7 @@ function createCodexAdapter(deps = {}) {
           req,
           resumeThreadId,
           instructions?.path ?? null,
-          threadPromptFingerprint,
+          threadStanding,
           images?.paths ?? []
         );
         if (spec.model === null) {
@@ -6704,10 +6772,18 @@ function createCodexAdapter(deps = {}) {
           cwd: req.local.cwd,
           resumedThreadId: resumeThreadId,
           degraded,
-          // Which prompt the thread carries once this turn lands. If we sent one, it's that one — the
-          // later copy is what the model reads. If we withheld it, the thread carries what it did. Read
-          // off the spec, so the record can't disagree with what was sent.
-          promptFingerprint: spec.promptRidesInput ? spec.promptFingerprint : threadPromptFingerprint,
+          // Which segments the thread carries once this turn lands. A segment sent is that one —
+          // the later copy is what the model reads. One withheld is what the thread had. Read off
+          // the spec, so the record can't disagree with what was sent.
+          promptFingerprint: spec.preamble.core ? spec.fingerprints.core : threadStanding?.core ?? null,
+          conversationFingerprint: spec.preamble.conversation ? spec.fingerprints.conversation : threadStanding?.conversation ?? null,
+          compactions,
+          // What the thread held before this turn, for the write at `thread.started`.
+          heldStanding: {
+            promptFingerprint: threadStanding?.core ?? null,
+            conversationFingerprint: threadStanding?.conversation ?? null,
+            compactions: threadStanding ? compactions : null
+          },
           storedState: req.session,
           usageBaseline: threadUsageBaseline,
           // Codex reports no model in-stream, so record what the thread was started with (null on the
@@ -6807,11 +6883,21 @@ var OP_FAILURE = {
     message: "files.read returned more than the result ceiling"
   }
 };
-var sessionEvent3 = (threadId, cwd = DIR2, degraded = false, promptFingerprint = fingerprintPrompt(PROMPT), usageBaseline = null) => ({
+var startedSession = (threadId, cwd = DIR2, degraded = false) => ({
   type: "session",
-  state: encodeSession3({ threadId, cwd, promptFingerprint, usageBaseline }),
+  state: encodeSession3({ threadId, cwd, promptFingerprint: null, usageBaseline: null }),
   ...degraded ? { degraded: true } : {}
 });
+var closingSession = (threadId, usageBaseline = null) => ({
+  type: "session",
+  state: encodeSession3({
+    threadId,
+    cwd: DIR2,
+    promptFingerprint: fingerprintPrompt(PROMPT),
+    usageBaseline,
+    compactions: 0
+  })
+});
 var CODEX_CONFORMANCE_FIXTURES = [
   {
     // A plain text reply: the held agent message seals as the terminal final at `turn.completed`;
@@ -6834,11 +6920,11 @@ var CODEX_CONFORMANCE_FIXTURES = [
       })
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "text", body: "Hello there.", terminal: true },
       // The closing session write — the thread's ending totals, recorded as the baseline the next turn
       // subtracts. A fresh thread, so the `result` usage below is the frame verbatim.
-      sessionEvent3(NEW_THREAD_ID, DIR2, false, fingerprintPrompt(PROMPT), {
+      closingSession(NEW_THREAD_ID, {
         inputTokens: 100,
         outputTokens: 50,
         cacheReadTokens: 20,
@@ -6885,7 +6971,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "text", body: "Reading your notes.", terminal: false },
       {
         type: "tool",
@@ -6905,6 +6991,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         result: [{ type: "text", text: "sleep early" }]
       },
       { type: "text", body: "Here's the summary.", terminal: true },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -6938,7 +7025,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "tool",
         id: "query-success",
@@ -6956,6 +7043,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         input: { op: "files.read", args: { path: "/ABOUT.md" } },
         result: OP_SUCCESS
       },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -6991,7 +7079,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "tool",
         id: "query-failed",
@@ -7009,6 +7097,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         input: { op: "files.read", args: { path: "/ABOUT.md" } },
         result: OP_FAILURE
       },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7032,7 +7121,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "tool",
         id: "mcp-failed",
@@ -7050,6 +7139,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         input: { q: "receipt" },
         result: "connection closed"
       },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7075,7 +7165,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "tool",
         id: "mcp-image",
@@ -7093,6 +7183,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         input: {},
         result: [{ type: "image", data: "base64-bytes", mimeType: "image/png" }]
       },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7133,7 +7224,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "tool", id: "t1", name: "list", phase: "start", summary: "", input: {} },
       {
         type: "tool",
@@ -7144,6 +7235,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         input: { path: "/product/tasks" },
         result: [{ type: "text", text: "CT481.md" }]
       },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7161,7 +7253,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "tool",
         id: "ws1",
@@ -7178,6 +7270,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         summary: "best pizza in nyc",
         input: { query: "best pizza in nyc" }
       },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7193,7 +7286,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "tool",
         id: "ws2",
@@ -7210,6 +7303,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         summary: "",
         input: { query: "" }
       },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7240,7 +7334,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "text", body: "Working on it.", terminal: false },
       {
         type: "tool",
@@ -7272,7 +7366,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnFailed("provider exploded")
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "text", body: "Partial work.", terminal: false },
       { type: "runtime_notice", body: "provider exploded" },
       { type: "result", ok: false, reason: "error:provider exploded" }
@@ -7289,7 +7383,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       fatalError("stream died")
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "text", body: "Starting.", terminal: false },
       { type: "runtime_notice", body: "stream died" },
       { type: "result", ok: false, reason: "error:stream died" }
@@ -7302,7 +7396,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnFailed("429 Too Many Requests")],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "runtime_notice", body: "429 Too Many Requests" },
       { type: "result", ok: false, reason: "rate_limited" }
     ]
@@ -7312,7 +7406,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnFailed("503 Service Unavailable")],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "runtime_notice", body: "503 Service Unavailable" },
       { type: "result", ok: false, reason: "server_error" }
     ]
@@ -7325,7 +7419,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnFailed("You've hit your session limit \xB7 resets 8:20pm (UTC)")
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "runtime_notice",
         body: "You've hit your session limit \xB7 resets 8:20pm (UTC)"
@@ -7338,7 +7432,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnFailed("401 Unauthorized: invalid api key")],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "runtime_notice", body: "401 Unauthorized: invalid api key" },
       { type: "result", ok: false, reason: "auth_expired" }
     ]
@@ -7350,7 +7444,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnFailed("something local broke")],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "runtime_notice", body: "something local broke" },
       { type: "result", ok: false, reason: "error:something local broke" }
     ]
@@ -7363,7 +7457,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnFailed(`  ${BOUNDED_NOTICE2}${"y".repeat(20)}  `)
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "runtime_notice", body: BOUNDED_NOTICE2 },
       { type: "result", ok: false, reason: "usage_capped" }
     ]
@@ -7374,26 +7468,32 @@ var CODEX_CONFORMANCE_FIXTURES = [
     name: "empty failure text emits no runtime notice",
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnFailed("")],
-    expected: [sessionEvent3(NEW_THREAD_ID), { type: "result", ok: false, reason: "error:unknown" }]
+    expected: [
+      startedSession(NEW_THREAD_ID),
+      { type: "result", ok: false, reason: "error:unknown" }
+    ]
   },
   {
     name: "whitespace-only failure text emits no runtime notice",
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnFailed("   ")],
-    expected: [sessionEvent3(NEW_THREAD_ID), { type: "result", ok: false, reason: "error:   " }]
+    expected: [startedSession(NEW_THREAD_ID), { type: "result", ok: false, reason: "error:   " }]
   },
   {
     name: "bare status token emits no runtime notice",
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnFailed("429")],
-    expected: [sessionEvent3(NEW_THREAD_ID), { type: "result", ok: false, reason: "rate_limited" }]
+    expected: [
+      startedSession(NEW_THREAD_ID),
+      { type: "result", ok: false, reason: "rate_limited" }
+    ]
   },
   {
     name: "single-word provider sentence emits a runtime notice",
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnFailed("Unavailable.")],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "runtime_notice", body: "Unavailable." },
       { type: "result", ok: false, reason: "error:Unavailable." }
     ]
@@ -7421,7 +7521,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "result",
         ok: false,
@@ -7441,8 +7541,9 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "text", body: "All good now.", terminal: true },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7454,7 +7555,11 @@ var CODEX_CONFORMANCE_FIXTURES = [
     name: "zero-content success (empty runtime result)",
     request: makeRequest3(),
     nativeStream: [threadStarted(NEW_THREAD_ID), turnCompleted()],
-    expected: [sessionEvent3(NEW_THREAD_ID), { type: "result", ok: true }]
+    expected: [
+      startedSession(NEW_THREAD_ID),
+      closingSession(NEW_THREAD_ID),
+      { type: "result", ok: true }
+    ]
   },
   {
     // Empty-final: a clean turn that ended on a tool call with no closing message.
@@ -7479,7 +7584,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       {
         type: "tool",
         id: "t1",
@@ -7497,6 +7602,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         input: { changes: [{ path: "a.md", kind: "add" }] },
         result: [{ path: "a.md", kind: "add" }]
       },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7512,9 +7618,10 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "thinking", text: "Let me check the notes." },
       { type: "text", body: "All set.", terminal: true },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   },
@@ -7532,8 +7639,9 @@ var CODEX_CONFORMANCE_FIXTURES = [
     }),
     nativeStream: [threadStarted(NEW_THREAD_ID), agentMessage("m1", "Done."), turnCompleted()],
     expected: [
-      sessionEvent3(NEW_THREAD_ID),
+      startedSession(NEW_THREAD_ID),
       { type: "text", body: "Done.", terminal: true },
+      closingSession(NEW_THREAD_ID),
       {
         type: "result",
         ok: true,
@@ -7555,7 +7663,8 @@ var CODEX_CONFORMANCE_FIXTURES = [
         threadId: "th1",
         cwd: DIR2,
         promptFingerprint: fingerprintPrompt(PROMPT),
-        usageBaseline: null
+        usageBaseline: null,
+        compactions: 0
       })
     }),
     nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
@@ -7577,8 +7686,9 @@ var CODEX_CONFORMANCE_FIXTURES = [
     }),
     nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
     expected: [
-      sessionEvent3("th1"),
+      startedSession("th1"),
       { type: "text", body: "Back again.", terminal: true },
+      closingSession("th1"),
       { type: "result", ok: true }
     ]
   },
@@ -7600,8 +7710,9 @@ var CODEX_CONFORMANCE_FIXTURES = [
     }),
     nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
     expected: [
-      sessionEvent3("th1"),
+      startedSession("th1"),
       { type: "text", body: "Back again.", terminal: true },
+      closingSession("th1"),
       { type: "result", ok: true }
     ]
   },
@@ -7627,8 +7738,9 @@ var CODEX_CONFORMANCE_FIXTURES = [
       turnCompleted()
     ],
     expected: [
-      sessionEvent3(NEW_THREAD_ID, DIR2, true),
+      startedSession(NEW_THREAD_ID, DIR2, true),
       { type: "text", body: "Fresh start.", terminal: true },
+      closingSession(NEW_THREAD_ID),
       { type: "result", ok: true }
     ]
   }
@@ -7710,7 +7822,7 @@ var ConnectorHealthStore = class {
 // src/dispatcher.ts
 import { randomUUID as randomUUID4 } from "crypto";
 import { existsSync as existsSync12, readdirSync as readdirSync2, statSync as statSync3 } from "fs";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 
 // src/runner/launch.ts
 import { createInterface } from "readline";
@@ -9108,6 +9220,7 @@ function buildCompanionTurnRequest(params) {
   const { turnContext: t } = params;
   return {
     systemPrompt: t.systemPrompt,
+    ...t.standing ? { standing: t.standing } : {},
     prompt: t.prompt,
     content: t.content,
     config: t.config,
@@ -9219,6 +9332,62 @@ function message(err) {
   return err instanceof Error ? err.message : String(err);
 }
 
+// src/codex-compactions.ts
+import { createReadStream } from "fs";
+import { readdir } from "fs/promises";
+import { homedir as homedir6 } from "os";
+import { join as join16 } from "path";
+import { createInterface as createInterface2 } from "readline";
+var DAY_MS = 864e5;
+var UUID_V7 = /^([0-9a-f]{8})-([0-9a-f]{4})-7[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var RECORD_HEAD_CHARS = 200;
+function createCodexCompactionCounter(codexHome = process.env.CODEX_HOME || join16(homedir6(), ".codex")) {
+  return async (threadId) => {
+    try {
+      const rollout = await findRollout(codexHome, threadId);
+      return rollout ? await countCompactions(rollout) : null;
+    } catch {
+      return null;
+    }
+  };
+}
+async function findRollout(codexHome, threadId) {
+  const id = UUID_V7.exec(threadId);
+  if (!id) return null;
+  const createdAt = parseInt(`${id[1]}${id[2]}`, 16);
+  const suffix = `-${threadId}.jsonl`;
+  for (const offset of [0, -DAY_MS, DAY_MS]) {
+    const day = new Date(createdAt + offset);
+    const dir2 = join16(
+      codexHome,
+      "sessions",
+      String(day.getUTCFullYear()),
+      String(day.getUTCMonth() + 1).padStart(2, "0"),
+      String(day.getUTCDate()).padStart(2, "0")
+    );
+    let names;
+    try {
+      names = await readdir(dir2);
+    } catch {
+      continue;
+    }
+    const name = names.find((n) => n.startsWith("rollout-") && n.endsWith(suffix));
+    if (name) return join16(dir2, name);
+  }
+  return null;
+}
+async function countCompactions(rollout) {
+  const lines2 = createInterface2({
+    input: createReadStream(rollout, { encoding: "utf8" }),
+    crlfDelay: Infinity
+  });
+  let count = 0;
+  for await (const line of lines2) {
+    if (line.slice(0, RECORD_HEAD_CHARS).includes('"type":"compacted"')) count += 1;
+  }
+  return count;
+}
+
 // src/turn-seq-floor.ts
 var SeqFloorUnavailable = class extends Error {
   constructor(detail) {
@@ -9316,15 +9485,15 @@ function reportFailure(config, body) {
 
 // src/prepared.ts
 import { mkdirSync as mkdirSync7, readFileSync as readFileSync8, rmSync as rmSync5, writeFileSync as writeFileSync5, existsSync as existsSync10 } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 function dirFor(workspaceId) {
-  return join16(cabaneDir(), "prepared", encodeURIComponent(workspaceId));
+  return join17(cabaneDir(), "prepared", encodeURIComponent(workspaceId));
 }
 function conversationDir(workspaceId, conversationId) {
-  return join16(dirFor(workspaceId), encodeURIComponent(conversationId));
+  return join17(dirFor(workspaceId), encodeURIComponent(conversationId));
 }
 function pathFor2(workspaceId, conversationId, agentId) {
-  return join16(conversationDir(workspaceId, conversationId), `${encodeURIComponent(agentId)}.json`);
+  return join17(conversationDir(workspaceId, conversationId), `${encodeURIComponent(agentId)}.json`);
 }
 function readPrepared(workspaceId, conversationId, agentId) {
   const path = pathFor2(workspaceId, conversationId, agentId);
@@ -9356,9 +9525,9 @@ function clearPrepared(workspaceId, conversationId, agentId) {
 
 // src/transcript-writer.ts
 import { appendFileSync, chmodSync as chmodSync4, copyFileSync, mkdirSync as mkdirSync8, readdirSync, rmSync as rmSync6 } from "fs";
-import { basename as basename3, dirname as dirname7, join as join17 } from "path";
+import { basename as basename3, dirname as dirname7, join as join18 } from "path";
 function transcriptsDir() {
-  return join17(runnerStateDir(), "transcripts");
+  return join18(runnerStateDir(), "transcripts");
 }
 var RETAIN = 200;
 var ANOMALY_RETAIN = 50;
@@ -9368,7 +9537,7 @@ var TranscriptWriter = class {
   onWarn;
   constructor(dir2, meta, onWarn) {
     this.onWarn = onWarn;
-    this.path = join17(dir2, fileName(meta));
+    this.path = join18(dir2, fileName(meta));
     try {
       mkdirSync8(dir2, { recursive: true });
       try {
@@ -9397,10 +9566,10 @@ var TranscriptWriter = class {
   preserveAnomaly() {
     if (this.broken) return;
     try {
-      const dir2 = join17(dirname7(this.path), "anomalies");
+      const dir2 = join18(dirname7(this.path), "anomalies");
       mkdirSync8(dir2, { recursive: true, mode: 448 });
       chmodSync4(dir2, 448);
-      const target = join17(dir2, basename3(this.path));
+      const target = join18(dir2, basename3(this.path));
       copyFileSync(this.path, target);
       chmodSync4(target, 384);
       pruneOld(dir2, ANOMALY_RETAIN);
@@ -9446,7 +9615,7 @@ function pruneOld(dir2, retain) {
   const drop = files.sort().slice(0, files.length - retain);
   for (const f of drop) {
     try {
-      rmSync6(join17(dir2, f), { force: true });
+      rmSync6(join18(dir2, f), { force: true });
     } catch {
     }
   }
@@ -10355,6 +10524,8 @@ var TurnExecution = class {
             turnId: this.turnId,
             warn: (meta, msg) => turnLog.warn(meta, msg)
           }),
+          // Whether a resumed thread compacted since its standing preamble was sent.
+          countCompactions: createCodexCompactionCounter(),
           ...codexPath ? { transport: createSdkCodexTransport({ codexPathOverride: codexPath }) } : {}
         })
       );
@@ -10415,6 +10586,9 @@ var TurnExecution = class {
       );
       return {
         systemPrompt: context.systemPrompt,
+        // Replaced even when absent, so the segments can't outlive the
+        // `systemPrompt` they were split from.
+        standing: context.standing,
         prompt: context.prompt,
         content: context.content
       };
@@ -10826,7 +11000,7 @@ function checkoutState(cwd) {
   if (entries.length === 0) {
     return { ok: false, reason: `${cwd} is empty \u2014 a recreated shell, not a prepared directory` };
   }
-  const gitPath = join18(cwd, ".git");
+  const gitPath = join19(cwd, ".git");
   if (!existsSync12(gitPath)) return { ok: true, reason: "usable" };
   let stat;
   try {
@@ -10834,7 +11008,7 @@ function checkoutState(cwd) {
   } catch (error) {
     return { ok: false, reason: `${gitPath} is unreadable (${error.message})` };
   }
-  if (stat.isDirectory() && !existsSync12(join18(gitPath, "HEAD")))
+  if (stat.isDirectory() && !existsSync12(join19(gitPath, "HEAD")))
     return { ok: false, reason: `${gitPath} has no HEAD \u2014 an empty shell, not a checkout` };
   return { ok: true, reason: "usable" };
 }
@@ -11041,7 +11215,7 @@ function createLocalProcessProvider(opts = {}) {
 import { createHash as createHash4, randomUUID as randomUUID5 } from "crypto";
 import { constants as constants3, tmpdir as tmpdir3 } from "os";
 import {
-  createReadStream,
+  createReadStream as createReadStream2,
   createWriteStream as createWriteStream2,
   existsSync as existsSync15,
   mkdirSync as mkdirSync10,
@@ -11052,7 +11226,7 @@ import {
   statSync as statSync4,
   writeFileSync as writeFileSync6
 } from "fs";
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 import { Writable } from "stream";
 
 // src/providers/docker-cli.ts
@@ -11246,7 +11420,7 @@ import {
   renameSync as renameSync5,
   rmSync as rmSync8
 } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 function routes(t) {
   const conv = `/api/workspaces/${t.workspaceId}/conversations/${t.conversationId}`;
   const agent = `${conv}/participants/agents/${t.agentId}`;
@@ -11292,7 +11466,7 @@ function publishStaged(from, to, move = atomicMove) {
   const staged = readdirSync3(from).filter((n) => n.endsWith(".json")).map((name) => {
     let entry = {};
     try {
-      entry = JSON.parse(readFileSync9(join19(from, name), "utf8"));
+      entry = JSON.parse(readFileSync9(join20(from, name), "utf8"));
     } catch {
     }
     return { name, entry };
@@ -11305,7 +11479,7 @@ function publishStaged(from, to, move = atomicMove) {
   let published = 0;
   for (const { name } of staged) {
     try {
-      move(join19(from, name), join19(to, name));
+      move(join20(from, name), join20(to, name));
     } catch {
       return { published, complete: false };
     }
@@ -11318,7 +11492,7 @@ function publishStaged(from, to, move = atomicMove) {
 // src/providers/runner-base.ts
 import { createHash as createHash3 } from "crypto";
 import { existsSync as existsSync14, realpathSync as realpathSync4 } from "fs";
-import { dirname as dirname8, join as join20, sep as sep3 } from "path";
+import { dirname as dirname8, join as join21, sep as sep3 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 var COMPANION_MOUNT = "/opt/cabane/companion";
 var BASE_DOCKERFILE = `FROM node:22-slim
@@ -11366,11 +11540,11 @@ async function ensureBaseImage(docker, image, log) {
 function ownInstall(moduleFile = fileURLToPath5(import.meta.url)) {
   let dir2 = dirname8(moduleFile);
   for (let i = 0; i < 4; i++) {
-    if (existsSync14(join20(dir2, "dist", "cli.js")) && existsSync14(join20(dir2, "package.json"))) break;
+    if (existsSync14(join21(dir2, "dist", "cli.js")) && existsSync14(join21(dir2, "package.json"))) break;
     dir2 = dirname8(dir2);
   }
-  if (!existsSync14(join20(dir2, "dist", "cli.js"))) return null;
-  const sdk = join20(dir2, "node_modules", "@anthropic-ai", "claude-agent-sdk");
+  if (!existsSync14(join21(dir2, "dist", "cli.js"))) return null;
+  const sdk = join21(dir2, "node_modules", "@anthropic-ai", "claude-agent-sdk");
   if (!existsSync14(sdk)) return null;
   const root = realpathSync4(dir2);
   return realpathSync4(sdk).startsWith(root + sep3) ? root : null;
@@ -11509,39 +11683,39 @@ function networkCreateError(stderr) {
 }
 function sessionArchivePath(deviceDir, attemptId) {
   if (!UUID_RE.test(attemptId)) throw new Error(`docker: not an attempt id: ${attemptId}`);
-  return join21(deviceDir, "attempts", attemptId, "session.tar");
+  return join22(deviceDir, "attempts", attemptId, "session.tar");
 }
 function pruneOtherAttempts(deviceDir, pair, keep) {
-  const root = join21(deviceDir, "attempts");
+  const root = join22(deviceDir, "attempts");
   if (!existsSync15(root)) return;
   for (const id of readdirSync4(root)) {
     if (id === keep || !UUID_RE.test(id)) continue;
     let pairOf = "";
     try {
-      pairOf = readFileSync10(join21(root, id, "pair"), "utf8");
+      pairOf = readFileSync10(join22(root, id, "pair"), "utf8");
     } catch {
       continue;
     }
     if (pairOf === `${pair.conversationId}/${pair.agentId}`) {
-      rmSync9(join21(root, id), { recursive: true, force: true });
+      rmSync9(join22(root, id), { recursive: true, force: true });
     }
   }
 }
 var IDLE_SESSION_ARCHIVE_MS = 30 * 24 * 60 * 6e4;
 function pruneIdleSessionArchives(deviceDir, now = Date.now(), maxAgeMs = IDLE_SESSION_ARCHIVE_MS) {
-  const root = join21(deviceDir, "attempts");
+  const root = join22(deviceDir, "attempts");
   if (!existsSync15(root)) return [];
   const removed = [];
   for (const id of readdirSync4(root)) {
     if (!UUID_RE.test(id)) continue;
     let kept;
     try {
-      kept = statSync4(join21(root, id)).mtimeMs;
+      kept = statSync4(join22(root, id)).mtimeMs;
     } catch {
       continue;
     }
     if (now - kept < maxAgeMs) continue;
-    rmSync9(join21(root, id), { recursive: true, force: true });
+    rmSync9(join22(root, id), { recursive: true, force: true });
     removed.push(id);
   }
   return removed;
@@ -11742,11 +11916,11 @@ function createDockerProvider(opts) {
       await must(["network", "disconnect", "-f", other, name], "moving the container");
     if (others.includes(sharedNetwork)) await retireSharedNetwork();
   };
-  const socketRoot = opts.socketRoot ?? join21(
+  const socketRoot = opts.socketRoot ?? join22(
     process.env.XDG_RUNTIME_DIR && existsSync15(process.env.XDG_RUNTIME_DIR) ? process.env.XDG_RUNTIME_DIR : tmpdir3(),
     `cabane-runners-${opts.deviceKey}`
   );
-  const socketDir = (name) => join21(socketRoot, createHash4("sha256").update(name).digest("hex").slice(0, 12));
+  const socketDir = (name) => join22(socketRoot, createHash4("sha256").update(name).digest("hex").slice(0, 12));
   const create = async (name, attempt) => {
     mkdirSync10(socketRoot, { recursive: true, mode: 448 });
     mkdirSync10(socketDir(name), { recursive: true, mode: 457 });
@@ -11888,7 +12062,7 @@ function createDockerProvider(opts) {
     }
   };
   const removeIn = (name, from, names) => names.length ? execIn(name, ["sh", "-c", 'cd "$1" && shift && rm -f -- "$@"', "sh", from, ...names]) : Promise.resolve(null);
-  const pendingPath = (name) => join21(opts.deviceDir, "runners-pending", `${name}.json`);
+  const pendingPath = (name) => join22(opts.deviceDir, "runners-pending", `${name}.json`);
   const readPending = (name) => {
     try {
       const ids = JSON.parse(readFileSync10(pendingPath(name), "utf8"));
@@ -11902,12 +12076,12 @@ function createDockerProvider(opts) {
       rmSync9(pendingPath(name), { force: true });
       return;
     }
-    mkdirSync10(join21(opts.deviceDir, "runners-pending"), { recursive: true });
+    mkdirSync10(join22(opts.deviceDir, "runners-pending"), { recursive: true });
     writeFileSync6(pendingPath(name), JSON.stringify([...new Set(ids)]));
   };
   const keepSession = async (name, attempt, attemptId) => {
     const archive = sessionArchivePath(opts.deviceDir, attemptId);
-    mkdirSync10(join21(archive, ".."), { recursive: true });
+    mkdirSync10(join22(archive, ".."), { recursive: true });
     const partial = `${archive}.${process.pid}.partial`;
     const file = new CappedFile(partial, sessionCap);
     const r = await execIn(
@@ -11924,7 +12098,7 @@ function createDockerProvider(opts) {
     );
     if (r.code === 0 && !file.over) {
       renameSync6(partial, archive);
-      writeFileSync6(join21(archive, "..", "pair"), `${attempt.conversationId}/${attempt.agentId}`);
+      writeFileSync6(join22(archive, "..", "pair"), `${attempt.conversationId}/${attempt.agentId}`);
       pruneOtherAttempts(opts.deviceDir, attempt, attemptId);
       await writeMarker(name, attemptId);
       log.debug({ container: name, attemptId, bytes: file.bytes }, "runners: session files kept");
@@ -11938,7 +12112,7 @@ function createDockerProvider(opts) {
       file.over ? "runners: the session files are over the size cap and weren't kept; the next new container starts the session over" : "runners: couldn't keep the session files; the next new container starts the session over"
     );
   };
-  const stagingDir = (name) => join21(opts.deviceDir, "runners-pending", `${name}.outbox`);
+  const stagingDir = (name) => join22(opts.deviceDir, "runners-pending", `${name}.outbox`);
   const ensureRunning = async (name) => {
     const seen = await docker.run(["inspect", "-f", "{{.State.Running}}", name]);
     if (seen.code !== 0) return false;
@@ -11946,7 +12120,7 @@ function createDockerProvider(opts) {
     return (await docker.run(["start", name])).code === 0;
   };
   const dropArchive = (attemptId) => {
-    rmSync9(join21(sessionArchivePath(opts.deviceDir, attemptId), ".."), {
+    rmSync9(join22(sessionArchivePath(opts.deviceDir, attemptId), ".."), {
       recursive: true,
       force: true
     });
@@ -12015,7 +12189,7 @@ function createDockerProvider(opts) {
         if (seen.stdout.trim().split(" ")[0] !== "true")
           await must(["start", name], "starting the container");
         const git = await serveGitCredentials({
-          socketPath: join21(socketDir(name), "git.sock"),
+          socketPath: join22(socketDir(name), "git.sock"),
           hosts: opts.gitHosts,
           fill: opts.gitFill,
           log
@@ -12051,7 +12225,7 @@ function createDockerProvider(opts) {
         const archive = sessionArchivePath(opts.deviceDir, attemptId);
         if (existsSync15(archive)) {
           const r = await execIn(name, ["tar", "-x", "-C", CONTAINER_HOME, "-f", "-"], {
-            input: createReadStream(archive)
+            input: createReadStream2(archive)
           });
           if (r.code !== 0) {
             log.warn(
@@ -12164,15 +12338,15 @@ function createDockerProvider(opts) {
       const transcripts = await readDir(name, `${CONTAINER_STATE}/transcripts`);
       if (transcripts) {
         const kept = transcripts.files.filter((f) => SAFE_NAME_RE.test(f.name));
-        if (kept.length) mkdirSync10(join21(opts.hostStateDir, "transcripts"), { recursive: true });
-        for (const f of kept) writeFileSync6(join21(opts.hostStateDir, "transcripts", f.name), f.data);
+        if (kept.length) mkdirSync10(join22(opts.hostStateDir, "transcripts"), { recursive: true });
+        for (const f of kept) writeFileSync6(join22(opts.hostStateDir, "transcripts", f.name), f.data);
         await removeIn(
           name,
           `${CONTAINER_STATE}/transcripts`,
           kept.map((f) => f.name)
         );
       }
-      const outboxRel = join21("outbox", encodeURIComponent(attempt.agentId));
+      const outboxRel = join22("outbox", encodeURIComponent(attempt.agentId));
       const outbox = await readDir(name, `${CONTAINER_STATE}/${outboxRel}`);
       let unpublished = false;
       if (outbox) {
@@ -12198,7 +12372,7 @@ function createDockerProvider(opts) {
           const staged = stagingDir(name);
           mkdirSync10(staged, { recursive: true });
           writeFileSync6(
-            join21(staged, `${encodeURIComponent(entry.turnId)}__${entry.seq}.json`),
+            join22(staged, `${encodeURIComponent(entry.turnId)}__${entry.seq}.json`),
             `${JSON.stringify(entry)}
 `
           );
@@ -12211,7 +12385,7 @@ function createDockerProvider(opts) {
         if (outbox.complete) {
           const published = publishStaged(
             stagingDir(name),
-            join21(opts.hostStateDir, outboxRel),
+            join22(opts.hostStateDir, outboxRel),
             opts.moveFile
           );
           queued = published.published;
@@ -12426,8 +12600,8 @@ import {
 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import { isIP } from "net";
-import { homedir as homedir6, networkInterfaces, tmpdir as tmpdir4, userInfo as userInfo2 } from "os";
-import { dirname as dirname9, join as join22, sep as sep4 } from "path";
+import { homedir as homedir7, networkInterfaces, tmpdir as tmpdir4, userInfo as userInfo2 } from "os";
+import { dirname as dirname9, join as join23, sep as sep4 } from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 import { SandboxManager } from "@anthropic-ai/sandbox-runtime";
 function accountHome() {
@@ -12524,7 +12698,7 @@ function companionStoreWatch(log) {
   return new CompanionStoreWatch({
     log,
     roots: () => {
-      const home = homedir6();
+      const home = homedir7();
       return storeWalkRoots([.../* @__PURE__ */ new Set([home, accountHome() ?? home])], cabaneDir());
     }
   });
@@ -12623,8 +12797,8 @@ function emptyHarnessVersions() {
 }
 
 // src/harness-copy.ts
-import { homedir as homedir7 } from "os";
-import { join as join23 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join24 } from "path";
 var HARNESS_LABELS = {
   "claude-code": "Claude Code",
   codex: "Codex",
@@ -12638,7 +12812,7 @@ function failureText(runtime, reason) {
     case "spawn":
       return `Couldn't check whether ${label} is signed in: Cabane's bundled ${label} wouldn't start. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
     case "config":
-      return `Couldn't check whether ${label} is signed in: its configuration file didn't load${runtime === "codex" ? ` (${tildePath(join23(homedir7(), ".codex", "config.toml"))})` : ""}. Fix it, then try again.`;
+      return `Couldn't check whether ${label} is signed in: its configuration file didn't load${runtime === "codex" ? ` (${tildePath(join24(homedir8(), ".codex", "config.toml"))})` : ""}. Fix it, then try again.`;
     case "unreadable":
       return `Couldn't check whether ${label} is signed in: it answered in a way Cabane couldn't read. Try again, and if it keeps happening, update Cabane.`;
   }
@@ -12978,7 +13152,7 @@ import {
   rmSync as rmSync11,
   writeFileSync as writeFileSync8
 } from "fs";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 var MAX_ENTRIES = 2e3;
 var MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var Outbox = class {
@@ -12991,10 +13165,10 @@ var Outbox = class {
   // Resolved lazily (per call) so tests that swap HOME between
   // cases route writes at the right tmpdir.
   dir() {
-    return join24(runnerStateDir(), "outbox", encodeURIComponent(this.workspaceId));
+    return join25(runnerStateDir(), "outbox", encodeURIComponent(this.workspaceId));
   }
   fileFor(turnId, seq) {
-    return join24(this.dir(), `${encodeURIComponent(turnId)}__${seq}.json`);
+    return join25(this.dir(), `${encodeURIComponent(turnId)}__${seq}.json`);
   }
   // Persist a commit for later draining. Atomic (temp file + rename) so a
   // concurrent `list()` never reads a half-written entry, then enforces the
@@ -13036,7 +13210,7 @@ var Outbox = class {
     const entries = [];
     for (const name of names) {
       if (!name.endsWith(".json")) continue;
-      const full = join24(dir2, name);
+      const full = join25(dir2, name);
       try {
         const parsed = JSON.parse(readFileSync12(full, "utf8"));
         if (parsed && typeof parsed.turnId === "string" && typeof parsed.seq === "number" && typeof parsed.path === "string") {
@@ -13260,7 +13434,7 @@ var SseSubscriber = class {
 // src/updater.ts
 import { spawn as spawn8 } from "child_process";
 import { copyFileSync as copyFileSync3, existsSync as existsSync18, mkdirSync as mkdirSync16, renameSync as renameSync11, rmSync as rmSync14 } from "fs";
-import { dirname as dirname13, join as join28 } from "path";
+import { dirname as dirname13, join as join29 } from "path";
 
 // src/boot-rule.ts
 import {
@@ -13272,7 +13446,7 @@ import {
   symlinkSync,
   writeFileSync as writeFileSync9
 } from "fs";
-import { dirname as dirname10, join as join25 } from "path";
+import { dirname as dirname10, join as join26 } from "path";
 var UNCONFIRMED_WINDOW_MS = 10 * 6e4;
 var MAX_STAGE_ATTEMPTS = 3;
 function superseded(pending, ...running) {
@@ -13305,26 +13479,26 @@ import {
   rmSync as rmSync13,
   symlinkSync as symlinkSync2
 } from "fs";
-import { dirname as dirname11, join as join26 } from "path";
+import { dirname as dirname11, join as join27 } from "path";
 import { fileURLToPath as fileURLToPath7 } from "url";
 function versionsDir() {
-  return join26(cabaneDir(), "versions");
+  return join27(cabaneDir(), "versions");
 }
 function currentLink() {
-  return join26(cabaneDir(), "current");
+  return join27(cabaneDir(), "current");
 }
 function bootGuardPath() {
-  return join26(cabaneDir(), "boot-guard.mjs");
+  return join27(cabaneDir(), "boot-guard.mjs");
 }
 function versionPackageRoot(version) {
-  return join26(versionsDir(), version, "node_modules", "@cabane", "companion");
+  return join27(versionsDir(), version, "node_modules", "@cabane", "companion");
 }
 function ownPackageRoot(moduleUrl = import.meta.url) {
   return dirname11(dirname11(fileURLToPath7(moduleUrl)));
 }
 function packageVersion(root) {
   try {
-    const pkg2 = JSON.parse(readFileSync14(join26(root, "package.json"), "utf8"));
+    const pkg2 = JSON.parse(readFileSync14(join27(root, "package.json"), "utf8"));
     return typeof pkg2.version === "string" ? pkg2.version : null;
   } catch {
     return null;
@@ -13333,7 +13507,7 @@ function packageVersion(root) {
 function currentRoot() {
   try {
     const root = realpathSync7(currentLink());
-    return existsSync17(join26(root, "dist", "cli.js")) ? root : null;
+    return existsSync17(join27(root, "dist", "cli.js")) ? root : null;
   } catch {
     return null;
   }
@@ -13356,7 +13530,7 @@ function pruneVersions(keep) {
   const removed = [];
   for (const name of readdirSync6(dir2)) {
     if (keep.includes(name)) continue;
-    rmSync13(join26(dir2, name), { recursive: true, force: true });
+    rmSync13(join27(dir2, name), { recursive: true, force: true });
     removed.push(name);
   }
   return removed;
@@ -13375,7 +13549,7 @@ function compareVersions(a, b) {
 
 // src/update-state.ts
 import { mkdirSync as mkdirSync15, readFileSync as readFileSync15, renameSync as renameSync10, writeFileSync as writeFileSync10 } from "fs";
-import { dirname as dirname12, join as join27 } from "path";
+import { dirname as dirname12, join as join28 } from "path";
 import { z as z18 } from "zod";
 var resultSchema = z18.object({
   kind: z18.enum(["updated", "rolled_back", "failed"]),
@@ -13399,7 +13573,7 @@ var stateSchema = z18.object({
   failed: z18.object({ version: z18.string(), attempts: z18.number().int(), at: z18.string() }).optional()
 });
 function updateStatePath(dir2 = cabaneDir()) {
-  return join27(dir2, "update.json");
+  return join28(dir2, "update.json");
 }
 function readUpdateState(path = updateStatePath()) {
   try {
@@ -13448,7 +13622,7 @@ function rollBack(pending, reason, now = /* @__PURE__ */ new Date()) {
   return updateUpdateState((state) => rolledBackState(state, pending, reason, now));
 }
 function writeBootGuard(root = ownPackageRoot()) {
-  const built = join28(root, "dist", "boot-guard.js");
+  const built = join29(root, "dist", "boot-guard.js");
   if (!existsSync18(built)) return false;
   const target = bootGuardPath();
   mkdirSync16(dirname13(target), { recursive: true });
@@ -13488,17 +13662,17 @@ var runProcess = (command, args, opts = {}) => new Promise((resolve2) => {
 async function stageVersion(version, harnesses, deps = {}) {
   const run = deps.run ?? runProcess;
   const node = deps.execPath ?? process.execPath;
-  const target = join28(versionsDir(), version);
+  const target = join29(versionsDir(), version);
   const placed = versionPackageRoot(version);
   if (existsSync18(placed)) {
     if (!await verifyInstall(placed, version, harnesses, { run, execPath: node }))
       return { ok: true, root: placed };
   }
-  const npm = join28(dirname13(node), "npm");
+  const npm = join29(dirname13(node), "npm");
   if (!existsSync18(npm))
     return { ok: false, reason: `there is no npm beside Node at ${dirname13(node)}` };
   mkdirSync16(versionsDir(), { recursive: true });
-  const staging = join28(versionsDir(), `.${version}.staging-${process.pid}`);
+  const staging = join29(versionsDir(), `.${version}.staging-${process.pid}`);
   rmSync14(staging, { recursive: true, force: true });
   const installed = await run(
     npm,
@@ -13527,7 +13701,7 @@ async function stageVersion(version, harnesses, deps = {}) {
       return { ok: false, reason: `version ${version} isn't published yet`, unpublished: true };
     return { ok: false, reason: `npm couldn't install it: ${lastLine(installed.stderr)}` };
   }
-  const root = join28(staging, "node_modules", "@cabane", "companion");
+  const root = join29(staging, "node_modules", "@cabane", "companion");
   const verdict = await verifyInstall(root, version, harnesses, { run, execPath: node });
   if (verdict) {
     rmSync14(staging, { recursive: true, force: true });
@@ -13539,7 +13713,7 @@ async function stageVersion(version, harnesses, deps = {}) {
 }
 async function verifyInstall(root, version, harnesses, deps) {
   if (packageVersion(root) !== version) return `the installed package isn't version ${version}`;
-  const answered = await deps.run(deps.execPath, [join28(root, "dist", "bin.js"), "--version"], {
+  const answered = await deps.run(deps.execPath, [join29(root, "dist", "bin.js"), "--version"], {
     timeoutMs: 6e4,
     env: { ...process.env, CABANE_LAUNCH_SELF: "1" }
   });
@@ -13547,7 +13721,7 @@ async function verifyInstall(root, version, harnesses, deps) {
     return `it doesn't start: ${lastLine(answered.stderr) || "no version printed"}`;
   }
   if (harnesses.length === 0) return null;
-  const probed = await deps.run(deps.execPath, [join28(root, "dist", "postinstall.js"), "--json"], {
+  const probed = await deps.run(deps.execPath, [join29(root, "dist", "postinstall.js"), "--json"], {
     timeoutMs: 6e4
   });
   let resolutions = {};
@@ -15348,9 +15522,9 @@ function handleUncaught(log, err, origin) {
 
 // src/crash-marker.ts
 import { existsSync as existsSync19, mkdirSync as mkdirSync17, readFileSync as readFileSync16, rmSync as rmSync15, writeFileSync as writeFileSync11 } from "fs";
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 function crashMarkerPath() {
-  return join29(cabaneDir(), "last-error.json");
+  return join30(cabaneDir(), "last-error.json");
 }
 function recordCrash(rec) {
   try {
@@ -15370,7 +15544,7 @@ function clearCrash() {
 // src/stray-companion.ts
 import { spawnSync } from "child_process";
 import { readFileSync as readFileSync17 } from "fs";
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 var COMPANION_ENTRY = /@cabane\/companion\/|cabane-companion|(^|[\s/])cabane\s|\.cabane\/(versions|current|boot-guard)/;
 var START = /\sstart(\s|$)/;
 function companionStarts(psOutput) {
@@ -15387,7 +15561,7 @@ function companionStarts(psOutput) {
 }
 function stateDirOf(env) {
   const home = env.CABANE_COMPANION_HOME || env.HOME;
-  return home ? join30(home, ".cabane") : null;
+  return home ? join31(home, ".cabane") : null;
 }
 function envFromPsE(output, command) {
   const line = output.replace(/\n$/, "");