botmux 3.1.1 → 3.2.0

package/dist/cli.js

@@ -53,7 +53,8 @@ import { isColdResumeDormant, sessionListDisposition } from './cli/session-list-
 import { dispatchPrimaryMessage, findStdinAliasAttachment, normalizeInteractiveCardInput, sendFileAttachments, sendVideoAttachments, shouldSendAsPureVideo, validateVideoAttachments } from './cli/send-dispatch.js';
 import { buildPm2SpawnCommand } from './cli/pm2-command.js';
 import { callDashboard } from './cli/dashboard-endpoint.js';
-import { installLatestBotmuxSync } from './core/maintenance.js';
+import { globalInstallUpdateLockTargetIn, installLatestBotmuxSync } from './core/maintenance.js';
+import { withFileLockSync } from './utils/file-lock.js';
 import { formatGlobalInstallCommand, resolveGlobalInstallPlan, UnsupportedGlobalInstallError, } from './utils/global-install.js';
 import { loadDashboardSecret } from './dashboard/auth.js';
 import { postWorkflowDaemonMutation, } from './workflows/v3/daemon-ipc-client.js';
@@ -68,7 +69,7 @@ import { chatAppLink, larkHosts, normalizeBrand, sdkDomain } from './im/lark/lar
 import { mergeDashboardConfig, mergeGlobalConfig, readGlobalConfig, setGlobalLocale, globalConfigPath } from './global-config.js';
 import { createWhiteboard, ensureDefaultWhiteboard, getWhiteboard, listWhiteboards, readWhiteboard, whiteboardEnabled, whiteboardPath, } from './services/whiteboard-store.js';
 import { buildBridgeSendMarkerContent } from './services/bridge-fallback-gate.js';
-import { writeManualIntentIfAbsentTo } from './services/restart-intent-store.js';
+import { bindRestartLeaseTo, writeManualIntentIfAbsentTo } from './services/restart-intent-store.js';
 import { stripLegacyPendingCardFields } from './services/session-store.js';
 import { evaluateVcMeetingManagedSend, isTrustedVcMeetingHostRelayParent, resolveVcMeetingImTurnOrigin, } from './services/vc-meeting-send-policy.js';
 import { finishVcMeetingImReply, prepareVcMeetingDeliveryReply, prepareVcMeetingImReply, } from './services/vc-meeting-im-reply.js';
