@cabane/companion 0.6.18 → 0.6.20

package/dist/runtime.js

@@ -309,14 +309,14 @@ function localAgentConfig(cfg, agent) {
   return map[agent.agentId] ?? map[agent.agentUsername] ?? map[`${agent.workspaceSlug}/${agent.agentUsername}`] ?? {};
 }
 function loadConfig() {
-  const path3 = configPath();
-  if (!existsSync(path3)) return null;
+  const path = configPath();
+  if (!existsSync(path)) return null;
   let raw;
   try {
-    raw = readFileSync(path3, "utf8");
+    raw = readFileSync(path, "utf8");
   } catch (err) {
     throw new ConfigError(
-      `couldn't read ${path3}: ${err instanceof Error ? err.message : String(err)}`
+      `couldn't read ${path}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
   if (raw.trim().length === 0) return null;
@@ -325,7 +325,7 @@ function loadConfig() {
     parsed = JSON.parse(raw);
   } catch (err) {
     throw new ConfigError(
-      `${path3} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`
+      `${path} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`
     );
   }
   const result = companionConfigSchema.safeParse(parsed);
@@ -333,30 +333,30 @@ function loadConfig() {
     const agentIssue = result.error.issues.find((i) => i.path[0] === "agents");
     if (agentIssue) {
       throw new ConfigError(
-        `${path3}: invalid "agents" config at \`${agentIssue.path.join(".")}\` \u2014 ${agentIssue.message}. Fix the agents block in the config and retry.`
+        `${path}: invalid "agents" config at \`${agentIssue.path.join(".")}\` \u2014 ${agentIssue.message}. Fix the agents block in the config and retry.`
       );
     }
     throw new ConfigError(
-      `${path3} is from an incompatible or older version of the companion, or was hand-edited. Run \`cabane-companion pair\` to re-pair, or \`cabane-companion logout --purge\` to reset.`
+      `${path} is from an incompatible or older version of the companion, or was hand-edited. Run \`cabane-companion pair\` to re-pair, or \`cabane-companion logout --purge\` to reset.`
     );
   }
   return result.data;
 }
 function saveConfig(cfg) {
-  const path3 = configPath();
-  mkdirSync(dirname(path3), { recursive: true });
+  const path = configPath();
+  mkdirSync(dirname(path), { recursive: true });
   try {
     chmodSync(cabaneDir(), 448);
   } catch {
   }
-  const tmp = `${path3}.${process.pid}.tmp`;
+  const tmp = `${path}.${process.pid}.tmp`;
   try {
     writeFileSync(tmp, JSON.stringify(cfg, null, 2) + "\n", { mode: 384 });
     try {
       chmodSync(tmp, 384);
     } catch {
     }
-    renameSync(tmp, path3);
+    renameSync(tmp, path);
   } catch (err) {
     try {
       rmSync(tmp, { force: true });
@@ -417,8 +417,8 @@ function consoleMessageFormat(log, messageKey) {
 var cached = null;
 function getLogger() {
   if (cached) return cached;
-  const path3 = companionLogPath();
-  mkdirSync2(dirname2(path3), { recursive: true });
+  const path = companionLogPath();
+  mkdirSync2(dirname2(path), { recursive: true });
   const streams = [];
   if (process.env.CABANE_COMPANION_DAEMON !== "1") {
     const consoleStream = pretty({
@@ -428,7 +428,7 @@ function getLogger() {
     });
     streams.push({ level: "info", stream: consoleStream });
   }
-  streams.push({ level: "debug", stream: createWriteStream(path3, { flags: "a" }) });
+  streams.push({ level: "debug", stream: createWriteStream(path, { flags: "a" }) });
   cached = pino({ level: "debug" }, pino.multistream(streams));
   return cached;
 }
@@ -807,12 +807,12 @@ function clampLimit(raw, fallback, max = 200) {
   if (!Number.isFinite(n) || n <= 0) return fallback;
   return Math.min(Math.floor(n), max);
 }
-function tailFile(path3, lines) {
-  if (!existsSync2(path3)) return [];
+function tailFile(path, lines) {
+  if (!existsSync2(path)) return [];
   const MAX_BYTES = 256 * 1024;
   let fd;
   try {
-    fd = openSync(path3, "r");
+    fd = openSync(path, "r");
     const size = fstatSync(fd).size;
     const start = Math.max(0, size - MAX_BYTES);
     const len = size - start;
@@ -1054,9 +1054,9 @@ function serialize(state) {
   return JSON.stringify(state, null, 2) + "\n";
 }
 function writeRuntimeState(state) {
-  const path3 = runtimePath();
+  const path = runtimePath();
   mkdirSync3(cabaneDir(), { recursive: true });
-  writeFileSync2(path3, serialize(state), "utf8");
+  writeFileSync2(path, serialize(state), "utf8");
 }
 function acquireRuntimeState(state) {
   const live = readLiveRuntimeState();
@@ -1076,15 +1076,15 @@ function acquireRuntimeState(state) {
   return { acquired: true };
 }
 function clearRuntimeState() {
-  const path3 = runtimePath();
-  if (existsSync3(path3)) rmSync2(path3, { force: true });
+  const path = runtimePath();
+  if (existsSync3(path)) rmSync2(path, { force: true });
 }
 function readLiveRuntimeState() {
-  const path3 = runtimePath();
-  if (!existsSync3(path3)) return null;
+  const path = runtimePath();
+  if (!existsSync3(path)) return null;
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync2(path3, "utf8"));
+    parsed = JSON.parse(readFileSync2(path, "utf8"));
   } catch {
     return null;
   }
@@ -1148,8 +1148,8 @@ var CabaneApi = class {
   // One HTTP attempt — no retry. Throws `ApiError` on a 4xx/5xx response and
   // rethrows transport errors (fetch reject) unchanged so the caller's retry
   // logic can classify them.
-  async attempt(method, path3, body, signal) {
-    const res = await fetch(`${this.base}${path3}`, {
+  async attempt(method, path, body, signal) {
+    const res = await fetch(`${this.base}${path}`, {
       method,
       headers: {
         Authorization: `Bearer ${this.opts.token}`,
@@ -1175,12 +1175,12 @@ var CabaneApi = class {
     }
     return parsed;
   }
-  async request(method, path3, body, opts = {}) {
+  async request(method, path, body, opts = {}) {
     const { signal, retry = false } = opts;
     const maxAttempts = retry ? RETRY_BACKOFF_MS.length + 1 : 1;
     for (let attempt = 1; ; attempt++) {
       try {
-        return await this.attempt(method, path3, body, signal);
+        return await this.attempt(method, path, body, signal);
       } catch (err) {
         if (attempt >= maxAttempts || signal?.aborted || !isRetryable(err)) throw err;
         await sleep(RETRY_BACKOFF_MS[attempt - 1], signal);
@@ -1206,9 +1206,9 @@ var CabaneApi = class {
   //     delivers it once the API returns. `(turnId, seq)` is the server's
   //     idempotency key, so a replay whose original POST's fate is unknown
   //     converges instead of duplicating.
-  async durableCommit(kind, path3, body, turnId, seq, signal) {
+  async durableCommit(kind, path, body, turnId, seq, signal) {
     try {
-      await this.request("POST", path3, body, {
+      await this.request("POST", path, body, {
         retry: true,
         ...signal ? { signal } : {}
       });
@@ -1217,7 +1217,7 @@ var CabaneApi = class {
       if (!outbox) throw err;
       if (signal?.aborted || isAbortError(err)) throw err;
       if (!isRetryable(err)) throw err;
-      outbox.persist({ enqueuedAt: Date.now(), turnId, seq, method: "POST", path: path3, body, kind });
+      outbox.persist({ enqueuedAt: Date.now(), turnId, seq, method: "POST", path, body, kind });
       this.opts.log?.warn(
         { kind, turnId, seq, err: err instanceof Error ? err.message : String(err) },
         "companion: commit queued to outbox after transient failure (will drain when the API returns)"
@@ -1369,12 +1369,12 @@ var CabaneApi = class {
   // left best-effort: it's lower-stakes and self-heals on the next turn, so it
   // stays a single-shot PATCH and is deliberately out of CT93's scope.
   setActiveRun(workspaceId, conversationId, agentId, body) {
-    const path3 = `/api/workspaces/${workspaceId}/conversations/${conversationId}/participants/agents/${agentId}/active-run`;
+    const path = `/api/workspaces/${workspaceId}/conversations/${conversationId}/participants/agents/${agentId}/active-run`;
     const touchesFlag = Object.prototype.hasOwnProperty.call(body, "activeRunStartedAt");
     if (touchesFlag && this.opts.outbox) {
-      return this.durableActiveRunWrite(path3, conversationId, agentId, body);
+      return this.durableActiveRunWrite(path, conversationId, agentId, body);
     }
-    return this.request("PATCH", path3, body);
+    return this.request("PATCH", path, body);
   }
   // CT93: send-or-enqueue for an active-run flag write, with last-writer-wins
   // across the (conversation, agent) pair. Mirrors `durableCommit`, with two
@@ -1388,11 +1388,11 @@ var CabaneApi = class {
   //     later and clobber the state we just wrote (the cross-turn race: turn N's
   //     queued clear vs. turn N+1's live set). Combined with persist-overwrites-
   //     by-key, this is the full last-writer-wins guarantee.
-  async durableActiveRunWrite(path3, conversationId, agentId, body) {
+  async durableActiveRunWrite(path, conversationId, agentId, body) {
     const outbox = this.opts.outbox;
     const key = activeRunOutboxKey(conversationId, agentId);
     try {
-      await this.request("PATCH", path3, body, { retry: true });
+      await this.request("PATCH", path, body, { retry: true });
       outbox?.remove(key, ACTIVE_RUN_OUTBOX_SEQ);
     } catch (err) {
       if (!outbox) throw err;
@@ -1405,7 +1405,7 @@ var CabaneApi = class {
         turnId: key,
         seq: ACTIVE_RUN_OUTBOX_SEQ,
         method: "PATCH",
-        path: path3,
+        path,
         body,
         kind: "active-run"
       });
@@ -1493,8 +1493,8 @@ var CabaneApi = class {
   // shared resolver the in-app path uses. Omitting it (older call sites) returns
   // the agent default — graceful degradation, no version coupling.
   getAgentSelf(conversationId) {
-    const path3 = conversationId ? `/api/agent/me?conversationId=${encodeURIComponent(conversationId)}` : `/api/agent/me`;
-    return this.request("GET", path3);
+    const path = conversationId ? `/api/agent/me?conversationId=${encodeURIComponent(conversationId)}` : `/api/agent/me`;
+    return this.request("GET", path);
   }
   // The companion fetches the triggering message body by listing the
   // conversation's messages and finding the one with `id === messageId`.
@@ -1549,8 +1549,8 @@ var DeviceApi = class {
   get base() {
     return this.opts.baseUrl.endsWith("/") ? this.opts.baseUrl.slice(0, -1) : this.opts.baseUrl;
   }
-  async request(method, path3, body) {
-    const res = await fetch(`${this.base}${path3}`, {
+  async request(method, path, body) {
+    const res = await fetch(`${this.base}${path}`, {
       method,
       headers: {
         Authorization: `Bearer ${this.opts.deviceToken}`,
@@ -1614,11 +1614,11 @@ function credentialsPath() {
 }
 var credentialStoreSchema = z3.record(z3.string(), z3.string());
 function load() {
-  const path3 = credentialsPath();
-  if (!existsSync4(path3)) return {};
+  const path = credentialsPath();
+  if (!existsSync4(path)) return {};
   let raw;
   try {
-    raw = readFileSync3(path3, "utf8");
+    raw = readFileSync3(path, "utf8");
   } catch {
     return {};
   }
@@ -1631,20 +1631,20 @@ function load() {
   }
 }
 function save(map) {
-  const path3 = credentialsPath();
-  mkdirSync4(dirname4(path3), { recursive: true });
+  const path = credentialsPath();
+  mkdirSync4(dirname4(path), { recursive: true });
   try {
     chmodSync2(cabaneDir(), 448);
   } catch {
   }
-  const tmp = `${path3}.${process.pid}.tmp`;
+  const tmp = `${path}.${process.pid}.tmp`;
   try {
     writeFileSync3(tmp, JSON.stringify(map, null, 2) + "\n", { mode: 384 });
     try {
       chmodSync2(tmp, 384);
     } catch {
     }
-    renameSync2(tmp, path3);
+    renameSync2(tmp, path);
   } catch (err) {
     try {
       rmSync3(tmp, { force: true });
@@ -1683,15 +1683,15 @@ function pathFor(workspaceId) {
   return join7(cabaneDir(), "cursors", encodeURIComponent(workspaceId));
 }
 function readCursor(workspaceId) {
-  const path3 = pathFor(workspaceId);
-  if (!existsSync5(path3)) return null;
-  const raw = readFileSync4(path3, "utf8").trim();
+  const path = pathFor(workspaceId);
+  if (!existsSync5(path)) return null;
+  const raw = readFileSync4(path, "utf8").trim();
   return raw.length > 0 ? raw : null;
 }
 function writeCursor(workspaceId, eventId) {
-  const path3 = pathFor(workspaceId);
+  const path = pathFor(workspaceId);
   mkdirSync5(join7(cabaneDir(), "cursors"), { recursive: true });
-  writeFileSync4(path3, eventId + "\n", "utf8");
+  writeFileSync4(path, eventId + "\n", "utf8");
 }
 
 // src/cursor-tracker.ts
@@ -1744,10 +1744,10 @@ function pathFor2(log, workspaceId) {
   return join8(dir(log), encodeURIComponent(workspaceId));
 }
 function readIds(log, workspaceId) {
-  const path3 = pathFor2(log, workspaceId);
-  if (!existsSync6(path3)) return [];
+  const path = pathFor2(log, workspaceId);
+  if (!existsSync6(path)) return [];
   try {
-    return readFileSync5(path3, "utf8").split("\n").map((s) => s.trim()).filter((s) => s.length > 0);
+    return readFileSync5(path, "utf8").split("\n").map((s) => s.trim()).filter((s) => s.length > 0);
   } catch {
     return [];
   }
@@ -1784,10 +1784,10 @@ function resumePathFor(workspaceId) {
 }
 function readResumeCounts(workspaceId) {
   const out = /* @__PURE__ */ new Map();
-  const path3 = resumePathFor(workspaceId);
-  if (!existsSync6(path3)) return out;
+  const path = resumePathFor(workspaceId);
+  if (!existsSync6(path)) return out;
   try {
-    for (const line of readFileSync5(path3, "utf8").split("\n")) {
+    for (const line of readFileSync5(path, "utf8").split("\n")) {
       const trimmed = line.trim();
       if (!trimmed) continue;
       const tab = trimmed.lastIndexOf("	");
@@ -4379,6 +4379,16 @@ function readMcpError(error) {
 }
 
 // packages/agent-runtime/src/codex/session.ts
+function fingerprintPrompt(prompt) {
+  let fnv = 2166136261;
+  let djb = 5381;
+  for (let i = 0; i < prompt.length; i += 1) {
+    const code = prompt.charCodeAt(i);
+    fnv = Math.imul(fnv ^ code, 16777619);
+    djb = Math.imul(djb, 33) + code | 0;
+  }
+  return `${prompt.length}.${(fnv >>> 0).toString(36)}.${(djb >>> 0).toString(36)}`;
+}
 function encodeSession3(state) {
   return JSON.stringify(state);
 }
@@ -4398,7 +4408,10 @@ function decideResume3(stored, currentCwd) {
   if (storedCwd !== (currentCwd ?? "")) {
     return { fresh: true, reason: "cwd_mismatch" };
   }
-  return { resume: state.threadId };
+  return {
+    resume: state.threadId,
+    promptFingerprint: typeof state.promptFingerprint === "string" ? state.promptFingerprint : null
+  };
 }
 
 // packages/agent-runtime/src/codex/loop.ts
@@ -4421,13 +4434,20 @@ async function* decodeCodexStream(events, ctx) {
     if (ctx.signal.aborted) return;
     if (ev.type === "thread.started") {
       const threadId = readThreadId(ev);
-      if (!sessionEmitted && threadId && threadId !== ctx.resumedThreadId) {
-        sessionEmitted = true;
-        yield {
-          type: "session",
-          state: encodeSession3({ threadId, cwd: ctx.cwd ?? "" }),
-          ...ctx.degraded ? { degraded: true } : {}
-        };
+      if (threadId && !sessionEmitted) {
+        const state = encodeSession3({
+          threadId,
+          cwd: ctx.cwd ?? "",
+          promptFingerprint: ctx.promptFingerprint ?? null
+        });
+        if (threadId !== ctx.resumedThreadId || state !== ctx.storedState) {
+          sessionEmitted = true;
+          yield {
+            type: "session",
+            state,
+            ...ctx.degraded ? { degraded: true } : {}
+          };
+        }
       }
       continue;
     }
@@ -4550,7 +4570,7 @@ function codexToolPolicy(policy) {
     networkAccessEnabled: policy.web
   };
 }
-var CODEX_REASONING_EFFORTS = ["minimal", "low", "medium", "high", "xhigh"];
+var CODEX_REASONING_EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultra"];
 var codexDialectSchema = z11.object({
   modelReasoningEffort: z11.enum(CODEX_REASONING_EFFORTS).optional()
 }).loose();
@@ -4572,7 +4592,7 @@ var CABANE_MCP_SERVER3 = "cabane";
 var TURN_CONTROL_MCP_SERVER2 = "cabane_companion";
 var ACTIVE_CONVERSATION_HEADER4 = "x-cabane-active-conversation";
 var ENV_ENVELOPE_KEYS = ["CABANE_ENV_TIER", "CABANE_ENV_KEY", "CABANE_ENV_BINDING"];
-function buildRunSpec2(req, resumeThreadId, instructionsFile = null) {
+function buildRunSpec2(req, resumeThreadId, instructionsFile = null, threadPromptFingerprint = null) {
   const { policy, config } = req;
   const directory = req.local.cwd ?? "";
   const dialect = readCodexDialect(config.runtimeOptions);
@@ -4583,6 +4603,9 @@ function buildRunSpec2(req, resumeThreadId, instructionsFile = null) {
       `[agent-runtime/codex] CT823: dispatching a subscription turn with NO concrete model (config.model=${JSON.stringify(config.model)}) \u2014 Codex will fall back to its own default. This should be unreachable post-CT823; the model resolver should have supplied a concrete house default.`
     );
   }
+  const promptFingerprint = fingerprintPrompt(req.systemPrompt);
+  const threadHasThisPrompt = resumeThreadId !== null && threadPromptFingerprint !== null && threadPromptFingerprint === promptFingerprint;
+  const promptRidesInput = baseInstructionsFile === null && !threadHasThisPrompt;
   return {
     resumeThreadId,
     directory,
@@ -4591,14 +4614,16 @@ function buildRunSpec2(req, resumeThreadId, instructionsFile = null) {
     skipGitRepoCheck: true,
     ...dialect.modelReasoningEffort ? { modelReasoningEffort: dialect.modelReasoningEffort } : {},
     baseInstructionsFile,
-    input: buildInput(req, baseInstructionsFile !== null),
+    input: buildInput(req, promptRidesInput),
+    promptRidesInput,
+    promptFingerprint,
     config: buildConfig(req, baseInstructionsFile)
   };
 }
-function buildInput(req, promptRidesInstructionsFile) {
+function buildInput(req, promptRidesInput) {
   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 (promptRidesInstructionsFile) return body;
+  if (!promptRidesInput) return body;
   const system = req.systemPrompt.trim();
   return system.length > 0 ? `${system}
 
@@ -4700,536 +4725,10 @@ function isStringRecord2(v) {
   return !!v && typeof v === "object" && Object.values(v).every((x) => typeof x === "string");
 }
 
-// node_modules/.pnpm/@openai+codex-sdk@0.146.0/node_modules/@openai/codex-sdk/dist/index.js
-import { promises as fs } from "fs";
-import os from "os";
-import path from "path";
-import { spawn as spawn4 } from "child_process";
-import { statSync } from "fs";
-import path2 from "path";
-import readline from "readline";
-import { createRequire } from "module";
-async function createOutputSchemaFile(schema) {
-  if (schema === void 0) {
-    return { cleanup: async () => {
-    } };
-  }
-  if (!isJsonObject(schema)) {
-    throw new Error("outputSchema must be a plain JSON object");
-  }
-  const schemaDir = await fs.mkdtemp(path.join(os.tmpdir(), "codex-output-schema-"));
-  const schemaPath = path.join(schemaDir, "schema.json");
-  const cleanup = async () => {
-    try {
-      await fs.rm(schemaDir, { recursive: true, force: true });
-    } catch {
-    }
-  };
-  try {
-    await fs.writeFile(schemaPath, JSON.stringify(schema), "utf8");
-    return { schemaPath, cleanup };
-  } catch (error) {
-    await cleanup();
-    throw error;
-  }
-}
-function isJsonObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-var Thread = class {
-  _exec;
-  _options;
-  _id;
-  _threadOptions;
-  /** Returns the ID of the thread. Populated after the first turn starts. */
-  get id() {
-    return this._id;
-  }
-  /* @internal */
-  constructor(exec, options, threadOptions, id = null) {
-    this._exec = exec;
-    this._options = options;
-    this._id = id;
-    this._threadOptions = threadOptions;
-  }
-  /** Provides the input to the agent and streams events as they are produced during the turn. */
-  async runStreamed(input, turnOptions = {}) {
-    return { events: this.runStreamedInternal(input, turnOptions) };
-  }
-  async *runStreamedInternal(input, turnOptions = {}) {
-    const { schemaPath, cleanup } = await createOutputSchemaFile(turnOptions.outputSchema);
-    const options = this._threadOptions;
-    const { prompt, images } = normalizeInput(input);
-    const generator = this._exec.run({
-      input: prompt,
-      baseUrl: this._options.baseUrl,
-      apiKey: this._options.apiKey,
-      threadId: this._id,
-      images,
-      model: options?.model,
-      sandboxMode: options?.sandboxMode,
-      workingDirectory: options?.workingDirectory,
-      skipGitRepoCheck: options?.skipGitRepoCheck,
-      outputSchemaFile: schemaPath,
-      modelReasoningEffort: options?.modelReasoningEffort,
-      signal: turnOptions.signal,
-      networkAccessEnabled: options?.networkAccessEnabled,
-      webSearchMode: options?.webSearchMode,
-      webSearchEnabled: options?.webSearchEnabled,
-      approvalPolicy: options?.approvalPolicy,
-      additionalDirectories: options?.additionalDirectories
-    });
-    try {
-      for await (const item of generator) {
-        let parsed;
-        try {
-          parsed = JSON.parse(item);
-        } catch (error) {
-          throw new Error(`Failed to parse item: ${item}`, { cause: error });
-        }
-        if (parsed.type === "thread.started") {
-          this._id = parsed.thread_id;
-        } else if (parsed.type === "turn.completed") {
-          parsed.usage.cache_write_input_tokens ??= 0;
-        }
-        yield parsed;
-      }
-    } finally {
-      await cleanup();
-    }
-  }
-  /** Provides the input to the agent and returns the completed turn. */
-  async run(input, turnOptions = {}) {
-    const generator = this.runStreamedInternal(input, turnOptions);
-    const items = [];
-    let finalResponse = "";
-    let usage = null;
-    let turnFailure = null;
-    for await (const event of generator) {
-      if (event.type === "item.completed") {
-        if (event.item.type === "agent_message") {
-          finalResponse = event.item.text;
-        }
-        items.push(event.item);
-      } else if (event.type === "turn.completed") {
-        usage = event.usage;
-      } else if (event.type === "turn.failed") {
-        turnFailure = event.error;
-        break;
-      }
-    }
-    if (turnFailure) {
-      throw new Error(turnFailure.message);
-    }
-    return { items, finalResponse, usage };
-  }
-};
-function normalizeInput(input) {
-  if (typeof input === "string") {
-    return { prompt: input, images: [] };
-  }
-  const promptParts = [];
-  const images = [];
-  for (const item of input) {
-    if (item.type === "text") {
-      promptParts.push(item.text);
-    } else if (item.type === "local_image") {
-      images.push(item.path);
-    }
-  }
-  return { prompt: promptParts.join("\n\n"), images };
-}
-var INTERNAL_ORIGINATOR_ENV = "CODEX_INTERNAL_ORIGINATOR_OVERRIDE";
-var TYPESCRIPT_SDK_ORIGINATOR = "codex_sdk_ts";
-var CODEX_NPM_NAME = "@openai/codex";
-var PLATFORM_PACKAGE_BY_TARGET = {
-  "x86_64-unknown-linux-musl": "@openai/codex-linux-x64",
-  "aarch64-unknown-linux-musl": "@openai/codex-linux-arm64",
-  "x86_64-apple-darwin": "@openai/codex-darwin-x64",
-  "aarch64-apple-darwin": "@openai/codex-darwin-arm64",
-  "x86_64-pc-windows-msvc": "@openai/codex-win32-x64",
-  "aarch64-pc-windows-msvc": "@openai/codex-win32-arm64"
-};
-var moduleRequire = createRequire(import.meta.url);
-var CodexExec = class {
-  executablePath;
-  pathDirs;
-  envOverride;
-  configOverrides;
-  constructor(executablePath = null, env, configOverrides) {
-    if (executablePath) {
-      this.executablePath = executablePath;
-      this.pathDirs = [];
-    } else {
-      const resolved = findCodexPath();
-      this.executablePath = resolved.executablePath;
-      this.pathDirs = resolved.pathDirs;
-    }
-    this.envOverride = env;
-    this.configOverrides = configOverrides;
-  }
-  async *run(args) {
-    const commandArgs = ["exec", "--experimental-json"];
-    if (this.configOverrides) {
-      for (const override of serializeConfigOverrides(this.configOverrides)) {
-        commandArgs.push("--config", override);
-      }
-    }
-    if (args.baseUrl) {
-      commandArgs.push(
-        "--config",
-        `openai_base_url=${toTomlValue(args.baseUrl, "openai_base_url")}`
-      );
-    }
-    if (args.model) {
-      commandArgs.push("--model", args.model);
-    }
-    if (args.sandboxMode) {
-      commandArgs.push("--sandbox", args.sandboxMode);
-    }
-    if (args.workingDirectory) {
-      commandArgs.push("--cd", args.workingDirectory);
-    }
-    if (args.additionalDirectories?.length) {
-      for (const dir2 of args.additionalDirectories) {
-        commandArgs.push("--add-dir", dir2);
-      }
-    }
-    if (args.skipGitRepoCheck) {
-      commandArgs.push("--skip-git-repo-check");
-    }
-    if (args.outputSchemaFile) {
-      commandArgs.push("--output-schema", args.outputSchemaFile);
-    }
-    if (args.modelReasoningEffort) {
-      commandArgs.push("--config", `model_reasoning_effort="${args.modelReasoningEffort}"`);
-    }
-    if (args.networkAccessEnabled !== void 0) {
-      commandArgs.push(
-        "--config",
-        `sandbox_workspace_write.network_access=${args.networkAccessEnabled}`
-      );
-    }
-    if (args.webSearchMode) {
-      commandArgs.push("--config", `web_search="${args.webSearchMode}"`);
-    } else if (args.webSearchEnabled === true) {
-      commandArgs.push("--config", `web_search="live"`);
-    } else if (args.webSearchEnabled === false) {
-      commandArgs.push("--config", `web_search="disabled"`);
-    }
-    if (args.approvalPolicy) {
-      commandArgs.push("--config", `approval_policy="${args.approvalPolicy}"`);
-    }
-    if (args.threadId) {
-      commandArgs.push("resume", args.threadId);
-    }
-    if (args.images?.length) {
-      for (const image of args.images) {
-        commandArgs.push("--image", image);
-      }
-    }
-    const env = {};
-    if (this.envOverride) {
-      Object.assign(env, this.envOverride);
-    } else {
-      for (const [key, value] of Object.entries(process.env)) {
-        if (value !== void 0) {
-          env[key] = value;
-        }
-      }
-    }
-    if (!env[INTERNAL_ORIGINATOR_ENV]) {
-      env[INTERNAL_ORIGINATOR_ENV] = TYPESCRIPT_SDK_ORIGINATOR;
-    }
-    if (args.apiKey) {
-      env.CODEX_API_KEY = args.apiKey;
-    }
-    if (this.pathDirs.length > 0) {
-      prependPathDirs(env, this.pathDirs);
-    }
-    const child = spawn4(this.executablePath, commandArgs, {
-      env,
-      signal: args.signal
-    });
-    let spawnError = null;
-    child.once("error", (err) => spawnError = err);
-    if (!child.stdin) {
-      child.kill();
-      throw new Error("Child process has no stdin");
-    }
-    child.stdin.write(args.input);
-    child.stdin.end();
-    if (!child.stdout) {
-      child.kill();
-      throw new Error("Child process has no stdout");
-    }
-    const stderrChunks = [];
-    if (child.stderr) {
-      child.stderr.on("data", (data) => {
-        stderrChunks.push(data);
-      });
-    }
-    const exitPromise = new Promise(
-      (resolve) => {
-        child.once("exit", (code, signal) => {
-          resolve({ code, signal });
-        });
-      }
-    );
-    const rl = readline.createInterface({
-      input: child.stdout,
-      crlfDelay: Infinity
-    });
-    try {
-      for await (const line of rl) {
-        yield line;
-      }
-      if (spawnError) throw spawnError;
-      const { code, signal } = await exitPromise;
-      if (code !== 0 || signal) {
-        const stderrBuffer = Buffer.concat(stderrChunks);
-        const detail = signal ? `signal ${signal}` : `code ${code ?? 1}`;
-        throw new Error(`Codex Exec exited with ${detail}: ${stderrBuffer.toString("utf8")}`);
-      }
-    } finally {
-      rl.close();
-      child.removeAllListeners();
-      try {
-        if (!child.killed) child.kill();
-      } catch {
-      }
-    }
-  }
-};
-function serializeConfigOverrides(configOverrides) {
-  const overrides = [];
-  flattenConfigOverrides(configOverrides, "", overrides);
-  return overrides;
-}
-function flattenConfigOverrides(value, prefix, overrides) {
-  if (!isPlainObject(value)) {
-    if (prefix) {
-      overrides.push(`${prefix}=${toTomlValue(value, prefix)}`);
-      return;
-    } else {
-      throw new Error("Codex config overrides must be a plain object");
-    }
-  }
-  const entries = Object.entries(value);
-  if (!prefix && entries.length === 0) {
-    return;
-  }
-  if (prefix && entries.length === 0) {
-    overrides.push(`${prefix}={}`);
-    return;
-  }
-  for (const [key, child] of entries) {
-    if (!key) {
-      throw new Error("Codex config override keys must be non-empty strings");
-    }
-    if (child === void 0) {
-      continue;
-    }
-    const path3 = prefix ? `${prefix}.${key}` : key;
-    if (isPlainObject(child)) {
-      flattenConfigOverrides(child, path3, overrides);
-    } else {
-      overrides.push(`${path3}=${toTomlValue(child, path3)}`);
-    }
-  }
-}
-function toTomlValue(value, path3) {
-  if (typeof value === "string") {
-    return JSON.stringify(value);
-  } else if (typeof value === "number") {
-    if (!Number.isFinite(value)) {
-      throw new Error(`Codex config override at ${path3} must be a finite number`);
-    }
-    return `${value}`;
-  } else if (typeof value === "boolean") {
-    return value ? "true" : "false";
-  } else if (Array.isArray(value)) {
-    const rendered = value.map((item, index) => toTomlValue(item, `${path3}[${index}]`));
-    return `[${rendered.join(", ")}]`;
-  } else if (isPlainObject(value)) {
-    const parts = [];
-    for (const [key, child] of Object.entries(value)) {
-      if (!key) {
-        throw new Error("Codex config override keys must be non-empty strings");
-      }
-      if (child === void 0) {
-        continue;
-      }
-      parts.push(`${formatTomlKey(key)} = ${toTomlValue(child, `${path3}.${key}`)}`);
-    }
-    return `{${parts.join(", ")}}`;
-  } else if (value === null) {
-    throw new Error(`Codex config override at ${path3} cannot be null`);
-  } else {
-    const typeName = typeof value;
-    throw new Error(`Unsupported Codex config override value at ${path3}: ${typeName}`);
-  }
-}
-var TOML_BARE_KEY = /^[A-Za-z0-9_-]+$/;
-function formatTomlKey(key) {
-  return TOML_BARE_KEY.test(key) ? key : JSON.stringify(key);
-}
-function isPlainObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function findCodexPath() {
-  const { platform, arch } = process;
-  let targetTriple = null;
-  switch (platform) {
-    case "linux":
-    case "android":
-      switch (arch) {
-        case "x64":
-          targetTriple = "x86_64-unknown-linux-musl";
-          break;
-        case "arm64":
-          targetTriple = "aarch64-unknown-linux-musl";
-          break;
-        default:
-          break;
-      }
-      break;
-    case "darwin":
-      switch (arch) {
-        case "x64":
-          targetTriple = "x86_64-apple-darwin";
-          break;
-        case "arm64":
-          targetTriple = "aarch64-apple-darwin";
-          break;
-        default:
-          break;
-      }
-      break;
-    case "win32":
-      switch (arch) {
-        case "x64":
-          targetTriple = "x86_64-pc-windows-msvc";
-          break;
-        case "arm64":
-          targetTriple = "aarch64-pc-windows-msvc";
-          break;
-        default:
-          break;
-      }
-      break;
-    default:
-      break;
-  }
-  if (!targetTriple) {
-    throw new Error(`Unsupported platform: ${platform} (${arch})`);
-  }
-  const platformPackage = PLATFORM_PACKAGE_BY_TARGET[targetTriple];
-  if (!platformPackage) {
-    throw new Error(`Unsupported target triple: ${targetTriple}`);
-  }
-  let vendorRoot;
-  try {
-    const codexPackageJsonPath = moduleRequire.resolve(`${CODEX_NPM_NAME}/package.json`);
-    const codexRequire = createRequire(codexPackageJsonPath);
-    const platformPackageJsonPath = codexRequire.resolve(`${platformPackage}/package.json`);
-    vendorRoot = path2.join(path2.dirname(platformPackageJsonPath), "vendor");
-  } catch {
-    throw new Error(
-      `Unable to locate Codex CLI binaries. Ensure ${CODEX_NPM_NAME} is installed with optional dependencies.`
-    );
-  }
-  const codexBinaryName = process.platform === "win32" ? "codex.exe" : "codex";
-  const nativePackage = resolveNativePackage(vendorRoot, targetTriple, codexBinaryName);
-  if (!nativePackage) {
-    throw new Error(
-      `Unable to locate Codex CLI binaries for ${targetTriple}. Ensure ${CODEX_NPM_NAME} is installed with optional dependencies.`
-    );
-  }
-  return nativePackage;
-}
-function resolveNativePackage(vendorRoot, targetTriple, codexBinaryName) {
-  const packageRoot = path2.join(vendorRoot, targetTriple);
-  const packageBinaryPath = path2.join(packageRoot, "bin", codexBinaryName);
-  if (isFile(packageBinaryPath) && isFile(path2.join(packageRoot, "codex-package.json"))) {
-    return {
-      executablePath: packageBinaryPath,
-      pathDirs: existingDirs(path2.join(packageRoot, "codex-path"))
-    };
-  }
-  const legacyBinaryPath = path2.join(packageRoot, "codex", codexBinaryName);
-  if (isFile(legacyBinaryPath)) {
-    return {
-      executablePath: legacyBinaryPath,
-      pathDirs: existingDirs(path2.join(packageRoot, "path"))
-    };
-  }
-  return null;
-}
-function existingDirs(...dirs) {
-  return dirs.filter(isDirectory);
-}
-function prependPathDirs(env, pathDirs, platform = process.platform) {
-  const pathKey = pathEnvKey(env, platform);
-  if (platform === "win32") {
-    for (const key of Object.keys(env)) {
-      if (key.toLowerCase() === "path" && key !== pathKey) {
-        delete env[key];
-      }
-    }
-  }
-  const existingEntries = (env[pathKey] ?? "").split(path2.delimiter).filter((entry) => entry.length > 0 && !pathDirs.includes(entry));
-  env[pathKey] = [...pathDirs, ...existingEntries].join(path2.delimiter);
-}
-function pathEnvKey(env, platform) {
-  if (platform !== "win32") {
-    return "PATH";
-  }
-  const matchingKeys = Object.keys(env).filter((key) => key.toLowerCase() === "path");
-  return matchingKeys.includes("Path") ? "Path" : matchingKeys.at(-1) ?? "PATH";
-}
-function isFile(filePath) {
-  try {
-    return statSync(filePath).isFile();
-  } catch {
-    return false;
-  }
-}
-function isDirectory(filePath) {
-  try {
-    return statSync(filePath).isDirectory();
-  } catch {
-    return false;
-  }
-}
-var Codex = class {
-  exec;
-  options;
-  constructor(options = {}) {
-    const { codexPathOverride, env, config } = options;
-    this.exec = new CodexExec(codexPathOverride, env, config);
-    this.options = options;
-  }
-  /**
-   * Starts a new conversation with an agent.
-   * @returns A new thread instance.
-   */
-  startThread(options = {}) {
-    return new Thread(this.exec, this.options, options);
-  }
-  /**
-   * Resumes a conversation with an agent based on the thread id.
-   * Threads are persisted in ~/.codex/sessions.
-   *
-   * @param id The id of the thread to resume.
-   * @returns A new thread instance.
-   */
-  resumeThread(id, options = {}) {
-    return new Thread(this.exec, this.options, options, id);
-  }
-};
-
 // packages/agent-runtime/src/codex/transport.ts
+import {
+  Codex
+} from "@openai/codex-sdk";
 function buildSdkThreadOptions(spec) {
   return {
     ...spec.model ? { model: spec.model } : {},
@@ -5283,6 +4782,7 @@ 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;
       if ("fresh" in decision && decision.reason === "cwd_mismatch") {
         deps.onWarn?.(
           "codex adapter: stored session directory no longer matches the current environment \u2014 starting a fresh thread (SJ527-analogue guard)",
@@ -5308,7 +4808,12 @@ function createCodexAdapter(deps = {}) {
         }
       }
       try {
-        const spec = buildRunSpec2(req, resumeThreadId, instructions?.path ?? null);
+        const spec = buildRunSpec2(
+          req,
+          resumeThreadId,
+          instructions?.path ?? null,
+          threadPromptFingerprint
+        );
         const result = await transport.run(spec, signal);
         if (signal.aborted) return;
         yield* decodeCodexStream(result.events, {
@@ -5316,6 +4821,14 @@ function createCodexAdapter(deps = {}) {
           cwd: req.local.cwd,
           resumedThreadId: resumeThreadId,
           degraded,
+          // CT1075: which prompt the thread carries once this turn lands. If we sent
+          // one, it's that one — a later copy is what the model reads, so a changed
+          // prompt supersedes the older copy still sitting above it. If we withheld
+          // it, the thread still carries whatever it did before. Read off the spec
+          // rather than recomputed, so the recorded fact can't disagree with what
+          // was actually sent.
+          promptFingerprint: spec.promptRidesInput ? spec.promptFingerprint : threadPromptFingerprint,
+          storedState: req.session,
           // CT601: Codex reports no model in-stream, so record what the thread was
           // started with (null on the default token). Same for the reasoning effort.
           resolvedModel: spec.model,
@@ -5350,9 +4863,10 @@ var COMPANION_POLICY2 = {
   uiPrompts: "never"
 };
 var DIR2 = "/env/here";
+var PROMPT = "system";
 function makeRequest3(overrides = {}) {
   return {
-    systemPrompt: "system",
+    systemPrompt: PROMPT,
     prompt: "hi there",
     content: [{ type: "text", text: "hi there" }],
     // CT601: the resolved model + reasoning effort ride the terminal `result` off
@@ -5395,9 +4909,9 @@ var errorItem = (id, message) => ({
   type: "item.completed",
   item: { id, type: "error", message }
 });
-var sessionEvent3 = (threadId, cwd = DIR2, degraded = false) => ({
+var sessionEvent3 = (threadId, cwd = DIR2, degraded = false, promptFingerprint = fingerprintPrompt(PROMPT)) => ({
   type: "session",
-  state: encodeSession3({ threadId, cwd }),
+  state: encodeSession3({ threadId, cwd, promptFingerprint }),
   ...degraded ? { degraded: true } : {}
 });
 var CODEX_CONFORMANCE_FIXTURES = [
@@ -5855,23 +5369,91 @@ var CODEX_CONFORMANCE_FIXTURES = [
   {
     // Session resume: the stored state matches the current directory, so the adapter
     // resumes its thread id and `thread.started` echoes the SAME id — NO session
-    // event fires (the id didn't change). This is what carries cross-turn memory.
+    // event fires (the id didn't change AND the state is unchanged). This is what
+    // carries cross-turn memory.
+    //
+    // CT1075: the stored state also says the thread already holds the composed
+    // prompt, so this turn withholds the preamble and the state it would write is
+    // byte-identical to the stored one. The silence is now proof of BOTH: an id that
+    // didn't change and a prompt that didn't need re-sending.
     name: "session resume (no re-emit on echo)",
-    request: makeRequest3({ session: encodeSession3({ threadId: "th1", cwd: DIR2 }) }),
+    request: makeRequest3({
+      session: encodeSession3({
+        threadId: "th1",
+        cwd: DIR2,
+        promptFingerprint: fingerprintPrompt(PROMPT)
+      })
+    }),
     nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
     expected: [
       { type: "text", body: "Back again.", terminal: true },
       { type: "result", ok: true }
     ]
   },
+  {
+    // CT1075: a resumed thread the platform's state does NOT vouch for — a state
+    // written before CT1075 existed, so it carries no `promptFingerprint` field. The
+    // adapter reads the absence as "we can't say which prompt this thread holds",
+    // sends the full prompt exactly as it did pre-CT1075, and re-emits the state with
+    // the fingerprint recorded — on the SAME thread id, which pre-CT1075 emitted
+    // nothing at all. That re-emit is the upgrade path: without it a long-lived
+    // thread would re-send the whole prompt forever.
+    //
+    // This is the fixture that fails if the static half is withheld on a thread we
+    // have no evidence about.
+    name: "session resume with a pre-CT1075 state re-emits with the prompt fingerprint",
+    request: makeRequest3({
+      session: JSON.stringify({ threadId: "th1", cwd: DIR2 })
+    }),
+    nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
+    expected: [
+      sessionEvent3("th1"),
+      { type: "text", body: "Back again.", terminal: true },
+      { type: "result", ok: true }
+    ]
+  },
+  {
+    // CT1075 (review finding): the thread carries a DIFFERENT prompt than the one
+    // this turn composed — a charter edit, a renamed agent, a redeployed prompt
+    // body. The stored fingerprint doesn't match, so the new prompt is sent exactly
+    // as on a fresh thread and the state is re-recorded against it.
+    //
+    // This is the fixture that fails if a stale prompt is treated as good enough. A
+    // boolean flag would have passed the resume fixture above and silently withheld
+    // every future charter edit from this thread.
+    name: "session resume with a stale prompt fingerprint re-sends the prompt",
+    request: makeRequest3({
+      session: encodeSession3({
+        threadId: "th1",
+        cwd: DIR2,
+        promptFingerprint: fingerprintPrompt("an older composed prompt")
+      })
+    }),
+    nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
+    expected: [
+      sessionEvent3("th1"),
+      { type: "text", body: "Back again.", terminal: true },
+      { type: "result", ok: true }
+    ]
+  },
   {
     // Directory-mismatch degrade (the SJ527 analogue): the stored state was created
     // under a DIFFERENT directory, so the adapter refuses to resume and starts
     // fresh — `thread.started` reports a NEW id, and the emitted session event
     // records the CURRENT directory with `degraded: true` so the host rewinds the
     // catch-up mark.
+    //
+    // CT1075: the refused resume means the new thread is EMPTY, so the full prompt
+    // goes in even though the stored state vouched for a copy — of a thread we're
+    // no longer in. The emitted state records the fresh thread's own answer.
     name: "session directory-mismatch degrades to fresh",
-    request: makeRequest3({ session: encodeSession3({ threadId: "old", cwd: "/env/gone" }) }),
+    request: makeRequest3({
+      session: encodeSession3({
+        threadId: "old",
+        cwd: "/env/gone",
+        promptFingerprint: fingerprintPrompt(PROMPT)
+      })
+    }),
     nativeStream: [
       threadStarted(NEW_THREAD_ID),
       agentMessage("m1", "Fresh start."),
@@ -5938,7 +5520,7 @@ var ConnectorHealthStore = class {
 
 // src/dispatcher.ts
 import { randomUUID } from "crypto";
-import { appendFileSync as appendFileSync2, existsSync as existsSync9, mkdirSync as mkdirSync9, statSync as statSync2 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync9, mkdirSync as mkdirSync9, statSync } from "fs";
 import { join as join13 } from "path";
 
 // src/summon.ts
@@ -6237,9 +5819,16 @@ function buildCompanionTurnRequest(params) {
       ...t.workspaceToolSurface ? { workspaceToolSurface: t.workspaceToolSurface } : {},
       // CT714: mount the turn-control surface ONLY when a real turn token backs
       // this turn — the surface admits `turn_token` auth exclusively, so a
-      // PAT-fallback bearer (older API / unresolved delegation) would be rejected
-      // there. Absent it, external adapters simply don't mount it that turn (the
-      // same graceful degrade as the rest of the OBO path).
+      // PAT-fallback bearer would be rejected there. Absent it, external adapters
+      // simply don't mount it that turn.
+      //
+      // CT1074: that fallback is now an OLD-API case only. The server mints a token
+      // for every turn it dispatched, so "no token" no longer means "no human behind
+      // the turn" — it means the API predates this change. The condition is right as
+      // it stands and stays where the failure is honest (a rejected bearer is worse
+      // than an unmounted server); what was wrong was upstream, where an undelegated
+      // turn minted nothing and this silently dropped all five verbs on Codex and
+      // opencode with no refusal anyone could see.
       ...params.turnToken ? { turnControlUrl: turnControlMcpUrl(params.baseUrl) } : {}
     },
     local: {
@@ -6269,10 +5858,10 @@ import { join as join9 } from "path";
 var PREFIX = "cabane-codex-instructions-";
 async function writeCodexInstructionsFile(contents) {
   const dir2 = await mkdtemp(join9(tmpdir(), PREFIX));
-  const path3 = join9(dir2, "instructions.md");
-  await writeFile(path3, contents, { encoding: "utf8", mode: 384 });
+  const path = join9(dir2, "instructions.md");
+  await writeFile(path, contents, { encoding: "utf8", mode: 384 });
   return {
-    path: path3,
+    path,
     cleanup: async () => {
       await rm(dir2, { recursive: true, force: true });
     }
@@ -6292,10 +5881,10 @@ function pathFor3(workspaceId, conversationId, agentId) {
   return join10(conversationDir(workspaceId, conversationId), `${encodeURIComponent(agentId)}.json`);
 }
 function readPrepared(workspaceId, conversationId, agentId) {
-  const path3 = pathFor3(workspaceId, conversationId, agentId);
-  if (!existsSync7(path3)) return null;
+  const path = pathFor3(workspaceId, conversationId, agentId);
+  if (!existsSync7(path)) return null;
   try {
-    const parsed = JSON.parse(readFileSync6(path3, "utf8"));
+    const parsed = JSON.parse(readFileSync6(path, "utf8"));
     if (parsed && typeof parsed.cwd === "string" && parsed.cwd.length > 0) {
       return {
         cwd: parsed.cwd,
@@ -6329,14 +5918,14 @@ function secretsPath() {
 }
 var secretStoreSchema = z13.record(z13.string(), z13.string());
 function loadSecretStore() {
-  const path3 = secretsPath();
-  if (!existsSync8(path3)) return makeStore({});
+  const path = secretsPath();
+  if (!existsSync8(path)) return makeStore({});
   let raw;
   try {
-    raw = readFileSync7(path3, "utf8");
+    raw = readFileSync7(path, "utf8");
   } catch (err) {
     throw new ConfigError(
-      `couldn't read ${path3}: ${err instanceof Error ? err.message : String(err)}`
+      `couldn't read ${path}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
   if (raw.trim().length === 0) return makeStore({});
@@ -6345,13 +5934,13 @@ function loadSecretStore() {
     parsed = JSON.parse(raw);
   } catch (err) {
     throw new ConfigError(
-      `${path3} is not valid JSON: ${err instanceof Error ? err.message : String(err)}. It must be a flat object of "NAME": "value" secret pairs.`
+      `${path} is not valid JSON: ${err instanceof Error ? err.message : String(err)}. It must be a flat object of "NAME": "value" secret pairs.`
     );
   }
   const result = secretStoreSchema.safeParse(parsed);
   if (!result.success) {
     throw new ConfigError(
-      `${path3} must be a flat object mapping secret names to string values (e.g. { "GITHUB_TOKEN": "ghp_\u2026" }).`
+      `${path} must be a flat object mapping secret names to string values (e.g. { "GITHUB_TOKEN": "ghp_\u2026" }).`
     );
   }
   return makeStore(result.data);
@@ -6787,7 +6376,7 @@ function checkoutState(cwd) {
   if (!existsSync9(gitPath)) return { ok: false, reason: `${cwd} holds no git metadata` };
   let stat;
   try {
-    stat = statSync2(gitPath);
+    stat = statSync(gitPath);
   } catch (error) {
     return { ok: false, reason: `${gitPath} is unreadable (${error.message})` };
   }
@@ -8218,8 +7807,8 @@ function sleep2(ms) {
 }
 
 // src/version.ts
-import { createRequire as createRequire2 } from "module";
-var pkg = createRequire2(import.meta.url)("../package.json");
+import { createRequire } from "module";
+var pkg = createRequire(import.meta.url)("../package.json");
 var COMPANION_VERSION = pkg.version;
 
 // src/supervisor.ts
@@ -9023,9 +8612,9 @@ var CompanionSupervisor = class {
 };
 function defaultReexec() {
   clearRuntimeState();
-  void import("child_process").then(({ spawn: spawn5 }) => {
+  void import("child_process").then(({ spawn: spawn4 }) => {
     try {
-      const child = spawn5(process.execPath, process.argv.slice(1), {
+      const child = spawn4(process.execPath, process.argv.slice(1), {
         stdio: "inherit",
         detached: false
       });
@@ -9109,8 +8698,8 @@ function recordCrash(rec) {
 }
 function clearCrash() {
   try {
-    const path3 = crashMarkerPath();
-    if (existsSync11(path3)) rmSync7(path3, { force: true });
+    const path = crashMarkerPath();
+    if (existsSync11(path)) rmSync7(path, { force: true });
   } catch {
   }
 }