@cabane/companion 0.6.196 → 0.6.198

package/README.md

@@ -4,7 +4,7 @@ The Cabane Companion runs your Cabane agents on your own device. Install it, pas
 
 It drives a **harness** you already have signed in: [Claude Code](https://www.npmjs.com/package/@anthropic-ai/claude-code), [Codex](https://developers.openai.com/codex/cli) or [OpenCode](https://opencode.ai). The Companion never installs a harness and never runs a sign-in; it finds the ones that are usable and reports them.
 
-Step-by-step guides with screenshots are in Cabane: open the **Account menu** and choose **Docs**. This README is the reference for the device side.
+Step-by-step guides with screenshots are at [cabane.ai/docs](https://cabane.ai/docs): [Connect your computer](https://cabane.ai/docs/connect-your-computer) to install and pair, [Create an agent](https://cabane.ai/docs/create-an-agent) to give an agent a device, and [When an agent doesn't answer](https://cabane.ai/docs/when-an-agent-doesnt-answer) when one stays silent. This README is the reference for the device side.
 
 ## The model
 
@@ -131,7 +131,7 @@ Cabane has no sandbox setting of its own. A harness's own sandbox settings restr
 
 So where agents run is your choice, and there are two ways:
 
-- **The Companion in a container or VM**, recommended for almost everyone: the Companion and the harness together in Docker, OrbStack or a VM, sharing only the folders and credentials they need. Agents keep a full shell to work and code in, still with no approvals, while the container or VM limits what they reach to what you put in, MCP servers, hooks and the harness process included. If you haven't set one up before, ask Claude to help; **Common device patterns** in Cabane's Docs walks through one with Docker.
+- **The Companion in a container or VM**, recommended for almost everyone: the Companion and the harness together in Docker, OrbStack or a VM, sharing only the folders and credentials they need. Agents keep a full shell to work and code in, still with no approvals, while the container or VM limits what they reach to what you put in, MCP servers, hooks and the harness process included. If you haven't set one up before, ask Claude to help; [Common device patterns](https://cabane.ai/docs/common-device-patterns) walks through one with Docker.
 - **Directly on your device**, with the harness's own sandbox set to taste. It restricts particular tools, and each harness draws a different line.
 
 Running directly, confining agents is set in each harness's own file, and governs your own sessions there as well as every agent on the device:

package/dist/cli.js

@@ -1682,7 +1682,7 @@ var init_api = __esm({
       // Single-shot, NEVER retried: a failed renewal has no answer worth replaying
       // and the next tick asks again; retrying stretches one tick over the next.
       //
-      // ALL FAILURE IS `unknown`. Only the server SAYING the turn is over may stop a
+      // Only the server SAYING the turn is over may stop a
       // running loop; a 500, a dropped connection, an expired token or an
       // unparseable body says nothing about the turn, and reading it as death would
       // kill healthy turns on every API hiccup. Fixed here, at the boundary, so no
@@ -1706,8 +1706,8 @@ var init_api = __esm({
             }
           );
           return res?.state === "running" || res?.state === "ended" ? res.state : "unknown";
-        } catch {
-          return "unknown";
+        } catch (err) {
+          return isTurnEndedRefusal(err) ? "ended" : "unknown";
         }
       }
       // Flips `active_run_started_at` and optionally captures the SDK session
@@ -10557,8 +10557,8 @@ var init_dispatcher = __esm({
         this.aborts = opts.aborts ?? /* @__PURE__ */ new Map();
       }
       opts;
-      // (conversation|agent) → per-TURN controllers. Stop is pair-scoped and must
-      // reach every live loop for the pair.
+      // (conversation|agent) → per-turn controllers. A delayed cancel for an old
+      // turn must never reach its successor.
       aborts;
       // Pairs already told their session couldn't be saved: the notice is once per
       // pair, while the rejection repeats every turn.
@@ -10609,19 +10609,22 @@ var init_dispatcher = __esm({
           { turnId: opts.turnId ?? randomUUID4(), resumed: opts.resumed === true }
         );
       }
-      // Cancel a (conversation, agent) run in flight in THIS process. True if one
-      // was aborted.
-      cancel(conversationId, agentId) {
+      // Cancel the named turn. An older server omits turnId and cancels the pair.
+      cancel(conversationId, agentId, turnId) {
         const key = runKey(conversationId, agentId);
         const pair = this.aborts.get(key);
         if (!pair || pair.size === 0) return false;
-        for (const ac of [...pair.values()]) {
+        const controllers = turnId === void 0 ? [...pair.values()] : [pair.get(turnId)];
+        let aborted = false;
+        for (const ac of controllers) {
+          if (!ac) continue;
+          aborted = true;
           try {
             ac.abort();
           } catch {
           }
         }
-        return true;
+        return aborted;
       }
       // Abort every run in flight in THIS process, whatever its conversation. For
       // an agent taken off this device: nothing it is still running here is
@@ -14918,7 +14921,11 @@ var CompanionSupervisor = class {
       };
       const agent2 = wr.agents.get(payload2.agentId);
       if (agent2) {
-        const aborted = agent2.dispatcher.cancel(payload2.conversationId, payload2.agentId);
+        const aborted = agent2.dispatcher.cancel(
+          payload2.conversationId,
+          payload2.agentId,
+          payload2.turnId
+        );
         if (aborted) {
           this.log.debug(
             {

package/dist/runtime.js

@@ -2110,7 +2110,7 @@ var CabaneApi = class {
   // Single-shot, NEVER retried: a failed renewal has no answer worth replaying
   // and the next tick asks again; retrying stretches one tick over the next.
   //
-  // ALL FAILURE IS `unknown`. Only the server SAYING the turn is over may stop a
+  // Only the server SAYING the turn is over may stop a
   // running loop; a 500, a dropped connection, an expired token or an
   // unparseable body says nothing about the turn, and reading it as death would
   // kill healthy turns on every API hiccup. Fixed here, at the boundary, so no
@@ -2134,8 +2134,8 @@ var CabaneApi = class {
         }
       );
       return res?.state === "running" || res?.state === "ended" ? res.state : "unknown";
-    } catch {
-      return "unknown";
+    } catch (err) {
+      return isTurnEndedRefusal(err) ? "ended" : "unknown";
     }
   }
   // Flips `active_run_started_at` and optionally captures the SDK session
@@ -8257,8 +8257,8 @@ var Dispatcher = class {
     this.aborts = opts.aborts ?? /* @__PURE__ */ new Map();
   }
   opts;
-  // (conversation|agent) → per-TURN controllers. Stop is pair-scoped and must
-  // reach every live loop for the pair.
+  // (conversation|agent) → per-turn controllers. A delayed cancel for an old
+  // turn must never reach its successor.
   aborts;
   // Pairs already told their session couldn't be saved: the notice is once per
   // pair, while the rejection repeats every turn.
@@ -8309,19 +8309,22 @@ var Dispatcher = class {
       { turnId: opts.turnId ?? randomUUID4(), resumed: opts.resumed === true }
     );
   }
-  // Cancel a (conversation, agent) run in flight in THIS process. True if one
-  // was aborted.
-  cancel(conversationId, agentId) {
+  // Cancel the named turn. An older server omits turnId and cancels the pair.
+  cancel(conversationId, agentId, turnId) {
     const key = runKey(conversationId, agentId);
     const pair = this.aborts.get(key);
     if (!pair || pair.size === 0) return false;
-    for (const ac of [...pair.values()]) {
+    const controllers = turnId === void 0 ? [...pair.values()] : [pair.get(turnId)];
+    let aborted = false;
+    for (const ac of controllers) {
+      if (!ac) continue;
+      aborted = true;
       try {
         ac.abort();
       } catch {
       }
     }
-    return true;
+    return aborted;
   }
   // Abort every run in flight in THIS process, whatever its conversation. For
   // an agent taken off this device: nothing it is still running here is
@@ -10528,7 +10531,11 @@ var CompanionSupervisor = class {
       };
       const agent2 = wr.agents.get(payload2.agentId);
       if (agent2) {
-        const aborted = agent2.dispatcher.cancel(payload2.conversationId, payload2.agentId);
+        const aborted = agent2.dispatcher.cancel(
+          payload2.conversationId,
+          payload2.agentId,
+          payload2.turnId
+        );
         if (aborted) {
           this.log.debug(
             {

package/package.json

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