@cabane/companion 0.6.204 → 0.6.206

package/dist/cli.js

@@ -222,7 +222,7 @@ var init_cabane_command = __esm({
 });
 
 // src/errors.ts
-var CompanionError, ApiError, ConfigError, PrepareHookError;
+var CompanionError, ApiError, EdgeBlockError, ConfigError, PrepareHookError;
 var init_errors = __esm({
   "src/errors.ts"() {
     "use strict";
@@ -242,6 +242,16 @@ var init_errors = __esm({
       status;
       body;
     };
+    EdgeBlockError = class extends ApiError {
+      constructor(status2, ray, requestId) {
+        super(status2, `${status2} blocked by a proxy in front of Cabane`);
+        this.ray = ray;
+        this.requestId = requestId;
+        this.name = "EdgeBlockError";
+      }
+      ray;
+      requestId;
+    };
     ConfigError = class extends CompanionError {
       constructor(message2) {
         super(message2);
@@ -1326,11 +1336,23 @@ function describeCause(err) {
   if (text === void 0 || text.length === 0) return void 0;
   return text.length > CAUSE_TEXT_CAP ? `${text.slice(0, CAUSE_TEXT_CAP)}\u2026` : text;
 }
+function edgeBlock(status2, headers, raw) {
+  if (status2 !== 403 || !(headers.get("content-type") ?? "").includes("text/html")) return null;
+  const requestId = /Request ID:\s*(?:<[^>]*>\s*)*([A-Za-z0-9-]+)/i.exec(raw)?.[1];
+  return new EdgeBlockError(status2, headers.get("cf-ray") ?? void 0, requestId);
+}
+function isEdgeBlock(err) {
+  return err instanceof EdgeBlockError;
+}
 function apiErrorLogFields(err) {
   const fields = {
     err: describeError(err)
   };
-  if (err instanceof ApiError) {
+  if (err instanceof EdgeBlockError) {
+    fields.status = err.status;
+    if (err.ray) fields.edgeRay = err.ray;
+    if (err.requestId) fields.edgeRequestId = err.requestId;
+  } else if (err instanceof ApiError) {
     fields.status = err.status;
     const body = describeErrorBody(err.body);
     if (body !== void 0) fields.responseBody = body;
@@ -1367,6 +1389,8 @@ var init_boot_id = __esm({
 });
 
 // src/api.ts
+import { promisify } from "util";
+import { gzip } from "zlib";
 function activeRunOutboxKey(conversationId, agentId) {
   return `activerun:${conversationId}:${agentId}`;
 }
@@ -1416,7 +1440,7 @@ function errorMessage(status2, body) {
   if (typeof body === "string" && body.length > 0) return `${status2} ${body.slice(0, 200)}`;
   return `${status2} error`;
 }
-var DEVICE_HEADER, RETRY_BACKOFF_MS, TURN_CONTEXT_BACKOFF_MS, ACTIVE_RUN_OUTBOX_SEQ, LEASE_CHECK_TIMEOUT_MS, CabaneApi;
+var DEVICE_HEADER, RETRY_BACKOFF_MS, TURN_CONTEXT_BACKOFF_MS, ACTIVE_RUN_OUTBOX_SEQ, LEASE_CHECK_TIMEOUT_MS, gzipAsync, CabaneApi;
 var init_api = __esm({
   "src/api.ts"() {
     "use strict";
@@ -1428,6 +1452,7 @@ var init_api = __esm({
     TURN_CONTEXT_BACKOFF_MS = [250, 750, 2e3, 5e3];
     ACTIVE_RUN_OUTBOX_SEQ = 0;
     LEASE_CHECK_TIMEOUT_MS = 1e4;
+    gzipAsync = promisify(gzip);
     CabaneApi = class {
       constructor(opts) {
         this.opts = opts;
@@ -1444,19 +1469,24 @@ var init_api = __esm({
       // rethrows transport errors (fetch reject) unchanged so the caller's retry
       // logic can classify them.
       async attempt(method, path, body, signal) {
+        const json = body !== void 0 ? JSON.stringify(body) : void 0;
+        const gzipped = json !== void 0 && this.opts.gzipBodies?.() === true;
         const res = await fetch(`${this.base}${path}`, {
           method,
           headers: {
             Authorization: `Bearer ${this.opts.token}`,
             ...this.opts.deviceToken ? { [DEVICE_HEADER]: this.opts.deviceToken } : {},
-            ...body !== void 0 ? { "content-type": "application/json" } : {},
+            ...json !== void 0 ? { "content-type": "application/json" } : {},
+            ...gzipped ? { "content-encoding": "gzip" } : {},
             accept: "application/json"
           },
-          ...body !== void 0 ? { body: JSON.stringify(body) } : {},
+          ...json !== void 0 ? { body: gzipped ? await gzipAsync(json) : json } : {},
           ...signal ? { signal } : {}
         });
         if (res.status === 204) return void 0;
         const raw = await res.text();
+        const blocked = edgeBlock(res.status, res.headers, raw);
+        if (blocked) throw blocked;
         let parsed = void 0;
         if (raw.length > 0) {
           try {
@@ -7477,7 +7507,7 @@ var init_opencode_lock = __esm({
 // src/turn-containment.ts
 import { execFile, execFileSync, spawn as spawn3 } from "child_process";
 import { readFileSync as readFileSync6 } from "fs";
-import { promisify } from "util";
+import { promisify as promisify2 } from "util";
 function turnScopeUnit(turnId, attempt) {
   const safe2 = turnId.replace(/[^A-Za-z0-9_.-]/g, "-");
   return `cabane-turn-${safe2}-${attempt}`;
@@ -7761,7 +7791,7 @@ var execFileAsync, asContained, CONTAINMENT_STOP_GRACE_SEC, FALLBACK_GRACE_MS, C
 var init_turn_containment = __esm({
   "src/turn-containment.ts"() {
     "use strict";
-    execFileAsync = promisify(execFile);
+    execFileAsync = promisify2(execFile);
     asContained = (child) => child;
     CONTAINMENT_STOP_GRACE_SEC = 5;
     FALLBACK_GRACE_MS = CONTAINMENT_STOP_GRACE_SEC * 1e3;
@@ -7969,7 +7999,10 @@ var init_protocol = __esm({
       sessionWriteNoticeClaimed: z14.boolean(),
       // The runner's identity, minted with its credential. The start
       // PATCH carries it so the lease knows which runner holds the span.
-      runnerId: z14.string()
+      runnerId: z14.string(),
+      // Whether the server took gzip request bodies at the latest heartbeat, as of
+      // the start. The launcher writes `gzip_bodies` when that changes mid-turn.
+      gzipBodies: z14.boolean().optional()
     });
     dispatchSchema = z14.object({
       type: z14.literal("device:dispatch_requested"),
@@ -8892,9 +8925,10 @@ var init_turn_committer = __esm({
         this.deps = deps;
         const source = deps.executionSourceId !== void 0 ? { executionSourceId: deps.executionSourceId } : {};
         this.onError = (err, hook) => {
+          const what = `${String(deps.log.bindings().agentName ?? "the agent")}'s ${hook === "text" ? "reply" : "reply or activity"}`;
           deps.log.warn(
             { ...apiErrorLogFields(err), hook },
-            `Couldn't save ${String(deps.log.bindings().agentName ?? "the agent")}'s ${hook === "text" ? "reply" : "reply or activity"} to Cabane. ${mayNeedUpdate()}`
+            isEdgeBlock(err) ? `Couldn't save ${what} to Cabane: a proxy or firewall between this device and Cabane blocked the request.` : `Couldn't save ${what} to Cabane. ${mayNeedUpdate()}`
           );
           deps.onCommitFailed?.(err);
         };
@@ -10520,6 +10554,7 @@ function openLauncherChannel(stdin, emit, onLauncherGone) {
   let resolveFirst;
   let gotFirst = false;
   let stopRequested = false;
+  let gzipBodies;
   let gone = false;
   const causeWaiters = /* @__PURE__ */ new Set();
   const first = new Promise((resolve2) => resolveFirst = resolve2);
@@ -10533,6 +10568,7 @@ function openLauncherChannel(stdin, emit, onLauncherGone) {
     const message2 = decodeLauncherMessage(line);
     if (message2?.cabaneLauncher === "granted") waiting.get(message2.id)?.();
     if (message2?.cabaneLauncher === "stop") stopRequested = true;
+    if (message2?.cabaneLauncher === "gzip_bodies") gzipBodies = message2.on;
     if (message2?.cabaneLauncher === "cause") {
       for (const resolve2 of causeWaiters) resolve2(message2.cause);
     }
@@ -10548,6 +10584,9 @@ function openLauncherChannel(stdin, emit, onLauncherGone) {
     get stopRequested() {
       return stopRequested;
     },
+    get gzipBodies() {
+      return gzipBodies;
+    },
     terminationCause(timeoutMs = CAUSE_TIMEOUT_MS) {
       if (gone) return Promise.resolve(null);
       return new Promise((resolve2) => {
@@ -10634,7 +10673,8 @@ function runnerTurnOptions(input, log2, emit, extras = {}) {
     baseUrl: input.baseUrl,
     token: input.credential,
     outbox,
-    log: log2
+    log: log2,
+    gzipBodies: extras.gzipBodies ?? (() => spec.gzipBodies === true)
   });
   extras.onOutbox?.(outbox, api);
   const health = new Map(Object.entries(spec.connectorHealth));
@@ -10787,6 +10827,7 @@ async function runTurn(env, deps) {
       shims,
       acquireLock: (key, signal) => channel.acquire(key, signal),
       stopRequested: () => channel.stopRequested,
+      gzipBodies: () => channel.gzipBodies ?? input.spec.gzipBodies === true,
       terminationCause: () => channel.terminationCause(),
       onProcessGroup: (pgid) => {
         groups.push(pgid);
@@ -12771,6 +12812,22 @@ init_boot_id();
 init_turn_containment();
 init_protocol();
 import { createInterface } from "readline";
+function gzipBodiesSignal() {
+  let on = false;
+  const listeners = /* @__PURE__ */ new Set();
+  return {
+    current: () => on,
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    set(next) {
+      if (next === on) return;
+      on = next;
+      for (const listener of listeners) listener(on);
+    }
+  };
+}
 function selfRunnerCommand() {
   const script = process.argv[1];
   if (!script) throw new Error("runner: cannot tell which script started this companion");
@@ -12832,7 +12889,8 @@ function runnerSpec(opts, launch, duties, runnerId) {
     transcripts: opts.transcriptDir !== void 0,
     logLevel: opts.log.level,
     connectorHealth: healthSnapshot(launch.connectorHealth),
-    sessionWriteNoticeClaimed: duties.sessionWriteNoticeClaimed()
+    sessionWriteNoticeClaimed: duties.sessionWriteNoticeClaimed(),
+    ...launch.gzipBodies?.current() ? { gzipBodies: true } : {}
   };
 }
 var PINO_LEVELS = {
@@ -12956,6 +13014,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
   const stopRunner = new AbortController();
   let ready = false;
   let child;
+  let unsubscribeGzip;
   let stopAnnounced = false;
   const announceStop = () => {
     if (stopAnnounced || !child?.stdin.writable) return;
@@ -13033,6 +13092,10 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
       stdin: runnerStdin(input)
     });
     child = running;
+    unsubscribeGzip = launch.gzipBodies?.subscribe((on) => {
+      if (running.stdin.writable)
+        running.stdin.write(encodeLauncherMessage({ cabaneLauncher: "gzip_bodies", on }));
+    });
     if (controller.signal.aborted) announceStop();
     log2.debug(
       { turnId, runnerPid: running.pid, provider: launch.provider.name },
@@ -13118,6 +13181,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     await Promise.all([stdoutDone, stderrDone]);
   } finally {
     if (locks) giveBackLocks(locks, `${turnId}#`, remote, launch, log2);
+    unsubscribeGzip?.();
     child?.stdin.end();
     controller.signal.removeEventListener("abort", forwardStop);
     duties.releaseAbort(turnId, controller);
@@ -14360,6 +14424,10 @@ var CompanionSupervisor = class {
   reconciliationAbort = new AbortController();
   // The version-skew warning is logged once, not every heartbeat.
   versionSkewWarned = false;
+  // Whether the server takes gzip request bodies, as the latest accepted
+  // heartbeat said; false until one has. Read per request by every agent's API
+  // client and pushed to the runners in flight when it changes.
+  gzipBodies = gzipBodiesSignal();
   // This device's id, captured from the heartbeat / assignments response. The SSE
   // router uses it to tell a dispatch addressed to THIS device (a freshly-assigned
   // agent the last poll hasn't caught yet — the assignment-change race) from one
@@ -14562,6 +14630,7 @@ var CompanionSupervisor = class {
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
       this.checkVersionSkew(res.serverVersion);
+      this.gzipBodies.set(res.acceptsGzipBodies === true);
       this.heartbeated = true;
       const view = acknowledgedDeviceSchema.safeParse(res.device);
       this.heartbeatStatus = {
@@ -14803,7 +14872,8 @@ var CompanionSupervisor = class {
       token: credential,
       ...this.config.deviceToken ? { deviceToken: this.config.deviceToken } : {},
       outbox,
-      log: agentLog
+      log: agentLog,
+      gzipBodies: () => this.gzipBodies.current()
     });
     const aborts = /* @__PURE__ */ new Map();
     const dispatcher = this.buildDispatcher({
@@ -15014,7 +15084,8 @@ var CompanionSupervisor = class {
         ...this.runnerEnv ? { env: this.runnerEnv } : {},
         reportRunnerGone: (report) => this.reportRunnerGone(report),
         connectorHealth: this.connectorHealth,
-        locks: this.runnerLocks
+        locks: this.runnerLocks,
+        gzipBodies: this.gzipBodies
       },
       observer: this.hub.observerFor(ctx2.workspaceId, ctx2.agentId, ctx2.workspaceSlug),
       aborts: ctx2.aborts

package/dist/runtime.js

@@ -133,6 +133,16 @@ var ApiError = class extends CompanionError {
   status;
   body;
 };
+var EdgeBlockError = class extends ApiError {
+  constructor(status, ray, requestId) {
+    super(status, `${status} blocked by a proxy in front of Cabane`);
+    this.ray = ray;
+    this.requestId = requestId;
+    this.name = "EdgeBlockError";
+  }
+  ray;
+  requestId;
+};
 var ConfigError = class extends CompanionError {
   constructor(message) {
     super(message);
@@ -1828,11 +1838,20 @@ function describeCause(err) {
   if (text === void 0 || text.length === 0) return void 0;
   return text.length > CAUSE_TEXT_CAP ? `${text.slice(0, CAUSE_TEXT_CAP)}\u2026` : text;
 }
+function edgeBlock(status, headers, raw) {
+  if (status !== 403 || !(headers.get("content-type") ?? "").includes("text/html")) return null;
+  const requestId = /Request ID:\s*(?:<[^>]*>\s*)*([A-Za-z0-9-]+)/i.exec(raw)?.[1];
+  return new EdgeBlockError(status, headers.get("cf-ray") ?? void 0, requestId);
+}
 function apiErrorLogFields(err) {
   const fields = {
     err: describeError(err)
   };
-  if (err instanceof ApiError) {
+  if (err instanceof EdgeBlockError) {
+    fields.status = err.status;
+    if (err.ray) fields.edgeRay = err.ray;
+    if (err.requestId) fields.edgeRequestId = err.requestId;
+  } else if (err instanceof ApiError) {
     fields.status = err.status;
     const body = describeErrorBody(err.body);
     if (body !== void 0) fields.responseBody = body;
@@ -1848,11 +1867,14 @@ var bootId = randomUUID();
 import { randomUUID as randomUUID5 } from "crypto";
 
 // src/api.ts
+import { promisify } from "util";
+import { gzip } from "zlib";
 var DEVICE_HEADER = "x-cabane-device";
 var RETRY_BACKOFF_MS = [250, 750];
 var TURN_CONTEXT_BACKOFF_MS = [250, 750, 2e3, 5e3];
 var ACTIVE_RUN_OUTBOX_SEQ = 0;
 var LEASE_CHECK_TIMEOUT_MS = 1e4;
+var gzipAsync = promisify(gzip);
 function activeRunOutboxKey(conversationId, agentId) {
   return `activerun:${conversationId}:${agentId}`;
 }
@@ -1872,19 +1894,24 @@ var CabaneApi = class {
   // rethrows transport errors (fetch reject) unchanged so the caller's retry
   // logic can classify them.
   async attempt(method, path, body, signal) {
+    const json = body !== void 0 ? JSON.stringify(body) : void 0;
+    const gzipped = json !== void 0 && this.opts.gzipBodies?.() === true;
     const res = await fetch(`${this.base}${path}`, {
       method,
       headers: {
         Authorization: `Bearer ${this.opts.token}`,
         ...this.opts.deviceToken ? { [DEVICE_HEADER]: this.opts.deviceToken } : {},
-        ...body !== void 0 ? { "content-type": "application/json" } : {},
+        ...json !== void 0 ? { "content-type": "application/json" } : {},
+        ...gzipped ? { "content-encoding": "gzip" } : {},
         accept: "application/json"
       },
-      ...body !== void 0 ? { body: JSON.stringify(body) } : {},
+      ...json !== void 0 ? { body: gzipped ? await gzipAsync(json) : json } : {},
       ...signal ? { signal } : {}
     });
     if (res.status === 204) return void 0;
     const raw = await res.text();
+    const blocked = edgeBlock(res.status, res.headers, raw);
+    if (blocked) throw blocked;
     let parsed = void 0;
     if (raw.length > 0) {
       try {
@@ -7564,8 +7591,8 @@ async function stopRemoteOpencodeSession(serverUrl, sessionId, opts = {}) {
 // src/turn-containment.ts
 import { execFile, execFileSync, spawn as spawn2 } from "child_process";
 import { readFileSync as readFileSync6 } from "fs";
-import { promisify } from "util";
-var execFileAsync = promisify(execFile);
+import { promisify as promisify2 } from "util";
+var execFileAsync = promisify2(execFile);
 var CONTAINMENT_STOP_GRACE_SEC = 5;
 var FALLBACK_GRACE_MS = CONTAINMENT_STOP_GRACE_SEC * 1e3;
 var OOM_READ_TIMEOUT_MS = 1500;
@@ -7718,7 +7745,10 @@ var runnerSpecSchema = z14.object({
   sessionWriteNoticeClaimed: z14.boolean(),
   // The runner's identity, minted with its credential. The start
   // PATCH carries it so the lease knows which runner holds the span.
-  runnerId: z14.string()
+  runnerId: z14.string(),
+  // Whether the server took gzip request bodies at the latest heartbeat, as of
+  // the start. The launcher writes `gzip_bodies` when that changes mid-turn.
+  gzipBodies: z14.boolean().optional()
 });
 var dispatchSchema = z14.object({
   type: z14.literal("device:dispatch_requested"),
@@ -7767,6 +7797,22 @@ function decodeRunnerEvent(line) {
 }
 
 // src/runner/launch.ts
+function gzipBodiesSignal() {
+  let on = false;
+  const listeners = /* @__PURE__ */ new Set();
+  return {
+    current: () => on,
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    set(next) {
+      if (next === on) return;
+      on = next;
+      for (const listener of listeners) listener(on);
+    }
+  };
+}
 function selfRunnerCommand() {
   const script = process.argv[1];
   if (!script) throw new Error("runner: cannot tell which script started this companion");
@@ -7828,7 +7874,8 @@ function runnerSpec(opts, launch, duties, runnerId) {
     transcripts: opts.transcriptDir !== void 0,
     logLevel: opts.log.level,
     connectorHealth: healthSnapshot(launch.connectorHealth),
-    sessionWriteNoticeClaimed: duties.sessionWriteNoticeClaimed()
+    sessionWriteNoticeClaimed: duties.sessionWriteNoticeClaimed(),
+    ...launch.gzipBodies?.current() ? { gzipBodies: true } : {}
   };
 }
 var PINO_LEVELS = {
@@ -7952,6 +7999,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
   const stopRunner = new AbortController();
   let ready = false;
   let child;
+  let unsubscribeGzip;
   let stopAnnounced = false;
   const announceStop = () => {
     if (stopAnnounced || !child?.stdin.writable) return;
@@ -8029,6 +8077,10 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
       stdin: runnerStdin(input)
     });
     child = running;
+    unsubscribeGzip = launch.gzipBodies?.subscribe((on) => {
+      if (running.stdin.writable)
+        running.stdin.write(encodeLauncherMessage({ cabaneLauncher: "gzip_bodies", on }));
+    });
     if (controller.signal.aborted) announceStop();
     log.debug(
       { turnId, runnerPid: running.pid, provider: launch.provider.name },
@@ -8114,6 +8166,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     await Promise.all([stdoutDone, stderrDone]);
   } finally {
     if (locks) giveBackLocks(locks, `${turnId}#`, remote, launch, log);
+    unsubscribeGzip?.();
     child?.stdin.end();
     controller.signal.removeEventListener("abort", forwardStop);
     duties.releaseAbort(turnId, controller);
@@ -10041,6 +10094,10 @@ var CompanionSupervisor = class {
   reconciliationAbort = new AbortController();
   // The version-skew warning is logged once, not every heartbeat.
   versionSkewWarned = false;
+  // Whether the server takes gzip request bodies, as the latest accepted
+  // heartbeat said; false until one has. Read per request by every agent's API
+  // client and pushed to the runners in flight when it changes.
+  gzipBodies = gzipBodiesSignal();
   // This device's id, captured from the heartbeat / assignments response. The SSE
   // router uses it to tell a dispatch addressed to THIS device (a freshly-assigned
   // agent the last poll hasn't caught yet — the assignment-change race) from one
@@ -10243,6 +10300,7 @@ var CompanionSupervisor = class {
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
       this.checkVersionSkew(res.serverVersion);
+      this.gzipBodies.set(res.acceptsGzipBodies === true);
       this.heartbeated = true;
       const view = acknowledgedDeviceSchema.safeParse(res.device);
       this.heartbeatStatus = {
@@ -10484,7 +10542,8 @@ var CompanionSupervisor = class {
       token: credential,
       ...this.config.deviceToken ? { deviceToken: this.config.deviceToken } : {},
       outbox,
-      log: agentLog
+      log: agentLog,
+      gzipBodies: () => this.gzipBodies.current()
     });
     const aborts = /* @__PURE__ */ new Map();
     const dispatcher = this.buildDispatcher({
@@ -10695,7 +10754,8 @@ var CompanionSupervisor = class {
         ...this.runnerEnv ? { env: this.runnerEnv } : {},
         reportRunnerGone: (report) => this.reportRunnerGone(report),
         connectorHealth: this.connectorHealth,
-        locks: this.runnerLocks
+        locks: this.runnerLocks,
+        gzipBodies: this.gzipBodies
       },
       observer: this.hub.observerFor(ctx.workspaceId, ctx.agentId, ctx.workspaceSlug),
       aborts: ctx.aborts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.204",
+  "version": "0.6.206",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an 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",
@@ -30,9 +30,9 @@
     "prepublishOnly": "pnpm build"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.303",
+    "@anthropic-ai/claude-agent-sdk": "0.3.310",
     "@clack/prompts": "1.8.1",
-    "@openai/codex-sdk": "0.163.0",
+    "@openai/codex-sdk": "0.164.0",
     "@hono/node-server": "1.19.14",
     "commander": "12.1.0",
     "eventsource-parser": "3.0.8",