@rynx-ai/runtime 0.1.11-beta.21 → 0.1.11-beta.23

package/dist/terminal/tmux.js

@@ -79,50 +79,32 @@ export function tmuxHasAttachedClient(name, tmuxBin = resolveTmuxBin()) {
         });
     });
 }
-/** Kill one private tmux server and verify it no longer answers. Missing
- * sockets are already stopped; an existing socket with an unusable tmux
- * command is unproven and returns false. */
+/** Best-effort close of one private tmux server. Mirrors Omnigent's bounded
+ * `TerminalInstance.close`: attempt `kill-server`, then retire the private
+ * socket regardless of command outcome. The registry has already forgotten
+ * the resource, so cleanup failure is diagnostic rather than a second
+ * lifecycle state. */
 export function terminateTmuxServer(name, tmuxBin = resolveTmuxBin()) {
     const socketPath = tmuxSocketPath(name);
     if (!existsSync(socketPath))
         return true;
     const base = ["-u", "-S", socketPath];
     try {
-        execFileSync(tmuxBin, [...base, "kill-server"], { stdio: "ignore" });
+        execFileSync(tmuxBin, [...base, "kill-server"], {
+            stdio: "ignore",
+            timeout: 5_000,
+        });
     }
     catch {
-        // A server may have exited between existsSync and kill-server. Verify below.
+        // Omnigent treats close as best-effort and still retires the resource.
     }
     try {
-        execFileSync(tmuxBin, [...base, "has-session", "-t", TMUX_TARGET], {
-            stdio: "ignore",
-        });
-        return false;
+        unlinkSync(socketPath);
     }
-    catch (error) {
-        // Only a real tmux exit status proves the server/session is absent. Spawn
-        // failures (missing/unexecutable tmux) leave liveness unproven and must not
-        // unlink a socket that could still belong to a live server.
-        if (!error ||
-            typeof error !== "object" ||
-            !("status" in error) ||
-            typeof error.status !== "number") {
-            return false;
-        }
-        try {
-            // tmux custom-socket servers can exit while leaving the filesystem entry
-            // behind. Remove that verified-stale socket so process/socket inventories
-            // do not accumulate dead terminals forever.
-            unlinkSync(socketPath);
-            return true;
-        }
-        catch (unlinkError) {
-            return Boolean(unlinkError &&
-                typeof unlinkError === "object" &&
-                "code" in unlinkError &&
-                unlinkError.code === "ENOENT");
-        }
+    catch {
+        // Gone already, or best-effort filesystem cleanup failed.
     }
+    return true;
 }
 /** Is a usable `tmux` on PATH? Cheap probe for the capability gate. */
 export function isTmuxAvailable(tmuxBin = resolveTmuxBin()) {
@@ -158,6 +140,14 @@ export class TmuxTerminal {
     tmuxBin;
     injectedSpawn;
     started = false;
+    lastPaneSnapshot = "";
+    /** Shared by every attachment watcher and by the lifecycle watcher's
+     * pane-dead stage. One Terminal must never fan the same tmux control probe
+     * out once per attached client. */
+    paneLivenessFlight;
+    /** Shared by lifecycle callers so capture + pane-dead remains one ordered
+     * Omnigent-style observation per Terminal. */
+    lifecycleLivenessFlight;
     constructor(opts) {
         this.name = opts.name;
         this.cwd = opts.cwd;
@@ -188,15 +178,8 @@ export class TmuxTerminal {
     start() {
         if (this.started)
             return;
-        // Clear any stale server on this socket (a crashed prior run / a test rerun
-        // reusing the name); the socket is unique per session, so this only ever
-        // reaps our own leftover, never a live sibling.
-        try {
-            execFileSync(this.tmuxBin, [...this.base(), "kill-server"], { stdio: "ignore" });
-        }
-        catch {
-            // No stale server — expected on a fresh start.
-        }
+        // Clear any stale server on this deterministic private socket before launch.
+        terminateTmuxServer(this.name, this.tmuxBin);
         // `new-session -d` starts detached; `-x/-y` seed the pane size so output
         // wraps sanely before the first client attaches and resizes it.
         execFileSync(this.tmuxBin, [
@@ -302,21 +285,82 @@ export class TmuxTerminal {
     /** Async pane-liveness probe — MUST NOT block the event loop. The attach
      *  pane-death watcher polls this on an interval; a synchronous `execFileSync`
      *  there stalls the runner child's event loop (freezing the PTY stream → the
-     *  terminal appears "stuck"). reference implementation's `_tmux_session_alive` uses an async
-     *  subprocess + timeout for exactly this reason. */
-    isAliveAsync() {
+     *  terminal appears "stuck"). Exactly like Omnigent's definitive pane probe,
+     *  every command error is `unknown`; only `#{pane_dead}=1` is `dead`. */
+    livenessAsync() {
         if (!this.started)
-            return Promise.resolve(false);
-        return new Promise((resolve) => {
+            return Promise.resolve("dead");
+        if (this.paneLivenessFlight)
+            return this.paneLivenessFlight;
+        const flight = new Promise((resolve) => {
             execFile(this.tmuxBin, [...this.base(), "list-panes", "-t", TMUX_TARGET, "-F", "#{pane_dead}"], { timeout: 2000 }, (err, stdout) => {
                 if (err) {
-                    resolve(false);
+                    resolve("unknown");
                     return;
                 }
                 const panes = stdout.toString().split(/\s+/).filter(Boolean);
-                resolve(panes.length > 0 && !panes.includes("1"));
+                if (panes.includes("1")) {
+                    resolve("dead");
+                }
+                else if (panes.length > 0) {
+                    resolve("alive");
+                }
+                else {
+                    resolve("unknown");
+                }
+            });
+        });
+        this.paneLivenessFlight = flight;
+        void flight.then(() => {
+            if (this.paneLivenessFlight === flight)
+                delete this.paneLivenessFlight;
+        }, () => {
+            if (this.paneLivenessFlight === flight)
+                delete this.paneLivenessFlight;
+        });
+        return flight;
+    }
+    /** Omnigent's always-on terminal lifecycle watcher first captures the pane:
+     * a control command that ran and reports the target missing is terminal exit;
+     * a probe that cannot spawn is inconclusive. If capture succeeds, the normal
+     * definitive `pane_dead` probe distinguishes live from exited. */
+    lifecycleLivenessAsync() {
+        if (!this.started)
+            return Promise.resolve("dead");
+        if (this.lifecycleLivenessFlight)
+            return this.lifecycleLivenessFlight;
+        const flight = new Promise((resolve) => {
+            execFile(this.tmuxBin, [...this.base(), "capture-pane", "-t", TMUX_TARGET, "-p", "-e"], (error, stdout) => {
+                if (error) {
+                    const code = typeof error === "object" && error && "code" in error
+                        ? error.code
+                        : undefined;
+                    resolve(typeof code === "number" ? "dead" : "unknown");
+                    return;
+                }
+                this.lastPaneSnapshot = stdout.toString();
+                void this.livenessAsync().then((liveness) => {
+                    // A successful capture proves the target exists. Omnigent treats a
+                    // subsequent pane-dead probe failure as non-dead for this tick.
+                    resolve(liveness === "dead" ? "dead" : "alive");
+                });
             });
         });
+        this.lifecycleLivenessFlight = flight;
+        void flight.then(() => {
+            if (this.lifecycleLivenessFlight === flight)
+                delete this.lifecycleLivenessFlight;
+        }, () => {
+            if (this.lifecycleLivenessFlight === flight)
+                delete this.lifecycleLivenessFlight;
+        });
+        return flight;
+    }
+    /** Compatibility boolean for callers that cannot represent an inconclusive
+     * probe. Unknown must remain live so a transient tmux failure cannot tear down
+     * a healthy native Session. */
+    async isAliveAsync() {
+        return await this.livenessAsync() !== "dead";
     }
     /** PID of the process currently owning the pane. */
     panePid() {
@@ -344,13 +388,15 @@ export class TmuxTerminal {
      */
     capturePane() {
         try {
-            return execFileSync(this.tmuxBin, [...this.base(), "capture-pane", "-t", TMUX_TARGET, "-p"], {
+            const snapshot = execFileSync(this.tmuxBin, [...this.base(), "capture-pane", "-t", TMUX_TARGET, "-p"], {
                 env: this.env,
                 encoding: "utf8",
             });
+            this.lastPaneSnapshot = snapshot;
+            return snapshot;
         }
         catch {
-            return "";
+            return this.lastPaneSnapshot;
         }
     }
     /** Send a submit Enter as a KEY NAME (no `-l`), committing the input line.
@@ -443,8 +489,8 @@ export class TmuxTerminal {
                     return;
                 // ASYNC probe (never execFileSync here — that would block the event loop
                 // and freeze the PTY stream, making the terminal unresponsive).
-                void this.isAliveAsync().then((alive) => {
-                    if (!alive && !exited)
+                void this.livenessAsync().then((liveness) => {
+                    if (liveness === "dead" && !exited)
                         fireExit(0);
                 });
             }, 1000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rynx-ai/runtime",
-  "version": "0.1.11-beta.21",
+  "version": "0.1.11-beta.23",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rynx-ai/rynx.git",
@@ -27,7 +27,7 @@
     "node-pty": "1.2.0-beta.15",
     "smol-toml": "1.7.1",
     "ws": "^8.21.0",
-    "@rynx-ai/core": "0.1.11-beta.21"
+    "@rynx-ai/core": "0.1.11-beta.23"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"