botmux 2.21.3 → 2.21.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters/backend/tmux-backend.d.ts +5 -1
- package/dist/adapters/backend/tmux-backend.d.ts.map +1 -1
- package/dist/adapters/backend/tmux-backend.js +43 -22
- package/dist/adapters/backend/tmux-backend.js.map +1 -1
- package/dist/adapters/backend/tmux-pipe-backend.d.ts.map +1 -1
- package/dist/adapters/backend/tmux-pipe-backend.js +23 -5
- package/dist/adapters/backend/tmux-pipe-backend.js.map +1 -1
- package/dist/adapters/cli/coco.d.ts.map +1 -1
- package/dist/adapters/cli/coco.js +182 -8
- package/dist/adapters/cli/coco.js.map +1 -1
- package/dist/cli.js +10 -8
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +10 -8
- package/dist/config.js.map +1 -1
- package/dist/core/session-discovery.d.ts.map +1 -1
- package/dist/core/session-discovery.js +4 -3
- package/dist/core/session-discovery.js.map +1 -1
- package/dist/setup/ensure-tmux.d.ts +49 -0
- package/dist/setup/ensure-tmux.d.ts.map +1 -1
- package/dist/setup/ensure-tmux.js +116 -31
- package/dist/setup/ensure-tmux.js.map +1 -1
- package/dist/setup/index.d.ts.map +1 -1
- package/dist/setup/index.js +14 -3
- package/dist/setup/index.js.map +1 -1
- package/dist/worker.js +12 -1
- package/dist/worker.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-discovery.js","sourceRoot":"","sources":["../../src/core/session-discovery.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"session-discovery.js","sourceRoot":"","sources":["../../src/core/session-discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,55 @@ export interface TmuxResult {
|
|
|
6
6
|
freshInstall: boolean;
|
|
7
7
|
/** Which strategy actually ran the install. */
|
|
8
8
|
strategy?: PackageManager;
|
|
9
|
+
/** When installed=false: human-readable reason for the caller's warning. */
|
|
10
|
+
reason?: string;
|
|
11
|
+
/** When installed=false: the manual command we'd have run, for the warning. */
|
|
12
|
+
manualCommand?: string;
|
|
9
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Strip tmux-injected env vars when spawning a tmux child process.
|
|
16
|
+
*
|
|
17
|
+
* If the parent (daemon / worker / cli wrapper) was launched from inside a
|
|
18
|
+
* tmux session, tmux exports `TMUX=<socket-path>,<pid>,<session-id>` and
|
|
19
|
+
* `TMUX_PANE=...` to the environment. Any `tmux` subcommand we run without
|
|
20
|
+
* explicit `-L <socket>` then targets *that* parent server — when the user's
|
|
21
|
+
* terminal tmux is gone (logged out, server killed, /tmp wiped) every
|
|
22
|
+
* subsequent call fails with `error connecting to <stale-socket>`.
|
|
23
|
+
*
|
|
24
|
+
* This affects botmux even when the user's *new* `tmux -V` works fine on the
|
|
25
|
+
* shell, because that test starts from a fresh shell with no stale `TMUX`.
|
|
26
|
+
* The daemon, autostarted via pm2/systemd at login, inherited the original
|
|
27
|
+
* shell's tmux env — `/tmp/tmux-1001/default` in the wild we see — and keeps
|
|
28
|
+
* hammering at it forever.
|
|
29
|
+
*
|
|
30
|
+
* Caller pattern: every execSync / execFileSync / spawnSync / pty.spawn that
|
|
31
|
+
* invokes the `tmux` binary must pass `env: tmuxEnv()` (or `tmuxEnv(opts.env)`
|
|
32
|
+
* when forwarding caller-provided env). TMUX_TMPDIR is intentionally left
|
|
33
|
+
* alone — it just changes the socket directory and is the user's deliberate
|
|
34
|
+
* override if set.
|
|
35
|
+
*/
|
|
36
|
+
export declare function tmuxEnv(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
37
|
+
/**
|
|
38
|
+
* Functional tmux probe — actually starts a tmux server and tears it down.
|
|
39
|
+
*
|
|
40
|
+
* `tmux -V` only checks the binary, not whether tmux can create a socket and
|
|
41
|
+
* fork a session. Real-world failures we've seen: (1) /tmp owned by another
|
|
42
|
+
* user, (2) broken ~/.tmux.conf, (3) the binary is a libc-mismatched dynamic
|
|
43
|
+
* link, (4) tmux 1.x on minimal images missing libevent. All of those make
|
|
44
|
+
* `tmux -V` succeed but every `new-session` / `attach-session` fail, which
|
|
45
|
+
* floods daemon-error.log and leaves the worker with no working backend.
|
|
46
|
+
*
|
|
47
|
+
* Uses a unique `-L <socket-name>` so the probe never clobbers an existing
|
|
48
|
+
* user tmux server. Stderr is captured (not inherited) so the failure
|
|
49
|
+
* reason can surface in the bootstrap warning without spilling onto the
|
|
50
|
+
* user's terminal.
|
|
51
|
+
*/
|
|
52
|
+
export declare function probeTmuxFunctional(): {
|
|
53
|
+
ok: true;
|
|
54
|
+
version: string;
|
|
55
|
+
} | {
|
|
56
|
+
ok: false;
|
|
57
|
+
reason: string;
|
|
58
|
+
};
|
|
10
59
|
export declare function ensureTmux(info?: PlatformInfo): Promise<TmuxResult>;
|
|
11
60
|
//# sourceMappingURL=ensure-tmux.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-tmux.d.ts","sourceRoot":"","sources":["../../src/setup/ensure-tmux.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ensure-tmux.d.ts","sourceRoot":"","sources":["../../src/setup/ensure-tmux.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAkB,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE9F,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,YAAY,EAAE,OAAO,CAAC;IACtB,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,4EAA4E;IAC5E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAgBD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,OAAO,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAAC,UAAU,CAG/E;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,IAAI;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAsBnG;AAiED,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAsEzE"}
|
|
@@ -2,30 +2,105 @@
|
|
|
2
2
|
* Ensure tmux is installed before the daemon starts. Strategy (first one
|
|
3
3
|
* that fits wins):
|
|
4
4
|
*
|
|
5
|
-
* 1. Already installed → done.
|
|
5
|
+
* 1. Already installed AND functional → done.
|
|
6
6
|
* 2. brew available → `brew install tmux` (no sudo)
|
|
7
7
|
* 3. conda/mamba available → `conda install -y -c conda-forge tmux` (no sudo)
|
|
8
8
|
* 4. Linux + system pkg manager:
|
|
9
9
|
* a. NOPASSWD sudo or running as root → run non-interactively
|
|
10
10
|
* b. Has TTY → run interactively (sudo will prompt for password)
|
|
11
|
-
* c. No TTY (autostart / pm2 fork) → skip
|
|
12
|
-
* 5. Otherwise →
|
|
11
|
+
* c. No TTY (autostart / pm2 fork) → skip with manual command
|
|
12
|
+
* 5. Otherwise → return failure with manual command.
|
|
13
13
|
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
14
|
+
* Tmux is a NICE-TO-HAVE (enables /adopt + multi-pane Web terminal), not
|
|
15
|
+
* load-bearing: PTY backend works without it. So this function never throws —
|
|
16
|
+
* the caller inspects `installed` and routes accordingly. Earlier versions
|
|
17
|
+
* threw on failure; that broke users whose tmux binary was present but
|
|
18
|
+
* couldn't actually start a server (corrupt install / restricted /tmp /
|
|
19
|
+
* broken ~/.tmux.conf — see daemon-error logs full of "error connecting to
|
|
20
|
+
* /tmp/tmux-UID/default"), because `tmux -V` would pass but every subsequent
|
|
21
|
+
* tmux command would fail. Functional probe + soft fallback fixes both.
|
|
17
22
|
*/
|
|
18
23
|
import { execSync, spawnSync } from 'node:child_process';
|
|
19
24
|
import { detectPlatform } from './detect-platform.js';
|
|
20
25
|
function probeTmuxVersion() {
|
|
21
26
|
try {
|
|
22
|
-
const out = execSync('tmux -V', {
|
|
27
|
+
const out = execSync('tmux -V', {
|
|
28
|
+
encoding: 'utf-8',
|
|
29
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
30
|
+
timeout: 3000,
|
|
31
|
+
env: tmuxEnv(),
|
|
32
|
+
});
|
|
23
33
|
return out.trim();
|
|
24
34
|
}
|
|
25
35
|
catch {
|
|
26
36
|
return undefined;
|
|
27
37
|
}
|
|
28
38
|
}
|
|
39
|
+
/**
|
|
40
|
+
* Strip tmux-injected env vars when spawning a tmux child process.
|
|
41
|
+
*
|
|
42
|
+
* If the parent (daemon / worker / cli wrapper) was launched from inside a
|
|
43
|
+
* tmux session, tmux exports `TMUX=<socket-path>,<pid>,<session-id>` and
|
|
44
|
+
* `TMUX_PANE=...` to the environment. Any `tmux` subcommand we run without
|
|
45
|
+
* explicit `-L <socket>` then targets *that* parent server — when the user's
|
|
46
|
+
* terminal tmux is gone (logged out, server killed, /tmp wiped) every
|
|
47
|
+
* subsequent call fails with `error connecting to <stale-socket>`.
|
|
48
|
+
*
|
|
49
|
+
* This affects botmux even when the user's *new* `tmux -V` works fine on the
|
|
50
|
+
* shell, because that test starts from a fresh shell with no stale `TMUX`.
|
|
51
|
+
* The daemon, autostarted via pm2/systemd at login, inherited the original
|
|
52
|
+
* shell's tmux env — `/tmp/tmux-1001/default` in the wild we see — and keeps
|
|
53
|
+
* hammering at it forever.
|
|
54
|
+
*
|
|
55
|
+
* Caller pattern: every execSync / execFileSync / spawnSync / pty.spawn that
|
|
56
|
+
* invokes the `tmux` binary must pass `env: tmuxEnv()` (or `tmuxEnv(opts.env)`
|
|
57
|
+
* when forwarding caller-provided env). TMUX_TMPDIR is intentionally left
|
|
58
|
+
* alone — it just changes the socket directory and is the user's deliberate
|
|
59
|
+
* override if set.
|
|
60
|
+
*/
|
|
61
|
+
export function tmuxEnv(env = process.env) {
|
|
62
|
+
const { TMUX: _tmux, TMUX_PANE: _pane, ...rest } = env;
|
|
63
|
+
return rest;
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Functional tmux probe — actually starts a tmux server and tears it down.
|
|
67
|
+
*
|
|
68
|
+
* `tmux -V` only checks the binary, not whether tmux can create a socket and
|
|
69
|
+
* fork a session. Real-world failures we've seen: (1) /tmp owned by another
|
|
70
|
+
* user, (2) broken ~/.tmux.conf, (3) the binary is a libc-mismatched dynamic
|
|
71
|
+
* link, (4) tmux 1.x on minimal images missing libevent. All of those make
|
|
72
|
+
* `tmux -V` succeed but every `new-session` / `attach-session` fail, which
|
|
73
|
+
* floods daemon-error.log and leaves the worker with no working backend.
|
|
74
|
+
*
|
|
75
|
+
* Uses a unique `-L <socket-name>` so the probe never clobbers an existing
|
|
76
|
+
* user tmux server. Stderr is captured (not inherited) so the failure
|
|
77
|
+
* reason can surface in the bootstrap warning without spilling onto the
|
|
78
|
+
* user's terminal.
|
|
79
|
+
*/
|
|
80
|
+
export function probeTmuxFunctional() {
|
|
81
|
+
const version = probeTmuxVersion();
|
|
82
|
+
if (!version)
|
|
83
|
+
return { ok: false, reason: 'tmux 二进制不在 PATH 上' };
|
|
84
|
+
const sockName = `bmx-probe-${process.pid}-${Date.now()}`;
|
|
85
|
+
// env: tmuxEnv() — without this, if the daemon inherited TMUX from a tmux
|
|
86
|
+
// session that has since died, this probe would target the dead server
|
|
87
|
+
// (despite the `-L` flag tmux still walks $TMUX in some 2.x paths during
|
|
88
|
+
// startup) and report "ok: false" even on a perfectly healthy install.
|
|
89
|
+
const run = spawnSync('tmux', ['-L', sockName, 'new-session', '-d', '-s', 'probe', 'true'], {
|
|
90
|
+
stdio: ['ignore', 'ignore', 'pipe'],
|
|
91
|
+
timeout: 5000,
|
|
92
|
+
env: tmuxEnv(),
|
|
93
|
+
});
|
|
94
|
+
if (run.status !== 0) {
|
|
95
|
+
const stderr = (run.stderr?.toString() ?? '').trim();
|
|
96
|
+
return { ok: false, reason: stderr || `tmux new-session 失败 (exit ${run.status})` };
|
|
97
|
+
}
|
|
98
|
+
// Tear down the probe server. Best-effort — if this leaks, the kernel
|
|
99
|
+
// will GC the abstract socket when the (now-empty) tmux server exits on
|
|
100
|
+
// its own once the only client (which we didn't attach) goes away.
|
|
101
|
+
spawnSync('tmux', ['-L', sockName, 'kill-server'], { stdio: 'ignore', timeout: 3000, env: tmuxEnv() });
|
|
102
|
+
return { ok: true, version };
|
|
103
|
+
}
|
|
29
104
|
/** Wrap a system command with the appropriate sudo prefix for the current
|
|
30
105
|
* platform context, or return undefined if we cannot escalate (no
|
|
31
106
|
* passwordless sudo and no TTY to prompt on). */
|
|
@@ -91,10 +166,25 @@ function runInstall(argv) {
|
|
|
91
166
|
}
|
|
92
167
|
export async function ensureTmux(info) {
|
|
93
168
|
const platform = info ?? detectPlatform();
|
|
94
|
-
// Step 1: already installed?
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
169
|
+
// Step 1: already installed AND functional?
|
|
170
|
+
// `tmux -V` alone is not enough — see probeTmuxFunctional jsdoc for the
|
|
171
|
+
// failure modes (broken /tmp perms / bad ~/.tmux.conf / mismatched libs)
|
|
172
|
+
// that pass -V but fail every actual tmux command.
|
|
173
|
+
const initialProbe = probeTmuxFunctional();
|
|
174
|
+
if (initialProbe.ok) {
|
|
175
|
+
return { installed: true, version: initialProbe.version, freshInstall: false };
|
|
176
|
+
}
|
|
177
|
+
// If the binary exists but the server can't start, no amount of
|
|
178
|
+
// `apt-get install tmux` will help — surface the underlying reason and
|
|
179
|
+
// let the caller fall back to PTY backend.
|
|
180
|
+
const versionPresent = probeTmuxVersion();
|
|
181
|
+
if (versionPresent) {
|
|
182
|
+
return {
|
|
183
|
+
installed: false,
|
|
184
|
+
freshInstall: false,
|
|
185
|
+
reason: `${versionPresent} 已安装但启动 server 失败：${initialProbe.reason}`,
|
|
186
|
+
manualCommand: '排查 ~/.tmux.conf / /tmp 权限 / libevent 依赖后再试',
|
|
187
|
+
};
|
|
98
188
|
}
|
|
99
189
|
console.log('⚠️ tmux 未检测到，正在安装...');
|
|
100
190
|
// Step 2..4: walk the package-manager preference list.
|
|
@@ -111,12 +201,12 @@ export async function ensureTmux(info) {
|
|
|
111
201
|
aptUpdateBeforeInstall(platform);
|
|
112
202
|
console.log(` 尝试 ${pm}: ${argv.join(' ')}`);
|
|
113
203
|
if (runInstall(argv)) {
|
|
114
|
-
const
|
|
115
|
-
if (
|
|
116
|
-
console.log(`✅ tmux ${
|
|
117
|
-
return { installed: true, version:
|
|
204
|
+
const postInstall = probeTmuxFunctional();
|
|
205
|
+
if (postInstall.ok) {
|
|
206
|
+
console.log(`✅ tmux ${postInstall.version} 安装完成 (via ${pm})`);
|
|
207
|
+
return { installed: true, version: postInstall.version, freshInstall: true, strategy: pm };
|
|
118
208
|
}
|
|
119
|
-
tried.push(`${pm}
|
|
209
|
+
tried.push(`${pm}（装上了但 server 起不来：${postInstall.reason}）`);
|
|
120
210
|
}
|
|
121
211
|
else {
|
|
122
212
|
tried.push(`${pm}（命令返回非零）`);
|
|
@@ -125,27 +215,22 @@ export async function ensureTmux(info) {
|
|
|
125
215
|
// Build a useful failure message with the most relevant manual command.
|
|
126
216
|
const preferred = platform.packageManagers.find(p => p !== 'unknown') ?? 'unknown';
|
|
127
217
|
const manual = suggestManualCommand(preferred, 'tmux');
|
|
128
|
-
const
|
|
129
|
-
'
|
|
130
|
-
'',
|
|
218
|
+
const reasonLines = [
|
|
219
|
+
'自动安装 tmux 失败',
|
|
131
220
|
'已尝试：',
|
|
132
221
|
...tried.map(t => ` - ${t}`),
|
|
133
|
-
'',
|
|
134
|
-
'请手动安装后重试：',
|
|
135
|
-
` ${manual}`,
|
|
136
222
|
];
|
|
137
|
-
// macOS without Homebrew → guide the user to install brew first.
|
|
138
223
|
if (platform.os === 'darwin' && !platform.packageManagers.includes('brew')) {
|
|
139
|
-
|
|
140
|
-
lines.push('macOS 推荐先安装 Homebrew：');
|
|
141
|
-
lines.push(' /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"');
|
|
142
|
-
lines.push('安装完成后重试 `botmux start`，会走 brew 自动装 tmux。');
|
|
224
|
+
reasonLines.push('macOS 推荐先安装 Homebrew：/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"');
|
|
143
225
|
}
|
|
144
226
|
if (!platform.hasTty && !platform.isRoot && !platform.passwordlessSudo && platform.os === 'linux') {
|
|
145
|
-
|
|
146
|
-
lines.push('提示：当前不是交互式 TTY 且 sudo 需要密码，systemd/pm2 自启场景下无法弹密码。');
|
|
147
|
-
lines.push('请在 shell 中手动跑一次 `botmux start`，或配置 NOPASSWD sudoers 后再启用 autostart。');
|
|
227
|
+
reasonLines.push('提示：当前不是交互式 TTY 且 sudo 需要密码，systemd/pm2 自启下无法弹密码 — 先在 shell 跑一次 `botmux start`，或配置 NOPASSWD sudoers。');
|
|
148
228
|
}
|
|
149
|
-
|
|
229
|
+
return {
|
|
230
|
+
installed: false,
|
|
231
|
+
freshInstall: false,
|
|
232
|
+
reason: reasonLines.join('\n'),
|
|
233
|
+
manualCommand: manual,
|
|
234
|
+
};
|
|
150
235
|
}
|
|
151
236
|
//# sourceMappingURL=ensure-tmux.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-tmux.js","sourceRoot":"","sources":["../../src/setup/ensure-tmux.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"ensure-tmux.js","sourceRoot":"","sources":["../../src/setup/ensure-tmux.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/setup/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEjE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/setup/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEjE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CA8BtE"}
|
package/dist/setup/index.js
CHANGED
|
@@ -12,10 +12,21 @@ import { ensureFonts } from './ensure-fonts.js';
|
|
|
12
12
|
export { botmuxFontDir } from './ensure-fonts.js';
|
|
13
13
|
export async function ensureDependencies() {
|
|
14
14
|
const platform = detectPlatform();
|
|
15
|
-
// tmux
|
|
15
|
+
// tmux: nice-to-have (enables /adopt + multi-pane Web terminal). Daemon
|
|
16
|
+
// still works on PTY backend without it, so failure is a warning, not fatal.
|
|
16
17
|
const tmux = await ensureTmux(platform);
|
|
17
|
-
if (
|
|
18
|
-
|
|
18
|
+
if (tmux.installed) {
|
|
19
|
+
if (!tmux.freshInstall)
|
|
20
|
+
console.log(`✓ tmux ${tmux.version} (existing)`);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
console.warn('');
|
|
24
|
+
console.warn('⚠️ tmux 不可用，已退回到 PTY backend');
|
|
25
|
+
console.warn(` 原因：${tmux.reason ?? '未知'}`);
|
|
26
|
+
if (tmux.manualCommand)
|
|
27
|
+
console.warn(` 手动尝试：${tmux.manualCommand}`);
|
|
28
|
+
console.warn(' 影响：/adopt（接管已有 CLI 会话）和多人 Web 终端不可用；常规对话不受影响。');
|
|
29
|
+
console.warn('');
|
|
19
30
|
}
|
|
20
31
|
// Fonts second — best-effort.
|
|
21
32
|
const fonts = await ensureFonts(platform);
|
package/dist/setup/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/setup/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAmB,MAAM,mBAAmB,CAAC;AAOjE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAElC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/setup/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAmB,MAAM,mBAAmB,CAAC;AAOjE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAElC,wEAAwE;IACxE,6EAA6E;IAC7E,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;IAC3E,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAC9C,IAAI,IAAI,CAAC,aAAa;YAAE,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACvE,OAAO,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC;IAED,8BAA8B;IAC9B,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC1C,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,IAAI,QAAQ,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACzB,CAAC"}
|
package/dist/worker.js
CHANGED
|
@@ -32,6 +32,7 @@ import { claudeJsonlPathForSession, resolveJsonlFromPid, findOpenClaudeSessionId
|
|
|
32
32
|
import { PtyBackend } from './adapters/backend/pty-backend.js';
|
|
33
33
|
import { TmuxBackend } from './adapters/backend/tmux-backend.js';
|
|
34
34
|
import { TmuxPipeBackend } from './adapters/backend/tmux-pipe-backend.js';
|
|
35
|
+
import { tmuxEnv } from './setup/ensure-tmux.js';
|
|
35
36
|
import { IdleDetector } from './utils/idle-detector.js';
|
|
36
37
|
import { ScreenAnalyzer } from './utils/screen-analyzer.js';
|
|
37
38
|
import { captureToPng } from './utils/screenshot-renderer.js';
|
|
@@ -2312,7 +2313,16 @@ function spawnCli(cfg) {
|
|
|
2312
2313
|
return;
|
|
2313
2314
|
}
|
|
2314
2315
|
cliAdapter = createCliAdapterSync(cfg.cliId, cfg.cliPathOverride);
|
|
2315
|
-
|
|
2316
|
+
// backendType=tmux trust-but-verify: an explicit per-bot config (or
|
|
2317
|
+
// BACKEND_TYPE=tmux env override) bypasses config.ts's auto-detect, so
|
|
2318
|
+
// the worker re-probes here. If tmux can't start a server we silently
|
|
2319
|
+
// fall back to PTY rather than letting attach-session / new-session spam
|
|
2320
|
+
// the daemon error log every poll cycle.
|
|
2321
|
+
let useTmux = cfg.backendType === 'tmux';
|
|
2322
|
+
if (useTmux && !TmuxBackend.isAvailable()) {
|
|
2323
|
+
log('tmux backend requested but functional probe failed — falling back to PTY backend');
|
|
2324
|
+
useTmux = false;
|
|
2325
|
+
}
|
|
2316
2326
|
isTmuxMode = useTmux;
|
|
2317
2327
|
const tmuxBe = useTmux ? new TmuxBackend(TmuxBackend.sessionName(cfg.sessionId)) : null;
|
|
2318
2328
|
backend = tmuxBe ?? new PtyBackend();
|
|
@@ -2545,6 +2555,7 @@ function startWebServer(host, preferredPort) {
|
|
|
2545
2555
|
name: 'xterm-256color',
|
|
2546
2556
|
cols,
|
|
2547
2557
|
rows,
|
|
2558
|
+
env: tmuxEnv(),
|
|
2548
2559
|
});
|
|
2549
2560
|
clientPtys.set(ws, cp);
|
|
2550
2561
|
cp.onData((d) => {
|