botmux 2.71.5 → 2.73.0

package/dist/cli.js

@@ -7,7 +7,7 @@
  *   botmux setup --no-open-platform-auto — skip Feishu Open Platform automation
  *   botmux start          — start daemon (pm2)
  *   botmux stop           — stop daemon
- *   botmux restart        — restart daemon (auto-restores sessions)
+ *   botmux restart [--include-pm2] — restart daemon (optionally restart PM2 God too)
  *   botmux logs [--lines] — view daemon logs
  *   botmux status         — show daemon status
  *   botmux upgrade        — upgrade to latest version
@@ -18,7 +18,7 @@
  *   botmux autostart enable|disable|status — manage boot-time autostart (launchd / user systemd)
  *   botmux worker-budget status|set|unset — inspect/override idle worker suspension budget
  */
-import { execSync, spawnSync, spawn } from 'node:child_process';
+import { execSync, execFileSync, spawnSync, spawn } from 'node:child_process';
 import { existsSync, mkdirSync, copyFileSync, readFileSync, writeFileSync, renameSync, readdirSync, readlinkSync, appendFileSync, statSync, unlinkSync } from 'node:fs';
 import { atomicWriteFileSync } from './utils/atomic-write.js';
 import { join, dirname, basename } from 'node:path';
@@ -35,7 +35,6 @@ import { tmuxEnv } from './setup/ensure-tmux.js';
 import { writeBotsJsonAtomic as writeBotsAtomic } from './setup/bots-store.js';
 import { applyBotConfigEdits, assertUniqueBotProcessNames, botProcessName, normalizeBotConfig, parseBotConfigsJson, parseBotSelection, removeBotConfig, resolveCliId, assertOwnerWhenChatGroups, findInvalidAllowedUserEntries, hasOwnerEntry, } from './setup/bot-config-editor.js';
 import { buildPreset, serializePreset, presetFilename } from './setup/agent-preset.js';
-import { createCliAdapterSync } from './adapters/cli/registry.js';
 import { logger } from './utils/logger.js';
 import { invalidWorkingDirs } from './utils/working-dir.js';
 import { firstPositional } from './cli/arg-utils.js';
@@ -297,63 +296,6 @@ function printInputHelp(title, lines) {
         console.log(`  ${line}`);
     }
 }
