@cabane/companion 0.6.195 → 0.6.197

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
@@ -11376,7 +11379,6 @@ import { join as join7 } from "path";
 // src/device-state.ts
 var DEVICE_STATES = ["waiting", "online", "offline", "deactivated"];
 var DEFAULT_DEVICE_OFFLINE_THRESHOLD_MS = 9e4;
-var DEFAULT_DEVICE_RECONNECT_GRACE_MS = 9e4;
 var HARNESS_STATES = [
   "checking",
   "connected",
@@ -14919,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(
             {
@@ -16380,7 +16386,7 @@ function defaultSpawnDetached(args) {
 // src/terminal-copy.ts
 init_cabane_command();
 var UNPAIRED = "This device isn't paired yet. Get a setup line from a workspace's Settings \u2192 Devices and paste it here.";
-var lease = DEFAULT_DEVICE_OFFLINE_THRESHOLD_MS + DEFAULT_DEVICE_RECONNECT_GRACE_MS;
+var lease = DEFAULT_DEVICE_OFFLINE_THRESHOLD_MS;
 function age(at, now) {
   const seconds = Math.max(0, Math.floor((now - Date.parse(at)) / 1e3));
   return seconds < 60 ? `${seconds}s` : seconds < 3600 ? `${Math.floor(seconds / 60)}m` : `${Math.floor(seconds / 3600)}h`;

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.195",
+  "version": "0.6.197",
   "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",