botmux 3.11.0 → 3.12.0

package/dist/cli.js

@@ -37,7 +37,7 @@ import { validateWorkingDir } from './core/working-dir.js';
 import { findAncestorSessionContext as findLiveAncestorSessionContext, resolveSessionContext, } from './core/session-marker.js';
 import { resolveBotmuxDataDir } from './core/data-dir.js';
 import { dashboardSecretPath } from './core/dashboard-secret.js';
-import { acceptedDispatchBotAppIds, activeConversationBotOpenIds, appendDispatchReportProtocol, appendLegacyDispatchReportProtocol, parseDispatchBotSpec, buildDispatchMessages, buildRepoPrimeText, buildReportContent, eligibleAutoMentionAliases, findDispatchRegistryEntry, foldableChatSessionAppIds, offTopicSubBotTopic, resolveReportPlacement, resolveReportRecipient, resolveReportTarget, resolveSendTarget, threadRootForReachability } from './core/dispatch.js';
+import { acceptedDispatchBotAppIds, activeConversationBotOpenIds, buildDispatchCompletionBrief, parseDispatchBotSpec, buildDispatchMessages, buildRepoPrimeText, buildReportContent, eligibleAutoMentionAliases, findDispatchRegistryEntry, foldableChatSessionAppIds, offTopicSubBotTopic, resolveReportPlacement, resolveReportRecipient, resolveReportTarget, resolveSendTarget, threadRootForReachability } from './core/dispatch.js';
 import { pickTurnReplyTarget, collectTurnWindowParticipants } from './core/reply-target.js';
 import { recordDispatchRegistryEntry } from './core/dispatch-registry.js';
 import { enableAutostart, disableAutostart, autostartStatus, refreshAutostart } from './autostart.js';
@@ -82,6 +82,7 @@ import { assertIncludePm2RestartAdmission } from './cli/pm2-god-admission.js';
 import { requestAttestedDaemonShutdown, requestAttestedDaemonShutdownBatch, } from './cli/supervisor-shutdown-client.js';
 import { assertDaemonPm2GracefulExitPolicy, assertConfiguredPm2FleetReady, assertExactAttestedDaemonSet, classifyStartBotFleetAdmission, normalizeRawPm2StopExitCodes, reconcileLatePm2StartPublication, runBoundedPm2StartTransaction, } from './cli/pm2-start-transaction.js';
 import { callDashboard } from './cli/dashboard-endpoint.js';
+import { DASHBOARD_COMMAND_USAGE, executeDashboardCommand, formatDashboardFallbackFailure, } from './cli/dashboard-command.js';
 import { globalInstallUpdateLockTargetIn, installLatestBotmuxSync } from './core/maintenance.js';
 import { formatGlobalInstallCommand, resolveGlobalInstallPlan, UnsupportedGlobalInstallError, } from './utils/global-install.js';
 import { loadDashboardSecret } from './dashboard/auth.js';
@@ -3658,7 +3659,7 @@ async function printDashboardHintWithRetry() {
     }
     // Soft fallback
     if (last?.reason === 'no-active-token') {
-        console.log('   面板: 运行 `botmux dashboard` 获取链接');
+        console.log('   面板: 运行 `botmux dashboard` 创建登录链接');
     }
     else if (last?.reason === 'no-secret') {
         console.log('   面板: dashboard 凭证未就绪，启动后可用 `botmux dashboard` 获取链接');
@@ -3670,13 +3671,22 @@ async function printDashboardHintWithRetry() {
         console.log('   面板: `botmux dashboard`（daemon 启动中，稍后可获取链接）');
     }
 }
