@cabane/companion 0.6.38 → 0.6.39

package/dist/cli.js

@@ -2679,6 +2679,19 @@ var DeviceApi = class {
   beginDrain() {
     return this.request("POST", "/api/companion/drain", {});
   }
+  // CT1146: report that a dispatch addressed to THIS device can't be run, because
+  // the agent isn't one this device runs (and still wasn't after a forced
+  // assignments refresh). The server clears the Working flag, retires the dispatch
+  // and posts an explanatory system message.
+  //
+  // This rides the DEVICE token deliberately: the agent's own credential is
+  // delivered through the device's assignments, so an agent this device doesn't
+  // roster is exactly an agent it holds no credential for. The device token is the
+  // only thing it can present, which is why this lives on `DeviceApi` rather than
+  // the per-agent `CabaneApi`.
+  reportDispatchDrop(body) {
+    return this.request("POST", "/api/companion/dispatch-drop", body);
+  }
   // Per-device liveness ping. Reports the companion build version and the env-var
   // names the operator's secret store exposes (never values), so CT30's UI can
   // warn pre-emptively about an agent that needs a secret this device lacks.
@@ -3458,18 +3471,24 @@ function summarizeToolResult(content) {
   }
   if (Array.isArray(content)) {
     const parts = [];
+    let sawContentEntry = false;
     for (const raw of content) {
       if (typeof raw === "string") {
+        sawContentEntry = true;
         parts.push(raw);
       } else if (raw && typeof raw === "object") {
         const block = raw;
+        if (typeof block.type === "string") sawContentEntry = true;
         if (block.type === "text" && typeof block.text === "string") parts.push(block.text);
       }
     }
     const joined = parts.join("\n").trim();
-    return joined.length > 0 ? truncate(joined, TOOL_IO_MAX_CHARS) : "";
+    if (joined.length > 0) return truncate(joined, TOOL_IO_MAX_CHARS);
+    if (sawContentEntry || content.length === 0) return "";
   }
-  return "";
+  if (typeof content !== "object") return "";
+  if (!Array.isArray(content) && Object.keys(content).length === 0) return "";
+  return summarizeToolIo(content);
 }
 function truncate(s, max) {
   if (s.length <= max) return s;
@@ -9498,6 +9517,10 @@ var CompanionSupervisor = class {
     if (!agent) {
       agent = await this.recoverRacedAgent(wr, payload);
       if (!agent) {
+        if (this.deviceId && payload.deviceId === this.deviceId) {
+          const reported = await this.reportUnrunnableDispatch(wr, payload);
+          if (!reported) return;
+        }
         if (ev.id) wr.cursor.settle(ev.id);
         return;
       }
@@ -9519,6 +9542,59 @@ var CompanionSupervisor = class {
     await tail;
     if (wr.chains.get(chainKey) === tail) wr.chains.delete(chainKey);
   }
+  // CT1146: tell the server this device cannot run a dispatch it was addressed to.
+  //
+  // Returns whether the report LANDED, because that answer decides whether the
+  // caller may settle the cursor. Nothing else on either side ends this turn: the
+  // server's sweep resolves the agent's effective connector, which in a roster
+  // desync still points at this device, so it is never classified `no_device` and
+  // only the silent 12h age backstop touches it. An unreported drop is therefore
+  // indistinguishable from the original defect.
+  //
+  // Bounded retry, because the common failure is transient (a 503 mid-deploy, a
+  // dropped socket) and one more attempt a second later usually lands. Bounded
+  // hard — this runs inline on the event loop, and an unbounded wait here would
+  // wedge the workspace's whole stream.
+  async reportUnrunnableDispatch(wr, payload) {
+    if (!this.deviceApi) return false;
+    const backoffMs = [0, 1e3, 3e3];
+    let lastErr;
+    for (const wait of backoffMs) {
+      if (this.stopped) return false;
+      if (wait > 0) await new Promise((r) => setTimeout(r, wait));
+      try {
+        const { cleared } = await this.deviceApi.reportDispatchDrop({
+          workspaceId: wr.workspaceId,
+          conversationId: payload.conversationId,
+          agentId: payload.agentId,
+          messageId: payload.messageId,
+          reason: "agent_not_on_device"
+        });
+        this.log.warn(
+          {
+            workspaceId: wr.workspaceId,
+            conversationId: payload.conversationId,
+            agentId: payload.agentId,
+            cleared
+          },
+          "companion: dispatch addressed to this device is for an agent it does not run \u2014 reported as unrunnable"
+        );
+        return true;
+      } catch (err) {
+        lastErr = err;
+      }
+    }
+    this.log.error(
+      {
+        workspaceId: wr.workspaceId,
+        conversationId: payload.conversationId,
+        agentId: payload.agentId,
+        err: lastErr instanceof Error ? lastErr.message : String(lastErr)
+      },
+      "companion: could not report an unrunnable dispatch \u2014 leaving it unsettled so a reconnect replays it"
+    );
+    return false;
+  }
   // Pull-on-miss for the assignment-change race: a dispatch arrived for an agent
   // we don't yet run. If it's addressed to THIS device, the assignment just
   // changed under us (the poll hasn't caught it) — force a fresh assignments pull

package/dist/runtime.js

@@ -2107,6 +2107,19 @@ var DeviceApi = class {
   beginDrain() {
     return this.request("POST", "/api/companion/drain", {});
   }
+  // CT1146: report that a dispatch addressed to THIS device can't be run, because
+  // the agent isn't one this device runs (and still wasn't after a forced
+  // assignments refresh). The server clears the Working flag, retires the dispatch
+  // and posts an explanatory system message.
+  //
+  // This rides the DEVICE token deliberately: the agent's own credential is
+  // delivered through the device's assignments, so an agent this device doesn't
+  // roster is exactly an agent it holds no credential for. The device token is the
+  // only thing it can present, which is why this lives on `DeviceApi` rather than
+  // the per-agent `CabaneApi`.
+  reportDispatchDrop(body) {
+    return this.request("POST", "/api/companion/dispatch-drop", body);
+  }
   // Per-device liveness ping. Reports the companion build version and the env-var
   // names the operator's secret store exposes (never values), so CT30's UI can
   // warn pre-emptively about an agent that needs a secret this device lacks.
@@ -2965,18 +2978,24 @@ function summarizeToolResult(content) {
   }
   if (Array.isArray(content)) {
     const parts = [];
+    let sawContentEntry = false;
     for (const raw of content) {
       if (typeof raw === "string") {
+        sawContentEntry = true;
         parts.push(raw);
       } else if (raw && typeof raw === "object") {
         const block = raw;
+        if (typeof block.type === "string") sawContentEntry = true;
         if (block.type === "text" && typeof block.text === "string") parts.push(block.text);
       }
     }
     const joined = parts.join("\n").trim();
-    return joined.length > 0 ? truncate(joined, TOOL_IO_MAX_CHARS) : "";
+    if (joined.length > 0) return truncate(joined, TOOL_IO_MAX_CHARS);
+    if (sawContentEntry || content.length === 0) return "";
   }
-  return "";
+  if (typeof content !== "object") return "";
+  if (!Array.isArray(content) && Object.keys(content).length === 0) return "";
+  return summarizeToolIo(content);
 }
 function truncate(s, max) {
   if (s.length <= max) return s;
@@ -9005,6 +9024,10 @@ var CompanionSupervisor = class {
     if (!agent) {
       agent = await this.recoverRacedAgent(wr, payload);
       if (!agent) {
+        if (this.deviceId && payload.deviceId === this.deviceId) {
+          const reported = await this.reportUnrunnableDispatch(wr, payload);
+          if (!reported) return;
+        }
         if (ev.id) wr.cursor.settle(ev.id);
         return;
       }
@@ -9026,6 +9049,59 @@ var CompanionSupervisor = class {
     await tail;
     if (wr.chains.get(chainKey) === tail) wr.chains.delete(chainKey);
   }
+  // CT1146: tell the server this device cannot run a dispatch it was addressed to.
+  //
+  // Returns whether the report LANDED, because that answer decides whether the
+  // caller may settle the cursor. Nothing else on either side ends this turn: the
+  // server's sweep resolves the agent's effective connector, which in a roster
+  // desync still points at this device, so it is never classified `no_device` and
+  // only the silent 12h age backstop touches it. An unreported drop is therefore
+  // indistinguishable from the original defect.
+  //
+  // Bounded retry, because the common failure is transient (a 503 mid-deploy, a
+  // dropped socket) and one more attempt a second later usually lands. Bounded
+  // hard — this runs inline on the event loop, and an unbounded wait here would
+  // wedge the workspace's whole stream.
+  async reportUnrunnableDispatch(wr, payload) {
+    if (!this.deviceApi) return false;
+    const backoffMs = [0, 1e3, 3e3];
+    let lastErr;
+    for (const wait of backoffMs) {
+      if (this.stopped) return false;
+      if (wait > 0) await new Promise((r) => setTimeout(r, wait));
+      try {
+        const { cleared } = await this.deviceApi.reportDispatchDrop({
+          workspaceId: wr.workspaceId,
+          conversationId: payload.conversationId,
+          agentId: payload.agentId,
+          messageId: payload.messageId,
+          reason: "agent_not_on_device"
+        });
+        this.log.warn(
+          {
+            workspaceId: wr.workspaceId,
+            conversationId: payload.conversationId,
+            agentId: payload.agentId,
+            cleared
+          },
+          "companion: dispatch addressed to this device is for an agent it does not run \u2014 reported as unrunnable"
+        );
+        return true;
+      } catch (err) {
+        lastErr = err;
+      }
+    }
+    this.log.error(
+      {
+        workspaceId: wr.workspaceId,
+        conversationId: payload.conversationId,
+        agentId: payload.agentId,
+        err: lastErr instanceof Error ? lastErr.message : String(lastErr)
+      },
+      "companion: could not report an unrunnable dispatch \u2014 leaving it unsettled so a reconnect replays it"
+    );
+    return false;
+  }
   // Pull-on-miss for the assignment-change race: a dispatch arrived for an agent
   // we don't yet run. If it's addressed to THIS device, the assignment just
   // changed under us (the poll hasn't caught it) — force a fresh assignments pull

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.38",
+  "version": "0.6.39",
   "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",