@ordewell/cli 0.6.1 → 0.6.3

package/dist/main.js

@@ -413,6 +413,8 @@ var ApiClient = class _ApiClient {
   static defaultWorkspace;
   port;
   workspace;
+  /** A session's open execution stream, so a new one can end it: one run is reported once. */
+  executionStreams = /* @__PURE__ */ new Map();
   constructor(port, workspace) {
     this.port = port || DEFAULT_PORT;
     this.workspace = workspace ?? _ApiClient.defaultWorkspace ?? process.cwd();
@@ -849,26 +851,36 @@ var ApiClient = class _ApiClient {
   }
   streamExecution(sessionId, onEvent, onReady) {
     return new Promise((resolve3, reject) => {
+      this.executionStreams.get(sessionId)?.();
       const socket = this.openSessionSocket(sessionId);
       let resolved = false;
       let opened = false;
+      const forget = () => {
+        if (this.executionStreams.get(sessionId) === end) this.executionStreams.delete(sessionId);
+      };
+      const end = () => {
+        forget();
+        if (resolved) return;
+        resolved = true;
+        socket.close();
+        resolve3();
+      };
+      this.executionStreams.set(sessionId, end);
       socket.on("open", () => {
         opened = true;
         onReady?.();
       });
       socket.on("message", (data) => {
+        if (resolved) return;
         try {
           const event = JSON.parse(data.toString());
           onEvent(event);
-          if ((event.type === "execution_complete" || event.type === "execution_stopped" || event.type === "isolation_blocked") && !resolved) {
-            resolved = true;
-            socket.close();
-            resolve3();
-          }
+          if (event.type === "execution_complete" || event.type === "execution_stopped") end();
         } catch {
         }
       });
       socket.on("error", (err) => {
+        forget();
         if (!opened) onReady?.(err);
         if (!resolved) {
           resolved = true;
@@ -876,6 +888,7 @@ var ApiClient = class _ApiClient {
         }
       });
       socket.on("close", () => {
+        forget();
         if (!opened) onReady?.(new Error("Execution stream closed before connecting"));
         if (!resolved) {
           resolved = true;
@@ -1688,6 +1701,11 @@ async function followExecution(api, sessionId, start, onBlocked) {
     }
   }
   let pausedAtGate = false;
+  let noteBlocked = () => {
+  };
+  const blockedSeen = new Promise((resolve3) => {
+    noteBlocked = resolve3;
+  });
   let settleReady = () => {
   };
   const streamReady = new Promise((resolve3, reject) => {
@@ -1726,6 +1744,7 @@ Done. ${summary.completed || 0} completed, ${summary.failed || 0} failed, ${summ
     if (event.type === "isolation_blocked") {
       blocked = event.message;
       dirtyRepos = event.repos ?? [];
+      noteBlocked();
     }
     if (event.type === "isolation_handoff") {
       const n = event.landed.length;
@@ -1743,7 +1762,7 @@ Run finished on ${handoffBranch(event)}${where} \u2014 ${n} task${n === 1 ? "" :
   void stream.catch(settleReady);
   await streamReady.catch(streamFailed);
   await start();
-  await stream.catch(streamFailed);
+  await Promise.race([stream, blockedSeen]).catch(streamFailed);
   if (blocked === null) return;
   if (!onBlocked) {
     await api.stopExecution(sessionId);
@@ -7797,8 +7816,8 @@ async function perform(effect, deps) {
       await refreshPlan(deps, effect.sessionId);
       dispatch({ type: "notice", message: `Removed the run's worktrees and task branches; ${effect.branch} is kept.` });
       return;
-    // Spawns runners again, so it needs the stream a run needs — the blocked
-    // one closed itself when nothing started.
+    // Spawns runners again, so it needs the stream a run needs. Opening it ends
+    // the blocked run's, which stayed open to show the ops tasks still running.
     case "isolationContinue": {
       const { sessionId } = effect;
       await withExecutionStream(deps, sessionId, () => effect.mode === "stash" ? api.continueWithStash(sessionId) : api.continueWithoutIsolation(sessionId));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordewell/cli",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Ordewell CLI and TUI — plan, run and verify coding-agent tasks from the terminal.",
   "license": "Apache-2.0",
   "author": "Alessandro Costanzo Ciano",
@@ -49,8 +49,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ordewell/core": "^0.6.1",
-    "@ordewell/web": "^0.6.1",
+    "@ordewell/core": "^0.6.3",
+    "@ordewell/web": "^0.6.3",
     "string-width": "^7.2.0",
     "ws": "^8.18.0"
   },