commonswarm 0.1.29 → 0.1.31

package/cswarm.cjs

@@ -22125,6 +22125,8 @@ var WORKSPACE_NAME_MAX_LENGTH = 80;
 var CAPABILITY_MIN_TTL_MS = 6e4;
 var CAPABILITY_MAX_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
 var SIGNAL_REQUEST_TIMEOUT_MS = 3e4;
+var SIGNAL_WRITE_MAX_ATTEMPTS = 3;
+var SIGNAL_WRITE_RETRY_BASE_MS = 500;
 var CommandTransportError = class extends Error {
   constructor(message) {
     super(message);
@@ -22380,6 +22382,27 @@ async function raceSignalDeadline(work, deadline, callerAbort) {
   }
   return await Promise.race(arms);
 }
+function signalRetryDelayMs(retry, baseMs, random) {
+  const exponential = baseMs * 2 ** (retry - 1);
+  const jitter = 0.5 + Math.min(1, Math.max(0, random()));
+  return Math.round(exponential * jitter);
+}
+async function waitForSignalRetry(delayMs, deadline, callerAbort) {
+  if (delayMs === 0) return "elapsed";
+  let timer2;
+  const elapsed = new Promise((resolve) => {
+    timer2 = setTimeout(() => resolve("elapsed"), delayMs);
+  });
+  try {
+    const outcome = await raceSignalDeadline(elapsed, deadline, callerAbort);
+    if (outcome.kind === "value") return outcome.value;
+    if (outcome.kind === "callerAbort") return "callerAbort";
+    if (outcome.kind === "deadline") return "deadline";
+    throw outcome.error;
+  } finally {
+    if (timer2 !== void 0) clearTimeout(timer2);
+  }
+}
 async function declareAgentModel(target2, request, fetcher = fetch) {
   const controller = new AbortController();
   const timer2 = setTimeout(() => controller.abort(), 3e4);
@@ -22416,12 +22439,14 @@ async function declareAgentModel(target2, request, fetcher = fetch) {
   return { httpStatus: response.status };
 }
 var ThinCommandClient = class {
-  constructor(target2, fetcher = fetch) {
+  constructor(target2, fetcher = fetch, options = {}) {
     this.target = target2;
     this.fetcher = fetcher;
+    this.options = options;
   }
   target;
   fetcher;
+  options;
   projections = /* @__PURE__ */ new Map();
   projection(taskId) {
     return this.projections.get(taskId) ?? null;
@@ -22681,10 +22706,12 @@ var ThinCommandClient = class {
     const callerAbort = new Promise((resolve) => {
       releaseCallerAbort = resolve;
     });
+    let deadlineReached = false;
     const timer2 = setTimeout(() => {
+      deadlineReached = true;
       releaseDeadline?.();
       controller.abort();
-    }, SIGNAL_REQUEST_TIMEOUT_MS);
+    }, this.options.signalRequestTimeoutMs ?? SIGNAL_REQUEST_TIMEOUT_MS);
     const onCallerAbort = () => {
       releaseCallerAbort?.();
       controller.abort();
@@ -22695,90 +22722,117 @@ var ThinCommandClient = class {
       controller.abort();
     }
     try {
-      let fetchWork;
-      try {
-        fetchWork = Promise.resolve(
-          this.fetcher(commandEndpoint(this.target), {
-            method: "POST",
-            headers: {
-              authorization: `Bearer ${request.credential}`,
-              apikey: this.target.anonKey,
-              "content-type": "application/json"
-            },
-            body: JSON.stringify({
-              command_id: commandId,
-              client_version: CLIENT_PROTOCOL_VERSION,
-              workspace_id: request.workspaceId,
-              stream: { kind: "workspace" },
-              command: command2
-            }),
-            signal: controller.signal
-          })
-        );
-      } catch (error) {
-        fetchWork = Promise.reject(error);
-      }
-      const fetchOutcome = await raceSignalDeadline(
-        fetchWork,
-        deadline,
-        callerSignal === void 0 ? void 0 : callerAbort
-      );
-      if (fetchOutcome.kind === "callerAbort") {
-        throw signalAbortError();
-      }
-      if (fetchOutcome.kind === "deadline") {
-        throw new CommandTransportError("signal request timed out");
-      }
-      if (fetchOutcome.kind === "error") {
-        throw new CommandTransportError(
-          "signal request failed before a response"
-        );
-      }
-      const response = fetchOutcome.value;
-      const bodyOutcome = await raceSignalDeadline(
-        parsedJson(response),
-        deadline,
-        callerSignal === void 0 ? void 0 : callerAbort
-      );
-      if (bodyOutcome.kind === "callerAbort") {
-        throw signalAbortError();
-      }
-      if (bodyOutcome.kind === "deadline") {
-        throw new CommandTransportError("signal request timed out");
-      }
-      if (bodyOutcome.kind === "error") {
-        if (response.status >= 400) {
-          throw new CommandHttpError(
-            response.status,
-            `signal failed (HTTP ${response.status})`
-          );
-        }
-        throw bodyOutcome.error;
-      }
-      const raw = bodyOutcome.value;
-      if (!response.ok) {
-        const error = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
-        throw new CommandHttpError(
-          response.status,
-          typeof error.message === "string" ? error.message : `signal failed (HTTP ${response.status}): ${typeof error.error === "string" ? error.error : "unknown_error"}`
-        );
-      }
-      const body = responseBody(raw);
-      if (body.status !== "accepted" || body.signal === void 0) {
-        throw new Error("signal endpoint accepted without a signal receipt");
-      }
-      if (body.min_client_version !== void 0) {
-        const order = compareVersion(CLIENT_PROTOCOL_VERSION, body.min_client_version);
-        if (order === null) {
-          throw new Error("server returned a malformed min_client_version");
+      for (let attempt = 1; attempt <= SIGNAL_WRITE_MAX_ATTEMPTS; attempt += 1) {
+        if (callerSignal?.aborted) throw signalAbortError();
+        if (deadlineReached) {
+          throw new CommandTransportError("signal request timed out");
         }
-        if (order < 0) {
-          throw new Error(
-            `client upgrade required (minimum ${body.min_client_version})`
+        try {
+          let fetchWork;
+          try {
+            fetchWork = Promise.resolve(
+              this.fetcher(commandEndpoint(this.target), {
+                method: "POST",
+                headers: {
+                  authorization: `Bearer ${request.credential}`,
+                  apikey: this.target.anonKey,
+                  "content-type": "application/json"
+                },
+                body: JSON.stringify({
+                  // One id is minted outside the loop. Every retry is a replay.
+                  command_id: commandId,
+                  client_version: CLIENT_PROTOCOL_VERSION,
+                  workspace_id: request.workspaceId,
+                  stream: { kind: "workspace" },
+                  command: command2
+                }),
+                signal: controller.signal
+              })
+            );
+          } catch (error) {
+            fetchWork = Promise.reject(error);
+          }
+          const fetchOutcome = await raceSignalDeadline(
+            fetchWork,
+            deadline,
+            callerSignal === void 0 ? void 0 : callerAbort
+          );
+          if (fetchOutcome.kind === "callerAbort") throw signalAbortError();
+          if (fetchOutcome.kind === "deadline") {
+            throw new CommandTransportError("signal request timed out");
+          }
+          if (fetchOutcome.kind === "error") {
+            throw new CommandTransportError(
+              "signal request failed before a response"
+            );
+          }
+          const response = fetchOutcome.value;
+          const bodyOutcome = await raceSignalDeadline(
+            parsedJson(response),
+            deadline,
+            callerSignal === void 0 ? void 0 : callerAbort
+          );
+          if (bodyOutcome.kind === "callerAbort") throw signalAbortError();
+          if (bodyOutcome.kind === "deadline") {
+            throw new CommandTransportError("signal request timed out");
+          }
+          if (bodyOutcome.kind === "error") {
+            if (response.status >= 400) {
+              throw new CommandHttpError(
+                response.status,
+                `signal failed (HTTP ${response.status})`
+              );
+            }
+            throw bodyOutcome.error;
+          }
+          const raw = bodyOutcome.value;
+          if (!response.ok) {
+            const error = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+            throw new CommandHttpError(
+              response.status,
+              typeof error.message === "string" ? error.message : `signal failed (HTTP ${response.status}): ${typeof error.error === "string" ? error.error : "unknown_error"}`
+            );
+          }
+          const body = responseBody(raw);
+          if (body.status !== "accepted" || body.signal === void 0) {
+            throw new Error("signal endpoint accepted without a signal receipt");
+          }
+          if (body.min_client_version !== void 0) {
+            const order = compareVersion(CLIENT_PROTOCOL_VERSION, body.min_client_version);
+            if (order === null) {
+              throw new Error("server returned a malformed min_client_version");
+            }
+            if (order < 0) {
+              throw new Error(
+                `client upgrade required (minimum ${body.min_client_version})`
+              );
+            }
+          }
+          return {
+            httpStatus: response.status,
+            response: body,
+            attempts: attempt,
+            retried: attempt > 1
+          };
+        } catch (error) {
+          const transient = error instanceof CommandTransportError || error instanceof CommandHttpError && error.status >= 500;
+          if (!transient || attempt === SIGNAL_WRITE_MAX_ATTEMPTS) throw error;
+          const waitOutcome = await waitForSignalRetry(
+            signalRetryDelayMs(
+              attempt,
+              this.options.signalRetryBaseMs ?? SIGNAL_WRITE_RETRY_BASE_MS,
+              this.options.signalRetryRandom ?? Math.random
+            ),
+            deadline,
+            callerSignal === void 0 ? void 0 : callerAbort
           );
+          if (waitOutcome === "callerAbort") throw signalAbortError();
+          if (waitOutcome === "deadline") {
+            throw new CommandTransportError("signal request timed out");
+          }
         }
       }
-      return { httpStatus: response.status, response: body };
+      throw new Error("signal retry loop ended without an outcome");
     } finally {
       clearTimeout(timer2);
       callerSignal?.removeEventListener("abort", onCallerAbort);
@@ -29524,6 +29578,8 @@ var import_node_crypto12 = require("node:crypto");
 // src/host/stderr-tail.ts
 var RING_CAPACITY_BYTES = 4096;
 var TAIL_MAX_CHARS = 2048;
+var STDERR_EXIT_GRACE_MS = 100;
+var STDERR_READABLE_END_GRACE_MS = STDERR_EXIT_GRACE_MS + 50;
 var EXOTIC_SEPARATORS = "\\u00a0\\u1680\\u2000-\\u200d\\u2028\\u2029\\u202a-\\u202e\\u2060\\u2066-\\u2069\\u202f\\u205f\\u3000\\ufeff";
 var SEPARATOR_CLASS_SOURCE = "\\t\\n\\x0b\\f\\r " + EXOTIC_SEPARATORS;
 var ANSI_ESCAPE_GLOBAL_RE2 = new RegExp("\\u001b\\[[0-?]*[ -\\/]*[@-~]", "g");
@@ -29571,6 +29627,34 @@ function attachStderrTailRing(stderr) {
     }
   };
 }
+function attachStderrTailExitObserver(child, onStderrTail) {
+  const stderrTail = attachStderrTailRing(child.stderr);
+  return (handler) => {
+    const observeExit = (code, signal) => {
+      let completed = false;
+      let timer2 = null;
+      const complete = () => {
+        if (completed) return;
+        completed = true;
+        if (timer2) clearTimeout(timer2);
+        child.removeListener("close", complete);
+        try {
+          onStderrTail?.(stderrTail.read());
+        } finally {
+          handler(code, signal);
+        }
+      };
+      child.once("close", complete);
+      timer2 = setTimeout(complete, STDERR_EXIT_GRACE_MS);
+      timer2.unref();
+    };
+    if (child.exitCode !== null || child.signalCode !== null) {
+      observeExit(child.exitCode, child.signalCode);
+    } else {
+      child.once("exit", observeExit);
+    }
+  };
+}
 
 // src/host/opencode.ts
 var import_node_fs3 = require("node:fs");
@@ -31367,27 +31451,18 @@ async function openOpenCodeAcpSession(options) {
       await disposeHome();
       throw new AcpHostError("spawn_failed", "child missing stdio pipes");
     }
-    const stderrTail = attachStderrTailRing(child.stderr);
-    if (options.onStderrTail) {
-      const deliverTail = options.onStderrTail;
-      let tailDelivered = false;
-      const publishTail = () => {
-        if (tailDelivered) return;
-        tailDelivered = true;
-        deliverTail(stderrTail.read());
-      };
-      child.once("exit", publishTail);
-      child.once("close", publishTail);
-    }
+    const observeStderrTailOnExit = attachStderrTailExitObserver(
+      child,
+      options.onStderrTail
+    );
     let sessionRef = null;
     const transport = createBoundTransport({
       readable: child.stdout,
       writable: child.stdin,
       requestTimeoutMs: options.requestTimeoutMs ?? ACP_DEFAULT_REQUEST_TIMEOUT_MS,
+      readableEndGraceMs: STDERR_READABLE_END_GRACE_MS,
       getSession: () => sessionRef,
-      onChildExit: (handler) => {
-        child.on("exit", (code, signal) => handler(code, signal));
-      }
+      onChildExit: observeStderrTailOnExit
     });
     try {
       const session = await AcpHostSession.connect({
@@ -31443,8 +31518,6 @@ var import_node_fs4 = require("node:fs");
 var import_node_path6 = require("node:path");
 var CHILD_EXIT_WAIT_MS2 = 3e3;
 var CHILD_KILL_WAIT_MS2 = 1e3;
-var STDERR_EXIT_GRACE_MS = 100;
-var READABLE_END_GRACE_MS = STDERR_EXIT_GRACE_MS + 50;
 var WINDOWS_NPM_SHIM_MAX_BYTES = 64 * 1024;
 var WINDOWS_NPM_ENTRYPOINT = [
   "node_modules",
@@ -31741,35 +31814,18 @@ async function openClaudeAcpSession(options) {
     await terminateClaudeChild(child);
     throw new AcpHostError("spawn_failed", "child missing stdio pipes");
   }
-  const stderrTail = attachStderrTailRing(child.stderr);
+  const observeStderrTailOnExit = attachStderrTailExitObserver(
+    child,
+    options.onStderrTail
+  );
   let sessionRef = null;
   const transport = createBoundTransport({
     readable: child.stdout,
     writable: child.stdin,
     requestTimeoutMs: options.requestTimeoutMs ?? ACP_DEFAULT_REQUEST_TIMEOUT_MS,
-    readableEndGraceMs: READABLE_END_GRACE_MS,
+    readableEndGraceMs: STDERR_READABLE_END_GRACE_MS,
     getSession: () => sessionRef,
-    onChildExit: (handler) => {
-      const observeExit = (code, signal) => {
-        let completed = false;
-        let timer2 = null;
-        const complete = () => {
-          if (completed) return;
-          completed = true;
-          if (timer2) clearTimeout(timer2);
-          child.removeListener("close", complete);
-          options.onStderrTail?.(stderrTail.read());
-          handler(code, signal);
-        };
-        child.once("close", complete);
-        timer2 = setTimeout(complete, STDERR_EXIT_GRACE_MS);
-      };
-      if (child.exitCode !== null || child.signalCode !== null) {
-        observeExit(child.exitCode, child.signalCode);
-      } else {
-        child.once("exit", observeExit);
-      }
-    }
+    onChildExit: observeStderrTailOnExit
   });
   try {
     const session = await Promise.race([
@@ -32038,27 +32094,18 @@ async function openCodexAcpSession(options) {
     await terminateCodexChild(child);
     throw new AcpHostError("spawn_failed", "child missing stdio pipes");
   }
-  const stderrTail = attachStderrTailRing(child.stderr);
-  if (options.onStderrTail) {
-    const deliverTail = options.onStderrTail;
-    let tailDelivered = false;
-    const publishTail = () => {
-      if (tailDelivered) return;
-      tailDelivered = true;
-      deliverTail(stderrTail.read());
-    };
-    child.once("exit", publishTail);
-    child.once("close", publishTail);
-  }
+  const observeStderrTailOnExit = attachStderrTailExitObserver(
+    child,
+    options.onStderrTail
+  );
   let sessionRef = null;
   const transport = createBoundTransport({
     readable: child.stdout,
     writable: child.stdin,
     requestTimeoutMs: options.requestTimeoutMs ?? ACP_DEFAULT_REQUEST_TIMEOUT_MS,
+    readableEndGraceMs: STDERR_READABLE_END_GRACE_MS,
     getSession: () => sessionRef,
-    onChildExit: (handler) => {
-      child.on("exit", (code, signal) => handler(code, signal));
-    }
+    onChildExit: observeStderrTailOnExit
   });
   try {
     const session = await Promise.race([
@@ -33012,27 +33059,18 @@ async function openGrokAcpSession(options) {
     child.kill("SIGKILL");
     throw new AcpHostError("spawn_failed", "child missing stdio pipes");
   }
-  const stderrTail = attachStderrTailRing(child.stderr);
-  if (options.onStderrTail) {
-    const deliverTail = options.onStderrTail;
-    let tailDelivered = false;
-    const publishTail = () => {
-      if (tailDelivered) return;
-      tailDelivered = true;
-      deliverTail(stderrTail.read());
-    };
-    child.once("exit", publishTail);
-    child.once("close", publishTail);
-  }
+  const observeStderrTailOnExit = attachStderrTailExitObserver(
+    child,
+    options.onStderrTail
+  );
   let sessionRef = null;
   const transport = createBoundTransport({
     readable: child.stdout,
     writable: child.stdin,
     requestTimeoutMs: options.requestTimeoutMs ?? ACP_DEFAULT_REQUEST_TIMEOUT_MS,
+    readableEndGraceMs: STDERR_READABLE_END_GRACE_MS,
     getSession: () => sessionRef,
-    onChildExit: (handler) => {
-      child.on("exit", (code, signal) => handler(code, signal));
-    }
+    onChildExit: observeStderrTailOnExit
   });
   try {
     const session = await AcpHostSession.connect({
@@ -37826,7 +37864,17 @@ async function discoverContexts(stateDirectory2, isListenerLive = listenerIsLive
       instanceDirectory
     );
     const statusIsLive = storedStatus === null ? null : await isListenerLive(storedStatus);
-    if (statusIsLive === false) continue;
+    if (statusIsLive === false) {
+      contexts.push({
+        instanceDirectory,
+        paths: storedStatus.paths,
+        status: storedStatus.status,
+        listenerLive: false,
+        credential: null,
+        credentialReadFailed: false
+      });
+      continue;
+    }
     await deleteSecureJsonFile(
       (0, import_node_path18.join)(instanceDirectory, RETIRED_HOOK_CREDENTIAL_FILE)
     ).catch(() => void 0);
@@ -37836,6 +37884,7 @@ async function discoverContexts(stateDirectory2, isListenerLive = listenerIsLive
         instanceDirectory,
         paths: storedStatus?.paths ?? null,
         status: storedStatus?.status ?? null,
+        listenerLive: statusIsLive,
         credential,
         credentialReadFailed: credential === null && storedStatus !== null
       });
@@ -37845,6 +37894,7 @@ async function discoverContexts(stateDirectory2, isListenerLive = listenerIsLive
         instanceDirectory,
         paths: storedStatus.paths,
         status: storedStatus.status,
+        listenerLive: statusIsLive,
         credential: null,
         credentialReadFailed: true
       });
@@ -37885,6 +37935,24 @@ function renderHookSignal(item) {
     `${replyLabel} cswarm reply ${item.signalId} "<answer>" --workspace-id ${item.workspaceId}`
   ].join("\n");
 }
+function listenerRestartCommand(status) {
+  const routeMode = status.routeMode ?? "worker";
+  return [
+    "cswarm listen start",
+    "--agent-token-stdin",
+    `--workspace-id ${status.workspaceId}`,
+    `--provider ${status.provider}`,
+    ...status.permissionMode ? [`--permissions ${status.permissionMode}`] : [],
+    `--route ${routeMode}`,
+    ...routeMode === "split" && status.deferOverChars !== null && status.deferOverChars !== void 0 ? [`--defer-over ${status.deferOverChars}`] : []
+  ].join(" ");
+}
+function renderStrandedQueue(context, count2) {
+  const status = context.status;
+  const noun = count2 === 1 ? "message" : "messages";
+  const verb = count2 === 1 ? "was" : "were";
+  return `[CommonSwarm] ${count2} ${noun} ${verb} waiting for agent ${status.principalId} in listener ${status.instanceId}, but that listener is no longer running. Restart it by piping the same agent credential into: ` + listenerRestartCommand(status);
+}
 async function inboxItems(context, options) {
   const stored = context.credential;
   const target2 = cloudTarget(stored.targetUrl, stored.anonKey);
@@ -37944,11 +38012,11 @@ async function checkListenerHooks(options) {
       options.isListenerLive ?? listenerIsLive
     );
     if (contexts.length === 0) return "";
-    const networkAllowed = await reserveCheck(
+    const networkAllowed = contexts.some((context) => context.listenerLive !== false) ? await reserveCheck(
       stateDirectory2,
       cooldownSeconds * 1e3,
       now()
-    );
+    ) : false;
     const checks = await Promise.all(contexts.map(async (context) => {
       const queue = new FilePendingMainQueue(context.instanceDirectory);
       const pending = await queue.read();
@@ -37973,7 +38041,7 @@ async function checkListenerHooks(options) {
         context,
         queue,
         pending,
-        droppedCount: stats.droppedCount,
+        droppedCount: context.listenerLive === false ? 0 : stats.droppedCount,
         network,
         credentialFailure,
         credentialHealthy
@@ -37989,6 +38057,11 @@ async function checkListenerHooks(options) {
         check.droppedCount
       );
       blocks.push(...staged.unseen.map(renderHookSignal));
+      const pendingSignalIds = new Set(check.pending.map((entry) => entry.signalId));
+      const unseenPending = staged.unseen.filter((item) => pendingSignalIds.has(item.signalId));
+      if (check.context.listenerLive === false && unseenPending.length > 0) {
+        blocks.push(renderStrandedQueue(check.context, unseenPending.length));
+      }
       const reportDrops = staged.droppedSinceLastCheck > 0;
       if (reportDrops) blocks.push(renderDroppedAsks(staged.droppedSinceLastCheck));
       const reportCredentialFailure = check.credentialFailure !== null && !staged.credentialFailureReported;
@@ -37999,12 +38072,14 @@ async function checkListenerHooks(options) {
           blocks.push(warning);
         }
       }
-      const pendingSignalIds = new Set(check.pending.map((entry) => entry.signalId));
       commits.push({
         check,
         store: store2,
         signalIds: staged.unseen.map((item) => item.signalId),
-        printedPendingSignalIds: staged.unseen.map((item) => item.signalId).filter((signalId) => pendingSignalIds.has(signalId)),
+        // Every staged queue entry is either written by this run or was committed
+        // after an earlier successful write. Removing both keeps the queue bounded
+        // without re-printing entries below the exactly-once high-water.
+        settledPendingSignalIds: check.pending.map((item) => item.signalId),
         reportDrops,
         reportCredentialFailure
       });
@@ -38018,7 +38093,7 @@ async function checkListenerHooks(options) {
         ...commit.reportCredentialFailure ? { credentialFailureReported: true } : commit.check.credentialHealthy ? { credentialFailureReported: false } : {}
       });
       const remainingCount = await commit.check.queue.remove(
-        new Set(commit.printedPendingSignalIds),
+        new Set(commit.settledPendingSignalIds),
         HOOK_LOCK_TIMEOUT_MS
       );
       if (commit.check.context.paths !== null && commit.check.context.status !== null) {
@@ -38151,8 +38226,8 @@ var ACCEPTED_AGENT_CREDENTIAL_MESSAGES = [
   AGENT_CREDENTIAL_MESSAGE_D088
 ];
 function packageVersion() {
-  if ("0.1.29".length > 0) {
-    return "0.1.29";
+  if ("0.1.31".length > 0) {
+    return "0.1.31";
   }
   try {
     const value = JSON.parse(
@@ -40039,7 +40114,11 @@ async function runPostSignal(args, kind) {
     }
     const reply = waitResult.signals[0] ?? null;
     if (args.has("json")) {
-      printJson(askWaitJsonPayload(signal, reply, waitResult.timedOut));
+      printJson({
+        ...askWaitJsonPayload(signal, reply, waitResult.timedOut),
+        retried: result.retried,
+        attempts: result.attempts
+      });
       return;
     }
     const authors2 = await settleSignalAuthorLabels(
@@ -40076,7 +40155,9 @@ ${renderSignals([signal, reply], {
     printJson({
       status: result.response.status,
       message: "Signal shared. It is immutable, tenancy-scoped, and will quietly expire at its horizon.",
-      signal
+      signal,
+      retried: result.retried,
+      attempts: result.attempts
     });
     return;
   }
@@ -40166,7 +40247,9 @@ async function runReply(args) {
     printJson({
       status: result.response.status,
       message: "Reply shared. It is immutable, tenancy-scoped, and will quietly expire at its horizon.",
-      signal
+      signal,
+      retried: result.retried,
+      attempts: result.attempts
     });
     return;
   }
@@ -40695,7 +40778,7 @@ function renderListenerStatus(status) {
     }
     if (pendingForMainCount > 0) {
       lines.push(
-        `${pendingForMainCount} asks waiting for this session; they surface at your next prompt, or run cswarm hook check.`
+        status.state === "stopped" || status.state === "failed" ? `${pendingForMainCount} asks are stranded because this listener is not running. Restart it by piping the same agent credential into: ${listenerRestartCommand(status)}` : `${pendingForMainCount} asks waiting for this session; they surface at your next prompt, or run cswarm hook check.`
       );
     }
   }
@@ -40711,6 +40794,20 @@ function renderListenerStatus(status) {
   }
   return lines.join("\n");
 }
+async function unsurfacedPendingMainStats(instanceDirectory, fallback) {
+  try {
+    const queue = new FilePendingMainQueue(instanceDirectory);
+    const pending = await queue.read();
+    const stats = await queue.stats();
+    const staged = await new FileHookSurfaceStore(instanceDirectory).stage(
+      pending,
+      stats.droppedCount
+    );
+    return { count: staged.unseen.length, droppedCount: stats.droppedCount };
+  } catch {
+    return fallback;
+  }
+}
 function listenerFailureMessage(code, provider) {
   if (code === "version_below_floor") {
     if (provider === "codex") {
@@ -41185,9 +41282,10 @@ async function runListenStart(args) {
   if ((status.routeMode ?? "worker") !== "worker") {
     const recordedPending = status.pendingForMainCount ?? 0;
     const recordedDropped = status.droppedForMainCount ?? 0;
-    const queueStats = await new FilePendingMainQueue(
-      paths.instanceDirectory
-    ).stats().catch(() => ({ count: recordedPending, droppedCount: recordedDropped }));
+    const queueStats = await unsurfacedPendingMainStats(
+      paths.instanceDirectory,
+      { count: recordedPending, droppedCount: recordedDropped }
+    );
     status = {
       ...status,
       pendingForMainCount: queueStats.count,
@@ -41302,9 +41400,10 @@ async function runListenStatusOrStop(args, command2) {
   if ((status.routeMode ?? "worker") !== "worker") {
     const recordedPending = status.pendingForMainCount ?? 0;
     const recordedDropped = status.droppedForMainCount ?? 0;
-    const queueStats = await new FilePendingMainQueue(
-      paths.instanceDirectory
-    ).stats().catch(() => ({ count: recordedPending, droppedCount: recordedDropped }));
+    const queueStats = await unsurfacedPendingMainStats(
+      paths.instanceDirectory,
+      { count: recordedPending, droppedCount: recordedDropped }
+    );
     status = {
       ...status,
       pendingForMainCount: queueStats.count,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commonswarm",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "CommonSwarm CLI — coordination for teams where people and AI agents work side by side.",
   "bin": {
     "cswarm": "cswarm.cjs"