commonswarm 0.1.30 → 0.1.31

package/cswarm.cjs

@@ -37864,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);
@@ -37874,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
       });
@@ -37883,6 +37894,7 @@ async function discoverContexts(stateDirectory2, isListenerLive = listenerIsLive
         instanceDirectory,
         paths: storedStatus.paths,
         status: storedStatus.status,
+        listenerLive: statusIsLive,
         credential: null,
         credentialReadFailed: true
       });
@@ -37923,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);
@@ -37982,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();
@@ -38011,7 +38041,7 @@ async function checkListenerHooks(options) {
         context,
         queue,
         pending,
-        droppedCount: stats.droppedCount,
+        droppedCount: context.listenerLive === false ? 0 : stats.droppedCount,
         network,
         credentialFailure,
         credentialHealthy
@@ -38027,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;
@@ -38037,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
       });
@@ -38056,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) {
@@ -38189,8 +38226,8 @@ var ACCEPTED_AGENT_CREDENTIAL_MESSAGES = [
   AGENT_CREDENTIAL_MESSAGE_D088
 ];
 function packageVersion() {
-  if ("0.1.30".length > 0) {
-    return "0.1.30";
+  if ("0.1.31".length > 0) {
+    return "0.1.31";
   }
   try {
     const value = JSON.parse(
@@ -40741,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.`
       );
     }
   }
@@ -40757,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") {
@@ -41231,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,
@@ -41348,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.30",
+  "version": "0.1.31",
   "description": "CommonSwarm CLI — coordination for teams where people and AI agents work side by side.",
   "bin": {
     "cswarm": "cswarm.cjs"