@cabane/companion 0.6.198 → 0.6.200

package/dist/cli.js

@@ -2616,7 +2616,7 @@ var init_descriptions = __esm({
       "withdraw_ask"
     ];
     TURN_CONTROL_TOOL_DESCRIPTIONS = {
-      ask: `Ask a person a structured question you need answered to continue, then end your turn; don't wait for the reply. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name it with \`@handle\` in your reply.
+      ask: `Ask a person a structured question you need answered to continue, then end your turn; don't wait for the reply. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name them with \`@handle\` in your reply.
 - Form: one question (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} \`{ headline, body?, options? }\`; never both. Decisions that arise together go in ONE call, in the order you want them answered. A second \`ask\` is a separate item, never an edit; raise one only for a genuinely new question.
 - \`headline\`: one sentence ending in \`?\`. Body (\`question\` or each item's \`body\`): a sentence or two of framing, not a report; inline Markdown only, no lists or headings. \`options\`: ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} one-click answers (always for a yes/no go-ahead), each a distinct course of action you can carry out without asking back.
 - Voice, in headline, body and options: "I" for yourself, never your own name; name everyone else who decides or acts, as on your roster. Never "you", "your", "we", "us", "our" or their contractions, nor "he", "she" or "they" for a named actor. Each option reads correctly alone. A quotation stays accurate: say who said it.
@@ -12686,7 +12686,7 @@ function turnFailureCopy(reason, runtime) {
   if (reason === "timeout_total")
     return "The turn ran longer than expected and was stopped. Reply in Cabane to continue.";
   if (reason === "result_error:error_max_turns")
-    return "The agent reached its step limit. Reply in Cabane to continue.";
+    return "The agent reached their step limit. Reply in Cabane to continue.";
   if (reason === "no_result" || reason === "empty_result" || reason === "empty_result_unverified")
     return "The agent finished without a response. Reply in Cabane to try again.";
   if (reason === "session_start_failed")
@@ -12700,11 +12700,11 @@ function turnFailureCopy(reason, runtime) {
   if (reason?.startsWith("seq_floor_unavailable:"))
     return "The interrupted turn could not safely continue. Reply in Cabane to continue.";
   if (reason === "result_error:error_max_budget_usd")
-    return "The agent reached its spending limit. Check its budget settings before trying again in Cabane.";
+    return "The agent reached their spending limit. Check their budget settings before trying again in Cabane.";
   if (reason === "result_error:error_max_structured_output_retries")
     return "The agent could not produce the requested response format. Check the requested format, then reply in Cabane to try again.";
   if (reason?.startsWith("result_error:"))
-    return "The agent stopped with an error while running. Check its transcript, then reply in Cabane to try again.";
+    return "The agent stopped with an error while running. Check their transcript, then reply in Cabane to try again.";
   if (reason === "setup_failed")
     return "The turn could not be set up. Check the agent setup on this device, then reply in Cabane to try again.";
   if (reason === "unexpected_role")
@@ -14179,6 +14179,10 @@ var CompanionSupervisor = class {
   // Whether the device stream is open, which is what every workspace's link on
   // the dashboard reports.
   deviceConnected = false;
+  // Set when the device stream ended on a 403: the device was deactivated, not
+  // unpaired. The next accepted heartbeat proves it was reactivated, and
+  // reopens the stream.
+  deviceStreamDeactivated = false;
   recoveryChecked = false;
   recovering = false;
   heartbeated = false;
@@ -14314,7 +14318,15 @@ var CompanionSupervisor = class {
         }
         if (ev.event === "message") await this.handleDeviceMessage(ev);
       },
-      onAuthFailure: () => {
+      onAuthFailure: (status2) => {
+        if (status2 === 403) {
+          this.deviceStreamDeactivated = true;
+          this.heartbeatTimer?.ref();
+          this.log.warn(
+            "This device was deactivated in Cabane. The companion will reconnect once it is reactivated."
+          );
+          return;
+        }
         this.log.error(
           `Cabane no longer accepts this device. Run ${cabane("logout")}, then ${cabane("setup")} to pair again.`
         );
@@ -14404,6 +14416,12 @@ var CompanionSupervisor = class {
         lastAcknowledgedDevice: view.success ? view.data : null,
         lastHeartbeatRefused: false
       };
+      if (this.deviceStreamDeactivated && this.deviceSub && !this.stopped) {
+        this.deviceStreamDeactivated = false;
+        this.heartbeatTimer?.unref();
+        this.log.info("This device was reactivated; reconnecting to Cabane.");
+        this.deviceSub.start();
+      }
       void this.recoverRuns();
       void this.updater?.onHeartbeat(res.companion, this.deviceConnected).catch(
         (err) => this.log.warn(
@@ -14586,7 +14604,7 @@ var CompanionSupervisor = class {
       if (!credential) {
         this.log.error(
           { workspaceId, agentId: it.agentId, username: it.agentUsername },
-          `Cannot run ${it.agentDisplayName}: its sign-in to Cabane is missing and Cabane didn't send a new one. Asking again on the next check.`
+          `Cannot run ${it.agentDisplayName}: their sign-in to Cabane is missing and Cabane didn't send a new one. Asking again on the next check.`
         );
         this.removeAgent(wr, it.agentId);
         this.hub.setAgent(workspaceId, {

package/dist/runtime.js

@@ -1756,7 +1756,7 @@ function turnFailureCopy(reason, runtime) {
   if (reason === "timeout_total")
     return "The turn ran longer than expected and was stopped. Reply in Cabane to continue.";
   if (reason === "result_error:error_max_turns")
-    return "The agent reached its step limit. Reply in Cabane to continue.";
+    return "The agent reached their step limit. Reply in Cabane to continue.";
   if (reason === "no_result" || reason === "empty_result" || reason === "empty_result_unverified")
     return "The agent finished without a response. Reply in Cabane to try again.";
   if (reason === "session_start_failed")
@@ -1770,11 +1770,11 @@ function turnFailureCopy(reason, runtime) {
   if (reason?.startsWith("seq_floor_unavailable:"))
     return "The interrupted turn could not safely continue. Reply in Cabane to continue.";
   if (reason === "result_error:error_max_budget_usd")
-    return "The agent reached its spending limit. Check its budget settings before trying again in Cabane.";
+    return "The agent reached their spending limit. Check their budget settings before trying again in Cabane.";
   if (reason === "result_error:error_max_structured_output_retries")
     return "The agent could not produce the requested response format. Check the requested format, then reply in Cabane to try again.";
   if (reason?.startsWith("result_error:"))
-    return "The agent stopped with an error while running. Check its transcript, then reply in Cabane to try again.";
+    return "The agent stopped with an error while running. Check their transcript, then reply in Cabane to try again.";
   if (reason === "setup_failed")
     return "The turn could not be set up. Check the agent setup on this device, then reply in Cabane to try again.";
   if (reason === "unexpected_role")
@@ -3079,7 +3079,7 @@ var TURN_CONTROL_TOOLS = [
   "withdraw_ask"
 ];
 var TURN_CONTROL_TOOL_DESCRIPTIONS = {
-  ask: `Ask a person a structured question you need answered to continue, then end your turn; don't wait for the reply. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name it with \`@handle\` in your reply.
+  ask: `Ask a person a structured question you need answered to continue, then end your turn; don't wait for the reply. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name them with \`@handle\` in your reply.
 - Form: one question (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} \`{ headline, body?, options? }\`; never both. Decisions that arise together go in ONE call, in the order you want them answered. A second \`ask\` is a separate item, never an edit; raise one only for a genuinely new question.
 - \`headline\`: one sentence ending in \`?\`. Body (\`question\` or each item's \`body\`): a sentence or two of framing, not a report; inline Markdown only, no lists or headings. \`options\`: ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} one-click answers (always for a yes/no go-ahead), each a distinct course of action you can carry out without asking back.
 - Voice, in headline, body and options: "I" for yourself, never your own name; name everyone else who decides or acts, as on your roster. Never "you", "your", "we", "us", "our" or their contractions, nor "he", "she" or "they" for a named actor. Each option reads correctly alone. A quotation stays accurate: say who said it.
@@ -9789,6 +9789,10 @@ var CompanionSupervisor = class {
   // Whether the device stream is open, which is what every workspace's link on
   // the dashboard reports.
   deviceConnected = false;
+  // Set when the device stream ended on a 403: the device was deactivated, not
+  // unpaired. The next accepted heartbeat proves it was reactivated, and
+  // reopens the stream.
+  deviceStreamDeactivated = false;
   recoveryChecked = false;
   recovering = false;
   heartbeated = false;
@@ -9924,7 +9928,15 @@ var CompanionSupervisor = class {
         }
         if (ev.event === "message") await this.handleDeviceMessage(ev);
       },
-      onAuthFailure: () => {
+      onAuthFailure: (status) => {
+        if (status === 403) {
+          this.deviceStreamDeactivated = true;
+          this.heartbeatTimer?.ref();
+          this.log.warn(
+            "This device was deactivated in Cabane. The companion will reconnect once it is reactivated."
+          );
+          return;
+        }
         this.log.error(
           `Cabane no longer accepts this device. Run ${cabane("logout")}, then ${cabane("setup")} to pair again.`
         );
@@ -10014,6 +10026,12 @@ var CompanionSupervisor = class {
         lastAcknowledgedDevice: view.success ? view.data : null,
         lastHeartbeatRefused: false
       };
+      if (this.deviceStreamDeactivated && this.deviceSub && !this.stopped) {
+        this.deviceStreamDeactivated = false;
+        this.heartbeatTimer?.unref();
+        this.log.info("This device was reactivated; reconnecting to Cabane.");
+        this.deviceSub.start();
+      }
       void this.recoverRuns();
       void this.updater?.onHeartbeat(res.companion, this.deviceConnected).catch(
         (err) => this.log.warn(
@@ -10196,7 +10214,7 @@ var CompanionSupervisor = class {
       if (!credential) {
         this.log.error(
           { workspaceId, agentId: it.agentId, username: it.agentUsername },
-          `Cannot run ${it.agentDisplayName}: its sign-in to Cabane is missing and Cabane didn't send a new one. Asking again on the next check.`
+          `Cannot run ${it.agentDisplayName}: their sign-in to Cabane is missing and Cabane didn't send a new one. Asking again on the next check.`
         );
         this.removeAgent(wr, it.agentId);
         this.hub.setAgent(workspaceId, {

package/package.json

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