@cabane/companion 0.6.23 → 0.6.25

package/dist/cli.js

@@ -6835,6 +6835,22 @@ function checkoutState(cwd) {
 function runKey(conversationId, agentId) {
   return `${conversationId}|${agentId}`;
 }
+var ERROR_BODY_LOG_CAP = 2e3;
+function describeErrorBody(body) {
+  if (body === void 0 || body === null) return void 0;
+  let text;
+  if (typeof body === "string") {
+    text = body;
+  } else {
+    try {
+      text = JSON.stringify(body);
+    } catch {
+      text = String(body);
+    }
+  }
+  if (text.length === 0) return void 0;
+  return text.length > ERROR_BODY_LOG_CAP ? `${text.slice(0, ERROR_BODY_LOG_CAP)}\u2026` : text;
+}
 function describeSubAgentError(status2, body) {
   const code = body && typeof body === "object" && "error" in body ? String(body.error) : void 0;
   switch (code) {
@@ -6860,6 +6876,13 @@ var Dispatcher = class {
   opts;
   // SJ383: per-(conversation, agent) abort registry.
   aborts;
+  // CT1109: pairs already told, in the conversation, that their session state is
+  // being refused. The failure repeats every single turn until someone fixes the
+  // payload, so without this the notice would be a per-turn drumbeat; one notice
+  // is the signal and the rest is noise. Deliberately in-memory and unbounded-free:
+  // a companion restart re-arms it, which is the behaviour we want — a restart is
+  // exactly when it's worth re-stating that memory is still being lost.
+  sessionWriteNotified = /* @__PURE__ */ new Set();
   notifyStart(info) {
     try {
       this.opts.observer?.onStart(info);
@@ -7430,6 +7453,7 @@ ${reason}`,
     ) : null;
     let sessionWritten = false;
     let sessionDegraded = false;
+    let sessionWriteRejected = false;
     let okResult = false;
     let resultReason;
     const turnRuntime = turnContext.runtime;
@@ -7550,10 +7574,25 @@ ${reason}`,
                 { agentSessionId: event.state }
               );
             } catch (err) {
-              turnLog.warn(
-                { err: err instanceof Error ? err.message : String(err) },
-                "dispatcher: session-id write failed (will retry next turn)"
-              );
+              const status2 = err instanceof ApiError ? err.status : void 0;
+              if (status2 !== void 0 && status2 >= 400 && status2 < 500) {
+                sessionWriteRejected = true;
+                turnLog.error(
+                  {
+                    err: err instanceof Error ? err.message : String(err),
+                    status: status2,
+                    responseBody: describeErrorBody(err instanceof ApiError ? err.body : void 0),
+                    stateLength: event.state.length,
+                    runtime: turnRuntime
+                  },
+                  "dispatcher: session-state write REJECTED (4xx) \u2014 this turn is not resumable and the next turn starts with no memory of it"
+                );
+              } else {
+                turnLog.warn(
+                  { err: err instanceof Error ? err.message : String(err) },
+                  "dispatcher: session-id write failed (will retry next turn)"
+                );
+              }
             }
           }
         } else if (event.type === "result") {
@@ -7680,6 +7719,10 @@ ${reason}`,
       if (sessionDegraded) {
         body.degraded = true;
       }
+      if (sessionWriteRejected && !this.sessionWriteNotified.has(key)) {
+        body.sessionWriteRejected = true;
+        this.sessionWriteNotified.add(key);
+      }
       this.opts.connectorHealth?.recordSettle(turnRuntime, {
         ok: okResult,
         errorReason: body.errorReason ?? null
@@ -8235,7 +8278,8 @@ var SseSubscriber = class {
   }
   async connect() {
     const base = this.opts.baseUrl.endsWith("/") ? this.opts.baseUrl.slice(0, -1) : this.opts.baseUrl;
-    const url = `${base}/api/workspaces/${this.opts.workspaceId}/events`;
+    const query = this.lastEventId ? "" : "?replayPending=1";
+    const url = `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
     this.controller = new AbortController();
     const headers = {
       Authorization: `Bearer ${this.opts.token}`,

package/dist/runtime.js

@@ -6454,6 +6454,22 @@ function checkoutState(cwd) {
 function runKey(conversationId, agentId) {
   return `${conversationId}|${agentId}`;
 }
+var ERROR_BODY_LOG_CAP = 2e3;
+function describeErrorBody(body) {
+  if (body === void 0 || body === null) return void 0;
+  let text;
+  if (typeof body === "string") {
+    text = body;
+  } else {
+    try {
+      text = JSON.stringify(body);
+    } catch {
+      text = String(body);
+    }
+  }
+  if (text.length === 0) return void 0;
+  return text.length > ERROR_BODY_LOG_CAP ? `${text.slice(0, ERROR_BODY_LOG_CAP)}\u2026` : text;
+}
 function describeSubAgentError(status, body) {
   const code = body && typeof body === "object" && "error" in body ? String(body.error) : void 0;
   switch (code) {
@@ -6479,6 +6495,13 @@ var Dispatcher = class {
   opts;
   // SJ383: per-(conversation, agent) abort registry.
   aborts;
+  // CT1109: pairs already told, in the conversation, that their session state is
+  // being refused. The failure repeats every single turn until someone fixes the
+  // payload, so without this the notice would be a per-turn drumbeat; one notice
+  // is the signal and the rest is noise. Deliberately in-memory and unbounded-free:
+  // a companion restart re-arms it, which is the behaviour we want — a restart is
+  // exactly when it's worth re-stating that memory is still being lost.
+  sessionWriteNotified = /* @__PURE__ */ new Set();
   notifyStart(info) {
     try {
       this.opts.observer?.onStart(info);
@@ -7049,6 +7072,7 @@ ${reason}`,
     ) : null;
     let sessionWritten = false;
     let sessionDegraded = false;
+    let sessionWriteRejected = false;
     let okResult = false;
     let resultReason;
     const turnRuntime = turnContext.runtime;
@@ -7169,10 +7193,25 @@ ${reason}`,
                 { agentSessionId: event.state }
               );
             } catch (err) {
-              turnLog.warn(
-                { err: err instanceof Error ? err.message : String(err) },
-                "dispatcher: session-id write failed (will retry next turn)"
-              );
+              const status = err instanceof ApiError ? err.status : void 0;
+              if (status !== void 0 && status >= 400 && status < 500) {
+                sessionWriteRejected = true;
+                turnLog.error(
+                  {
+                    err: err instanceof Error ? err.message : String(err),
+                    status,
+                    responseBody: describeErrorBody(err instanceof ApiError ? err.body : void 0),
+                    stateLength: event.state.length,
+                    runtime: turnRuntime
+                  },
+                  "dispatcher: session-state write REJECTED (4xx) \u2014 this turn is not resumable and the next turn starts with no memory of it"
+                );
+              } else {
+                turnLog.warn(
+                  { err: err instanceof Error ? err.message : String(err) },
+                  "dispatcher: session-id write failed (will retry next turn)"
+                );
+              }
             }
           }
         } else if (event.type === "result") {
@@ -7299,6 +7338,10 @@ ${reason}`,
       if (sessionDegraded) {
         body.degraded = true;
       }
+      if (sessionWriteRejected && !this.sessionWriteNotified.has(key)) {
+        body.sessionWriteRejected = true;
+        this.sessionWriteNotified.add(key);
+      }
       this.opts.connectorHealth?.recordSettle(turnRuntime, {
         ok: okResult,
         errorReason: body.errorReason ?? null
@@ -7854,7 +7897,8 @@ var SseSubscriber = class {
   }
   async connect() {
     const base = this.opts.baseUrl.endsWith("/") ? this.opts.baseUrl.slice(0, -1) : this.opts.baseUrl;
-    const url = `${base}/api/workspaces/${this.opts.workspaceId}/events`;
+    const query = this.lastEventId ? "" : "?replayPending=1";
+    const url = `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
     this.controller = new AbortController();
     const headers = {
       Authorization: `Bearer ${this.opts.token}`,

package/package.json

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