@bivy/bivy 0.16.18-staging.7 → 0.16.18-staging.8

package/dist/session/run-terminal.js

@@ -345,12 +345,14 @@ export function createRunTerminals(deps) {
         const discover = SESSION_DISCOVERY_BY_AGENT[agent];
         if (!discover)
             return undefined;
-        for (let attempt = 0; attempt < TAKEOVER_DISCOVERY_ATTEMPTS; attempt++) {
+        const attempts = Math.max(1, Math.floor(deps.takeoverDiscoveryAttempts ?? TAKEOVER_DISCOVERY_ATTEMPTS));
+        const delayMs = Math.max(0, Math.floor(deps.takeoverDiscoveryDelayMs ?? TAKEOVER_DISCOVERY_DELAY_MS));
+        for (let attempt = 0; attempt < attempts; attempt++) {
             const ref = await discover(workspace, createdAt);
             if (ref)
                 return ref;
-            if (attempt + 1 < TAKEOVER_DISCOVERY_ATTEMPTS) {
-                await new Promise((resolve) => setTimeout(resolve, TAKEOVER_DISCOVERY_DELAY_MS));
+            if (delayMs > 0 && attempt + 1 < attempts) {
+                await new Promise((resolve) => setTimeout(resolve, delayMs));
             }
         }
         return undefined;

package/dist/terminal.js

@@ -196,6 +196,8 @@ export class TerminalManager {
             env,
         });
         const now = Date.now();
+        let resolveExit;
+        const exitPromise = new Promise((resolve) => { resolveExit = resolve; });
         const entry = {
             proc,
             workspace: options.workspace,
@@ -209,6 +211,8 @@ export class TerminalManager {
             flushTimer: null,
             closed: false,
             onData: options.onData,
+            exitPromise,
+            resolveExit,
         };
         // Register the opener as a sized client so a later, smaller client shrinks
         // the PTY to the min of the two rather than clobbering the opener's size.
@@ -269,7 +273,12 @@ export class TerminalManager {
             flush();
             entry.closed = true;
             this.terminals.delete(id);
-            options.onExit(exitCode, signal, entry.buffer);
+            try {
+                options.onExit(exitCode, signal, entry.buffer);
+            }
+            finally {
+                entry.resolveExit();
+            }
         });
         return id;
     }
@@ -347,6 +356,19 @@ export class TerminalManager {
         const entry = this.terminals.get(id);
         if (!entry)
             return false;
+        this.closeEntry(id, entry);
+        return true;
+    }
+    /** Close a terminal and wait for the underlying PTY process to report exit. */
+    async closeAndWait(id, timeoutMs = 2000) {
+        const entry = this.terminals.get(id);
+        if (!entry)
+            return false;
+        this.closeEntry(id, entry);
+        await waitForExit(entry.exitPromise, timeoutMs);
+        return true;
+    }
+    closeEntry(id, entry) {
         this.terminals.delete(id);
         // Drop any queued output — the client asked to close, so don't emit a
         // trailing batch (which would fire onData for a terminal it has torn down).
@@ -363,7 +385,6 @@ export class TerminalManager {
         catch {
             // already gone
         }
-        return true;
     }
     has(id) {
         return this.terminals.has(id);
@@ -421,6 +442,28 @@ export class TerminalManager {
         for (const id of [...this.terminals.keys()])
             this.close(id);
     }
+    /** Kill every terminal and wait for node-pty to release its child handles. */
+    async disposeAllAndWait(timeoutMs = 2000) {
+        const exits = [];
+        for (const [id, entry] of [...this.terminals]) {
+            this.closeEntry(id, entry);
+            exits.push(waitForExit(entry.exitPromise, timeoutMs));
+        }
+        await Promise.all(exits);
+    }
+}
+async function waitForExit(exitPromise, timeoutMs) {
+    let timer;
+    try {
+        await Promise.race([
+            exitPromise,
+            new Promise((resolve) => { timer = setTimeout(resolve, timeoutMs); }),
+        ]);
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
 }
 function clampDim(value, fallback) {
     const n = Math.floor(Number(value));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.16.18-staging.7",
+  "version": "0.16.18-staging.8",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",