-/**
- * Print a fresh dashboard URL by HMAC-authing to the dashboard process's
- * loopback rotation endpoint. Each call invalidates the previously-issued
- * token, so sharing a URL is the same as sharing a one-shot session.
- */
-async function cmdDashboard() {
-    const r = await callDashboardEndpoint('/__cli/rotate');
+/** Get or create the current dashboard URL, or explicitly rotate it. Bare
+ * `dashboard` is the non-rotating get-or-create form; help and invalid
+ * subcommands never call either credential endpoint. */
+async function cmdDashboard(args) {
+    const execution = await executeDashboardCommand(args, callDashboardEndpoint);
+    if (execution.kind === 'help') {
+        console.log(DASHBOARD_COMMAND_USAGE);
+        return;
+    }
+    if (execution.kind === 'invalid') {
+        console.error(`未知 dashboard 子命令: ${execution.argument}`);
+        console.error(DASHBOARD_COMMAND_USAGE);
+        process.exitCode = 2;
+        return;
+    }
+    const { action, result: r } = execution;
     if (r.ok) {
         // 首行保持纯 URL（脚本/复制取第一行即可）；走中心化平台时再补一行本地直连兜底。
         console.log(r.url);
@@ -3704,8 +3714,7 @@ async function cmdDashboard() {
             console.error(`  详情: ${r.detail}`);
     }
     else {
-        // `no-active-token` can't occur on rotate (it always mints); fall through.
-        console.error('Rotation failed:', r.detail ?? r.reason);
+        console.error(formatDashboardFallbackFailure(action, r));
     }
     process.exit(1);
 }
@@ -6065,7 +6074,10 @@ botmux v${getVersion()} — IM ↔ AI 编程 CLI 桥接
   logs        查看 daemon 日志（--lines N, --bot <0-based-index|pm2-name|appId>）
   status      查看 daemon 状态
   upgrade     升级到最新版本（别名：update）
-  dashboard   打印新的 Web Dashboard 一次性登录 URL（旧 token 同时失效）
+  dashboard current
+              获取当前 Web Dashboard 登录 URL（裸 \`dashboard\` 同义；没有则创建）
+  dashboard rotate
+              显式轮换 token，并打印新的登录 URL
   device enroll|status|logout
               在宿主终端注册、查看或清除 desktop device 凭证（AI CLI 会话内拒绝）
   list        列出活跃会话（交互式选择并连接 tmux）
@@ -9536,18 +9548,20 @@ async function cmdDispatch(rest) {
     }
     const bots = [...legacyBots, ...appBots]
         .filter((bot, index, all) => all.findIndex(candidate => candidate.openId === bot.openId) === index);
-    // Only an all-local stable-app dispatch can rely on this host's registry being
-    // visible to every receiver. Legacy or mixed --bot dispatches may cross hosts,
-    // so keep their context-derived compatibility report protocol.
+    const { readRoleDispatchCompletionEnabled } = await import('./core/role-resolver.js');
+    const sameTopicSendEnabled = readRoleDispatchCompletionEnabled(appId, targetChatId);
     const exactReportRootEnabled = parsedBotApps.length > 0 && legacyBots.length === 0;
-    const briefWithReportProtocol = (dispatchRootId) => exactReportRootEnabled
-        ? appendDispatchReportProtocol(brief, dispatchRootId)
-        : appendLegacyDispatchReportProtocol(brief);
+    const briefWithCompletionProtocol = (dispatchRootId) => buildDispatchCompletionBrief({
+        brief,
+        dispatchRootId,
+        exactReportRootEnabled,
+        sameTopicSendEnabled,
+    });
     let built;
     try {
         built = buildDispatchMessages({
             title: title.trim() || '子项目',
-            brief: intoRoot ? briefWithReportProtocol(intoRoot) : brief,
+            brief: intoRoot ? briefWithCompletionProtocol(intoRoot) : brief,
             bots,
         });
     }
@@ -9627,7 +9641,7 @@ async function cmdDispatch(rest) {
             // resident chat-scope session's mutable latest reply alias.
             const kickoffBuilt = buildDispatchMessages({
                 title: title.trim() || '子项目',
-                brief: briefWithReportProtocol(seedId),
+                brief: briefWithCompletionProtocol(seedId),
                 bots,
             });
             const kickoffBriefJson = JSON.stringify({ zh_cn: { title: '', content: kickoffBuilt.threadContent } });
@@ -9926,7 +9940,7 @@ async function cmdReport(rest) {
         }
         let response;
         try {
-            response = await fetch(`http://127.0.0.1:${daemon.ipcPort}/api/trigger`, {
+            response = await fetchDaemonIpc(daemon.ipcPort, '/api/trigger', {
                 method: 'POST',
                 headers: { 'content-type': 'application/json' },
                 body: JSON.stringify({
@@ -12037,7 +12051,7 @@ switch (command) {
         cmdUpgrade();
         break;
     case 'dashboard':
-        await cmdDashboard();
+        await cmdDashboard(process.argv.slice(3));
         break;
     case 'bind': {
         // `botmux bind <code>` — 把本机绑定到中心化平台