botmux 2.102.0 → 2.103.0

package/dist/cli.d.ts

@@ -1,4 +1,13 @@
 #!/usr/bin/env node
+export type StartBotLiveResult = {
+    ok: true;
+    state: 'started' | 'already-online';
+    processName: string;
+} | {
+    ok: false;
+    reason: 'not_found' | 'fleet_down' | 'pm2_error';
+    message: string;
+};
 /**
  * runHook: hook 命令的纯业务逻辑，接受已解析的 payload/env/postAskFn，
  * 返回应写到 stdout 的字符串。通过依赖注入使单元测试无需真实 daemon/env。

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA+5KA;;;;;;;;;;;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":";AAg7DA,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACtE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,GAAG,YAAY,GAAG,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAgnHrF;;;;;;;;;;;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

@@ -48,7 +48,7 @@ import { callDashboard } from './cli/dashboard-endpoint.js';
 import { loadDashboardSecret } from './dashboard/auth.js';
 import { rejectLikelyWindowsStdinMojibake, decodeStdinBytes } from './cli/stdin-encoding.js';
 import { formatBotInfoEntriesForCli, formatChatBotsForCli, } from './cli/bots-list-output.js';
-import { buildFooterAddressing, hasKnownBotMention, knownBotOpenIdsFromCrossRef, orderedFooterRecipients, } from './utils/bot-routing.js';
+import { buildFooterAddressing, hasKnownBotMention, knownBotOpenIdsFromCrossRef, orderedFooterRecipients, stripCodeSpans, } from './utils/bot-routing.js';
 import { isLocale, localeForBot, setDefaultLocale, SUPPORTED_LOCALES, t } from './i18n/index.js';
 import { chatAppLink, larkHosts, normalizeBrand, sdkDomain } from './im/lark/lark-hosts.js';
 import { mergeGlobalConfig, readGlobalConfig, setGlobalLocale, globalConfigPath } from './global-config.js';
@@ -1182,6 +1182,9 @@ async function cmdSetupScripted(argv) {
             await finishOpenPlatformSetup(bot.larkAppId, botBrand(bot));
         }
         const index = existing.length;
+        // daemon 在跑就直接把新 bot 那一个进程拉起来，免整组 botmux restart。
+        const live = ensureBotDaemonStarted(bot.larkAppId, { quiet: cmd.json });
+        const next = live.ok ? 'live' : (live.reason === 'fleet_down' ? 'botmux start' : 'botmux restart');
         if (cmd.json) {
             console.log(JSON.stringify({
                 ok: true,
@@ -1190,7 +1193,8 @@ async function cmdSetupScripted(argv) {
                 botsFile: BOTS_JSON_FILE,
                 envMigrated: migratedEnv || undefined,
                 openPlatform: cmd.openPlatformAuto ? 'attempted' : 'skipped',
-                next: 'botmux restart',
+                live,
+                next,
             }, null, 2));
         }
         else {
@@ -1201,7 +1205,15 @@ async function cmdSetupScripted(argv) {
             if (!cmd.openPlatformAuto) {
                 console.log('   已跳过开放平台自动配置（权限导入/发版）。需要时加 --open-platform-auto（要扫码），或运行交互式 botmux setup。');
             }
-            console.log('下一步: botmux restart');
+            if (live.ok) {
+                console.log(`✅ 已自动上线（${live.processName}），无需重启其它机器人。`);
+            }
+            else if (live.reason === 'fleet_down') {
+                console.log('下一步: botmux start（daemon 尚未运行）');
+            }
+            else {
+                console.log(`⚠️  自动上线失败（${live.message}）。下一步: botmux restart`);
+            }
         }
         return;
     }
@@ -1459,7 +1471,7 @@ async function cmdSetup() {
             console.log(`\n✅ 已添加机器人 ${newBot.larkAppId}，共 ${bots.length + 1} 个`);
             console.log(`   配置文件: ${BOTS_JSON_FILE}`);
             await finishOpenPlatformSetup(newBot.larkAppId, botBrand(newBot));
-            console.log(`下一步: botmux restart\n`);
+            printAddBotLiveHint(newBot.larkAppId);
             return;
         }
     }
@@ -1513,7 +1525,7 @@ async function cmdSetup() {
         console.log(`   配置文件: ${BOTS_JSON_FILE}`);
         console.log(`   旧配置已备份: ${ENV_FILE}.bak`);
         await finishOpenPlatformSetup(newBot.larkAppId, botBrand(newBot));
-        console.log(`下一步: botmux restart\n`);
+        printAddBotLiveHint(newBot.larkAppId);
     }
     else {
         // --- Fresh install ---
@@ -1874,6 +1886,120 @@ async function cmdRestart() {
     }
     await printDashboardHintWithRetry();
 }
+/**
+ * pm2 process list filtered to botmux entries (bot daemons + dashboard). Returns
+ * `[]` when pm2 isn't running or has no botmux apps at all.
+ */
+function listBotmuxPm2Apps() {
+    try {
+        const apps = JSON.parse(pm2Capture(['jlist']));
+        return (Array.isArray(apps) ? apps : [])
+            .filter(a => a && (a.name === PM2_NAME || String(a.name).startsWith(`${PM2_NAME}-`)))
+            .map(a => ({ name: String(a.name), online: a?.pm2_env?.status === 'online' }));
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Bring a SINGLE bot's daemon online without touching any other bot's process.
+ * The key to "add a bot without `botmux restart`": a new bot is always APPENDED
+ * to bots.json (stable index), so the existing daemons (indices 0..N-1) keep
+ * running unchanged — we only need to spawn the new bot's own process.
+ *
+ * We regenerate ecosystem.config.json (which now includes the new app at index
+ * N) and run `pm2 start --only <processName>`, which starts exactly that one app
+ * and leaves every already-online daemon untouched (unlike `botmux restart`,
+ * which tears down the whole fleet). The new daemon runs its slice of
+ * startDaemon() — registerBot + WSClient long-connection + descriptor publish —
+ * so it starts receiving Feishu messages and the dashboard auto-discovers it via
+ * its freshly-written descriptor.
+ *
+ * Idempotent: a no-op when the target is already online. When the whole fleet is
+ * down (no botmux pm2 apps — the dashboard itself isn't running either), we do
+ * NOT start a lone bot; that case belongs to `botmux start`, which brings up the
+ * entire ecosystem (all bots + dashboard).
+ */
+function ensureBotDaemonStarted(appId, opts = {}) {
+    const bots = loadBotsJson();
+    const index = bots.findIndex(b => b?.larkAppId === appId);
+    if (index < 0) {
+        return { ok: false, reason: 'not_found', message: `appId ${appId} 不在 bots.json 中` };
+    }
+    const processName = botProcessName(bots[index], index, PM2_NAME);
+    const running = listBotmuxPm2Apps();
+    if (running.length === 0) {
+        return { ok: false, reason: 'fleet_down', message: 'daemon 未在运行，请先 botmux start' };
+    }
+    if (running.some(a => a.name === processName && a.online)) {
+        return { ok: true, state: 'already-online', processName };
+    }
+    const cfg = ecosystemConfig();
+    try {
+        // `--only <name>` filters the ecosystem to just this app, so pm2 starts only
+        // the new bot's daemon and never restarts the already-online ones.
+        runPm2(['start', cfg, '--only', processName], !opts.quiet);
+    }
+    catch (e) {
+        return { ok: false, reason: 'pm2_error', message: e instanceof Error ? e.message : String(e) };
+    }
+    return { ok: true, state: 'started', processName };
+}
+/**
+ * `botmux start-bot <larkAppId>` — bring one freshly-added bot online without a
+ * fleet-wide restart. Invoked by `botmux setup add` (inline) and by the
+ * dashboard onboarding flow (spawned as a subprocess). `--json` for scripted
+ * callers.
+ */
+async function cmdStartBot(argv) {
+    const wantsJson = argv.includes('--json');
+    const appId = argv.find(a => !a.startsWith('-'));
+    if (!appId) {
+        const msg = '用法: botmux start-bot <larkAppId> —— 拉起单个新机器人的 daemon（不重启其它 bot）';
+        if (wantsJson)
+            console.log(JSON.stringify({ ok: false, reason: 'missing_app_id', message: msg }));
+        else
+            console.error(`❌ ${msg}`);
+        process.exit(1);
+    }
+    ensureConfigDir();
+    const r = ensureBotDaemonStarted(appId, { quiet: wantsJson });
+    if (wantsJson) {
+        console.log(JSON.stringify(r, null, 2));
+        if (!r.ok)
+            process.exitCode = 1;
+        return;
+    }
+    if (r.ok) {
+        if (r.state === 'already-online')
+            console.log(`✅ ${r.processName} 已在运行，无需操作`);
+        else
+            console.log(`✅ 已拉起 ${r.processName}（未重启其它机器人）`);
+        return;
+    }
+    if (r.reason === 'fleet_down') {
+        console.error('ℹ️  daemon 未在运行。请用 `botmux start` 启动整个进程组。');
+    }
+    else {
+        console.error(`❌ 拉起失败 (${r.reason}): ${r.message}`);
+    }
+    process.exit(1);
+}
+/** Print the post-add "next step" line for interactive setup: auto-start the new
+ *  bot's own daemon when the fleet is up (no fleet-wide restart), else fall back
+ *  to the botmux start / restart hint. */
+function printAddBotLiveHint(appId) {
+    const live = ensureBotDaemonStarted(appId);
+    if (live.ok) {
+        console.log(`✅ 已自动上线（${live.processName}），无需重启其它机器人。\n`);
+    }
+    else if (live.reason === 'fleet_down') {
+        console.log('下一步: botmux start（daemon 尚未运行）\n');
+    }
+    else {
+        console.log(`⚠️  自动上线失败（${live.message}）。下一步: botmux restart\n`);
+    }
+}
 /** 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
@@ -4501,6 +4627,12 @@ async function cmdSend(rest) {
             // bot（正是要避免的循环 @）。botEntries/crossRef 仍需加载供 footer 寻址用。
             if (!noMention) {
                 const alreadyMentioned = new Set(mentions.map(m => m.open_id));
+                // Scan a code-span-stripped copy so a bot name quoted inside backticks or a
+                // fenced block (e.g. an example `botmux send --mention @Bot …` or an
+                // explanatory `@Bot`) is not auto-injected as a real handoff — that spurious
+                // <at> would wake a bot the model never meant to @. Explicit --mention still
+                // works (it doesn't go through this prose scan).
+                const textForBotScan = stripCodeSpans(text);
                 // Sort by name length desc so longer names ("Claude分身") win over their
                 // prefix ("Claude") when both could match — break-on-first-hit otherwise
                 // routes "@Claude分身" to Claude.
@@ -4543,7 +4675,7 @@ async function cmdSend(rest) {
                         // `@Claude2` doesn't match name "Claude" and `@Claude分身好的` doesn't
                         // either-half-match.
                         const re = new RegExp(`(?<![A-Za-z0-9_])@${escName}(?![\\p{L}\\p{N}_])`, 'iu');
-                        if (!re.test(text))
+                        if (!re.test(textForBotScan))
                             continue;
                         // Lark open_id is per-app scoped. Use sender-scoped id from cross-ref
                         // only — falling back to entry.botOpenId would feed Lark a wrong-scope
@@ -6102,6 +6234,9 @@ switch (command) {
     case 'start':
         await cmdStart();
         break;
+    case 'start-bot':
+        await cmdStartBot(process.argv.slice(3));
+        break;
     case 'stop':
         cmdStop();
         break;