-/**
- * 读取指定 CLI 适配器声明的候选 model 列表 —— 不支持 model 配置的 CLI（aiden/
- * antigravity/mtr 等没声明 modelChoices）返回 null，promptModel 据此整段
- * 跳过提问。适配器解析失败也按"不支持"处理，避免在 setup 中冒出陌生堆栈。
- */
-function cliModelChoices(cliId) {
-    try {
-        const adapter = createCliAdapterSync(cliId);
-        return adapter.modelChoices && adapter.modelChoices.length > 0
-            ? adapter.modelChoices
-            : null;
-    }
-    catch {
-        return null;
-    }
-}
-/**
- * 询问"指定 CLI 用哪个 model"。
- *   - cliId 对应的 adapter 没声明 modelChoices → return undefined（跳过提问）
- *   - 用户输入序号 → 取候选列表对应项
- *   - 输入空 + 提供 current → 保留当前值（current 透传出去）
- *   - 输入空 + 无 current → return undefined（用 CLI 默认）
- *   - 输入 `-` → return null（语义：清空，调用方据此 delete model 字段）
- *   - 输入自由文本 → 原样返回
- */
-async function promptModel(rl, cliId, current) {
-    const choices = cliModelChoices(cliId);
-    if (!choices)
-        return undefined;
-    const numbered = choices.map((m, i) => `${i + 1}) ${m}`).join('  ');
-    printInputHelp(`CLI Model（${cliId}）`, [
-        '可选。在 spawn CLI 时注入 model 参数；同一 CLI 配多个 bot 可以跑不同 model。',
-        `候选: ${numbered}  ${choices.length + 1}) Other（自定义输入）`,
-        current
-            ? '留空保留当前值；输入 - 清空（回到 CLI 默认）。'
-            : '留空 = 不设置（用 CLI 默认）。',
-    ]);
-    const label = current ? formatOptionalValue(current) : '未设置';
-    const raw = (await ask(rl, `CLI Model [${label}]: `)).trim();
-    if (!raw)
-        return current ?? undefined;
-    if (raw === '-')
-        return null;
-    const numIdx = Number(raw);
-    if (Number.isInteger(numIdx) && numIdx >= 1 && numIdx <= choices.length) {
-        return choices[numIdx - 1];
-    }
-    if (Number.isInteger(numIdx) && numIdx === choices.length + 1) {
-        // 选了 Other，进一步要 free-form
-        const customRaw = (await ask(rl, '请输入 model 名: ')).trim();
-        if (!customRaw)
-            return current ?? undefined;
-        return customRaw;
-    }
-    // 直接当成自由输入
-    return raw;
-}
 // Thin wrapper around setup/bots-store.writeBotsJsonAtomic so call-sites keep
 // the same name without passing BOTS_JSON_FILE explicitly each time.
 function writeBotsJsonAtomic(bots) {
@@ -630,7 +572,6 @@ async function promptBotConfig(rl) {
         return null;
     }
     const workingDir = await ask(rl, '默认工作目录 [~]: ');
-    const modelChoice = await promptModel(rl, cliId);
     const bot = {
         larkAppId: creds.appId,
         larkAppSecret: creds.appSecret,
@@ -645,10 +586,8 @@ async function promptBotConfig(rl) {
     if (creds.brand === 'lark') {
         bot.brand = 'lark';
     }
-    // modelChoice === undefined → 该 CLI 没声明候选 / 用户跳过；不写 model 字段
-    if (typeof modelChoice === 'string' && modelChoice) {
-        bot.model = modelChoice;
-    }
+    // setup 不再询问 model（用户常选到无权限的 model，setup 完一发消息就 spawn
+    // 报错，排查成本高）。需要指定 model 走 /config 卡片或手动编辑 bots.json。
     // 扫码场景默认填扫码人自己 (registerApp 返回里有 open_id), 天然就是 owner.
     // 优先解析成 union_id (on_，跨应用稳定)；失败则 fallback 到 open_id (ou_)。
     // 手动 fallback 场景没 open_id —— 必须显式指定 owner, 否则配置无 owner:
@@ -723,29 +662,14 @@ async function promptEditBotConfig(rl, bot) {
         '留空保留当前值；输入 - 清空覆盖，回到 PATH 查 cliId 对应的默认二进制。',
     ]);
     input.cliPathOverride = await ask(rl, `CLI 可执行文件路径覆盖 [${formatOptionalValue(bot.cliPathOverride)}]: `);
-    // promptModel 返回 string | null | undefined，直接灌进 BotConfigEditInput.model:
-    //   undefined = 用户跳过 / adapter 不支持 → applyBotConfigEdits 不改 model
-    //   null      = 用户输 `-` 清空 → delete model
-    //   string    = 设值
-    // 用本轮编辑后的 cliId 而非 bot.cliId —— 用户可能刚换了 CLI。
-    const effectiveCliIdForModel = (resolveCliId(input.cliChoice) ?? bot.cliId ?? 'claude-code');
+    // setup 不再询问 model（同 promptBotConfig 的理由）。但切换 CLI 时旧 model
+    // 是上一个 CLI 的值，套到新 CLI 上没意义甚至直接 spawn 报错，必须强制清空；
+    // 未换 CLI 时 input.model 留 undefined，applyBotConfigEdits 保持原值不动。
     const cliChanged = !!resolveCliId(input.cliChoice) && resolveCliId(input.cliChoice) !== bot.cliId;
-    if (cliChanged && !cliModelChoices(effectiveCliIdForModel)) {
-        // 切到一个不支持 model 的 adapter（例如 aiden / mtr / antigravity）：
-        // 即使原本配了 model 也要主动清空，避免 bots.json 里残留陈旧字段——
-        // 否则用户后面再换回支持 model 的 adapter 一路回车时，旧 model
-        // 会被当作"当前值"保留下来误套到新 CLI 上。
-        console.log('\n⚠️  新 CLI 不支持 --model 参数，已清空原 model 字段。');
+    if (cliChanged && bot.model) {
+        console.log('\n⚠️  已切换 CLI，原 model 字段已清空（如需指定 model 请用 /config 卡片或编辑 bots.json）。');
         input.model = null;
     }
-    else {
-        const promptCurrent = cliChanged ? undefined : (typeof bot.model === 'string' ? bot.model : undefined);
-        const result = await promptModel(rl, effectiveCliIdForModel, promptCurrent);
-        // 切换 CLI 时哪怕用户留空也要清掉旧 model —— 旧值是上一个 CLI 的 model，
-        // 套到新 CLI 上没意义。result === undefined 在"未变 CLI"分支等价于"保留旧值"，
-        // 但在 cliChanged 分支等价于"用户没指定，回到新 CLI 默认"，必须 force null。
-        input.model = cliChanged && result === undefined ? null : result;
-    }
     printInputHelp('会话后端 backendType', [
         '可选。pty 更轻量；tmux 支持 adopt 和 Web Terminal 附着；herdr 支持托管持久会话；zellij 为实验后端（需 zellij >= 0.44）。',
         '留空保留当前值；输入 - 回到自动检测；接受 pty / tmux / herdr / zellij。',
@@ -1181,6 +1105,32 @@ function deleteAllBotmuxProcesses(home = PM2_HOME) {
     }
     catch { /* pm2 not running or no apps */ }
 }
+function killPm2GodDaemon(home = PM2_HOME) {
+    try {
+        execSync(`${pm2Bin()} kill`, {
+            stdio: 'inherit',
+            env: pm2Env(home),
+            timeout: 15_000,
+        });
+        return;
+    }
+    catch {
+        // Fall back to direct pid cleanup below.
+    }
+    for (const pid of listPm2GodDaemonPids(home)) {
+        try {
+            process.kill(pid, 'SIGTERM');
+        }
+        catch { /* already gone */ }
+    }
+    for (const pid of listPm2GodDaemonPids(home)) {
+        try {
+            process.kill(pid, 0);
+            process.kill(pid, 'SIGKILL');
+        }
+        catch { /* already gone */ }
+    }
+}
 /**
  * One-time migration for users upgrading from versions that used the default
  * ~/.pm2 directory. Removes any lingering botmux-* processes registered under
@@ -1249,6 +1199,7 @@ async function cmdRestart() {
         process.exit(1);
     }
     ensureConfigDir();
+    const includePm2 = process.argv.includes('--include-pm2');
     // Drop a restart-intent breadcrumb so the fresh daemon knows this was an
     // intentional restart and DMs the owner a summary. `IfAbsent` preserves a
     // richer breadcrumb (update / auto-restart) already written by the
@@ -1266,6 +1217,9 @@ async function cmdRestart() {
     cleanupLegacyPm2();
     // Delete all botmux processes (handles both old single-process and new multi-process)
     deleteAllBotmuxProcesses();
+    if (includePm2) {
+        killPm2GodDaemon();
+    }
     // Wipe abandoned dashboard-daemon descriptors left behind by killed daemons.
     cleanupStaleDaemonDescriptors();
     runPm2(['start', cfg]);
@@ -1727,11 +1681,13 @@ function formatSessionRow(s, multiBot, botLabels, cols) {
     }
     const title = padEndDisplay(truncate((s.title || '(untitled)').replace(/[\r\n]+/g, ' '), cols.title), cols.title);
     const dir = padEndDisplay(truncate(s.workingDir || '-', cols.dir), cols.dir);
-    const pid = s.pid ? String(s.pid).padEnd(cols.pid) : '-'.padEnd(cols.pid);
+    const displayPid = sessionDisplayPid(s);
+    const pid = displayPid ? String(displayPid).padEnd(cols.pid) : '-'.padEnd(cols.pid);
     const uptime = formatDuration(Date.now() - new Date(s.createdAt).getTime()).padEnd(cols.uptime);
-    const alive = !!(s.pid && isProcessAlive(s.pid));
-    const status = (alive ? 'online' : s.pid ? 'stopped' : 'idle').padEnd(cols.status);
-    parts.push(title, dir, pid, uptime, status);
+    const alive = isSessionAliveForList(s);
+    const status = padEndDisplay(sessionStatusLabel(s), cols.status);
+    const target = padEndDisplay(truncate(sessionTargetLabel(s), cols.target), cols.target);
+    parts.push(title, dir, pid, uptime, status, target);
     return { text: parts.join(' │ '), alive };
 }
 /** Print plain session table (non-interactive). */
@@ -1743,11 +1699,11 @@ function printSessionTable(active) {
         const b = botConfigs[i];
         botLabels.set(b.larkAppId, `bot${i + 1} (${b.cliId ?? 'claude-code'})`);
     }
-    const cols = { id: 10, ...(multiBot ? { bot: 22 } : {}), title: 28, dir: 28, pid: 8, uptime: 8, status: 8 };
+    const cols = { id: 10, ...(multiBot ? { bot: 22 } : {}), title: 28, dir: 28, pid: 8, uptime: 8, status: 8, target: 26 };
     const headerParts = ['id'.padEnd(cols.id)];
     if (multiBot)
         headerParts.push('bot'.padEnd(cols.bot));
-    headerParts.push('title'.padEnd(cols.title), 'working dir'.padEnd(cols.dir), 'pid'.padEnd(cols.pid), 'uptime'.padEnd(cols.uptime), 'status'.padEnd(cols.status));
+    headerParts.push('title'.padEnd(cols.title), 'working dir'.padEnd(cols.dir), 'pid'.padEnd(cols.pid), 'uptime'.padEnd(cols.uptime), 'status'.padEnd(cols.status), 'target'.padEnd(cols.target));
     const header = headerParts.join(' │ ');
     const separator = '─'.repeat(displayWidth(header));
     console.log(separator);
@@ -1770,6 +1726,66 @@ function tmuxSessionExists(name) {
         return false;
     }
 }
+function applyTmuxWindowSizeLargest(sessionName) {
+    try {
+        execFileSync('tmux', ['set-option', '-t', sessionName, 'window-size', 'largest'], {
+            stdio: 'ignore',
+            timeout: 3000,
+            env: tmuxEnv(),
+        });
+    }
+    catch { /* best-effort: attach can still proceed */ }
+}
+function isAdoptedSession(s) {
+    return !!s.adoptedFrom && typeof s.adoptedFrom === 'object';
+}
+function adoptedCliPid(s) {
+    const pid = isAdoptedSession(s) ? s.adoptedFrom.originalCliPid : undefined;
+    return typeof pid === 'number' && pid > 0 ? pid : undefined;
+}
+function adoptTargetLabel(s) {
+    if (!isAdoptedSession(s))
+        return '';
+    const a = s.adoptedFrom;
+    if (a.source === 'zellij' || a.zellijPaneId) {
+        const target = a.zellijSession && a.zellijPaneId
+            ? `${a.zellijSession}/${a.zellijPaneId}`
+            : a.zellijPaneId || a.zellijSession || '?';
+        return `adopt: zellij ${target}`;
+    }
+    if (a.source === 'herdr' || a.herdrSessionName || a.herdrPaneId || a.herdrTarget) {
+        const pane = a.herdrTarget ?? a.herdrPaneId ?? '?';
+        const target = a.herdrSessionName ? `${a.herdrSessionName}:${pane}` : pane;
+        return `adopt: herdr ${target}`;
+    }
+    return `adopt: tmux ${a.tmuxTarget ?? '?'}`;
+}
+function sessionDisplayPid(s) {
+    return adoptedCliPid(s) ?? s.pid;
+}
+function isSessionAliveForList(s) {
+    const pid = sessionDisplayPid(s);
+    return !!(pid && isProcessAlive(pid));
+}
+function sessionStatusLabel(s) {
+    if (isAdoptedSession(s)) {
+        const pid = adoptedCliPid(s);
+        if (pid)
+            return isProcessAlive(pid) ? 'adopt' : 'stopped';
+        return s.pid && isProcessAlive(s.pid) ? 'adopt' : 'idle';
+    }
+    return s.pid && isProcessAlive(s.pid) ? 'online' : s.pid ? 'stopped' : 'idle';
+}
+function sessionTargetLabel(s, tmuxName, hasTmux) {
+    if (isAdoptedSession(s))
+        return adoptTargetLabel(s);
+    if (hasTmux === undefined) {
+        const name = tmuxName ?? `bmx-${s.sessionId.substring(0, 8)}`;
+        hasTmux = tmuxSessionExists(name);
+        tmuxName = name;
+    }
+    return hasTmux ? `tmux: ${tmuxName}` : '-';
+}
 /** Shorten path for display: replace $HOME with ~. */
 function shortenPath(p) {
     const home = homedir();
@@ -1788,10 +1804,10 @@ function interactiveSessionPicker(active) {
     const termWidth = process.stdout.columns || 100;
     const PREFIX = 4; // "  ❯ " or "    "
     const SEP_W = 3; // " │ "
-    const fixedCols = { id: 10, pid: 8, uptime: 7, status: 7 };
+    const fixedCols = { id: 10, pid: 8, uptime: 7, status: 7, target: 26 };
     const botW = multiBot ? 18 : 0;
-    const numSeps = (multiBot ? 7 : 6) - 1; // separators between columns
-    const fixedTotal = PREFIX + fixedCols.id + botW + fixedCols.pid + fixedCols.uptime + fixedCols.status + numSeps * SEP_W;
+    const numSeps = (multiBot ? 8 : 7) - 1; // separators between columns
+    const fixedTotal = PREFIX + fixedCols.id + botW + fixedCols.pid + fixedCols.uptime + fixedCols.status + fixedCols.target + numSeps * SEP_W;
     const flexTotal = Math.max(20, termWidth - fixedTotal);
     const titleW = Math.floor(flexTotal * 0.4);
     const dirW = flexTotal - titleW;
@@ -1803,10 +1819,15 @@ function interactiveSessionPicker(active) {
         pid: fixedCols.pid,
         uptime: fixedCols.uptime,
         status: fixedCols.status,
+        target: fixedCols.target,
     };
     // Build row data — use shortened paths for TUI
     function buildRows() {
         return active.map(s => {
+            const tmuxName = `bmx-${s.sessionId.substring(0, 8)}`;
+            const isAdopt = isAdoptedSession(s);
+            const hasTmux = !isAdopt && tmuxSessionExists(tmuxName);
+            const targetLabel = sessionTargetLabel(s, tmuxName, hasTmux);
             // Build row text with shortened dir
             const id = padEndDisplay(s.sessionId.substring(0, 8), cols.id);
             const parts = [id];
@@ -1816,14 +1837,14 @@ function interactiveSessionPicker(active) {
             }
             const title = padEndDisplay(truncate((s.title || '(untitled)').replace(/[\r\n]+/g, ' '), cols.title), cols.title);
             const dir = padEndDisplay(truncate(shortenPath(s.workingDir || '-'), cols.dir), cols.dir);
-            const pid = s.pid ? String(s.pid).padEnd(cols.pid) : '-'.padEnd(cols.pid);
+            const displayPid = sessionDisplayPid(s);
+            const pid = displayPid ? String(displayPid).padEnd(cols.pid) : '-'.padEnd(cols.pid);
             const uptime = formatDuration(Date.now() - new Date(s.createdAt).getTime()).padEnd(cols.uptime);
-            const alive = !!(s.pid && isProcessAlive(s.pid));
-            const status = (alive ? 'online' : s.pid ? 'stopped' : 'idle').padEnd(cols.status);
-            parts.push(title, dir, pid, uptime, status);
-            const tmuxName = `bmx-${s.sessionId.substring(0, 8)}`;
-            const hasTmux = tmuxSessionExists(tmuxName);
-            return { session: s, text: parts.join(' │ '), alive, tmuxName, hasTmux };
+            const alive = isSessionAliveForList(s);
+            const status = padEndDisplay(sessionStatusLabel(s), cols.status);
+            const target = padEndDisplay(truncate(targetLabel, cols.target), cols.target);
+            parts.push(title, dir, pid, uptime, status, target);
+            return { session: s, text: parts.join(' │ '), alive, tmuxName, hasTmux, isAdopt, targetLabel, canAttach: hasTmux && !isAdopt };
         });
     }
     let rows = buildRows();
@@ -1832,7 +1853,7 @@ function interactiveSessionPicker(active) {
         const hParts = ['id'.padEnd(cols.id)];
         if (multiBot)
             hParts.push('bot'.padEnd(cols.bot));
-        hParts.push('title'.padEnd(cols.title), 'working dir'.padEnd(cols.dir), 'pid'.padEnd(cols.pid), 'uptime'.padEnd(cols.uptime), 'status'.padEnd(cols.status));
+        hParts.push('title'.padEnd(cols.title), 'working dir'.padEnd(cols.dir), 'pid'.padEnd(cols.pid), 'uptime'.padEnd(cols.uptime), 'status'.padEnd(cols.status), 'target'.padEnd(cols.target));
         return hParts.join(' │ ');
     }
     const header = buildHeader();
@@ -1866,10 +1887,12 @@ function interactiveSessionPicker(active) {
         process.stdout.write(`    ${separator}\n`);
         // Footer info
         const selected = rows[cursor];
-        const tmuxHint = selected.hasTmux
-            ? `\x1b[32mtmux: ${selected.tmuxName}\x1b[0m`
-            : `\x1b[2mtmux: 无会话\x1b[0m`;
-        process.stdout.write(`\n  ${tmuxHint}\n`);
+        const targetHint = selected.isAdopt
+            ? `\x1b[33m${selected.targetLabel}\x1b[0m  \x1b[2mEnter 已禁用；请直接使用原 tmux/zellij/herdr 客户端。\x1b[0m`
+            : selected.hasTmux
+                ? `\x1b[32mtmux: ${selected.tmuxName}\x1b[0m`
+                : `\x1b[2mtmux: 无会话\x1b[0m`;
+        process.stdout.write(`\n  ${targetHint}\n`);
         // Flash message or confirmation prompt
         if (confirmDelete) {
             const s = selected.session;
@@ -1882,7 +1905,7 @@ function interactiveSessionPicker(active) {
             process.stdout.write('\n');
         }
         // Keybinding hints
-        process.stdout.write(`\n  \x1b[2m↑/↓ 选择  ⏎ 连接  d 删除  q 退出\x1b[0m\n`);
+        process.stdout.write(`\n  \x1b[2m↑/↓ 选择  ⏎ ${selected?.canAttach ? '连接' : '不可连接'}  d 删除  q 退出\x1b[0m\n`);
     }
     return new Promise((resolve) => {
         process.stdin.setRawMode(true);
@@ -1900,12 +1923,14 @@ function interactiveSessionPicker(active) {
         function deleteSession(idx) {
             const r = rows[idx];
             const s = r.session;
-            // Kill CLI process
-            if (s.pid && isProcessAlive(s.pid)) {
+            // Kill botmux's worker process. For adopted sessions, never kill the
+            // user's original CLI pid if an old record stored it in `pid`.
+            const originalPid = adoptedCliPid(s);
+            if (s.pid && s.pid !== originalPid && isProcessAlive(s.pid)) {
                 killProcess(s.pid);
             }
-            // Kill tmux session
-            if (r.hasTmux) {
+            // Kill only botmux-owned tmux sessions. Adopted panes belong to the user.
+            if (!r.isAdopt && r.hasTmux) {
                 try {
                     execSync(`tmux kill-session -t '${r.tmuxName}' 2>/dev/null`, { stdio: 'ignore', env: tmuxEnv() });
                 }
@@ -1970,11 +1995,17 @@ function interactiveSessionPicker(active) {
             // Enter — attach to tmux
             if (key === '\r' || key === '\n') {
                 const selected = rows[cursor];
-                if (!selected.hasTmux) {
+                if (selected.isAdopt) {
+                    flashMsg = `\x1b[33m这是 adopt 会话；botmux 不 attach 用户 pane。目标: ${selected.targetLabel}\x1b[0m`;
+                    render();
+                    return;
+                }
+                if (!selected.canAttach) {
                     flashMsg = '\x1b[33m该会话没有 tmux，无法连接\x1b[0m';
                     render();
                     return;
                 }
+                applyTmuxWindowSizeLargest(selected.tmuxName);
                 cleanup();
                 spawnSync('tmux', ['attach-session', '-t', selected.tmuxName], {
                     stdio: 'inherit',
@@ -2001,6 +2032,20 @@ async function cmdList() {
     const prunedScratch = [];
     const live = [];
     for (const s of active) {
+        if (isAdoptedSession(s)) {
+            const pid = adoptedCliPid(s);
+            if (pid && isProcessAlive(pid)) {
+                live.push(s);
+            }
+            else if (pid) {
+                pruned.push(s);
+            }
+            else {
+                const hasPid = !!(s.pid && isProcessAlive(s.pid));
+                hasPid ? live.push(s) : pruned.push(s);
+            }
+            continue;
+        }
         const hasPid = !!(s.pid && isProcessAlive(s.pid));
         const hasTmux = tmuxSessionExists(`bmx-${s.sessionId.substring(0, 8)}`);
         if (!hasPid && !hasTmux) {
@@ -2022,7 +2067,7 @@ async function cmdList() {
     closeNow(prunedScratch);
     if (pruned.length > 0) {
         closeNow(pruned);
-        console.log(`已自动清理 ${pruned.length} 个不可恢复的会话（进程已死且无 tmux session）`);
+        console.log(`已自动清理 ${pruned.length} 个不可恢复的会话（进程已退出或无可恢复后端）`);
     }
     // Sort by creation time, newest first
     live.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
@@ -2056,6 +2101,10 @@ function cmdDelete() {
     }
     else if (target === 'stopped') {
         toDelete = active.filter(s => {
+            if (isAdoptedSession(s)) {
+                const pid = adoptedCliPid(s);
+                return pid ? !isProcessAlive(pid) : !(s.pid && isProcessAlive(s.pid));
+            }
             const hasPid = !!(s.pid && isProcessAlive(s.pid));
             const hasTmux = tmuxSessionExists(`bmx-${s.sessionId.substring(0, 8)}`);
             return !hasPid && !hasTmux;
@@ -2082,18 +2131,23 @@ function cmdDelete() {
         }
     }
     for (const s of toDelete) {
-        // Kill CLI process if running
-        if (s.pid && isProcessAlive(s.pid)) {
+        const originalPid = adoptedCliPid(s);
+        // Kill botmux's worker process if running. For adopted sessions, never
+        // kill the user's original CLI pid.
+        if (s.pid && s.pid !== originalPid && isProcessAlive(s.pid)) {
             killProcess(s.pid);
             console.log(`  killed pid ${s.pid}`);
         }
-        // Kill associated tmux session if it exists
+        // Kill associated botmux-owned tmux session if it exists. Adopted panes
+        // belong to the user and must be left untouched.
         const tmuxName = `bmx-${s.sessionId.substring(0, 8)}`;
-        try {
-            execSync(`tmux kill-session -t '${tmuxName}' 2>/dev/null`, { stdio: 'ignore', env: tmuxEnv() });
-            console.log(`  killed tmux ${tmuxName}`);
+        if (!isAdoptedSession(s)) {
+            try {
+                execSync(`tmux kill-session -t '${tmuxName}' 2>/dev/null`, { stdio: 'ignore', env: tmuxEnv() });
+                console.log(`  killed tmux ${tmuxName}`);
+            }
+            catch { /* no tmux session */ }
         }
-        catch { /* no tmux session */ }
         // Mark session as closed
         s.status = 'closed';
         s.closedAt = new Date().toISOString();
@@ -2360,7 +2414,7 @@ botmux v${getVersion()} — IM ↔ AI 编程 CLI 桥接
               默认使用 botmux 内置 Feishu Web QR 登录尝试自动导入权限/redirect/发布版本；可加 --no-open-platform-auto 跳过
   start       启动 daemon
   stop        停止 daemon
-  restart     重启 daemon（自动恢复活跃会话）
+  restart     重启 daemon（自动恢复活跃会话；--include-pm2 同时重启 PM2 God）
   logs        查看 daemon 日志（--lines N, --bot <0-based-index|pm2-name|appId>）
   status      查看 daemon 状态
   upgrade     升级到最新版本