@sechroom/cli 2026.8.1 → 2026.8.3-rc.fc3795ae7

package/dist/index.js

@@ -8975,7 +8975,7 @@ function herdrRequest(socketPath, method, params, timeoutMs = 1e4) {
   });
 }
 function herdrStream(socketPath, subscriptions, onEvent, options = {}) {
-  const { signal, onWarning, subscribeTimeoutMs = 1e4 } = options;
+  const { signal, onWarning, onReady, subscribeTimeoutMs = 1e4 } = options;
   return new Promise((resolvePromise, rejectPromise) => {
     if (signal?.aborted) {
       resolvePromise();
@@ -9017,6 +9017,7 @@ function herdrStream(socketPath, subscriptions, onEvent, options = {}) {
         if (!acked) {
           acked = true;
           clearTimeout(ackTimer);
+          onReady?.();
         }
         const classified = classifyStreamLine(line, id);
         if (classified.kind === "ack") continue;
@@ -9191,9 +9192,12 @@ function indexAgents(agents) {
   return new Map(agents.map((agent) => [agent.pane_id, agent]));
 }
 function buildWatchSubscriptions(agents) {
-  return agents.flatMap((agent) => [
-    { type: "pane.agent_status_changed", pane_id: agent.pane_id },
-    { type: "pane.exited", pane_id: agent.pane_id }
+  return buildPaneSubscriptions(agents.map((agent) => agent.pane_id));
+}
+function buildPaneSubscriptions(paneIds) {
+  return [...new Set(paneIds)].flatMap((pane_id) => [
+    { type: "pane.agent_status_changed", pane_id },
+    { type: "pane.exited", pane_id }
   ]);
 }
 function normalizeWatchEvent(raw) {
@@ -9385,6 +9389,7 @@ async function runWait(ports, targets, options) {
   const remaining = new Set(targetIds);
   let seed = /* @__PURE__ */ new Map();
   let attempt = 0;
+  const subscriptions = buildPaneSubscriptions(targetIds);
   const settle = (agent, paneId, status) => {
     if (!remaining.has(paneId)) return;
     const record = {
@@ -9403,67 +9408,124 @@ async function runWait(ports, targets, options) {
   try {
     while (!controller.signal.aborted) {
       try {
-        const listed = await raceAbort(
-          ports.request("agent.list", {})
-        );
-        if (listed === aborted) break;
-        const current = listed.agents ?? [];
-        const fresh = indexAgents(current);
-        for (const paneId of [...remaining]) {
-          const currentAgent = fresh.get(paneId);
-          if (currentAgent === void 0) {
-            settle(seed.get(paneId), paneId, "exited");
-            continue;
-          }
-          const status = currentAgent.agent_status?.trim().toLowerCase();
-          if (status !== void 0 && statuses.has(status)) {
-            settle(currentAgent, paneId, currentAgent.agent_status ?? status);
-          }
-        }
-        seed = fresh;
-        if (completed || remaining.size === 0) return;
-        const subscriptions = buildWatchSubscriptions(
-          current.filter((agent) => remaining.has(agent.pane_id))
-        );
         let carriedTraffic = false;
         let relistNeeded = false;
+        let reconciled = false;
+        const bufferedEvents = [];
         const startedAt = now();
         const cycle = new AbortController();
         const stopCycle = () => cycle.abort();
         controller.signal.addEventListener("abort", stopCycle, { once: true });
+        let streamReady = false;
+        let streamFailed = false;
+        let streamFailure;
+        let resolveReady;
+        let rejectReady;
+        const ready = new Promise((resolve9, reject) => {
+          resolveReady = resolve9;
+          rejectReady = reject;
+        });
+        const handleEvent = (event) => {
+          if (!remaining.has(event.paneId)) return;
+          const known = seed.get(event.paneId);
+          if (event.type === "pane.exited") {
+            settle(known, event.paneId, "exited");
+            return;
+          }
+          const status = event.to?.trim().toLowerCase();
+          if (known && event.to) known.agent_status = event.to;
+          if (status !== void 0 && statuses.has(status)) {
+            settle(known, event.paneId, event.to ?? status);
+          }
+        };
+        let streamFinished;
         try {
-          const streamed = await raceAbort(
-            ports.stream(
-              subscriptions,
-              (raw) => {
-                carriedTraffic = true;
-                const event = normalizeWatchEvent(raw);
-                if (event === null || needsRelistFallback(event)) {
-                  relistNeeded = true;
-                  cycle.abort();
-                  return;
-                }
-                if (!remaining.has(event.paneId)) return;
-                const known = seed.get(event.paneId);
-                if (event.type === "pane.exited") {
-                  settle(known, event.paneId, "exited");
-                  return;
-                }
-                const status = event.to?.trim().toLowerCase();
-                if (known && event.to) known.agent_status = event.to;
-                if (status !== void 0 && statuses.has(status)) {
-                  settle(known, event.paneId, event.to ?? status);
-                }
+          const stream = ports.stream(
+            subscriptions,
+            (raw) => {
+              carriedTraffic = true;
+              if (!streamReady) {
+                streamReady = true;
+                resolveReady();
+              }
+              const event = normalizeWatchEvent(raw);
+              if (event === null || needsRelistFallback(event)) {
+                relistNeeded = true;
+                cycle.abort();
+                return;
+              }
+              if (!reconciled) {
+                bufferedEvents.push(event);
+                return;
+              }
+              handleEvent(event);
+            },
+            {
+              signal: cycle.signal,
+              onReady: () => {
+                streamReady = true;
+                resolveReady();
               },
-              {
-                signal: cycle.signal,
-                onWarning: (message) => warn2(`herdr wait: ${message}`)
+              onWarning: (message) => warn2(`herdr wait: ${message}`)
+            }
+          );
+          streamFinished = stream.then(
+            () => {
+              if (!streamReady) {
+                rejectReady(
+                  new Error("Herdr subscription closed before it was ready")
+                );
               }
-            )
+            },
+            (error) => {
+              streamFailed = true;
+              streamFailure = error;
+              if (!streamReady) rejectReady(error);
+            }
           );
+        } catch (error) {
+          streamFailed = true;
+          streamFailure = error;
+          rejectReady(error);
+          streamFinished = Promise.resolve();
+        }
+        try {
+          const readyResult = await raceAbort(ready);
+          if (readyResult === aborted) break;
+          const listed = await raceAbort(
+            ports.request("agent.list", {})
+          );
+          if (listed === aborted) break;
+          const current = listed.agents ?? [];
+          const fresh = indexAgents(current);
+          for (const paneId of [...remaining]) {
+            const currentAgent = fresh.get(paneId);
+            if (currentAgent === void 0) {
+              settle(seed.get(paneId), paneId, "exited");
+            }
+          }
+          seed = fresh;
+          reconciled = true;
+          for (const paneId of [...remaining]) {
+            const currentAgent = fresh.get(paneId);
+            if (currentAgent === void 0) continue;
+            for (const event of bufferedEvents) {
+              if (event.paneId === paneId) handleEvent(event);
+            }
+            if (!remaining.has(paneId)) continue;
+            const status = currentAgent.agent_status?.trim().toLowerCase();
+            if (status !== void 0 && statuses.has(status)) {
+              settle(currentAgent, paneId, currentAgent.agent_status ?? status);
+            }
+          }
+          if (completed || remaining.size === 0) return;
+          if (relistNeeded) continue;
+          const streamed = await raceAbort(streamFinished);
           if (streamed === aborted) break;
+          if (streamFailed) throw streamFailure;
         } finally {
           controller.signal.removeEventListener("abort", stopCycle);
+          cycle.abort();
         }
         if (completed) return;
         if (relistNeeded) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sechroom/cli",
-  "version": "2026.8.1",
+  "version": "2026.8.3-rc.fc3795ae7",
   "description": "Command-line interface for Sechroom — sign in, wire your AI tools, and work with your sechroom from the terminal.",
   "type": "module",
   "license": "UNLICENSED",