@@ -2303,6 +2304,20 @@ async function cmdStop() {
         console.log('daemon 未在运行。');
 }
 async function cmdRestart() {
+    const restartLeaseId = process.env.BOTMUX_RESTART_LEASE_ID;
+    const restartLeaseDir = process.env.BOTMUX_RESTART_LEASE_DIR;
+    delete process.env.BOTMUX_RESTART_LEASE_ID;
+    delete process.env.BOTMUX_RESTART_LEASE_DIR;
+    if (restartLeaseId) {
+        if (!restartLeaseDir)
+            throw new Error('restart driver lease directory is missing');
+        let bound = false;
+        withFileLockSync(globalInstallUpdateLockTargetIn(restartLeaseDir), () => {
+            bound = bindRestartLeaseTo(restartLeaseDir, restartLeaseId, process.pid, Date.now());
+        });
+        if (!bound)
+            throw new Error('failed to bind restart driver lease');
+    }
     if (!hasConfig()) {
         console.error('❌ 未找到配置文件');
         console.error('   请先运行: botmux setup');
@@ -4210,6 +4225,7 @@ botmux v${getVersion()} — IM ↔ AI 编程 CLI 桥接
   schedule list                        列出所有任务
   schedule add <schedule> <prompt>     添加任务（ex: "30m" / "every 2h" / "每日9:00" / "0 9 * * *"）
        --new-topic                     每次触发在同群开一个新话题、起独立会话（不续旧话题）
+       --silent                        静默执行：不发「执行中」提示，模型判断是否 botmux send 报警（与 --new-topic 互斥）
   schedule remove <id>                 删除任务
   schedule pause|resume <id>           暂停/恢复
   schedule run <id>                    标记立即执行
@@ -4337,6 +4353,7 @@ function detectCurrentSession() {
         workingDir: s.workingDir,
         larkAppId: s.larkAppId,
         chatType: s.chatType,
+        scope: s.scope,
     };
 }
 /** Pick a value from --flag <value> or --flag=value style args. */
@@ -4678,7 +4695,7 @@ async function cmdSchedule(sub, rest) {
             const prompt = t.prompt ?? '';
             const chatId = t.chatId ?? '—';
             const rootId = t.rootMessageId ?? '—';
-            console.log(`${status} [${t.id}] ${display} | ${t.name}`);
+            console.log(`${status} [${t.id}] ${display} | ${t.name}${t.silent ? ' 🔇静默' : ''}`);
             console.log(`   prompt: ${prompt.length > 60 ? prompt.slice(0, 60) + '…' : prompt}`);
             console.log(`   chat: ${chatId.slice(0, 12)}…   thread: ${rootId.slice(0, 16)}…`);
             console.log(`   next: ${next}   last: ${last}${t.lastStatus === 'error' ? ' ❌' : ''}`);
@@ -4687,9 +4704,9 @@ async function cmdSchedule(sub, rest) {
         return;
     }
     if (sub === 'add') {
-        const [rawSchedule, ...promptParts] = positionals(rest, ['--new-topic']);
+        const [rawSchedule, ...promptParts] = positionals(rest, ['--new-topic', '--silent']);
         if (!rawSchedule) {
-            console.error('用法: botmux schedule add <schedule> <prompt> [--name NAME] [--chat-id CHAT] [--root-msg-id ROOT] [--lark-app-id APP] [--workdir DIR] [--new-topic]');
+            console.error('用法: botmux schedule add <schedule> <prompt> [--name NAME] [--chat-id CHAT] [--root-msg-id ROOT] [--lark-app-id APP] [--workdir DIR] [--new-topic] [--silent]');
             process.exit(1);
         }
         // prompt may come from positional or --prompt flag
@@ -4708,6 +4725,13 @@ async function cmdSchedule(sub, rest) {
         const deliver = rest.includes('--new-topic')
             ? 'new-topic'
             : (argValue(rest, '--deliver') ?? 'origin');
+        // --silent: fires post no "执行中" banner; the spawned turn stays quiet and
+        // the model only `botmux send`s when the alert condition in the prompt is met.
+        const silent = rest.includes('--silent');
+        if (silent && deliver === 'new-topic') {
+            console.error('--silent 与 --new-topic 不能同时使用：新话题必须由首条消息开启。要「有异常才开新话题」，请在 prompt 里指示模型报警时用 botmux send 顶层发送。');
+            process.exit(1);
+        }
         if (!chatId) {
             console.error('无法推断 chat-id。请加上 --chat-id <CHAT_ID>，或从 Lark 话题内的 CLI 会话中运行本命令。');
             process.exit(1);
@@ -4733,7 +4757,9 @@ async function cmdSchedule(sub, rest) {
             creatorRootMessageId: cur?.rootMessageId,
             creatorLarkAppId: cur?.larkAppId,
             chatType: cur?.chatType === 'p2p' ? 'p2p' : 'topic_group',
+            scope: cur?.scope,
             deliver,
+            silent,
         });
         const next = task.nextRunAt ? new Date(task.nextRunAt).toLocaleString('zh-CN', { timeZone: scheduleTimeZone() }) : '—';
         console.log(`✅ 已创建定时任务 [${task.id}] ${task.name}`);
@@ -4741,6 +4767,8 @@ async function cmdSchedule(sub, rest) {
         console.log(`   下次执行: ${next}`);
         console.log(`   工作目录: ${workingDir}`);
         console.log(`   话题: ${deliver === 'new-topic' ? '(每次新开话题，独立会话)' : rootMessageId ?? '(将新开)'}`);
+        if (silent)
+            console.log('   静默: 触发时不发「执行中」提示，由模型判断是否需要 botmux send 报警');
         return;
     }
     const id = positionals(rest)[0];
@@ -8268,6 +8296,32 @@ function printPluginUsage() {
   botmux plugin service restart [plugin-id|--all]
 `);
 }
+function printPluginServiceRunningError(err) {
+    if (!err || typeof err !== 'object' || err.code !== 'plugin_service_running')
+        return false;
+    const pluginId = String(err.pluginId ?? 'unknown');
+    const operation = String(err.operation ?? 'update');
+    const status = String(err.serviceStatus ?? 'unknown');
+    const pid = typeof err.pid === 'number' ? `, PID ${err.pid}` : '';
+    const operationLabel = operation === 'uninstall' ? '卸载' : operation === 'install' ? '安装' : '更新';
+    console.error(`❌ 无法${operationLabel}插件 ${pluginId}：插件服务仍在运行（${status}${pid}）。`);
+    console.error(`   请先运行: botmux plugin service stop ${pluginId}`);
+    console.error('   Botmux 不会在安装、更新或卸载时隐式停止插件服务。');
+    return true;
+}
+function printPluginServiceDeleteError(err) {
+    if (!err || typeof err !== 'object' || err.code !== 'plugin_service_delete_failed')
+        return false;
+    const failures = Array.isArray(err.failures) ? err.failures : [];
+    const details = failures
+        .map((failure) => `${String(failure.pluginId ?? 'unknown')}: ${String(failure.warning ?? 'PM2 删除失败')}`)
+        .join('; ');
+    console.error('❌ 插件服务的 PM2 记录删除失败，插件未卸载。');
+    if (details)
+        console.error(`   ${details}`);
+    console.error('   请确认 PM2 可用后重新执行卸载；Botmux 未清理插件文件、配置或绑定。');
+    return true;
+}
 async function cmdPlugin(args) {
     const sub = (args[0] ?? 'list').toLowerCase();
     if (sub === 'help' || sub === '--help' || sub === '-h') {
@@ -8283,7 +8337,17 @@ async function cmdPlugin(args) {
         const { installPlugin } = await import('./core/plugins/install.js');
         const { resolveOfficialPluginPackageSpec } = await import('./core/plugins/init.js');
         const resolvedSpec = resolveOfficialPluginPackageSpec(spec);
-        const result = installPlugin(resolvedSpec, { link: args.includes('--link') });
+        let result;
+        try {
+            result = installPlugin(resolvedSpec, { link: args.includes('--link') });
+        }
+        catch (err) {
+            if (printPluginServiceRunningError(err)) {
+                process.exitCode = 1;
+                return;
+            }
+            throw err;
+        }
         const enabledPlugins = normalizePluginIdList(readGlobalConfig().plugins) ?? [];
         if (enabledPlugins.includes(result.record.id)) {
             const { materializePlugin } = await import('./core/plugins/materializer.js');
@@ -8381,27 +8445,54 @@ async function cmdPlugin(args) {
     if (sub === 'uninstall' || sub === 'remove' || sub === 'rm') {
         const pluginId = requirePluginId(args[1]);
         assertPluginInstalled(pluginId);
-        const enabledEverywhere = new Set(normalizePluginIdList(readGlobalConfig().plugins) ?? []);
-        for (const bot of loadBotsJson()) {
-            for (const id of normalizePluginIdList(bot.plugins) ?? [])
-                enabledEverywhere.add(id);
-        }
-        const dependents = enabledPluginDependents(pluginId, [...enabledEverywhere], registry);
-        if (dependents.length > 0) {
-            console.error(`❌ 不能卸载 ${pluginId}，以下已启用插件依赖它: ${dependents.join(', ')}`);
-            console.error('   请先在对应作用域显式禁用这些插件。');
-            process.exit(1);
-        }
+        const { assertPluginServiceStopped, deletePluginServicesOrThrowUnlocked, withPluginServiceLock, } = await import('./core/plugins/service-manager.js');
         const { dematerializePlugin } = await import('./core/plugins/materializer.js');
-        const { deletePluginServices } = await import('./core/plugins/service-manager.js');
-        dematerializePlugin(pluginId);
-        await deletePluginServices([pluginId]);
-        await removePluginSkillRegistryEntries(pluginId);
-        const { removeInstalledPlugin } = await import('./services/plugin-registry-store.js');
+        const { readPluginRegistry, removeInstalledPlugin } = await import('./services/plugin-registry-store.js');
         const { pluginHome } = await import('./core/plugins/paths.js');
-        removeInstalledPlugin(pluginId);
-        removePluginBindingsEverywhere(pluginId);
-        rmSync(pluginHome(pluginId), { recursive: true, force: true });
+        try {
+            await withPluginServiceLock(async () => {
+                const lockedRegistry = readPluginRegistry();
+                const installed = lockedRegistry.plugins[pluginId];
+                if (!installed)
+                    throw new Error(`plugin_not_installed:${pluginId}`);
+                const enabledEverywhere = new Set(normalizePluginIdList(readGlobalConfig().plugins) ?? []);
+                for (const bot of loadBotsJson()) {
+                    for (const id of normalizePluginIdList(bot.plugins) ?? [])
+                        enabledEverywhere.add(id);
+                }
+                const dependents = enabledPluginDependents(pluginId, [...enabledEverywhere], lockedRegistry);
+                if (dependents.length > 0) {
+                    throw new Error(`plugin_has_enabled_dependents:${pluginId}:${dependents.join(',')}`);
+                }
+                if (installed.manifest.service) {
+                    assertPluginServiceStopped(pluginId, 'uninstall');
+                }
+                await deletePluginServicesOrThrowUnlocked([pluginId]);
+                dematerializePlugin(pluginId);
+                await removePluginSkillRegistryEntries(pluginId);
+                removeInstalledPlugin(pluginId);
+                removePluginBindingsEverywhere(pluginId);
+                rmSync(pluginHome(pluginId), { recursive: true, force: true });
+            });
+        }
+        catch (err) {
+            if (err instanceof Error && err.message.startsWith(`plugin_has_enabled_dependents:${pluginId}:`)) {
+                const dependents = err.message.slice(`plugin_has_enabled_dependents:${pluginId}:`.length).split(',').filter(Boolean);
+                console.error(`❌ 不能卸载 ${pluginId}，以下已启用插件依赖它: ${dependents.join(', ')}`);
+                console.error('   请先在对应作用域显式禁用这些插件。');
+                process.exitCode = 1;
+                return;
+            }
+            if (printPluginServiceRunningError(err)) {
+                process.exitCode = 1;
+                return;
+            }
+            if (printPluginServiceDeleteError(err)) {
+                process.exitCode = 1;
+                return;
+            }
+            throw err;
+        }
         console.log(`✅ 已卸载插件: ${pluginId}`);
         return;
     }
@@ -8579,6 +8670,7 @@ switch (command) {
             process.exitCode = 2;
             break;
         }
+        process.env.SESSION_DATA_DIR ??= resolveDataDir();
         const { runMcpGateway } = await import('./core/plugins/mcp/gateway.js');
         await runMcpGateway();
         break;