baychat 0.33.2 → 0.34.0

package/dist/relay/launcher/stop-registered.js

@@ -0,0 +1,155 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ownSessionName = ownSessionName;
+exports.stopRegistered = stopRegistered;
+exports.realStopRegisteredDeps = realStopRegisteredDeps;
+const child_process_1 = require("child_process");
+const fs = __importStar(require("fs"));
+const terminal_pane_1 = require("../terminal-pane");
+const argv_1 = require("./argv");
+const multiplexer_1 = require("./multiplexer");
+/**
+ * The tmux session names our CLI has ever given, for session `name` (git history of
+ * multiplexer-launch.ts and launcher/argv.ts):
+ * - `bc-<name>` — the relay's launcher (a session started from BayChat);
+ * - `claude-<pid>`, `claude-<pid>-<n>`, `claude-<pid>-<epoch ms>` — `baychat claude` (`fresh`);
+ * - `<name>`, or `baychat` when no name was given — `baychat start [name]` (`reattach`).
+ * The last two are names a person could give their own tmux too, so they count only when the
+ * session recorded that our CLI made it (`recorded`); without a record only the first two do.
+ */
+function ownSessionName(tmuxSession, name, recorded) {
+    if (recorded !== undefined) {
+        if (tmuxSession !== recorded)
+            return false;
+        return ownSessionName(tmuxSession, name) || tmuxSession === name || tmuxSession === "baychat";
+    }
+    return tmuxSession === `${argv_1.LAUNCH_SESSION_PREFIX}${name}` || /^claude-\d+(-\d+)?$/.test(tmuxSession);
+}
+const PANE_FORMAT = "#{pane_id}\t#{session_name}\t#{window_panes}\t#{session_windows}\t#{pid}\t#{pane_tty}";
+function lookPane(handle, run) {
+    const res = run("tmux", ["-S", handle.socket, "display-message", "-p", "-t", handle.pane, PANE_FORMAT]);
+    if (res.error)
+        return { unreachable: res.error.message };
+    if (res.status !== 0) {
+        // "can't find pane" = the server answered and the pane is gone. Anything else (no server on
+        // that socket, the socket missing) is not knowledge that it is gone.
+        return /can't find|no such pane/i.test(res.stderr) ? { gone: true } : { unreachable: res.stderr.trim() || `exit ${res.status}` };
+    }
+    const [paneId = "", session = "", panes = "", windows = "", pid = "", tty = ""] = res.stdout.trim().split("\t");
+    return { found: { paneId, session, windowPanes: Number(panes), sessionWindows: Number(windows), serverPid: Number(pid), tty } };
+}
+/** `lookPane`, after making the server's socket again when macOS's tmp cleanup deleted it
+ *  (multiplexer.ts `healTmuxSocket`): without that, a live pane would read as unreachable. */
+async function lookPaneHealing(handle, deps) {
+    const first = lookPane(handle, deps.run);
+    if (!("unreachable" in first))
+        return first;
+    // "no-server" is NOT "gone": a server we could not recognise may still run the agent, and saying
+    // "closed" for a terminal that is still open is the one answer End must never give.
+    let healed = deps.heal(handle.socket, handle.serverPid);
+    for (let i = 0; healed === "signalled" && i < 10; i++) {
+        await deps.sleep(100);
+        if (deps.socketExists(handle.socket))
+            healed = "healed";
+    }
+    if (healed !== "healed")
+        return first;
+    deps.log(`tmux socket ${handle.socket} was missing; the tmux server made it again`);
+    return lookPane(handle, deps.run);
+}
+/** Is `pid` alive with its controlling terminal `tty` (ps prints `ttys003`, tmux `/dev/ttys003`)? */
+function aliveOn(pid, tty, check) {
+    try {
+        const own = check("ps", ["-o", "tty=", "-p", String(pid)]).trim();
+        return !!own && own !== "?" && (tty === own || tty.endsWith(`/${own}`));
+    }
+    catch {
+        return false;
+    }
+}
+async function stopRegistered(name, target, deps) {
+    if (!target?.pane)
+        return "not-registered";
+    const handle = target.pane;
+    // screen and zellij cannot name the session a window is in, so check 2 is impossible: refused.
+    if (handle.kind !== "tmux")
+        return "not-ours";
+    // Without the server's pid a pane id proves nothing (it may be a reused %N): refused.
+    if (!handle.serverPid)
+        return "not-ours";
+    const look = await lookPaneHealing(handle, deps);
+    if ("gone" in look)
+        return "not-running";
+    if ("unreachable" in look) {
+        deps.log(`stop "${name}": tmux at ${handle.socket} did not answer (${look.unreachable})`);
+        return "unreachable";
+    }
+    const pane = look.found;
+    if (pane.paneId !== handle.pane || pane.serverPid !== handle.serverPid) {
+        deps.log(`stop "${name}": pane ${handle.pane} now belongs to another tmux server; left open`);
+        return "not-ours";
+    }
+    if (!ownSessionName(pane.session, name, handle.session)) {
+        deps.log(`stop "${name}": pane ${handle.pane} is in tmux session "${pane.session}", which BayChat did not make; left open`);
+        return "not-ours";
+    }
+    const running = (0, terminal_pane_1.verifyPane)(handle, target.runtime, deps.check, target.ownerPid);
+    if (!running.ok) {
+        deps.log(`stop "${name}": ${running.reason} Left open.`);
+        return "not-ours";
+    }
+    if (target.ownerPid !== undefined && !aliveOn(target.ownerPid, pane.tty, deps.check)) {
+        deps.log(`stop "${name}": its process ${target.ownerPid} is not on pane ${handle.pane} any more; left open`);
+        return "not-ours";
+    }
+    const whole = pane.windowPanes === 1 && pane.sessionWindows === 1;
+    deps.run("tmux", whole ? ["-S", handle.socket, "kill-session", "-t", `=${pane.session}`] : ["-S", handle.socket, "kill-pane", "-t", handle.pane]);
+    // The kill's own answer is not the proof (handle.ts `stopRecorded`): the pane must be GONE.
+    if (!("gone" in lookPane(handle, deps.run)))
+        return "failed";
+    deps.log(`stop "${name}": closed ${whole ? `tmux session "${pane.session}"` : `pane ${handle.pane} of "${pane.session}"`}`);
+    return "stopped";
+}
+function realStopRegisteredDeps(run, log) {
+    return {
+        run,
+        check: (file, args) => (0, child_process_1.execFileSync)(file, args, { encoding: "utf8", timeout: 5_000 }),
+        heal: (socket, serverPid) => (0, multiplexer_1.healTmuxSocket)(run, { socket, serverPid }),
+        socketExists: (socket) => fs.existsSync(socket),
+        sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+        log,
+    };
+}

package/dist/relay/terminal-pane.js

@@ -23,9 +23,18 @@ function detectPane(env = process.env) {
     const tmuxPane = env.TMUX_PANE;
     if (tmux && tmuxPane) {
         // "<socket>,<server pid>,<session>" — only the first field addresses the server.
-        const socket = tmux.split(",")[0];
-        if (socket)
-            return { kind: "tmux", socket, pane: tmuxPane };
+        const [socket, pid] = tmux.split(",");
+        const serverPid = Number(pid);
+        const session = env.BAYCHAT_TMUX_SESSION;
+        if (socket) {
+            return {
+                kind: "tmux",
+                socket,
+                pane: tmuxPane,
+                ...(Number.isInteger(serverPid) && serverPid > 0 ? { serverPid } : {}),
+                ...(session ? { session } : {}),
+            };
+        }
     }
     if (env.STY)
         return { kind: "screen", session: env.STY, window: env.WINDOW ?? "0" };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baychat",
-  "version": "0.33.2",
+  "version": "0.34.0",
   "description": "BayChat connector CLI — pair an agent session (Claude Code, Codex, Cursor) with BayChat, or have the relay run DeepSeek or the Cursor CLI for you",
   "bin": {
     "baychat": "dist/index.js"