botmux 2.96.1 → 2.97.0

package/dist/adapters/backend/session-backend-selector.d.ts

@@ -1,4 +1,36 @@
 import type { BackendType, SessionBackend } from './types.js';
+export type BackendGateDecision = {
+    action: 'spawn';
+} | {
+    action: 'gate';
+    reason: string;
+};
+/**
+ * Hard gate (PTY 退役): a requested *persistent* backend (tmux/herdr/zellij)
+ * that isn't functional on this host no longer silently degrades to raw PTY.
+ * That silent fallback was the root of the "secretly running on PTY, then
+ * hitting all of PTY's problems (no survival across daemon restart, etc.)"
+ * bug class. Instead the worker refuses to spawn and posts an actionable card.
+ *
+ * PTY stays reachable ONLY as an explicit opt-in — `BACKEND_TYPE=pty` or a
+ * per-bot `backendType: 'pty'` — which arrives here as `requested === 'pty'`
+ * and is always allowed straight through.
+ *
+ * `hasExistingSession` lets an already-running persistent session reattach
+ * regardless of a transient probe failure (a disposable "can we start a new
+ * server?" probe is far less authoritative than a live session — see PR#249):
+ * abandoning it would spawn a duplicate CLI and orphan the real conversation.
+ * The caller computes it only for backends whose probe is a disposable
+ * session (tmux, zellij); herdr's probe is a cheap non-destructive
+ * `herdr --version`, so it passes `hasExistingSession: false`.
+ */
+export declare function decideBackendGate(opts: {
+    requested: BackendType;
+    available: boolean;
+    hasExistingSession: boolean;
+}): BackendGateDecision;
+/** User-facing card shown when {@link decideBackendGate} gates a session. */
+export declare function backendGateUserMessage(backend: BackendType, reason: string): string;
 export interface SelectedSessionBackend {
     backend: SessionBackend;
     isTmuxMode: boolean;

package/dist/adapters/backend/session-backend-selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-backend-selector.d.ts","sourceRoot":"","sources":["../../../src/adapters/backend/session-backend-selector.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE9D,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB;;mFAE+E;IAC/E,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAAG,sBAAsB,CAwDlH"}
+{"version":3,"file":"session-backend-selector.d.ts","sourceRoot":"","sources":["../../../src/adapters/backend/session-backend-selector.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE9D,MAAM,MAAM,mBAAmB,GAC3B;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GACnB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,SAAS,EAAE,WAAW,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,kBAAkB,EAAE,OAAO,CAAC;CAC7B,GAAG,mBAAmB,CAKtB;AAED,6EAA6E;AAC7E,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAYnF;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB;;mFAE+E;IAC/E,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAAG,sBAAsB,CAwDlH"}

package/dist/adapters/backend/session-backend-selector.js

@@ -3,6 +3,47 @@ import { PtyBackend } from './pty-backend.js';
 import { TmuxBackend } from './tmux-backend.js';
 import { TmuxPipeBackend } from './tmux-pipe-backend.js';
 import { ZellijBackend } from './zellij-backend.js';
+/**
+ * Hard gate (PTY 退役): a requested *persistent* backend (tmux/herdr/zellij)
+ * that isn't functional on this host no longer silently degrades to raw PTY.
+ * That silent fallback was the root of the "secretly running on PTY, then
+ * hitting all of PTY's problems (no survival across daemon restart, etc.)"
+ * bug class. Instead the worker refuses to spawn and posts an actionable card.
+ *
+ * PTY stays reachable ONLY as an explicit opt-in — `BACKEND_TYPE=pty` or a
+ * per-bot `backendType: 'pty'` — which arrives here as `requested === 'pty'`
+ * and is always allowed straight through.
+ *
+ * `hasExistingSession` lets an already-running persistent session reattach
+ * regardless of a transient probe failure (a disposable "can we start a new
+ * server?" probe is far less authoritative than a live session — see PR#249):
+ * abandoning it would spawn a duplicate CLI and orphan the real conversation.
+ * The caller computes it only for backends whose probe is a disposable
+ * session (tmux, zellij); herdr's probe is a cheap non-destructive
+ * `herdr --version`, so it passes `hasExistingSession: false`.
+ */
+export function decideBackendGate(opts) {
+    if (opts.requested === 'pty')
+        return { action: 'spawn' };
+    if (opts.hasExistingSession)
+        return { action: 'spawn' };
+    if (opts.available)
+        return { action: 'spawn' };
+    return { action: 'gate', reason: `${opts.requested} 后端在本机不可用` };
+}
+/** User-facing card shown when {@link decideBackendGate} gates a session. */
+export function backendGateUserMessage(backend, reason) {
+    const installHint = backend === 'tmux'
+        ? 'macOS: brew install tmux ｜ Debian/Ubuntu: sudo apt-get install -y tmux ｜ 其它发行版用对应包管理器安装 tmux'
+        : `请确认 ${backend} 已正确安装并可用`;
+    return [
+        `⚠️ 本机 ${backend} 不可用，无法启动会话。`,
+        `原因：${reason}`,
+        `请安装/修复后重试 —— ${installHint}`,
+        `（如确需在没有 ${backend} 的环境运行，可显式设置环境变量 BACKEND_TYPE=pty 用 PTY 后端兜底；` +
+            `但 PTY 会话不跨 daemon 重启存活，仅作应急。）`,
+    ].join('\n');
+}
 export function selectSessionBackend(opts) {
     if (opts.backendType === 'zellij') {
         const sessionName = ZellijBackend.sessionName(opts.sessionId);

package/dist/adapters/backend/session-backend-selector.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-backend-selector.js","sourceRoot":"","sources":["../../../src/adapters/backend/session-backend-selector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAapD,MAAM,UAAU,oBAAoB,CAAC,IAAqD;IACxF,IAAI,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACvD,OAAO;YACL,OAAO,EAAE,IAAI,aAAa,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;YACpF,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;QAC/B,OAAO;YACL,OAAO,EAAE,IAAI,UAAU,EAAE;YACzB,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,WAAW,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACzC,OAAO;gBACL,OAAO,EAAE,IAAI,YAAY,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;gBAC5D,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,KAAK;aACpB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI,YAAY,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;YAC/D,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5D,IAAI,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACxC,OAAO;YACL,OAAO,EAAE,IAAI,eAAe,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAClF,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI,eAAe,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACrF,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE,KAAK;KACpB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"session-backend-selector.js","sourceRoot":"","sources":["../../../src/adapters/backend/session-backend-selector.ts"],"names":[],"mappings":"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"}

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAy3JA;;;;;;;;;;;GAWG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,EAC9F,KAAK,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,2BAA2B,EAAE,UAAU,GAAG,IAAI,CAAC,GACzF,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CA8F7B"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAq5JA;;;;;;;;;;;GAWG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,EAC9F,KAAK,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,2BAA2B,EAAE,UAAU,GAAG,IAAI,CAAC,GACzF,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CA8F7B"}

package/dist/cli.js

@@ -1376,18 +1376,44 @@ async function cmdRestart() {
     }
     await printDashboardHintWithRetry();
 }
-/** Wraps `ensureDependencies()`. Neither tmux nor fonts are load-bearing —
- *  ensureDependencies surfaces failures as warnings and the daemon continues
- *  on PTY backend. Only an unexpected exception (programmer error) propagates. */
+/** Wraps `ensureDependencies()`. Fonts are nice-to-have (warn only). tmux is
+ *  required since PTY 退役: if it's GENUINELY ABSENT and a bot wants the tmux
+ *  backend (and the operator hasn't opted into BACKEND_TYPE=pty), we hard-fail
+ *  here — non-zero exit, no pm2 spawn — so an unattended `start`/`restart`
+ *  surfaces the failure instead of bringing up a daemon whose every session
+ *  would gate at first message. A present-but-broken tmux (functional probe
+ *  flaked) is NOT fatal: the daemon still starts and degrades per-session, so a
+ *  transient probe failure can't block reattaching live sessions (PR#249). An
+ *  unexpected exception in the probe itself is non-fatal for the same reason. */
 async function ensureSystemDependencies() {
-    const { ensureDependencies } = await import('./setup/index.js');
+    const { ensureDependencies, shouldHardFailStartupForMissingTmux } = await import('./setup/index.js');
+    let report;
     try {
-        await ensureDependencies();
+        report = await ensureDependencies();
     }
     catch (err) {
         console.error('');
         console.error(`依赖检测内部错误: ${err?.message ?? String(err)}`);
-        // Don't exit — let daemon start try anyway; worst case PTY backend works.
+        // Don't exit — a probe-internal error is not a confirmed "tmux missing".
+        return;
+    }
+    // loadBotsJson() returns [] when bots.json is absent (→ no bot wants tmux) and
+    // hard-exits on a malformed file (existing fast-fail) — it never throws here.
+    const anyBotWantsTmux = loadBotsJson().some(b => (b?.backendType ?? config.daemon.backendType) === 'tmux');
+    const ptyOptIn = (process.env.BACKEND_TYPE ?? '').toLowerCase() === 'pty';
+    if (shouldHardFailStartupForMissingTmux({
+        tmuxInstalled: report.tmux.installed,
+        tmuxBinaryPresent: report.tmux.binaryPresent === true,
+        anyBotWantsTmux,
+        ptyOptIn,
+    })) {
+        console.error('');
+        console.error('❌ tmux 未安装，已中止 daemon 启动 —— 默认走 tmux 后端的会话将全部无法运行。');
+        console.error('   请按上方指引安装 tmux 后重试。');
+        console.error('   如确需在没有 tmux 的环境运行，可显式用 PTY 兜底：BACKEND_TYPE=pty botmux start');
+        console.error('   （注意：PTY 会话不跨 daemon 重启存活，仅作应急。）');
+        console.error('');
+        process.exit(1);
     }
 }
 /**