@cabane/companion 0.6.104 → 0.6.106

package/dist/cli.js

@@ -2858,7 +2858,11 @@ function turnFailureCopy(reason, runtime) {
 var LEASE_REFUSALS = /* @__PURE__ */ new Set([
   "dispatch_not_admitted",
   "turn_already_ended",
-  "turn_belongs_elsewhere"
+  "turn_belongs_elsewhere",
+  // Rooms: the context this start was composed from named an attempt the
+  // lease no longer picks (midnight rolled it, a degrade retired it). Nothing
+  // was granted; the turn recomposes its context and starts again, once.
+  "dispatch_context_stale"
 ]);
 function apiErrorCode(err) {
   if (!(err instanceof ApiError)) return null;
@@ -7135,6 +7139,67 @@ function isStringRecord2(v) {
 import {
   Codex
 } from "@openai/codex-sdk";
+
+// packages/agent-runtime/src/codex/config-overrides.ts
+var TOML_BARE_KEY = /^[A-Za-z0-9_-]+$/;
+function formatKey(key) {
+  return TOML_BARE_KEY.test(key) ? key : JSON.stringify(key);
+}
+function isTable(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function tomlValue(value, path) {
+  if (typeof value === "string") return JSON.stringify(value);
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      throw new Error(`Codex config override at ${path} must be a finite number`);
+    }
+    return `${value}`;
+  }
+  if (typeof value === "boolean") return value ? "true" : "false";
+  if (Array.isArray(value)) {
+    return `[${value.map((item, i) => tomlValue(item, `${path}[${i}]`)).join(", ")}]`;
+  }
+  if (isTable(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(`${formatKey(key)} = ${tomlValue(child, `${path}.${key}`)}`);
+    }
+    return `{${parts.join(", ")}}`;
+  }
+  throw new Error(`Codex config override at ${path} has an unsupported type`);
+}
+function walk(table, prefix, out) {
+  const entries = Object.entries(table).filter(([, child]) => child !== void 0);
+  if (entries.length === 0) {
+    if (prefix) out.push(`${prefix}={}`);
+    return;
+  }
+  for (const [key] of entries) {
+    if (!key) throw new Error("Codex config override keys must be non-empty strings");
+  }
+  if (entries.some(([key]) => !TOML_BARE_KEY.test(key))) {
+    if (!prefix) {
+      throw new Error("Codex config override has a non-bare key at the root");
+    }
+    out.push(`${prefix}=${tomlValue(Object.fromEntries(entries), prefix)}`);
+    return;
+  }
+  for (const [key, child] of entries) {
+    const path = prefix ? `${prefix}.${key}` : key;
+    if (isTable(child)) walk(child, path, out);
+    else out.push(`${path}=${tomlValue(child, path)}`);
+  }
+}
+function buildConfigOverrides(config) {
+  const out = [];
+  walk(config, "", out);
+  return out;
+}
+
+// packages/agent-runtime/src/codex/transport.ts
 function buildSdkThreadOptions(spec) {
   return {
     ...spec.model ? { model: spec.model } : {},
@@ -7151,11 +7216,17 @@ function createSdkCodexTransport(opts = {}) {
       const codexOptions = {
         ...opts.apiKey ? { apiKey: opts.apiKey } : {},
         ...opts.codexPathOverride ? { codexPathOverride: opts.codexPathOverride } : {},
-        // The `--config` overrides (MCP servers + rmcp flag). Cast at the SDK
-        // boundary — `CodexConfig` is a TOML-shaped plain object the SDK flattens
-        // to dotted `--config key=value` flags (verified against the SDK's
-        // `serializeConfigOverrides`).
-        config: spec.config
+        // The `--config` overrides (MCP servers + rmcp flag). CT1501: rendered to
+        // finished `--config` strings by US and passed through `configOverrides`,
+        // the SDK's raw passthrough — NOT through `config`, which would flatten
+        // them itself. A user MCP server named `my.server` cannot go in an
+        // override's dotted path at all (the CLI splits the path on `.` and
+        // ignores TOML quoting), so it has to ride inside an inline-table value,
+        // and the SDK's flattener cannot be steered into producing one. This is
+        // also what makes the PUBLISHED companion correct, where the vendored
+        // patch never reached — and why that patch is gone. See
+        // `config-overrides.ts`.
+        configOverrides: buildConfigOverrides(spec.config)
       };
       const codex = new Codex(codexOptions);
       const threadOptions = buildSdkThreadOptions(spec);
@@ -9371,6 +9442,8 @@ var TurnExecution = class {
   // so every exit after this point must settle THE SPAN, not just clear the
   // participant flag.
   admitted = false;
+  // Rooms: one recompose per turn when the lease refuses a stale context.
+  recomposedForLease = false;
   concluded(reason, errorReason) {
     return new TurnConcluded(reason, errorReason);
   }
@@ -9689,9 +9762,18 @@ var TurnExecution = class {
         // and settle moves the cursor to it. Omitted when the server sent
         // none (an older API), so the cursor stays where it was.
         ...this.turnContext.readThrough !== void 0 ? { readThrough: this.turnContext.readThrough } : {},
-        ...this.turnContext.readRevision !== void 0 ? { readRevision: this.turnContext.readRevision } : {}
+        ...this.turnContext.readRevision !== void 0 ? { readRevision: this.turnContext.readRevision } : {},
+        // Rooms: the attempt this request's session belongs to (null = fresh).
+        ...this.turnContext.attemptId !== void 0 ? { attemptId: this.turnContext.attemptId } : {}
       });
     } catch (err) {
+      if (leaseRefusal(err) === "dispatch_context_stale" && !this.recomposedForLease) {
+        this.recomposedForLease = true;
+        turnLog.info({ turnId }, "dispatcher: lease found the context stale; recomposing");
+        await this.fetchContext();
+        this.buildRequest();
+        return this.acquireLease();
+      }
       const refusal = leaseRefusal(err);
       if (refusal === "dispatch_not_admitted" || refusal === "turn_already_ended") {
         turnLog.debug(

package/dist/runtime.js

@@ -2192,7 +2192,11 @@ function turnFailureCopy(reason, runtime) {
 var LEASE_REFUSALS = /* @__PURE__ */ new Set([
   "dispatch_not_admitted",
   "turn_already_ended",
-  "turn_belongs_elsewhere"
+  "turn_belongs_elsewhere",
+  // Rooms: the context this start was composed from named an attempt the
+  // lease no longer picks (midnight rolled it, a degrade retired it). Nothing
+  // was granted; the turn recomposes its context and starts again, once.
+  "dispatch_context_stale"
 ]);
 function apiErrorCode(err) {
   if (!(err instanceof ApiError)) return null;
@@ -6548,6 +6552,67 @@ function isStringRecord2(v) {
 import {
   Codex
 } from "@openai/codex-sdk";
+
+// packages/agent-runtime/src/codex/config-overrides.ts
+var TOML_BARE_KEY = /^[A-Za-z0-9_-]+$/;
+function formatKey(key) {
+  return TOML_BARE_KEY.test(key) ? key : JSON.stringify(key);
+}
+function isTable(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function tomlValue(value, path) {
+  if (typeof value === "string") return JSON.stringify(value);
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      throw new Error(`Codex config override at ${path} must be a finite number`);
+    }
+    return `${value}`;
+  }
+  if (typeof value === "boolean") return value ? "true" : "false";
+  if (Array.isArray(value)) {
+    return `[${value.map((item, i) => tomlValue(item, `${path}[${i}]`)).join(", ")}]`;
+  }
+  if (isTable(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(`${formatKey(key)} = ${tomlValue(child, `${path}.${key}`)}`);
+    }
+    return `{${parts.join(", ")}}`;
+  }
+  throw new Error(`Codex config override at ${path} has an unsupported type`);
+}
+function walk(table, prefix, out) {
+  const entries = Object.entries(table).filter(([, child]) => child !== void 0);
+  if (entries.length === 0) {
+    if (prefix) out.push(`${prefix}={}`);
+    return;
+  }
+  for (const [key] of entries) {
+    if (!key) throw new Error("Codex config override keys must be non-empty strings");
+  }
+  if (entries.some(([key]) => !TOML_BARE_KEY.test(key))) {
+    if (!prefix) {
+      throw new Error("Codex config override has a non-bare key at the root");
+    }
+    out.push(`${prefix}=${tomlValue(Object.fromEntries(entries), prefix)}`);
+    return;
+  }
+  for (const [key, child] of entries) {
+    const path = prefix ? `${prefix}.${key}` : key;
+    if (isTable(child)) walk(child, path, out);
+    else out.push(`${path}=${tomlValue(child, path)}`);
+  }
+}
+function buildConfigOverrides(config) {
+  const out = [];
+  walk(config, "", out);
+  return out;
+}
+
+// packages/agent-runtime/src/codex/transport.ts
 function buildSdkThreadOptions(spec) {
   return {
     ...spec.model ? { model: spec.model } : {},
@@ -6564,11 +6629,17 @@ function createSdkCodexTransport(opts = {}) {
       const codexOptions = {
         ...opts.apiKey ? { apiKey: opts.apiKey } : {},
         ...opts.codexPathOverride ? { codexPathOverride: opts.codexPathOverride } : {},
-        // The `--config` overrides (MCP servers + rmcp flag). Cast at the SDK
-        // boundary — `CodexConfig` is a TOML-shaped plain object the SDK flattens
-        // to dotted `--config key=value` flags (verified against the SDK's
-        // `serializeConfigOverrides`).
-        config: spec.config
+        // The `--config` overrides (MCP servers + rmcp flag). CT1501: rendered to
+        // finished `--config` strings by US and passed through `configOverrides`,
+        // the SDK's raw passthrough — NOT through `config`, which would flatten
+        // them itself. A user MCP server named `my.server` cannot go in an
+        // override's dotted path at all (the CLI splits the path on `.` and
+        // ignores TOML quoting), so it has to ride inside an inline-table value,
+        // and the SDK's flattener cannot be steered into producing one. This is
+        // also what makes the PUBLISHED companion correct, where the vendored
+        // patch never reached — and why that patch is gone. See
+        // `config-overrides.ts`.
+        configOverrides: buildConfigOverrides(spec.config)
       };
       const codex = new Codex(codexOptions);
       const threadOptions = buildSdkThreadOptions(spec);
@@ -8794,6 +8865,8 @@ var TurnExecution = class {
   // so every exit after this point must settle THE SPAN, not just clear the
   // participant flag.
   admitted = false;
+  // Rooms: one recompose per turn when the lease refuses a stale context.
+  recomposedForLease = false;
   concluded(reason, errorReason) {
     return new TurnConcluded(reason, errorReason);
   }
@@ -9112,9 +9185,18 @@ var TurnExecution = class {
         // and settle moves the cursor to it. Omitted when the server sent
         // none (an older API), so the cursor stays where it was.
         ...this.turnContext.readThrough !== void 0 ? { readThrough: this.turnContext.readThrough } : {},
-        ...this.turnContext.readRevision !== void 0 ? { readRevision: this.turnContext.readRevision } : {}
+        ...this.turnContext.readRevision !== void 0 ? { readRevision: this.turnContext.readRevision } : {},
+        // Rooms: the attempt this request's session belongs to (null = fresh).
+        ...this.turnContext.attemptId !== void 0 ? { attemptId: this.turnContext.attemptId } : {}
       });
     } catch (err) {
+      if (leaseRefusal(err) === "dispatch_context_stale" && !this.recomposedForLease) {
+        this.recomposedForLease = true;
+        turnLog.info({ turnId }, "dispatcher: lease found the context stale; recomposing");
+        await this.fetchContext();
+        this.buildRequest();
+        return this.acquireLease();
+      }
       const refusal = leaseRefusal(err);
       if (refusal === "dispatch_not_admitted" || refusal === "turn_already_ended") {
         turnLog.debug(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.104",
+  "version": "0.6.106",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",
@@ -29,8 +29,8 @@
     "prepublishOnly": "pnpm build"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.263",
-    "@openai/codex-sdk": "0.153.4",
+    "@anthropic-ai/claude-agent-sdk": "0.3.270",
+    "@openai/codex-sdk": "0.154.0",
     "@hono/node-server": "1.19.14",
     "@inquirer/prompts": "7.10.1",
     "commander": "12.1.0",