botmux 2.95.0 → 2.96.1

package/dist/core/dashboard-ipc-server.js

@@ -18,10 +18,11 @@ import * as observedBotsStore from '../services/observed-bots-store.js';
 import { getDeploymentIdentity } from '../services/deployment-identity.js';
 import * as grantPrefsStore from '../services/grant-prefs-store.js';
 import { findConfigField, applyConfigField, coerceConfigValue } from '../services/bot-config-store.js';
+import { summaryRangeFromBotConfig, updateDashboardSummaryRange } from '../services/summary-range-store.js';
 import { config } from '../config.js';
 import { computeSandboxDiff, applySandboxDiff } from '../services/sandbox-land.js';
 import { buildSafeInsightConversation, buildSafeInsightOverview, buildSafeInsightReport, buildSafeInsightTurnDetail } from '../services/insight/report.js';
-import { readRawConfig, findEntryIndex, requireConfigPath } from '../services/config-store.js';
+import { readRawConfig, findEntryIndex, requireConfigPath, rmwBotEntry } from '../services/config-store.js';
 import { setDefaultLocale, localeForBot, t } from '../i18n/index.js';
 import { isLocale } from '../i18n/types.js';
 import { readGlobalConfig } from '../global-config.js';
@@ -44,6 +45,7 @@ import { deleteRoleProfileEntry, deleteRoleProfileIfEmpty, isValidRoleProfileId,
 import { triggerSessionTurn } from './trigger-session.js';
 import { triggerWorkflowFromEnvelope } from '../workflows/trigger-from-envelope.js';
 import { validateTriggerRequest } from '../services/trigger-types.js';
+import { resolveCliSelection, selectionKeyForBot } from '../setup/cli-selection.js';
 // Workflow runner is wired by the daemon (it owns the heavy triggerWorkflowRun
 // deps). Until set, workflow-targeted triggers report not-implemented.
 let workflowRunner = null;
@@ -209,6 +211,46 @@ ipcRoute('POST', '/api/sessions/:sessionId/restart', (_req, res, params) => {
 function findSessionRecord(sessionId) {
     return findActiveBySessionId(sessionId)?.session ?? sessionStore.getSession(sessionId);
 }
+function buildAsyncTriggerLookupResponse(sessionId, triggerId) {
+    const ds = findActiveBySessionId(sessionId);
+    if (!ds) {
+        return { ok: false, errorCode: 'session_not_found', error: `active session not found: ${sessionId}` };
+    }
+    const resolvedTriggerId = triggerId || ds.latestAsyncTriggerId;
+    if (!resolvedTriggerId) {
+        return { ok: false, errorCode: 'bad_request', error: 'no async trigger recorded for this session' };
+    }
+    const state = ds.asyncTriggerResults?.get(resolvedTriggerId);
+    if (!state) {
+        return { ok: false, errorCode: 'bad_request', error: `async trigger not found for session: ${resolvedTriggerId}` };
+    }
+    if (state.status === 'completed') {
+        return {
+            ok: true,
+            triggerId: resolvedTriggerId,
+            action: 'completed',
+            target: { kind: 'turn', sessionId, chatId: ds.chatId },
+            output: state.content ? { content: state.content } : undefined,
+            async: {
+                status: 'completed',
+                sessionId,
+                completedAt: state.completedAt ? new Date(state.completedAt).toISOString() : undefined,
+            },
+            message: 'async trigger completed',
+        };
+    }
+    return {
+        ok: true,
+        triggerId: resolvedTriggerId,
+        action: 'queued',
+        target: { kind: 'turn', sessionId, chatId: ds.chatId },
+        async: {
+            status: 'pending',
+            sessionId,
+        },
+        message: 'async trigger pending',
+    };
+}
 // 看板放置：dashboard 看板视图拖拽卡片后持久化列 + 列内排序位置。
 // 改完广播 session.update，所有打开的 dashboard 实时同步。
 ipcRoute('POST', '/api/sessions/:sessionId/board', async (req, res, params) => {
@@ -352,6 +394,17 @@ ipcRoute('GET', '/api/sessions/:sessionId/history', async (req, res, params) =>
         jsonRes(res, 502, { ok: false, error: String(err?.message ?? err) });
     }
 });
+ipcRoute('GET', '/api/sessions/:sessionId/trigger-result', (req, res, params) => {
+    const url = new URL(req.url ?? '/', 'http://localhost');
+    const triggerId = url.searchParams.get('triggerId') ?? undefined;
+    const result = buildAsyncTriggerLookupResponse(params.sessionId, triggerId);
+    const status = result.ok
+        ? 200
+        : result.errorCode === 'session_not_found'
+            ? 404
+            : 400;
+    jsonRes(res, status, result);
+});
 // 会话 insight：只读解析本会话的 transcript，产出动作 span / 失败聚合 / 规则建议
 // （SafeInsightReport）。底层 services/insight 已做 fail-closed 脱敏投影——raw 命令
 // 与输出永不进结构。detail=summary 只返聚合+建议（/insight 卡片、抽屉概览用）；
@@ -487,6 +540,33 @@ ipcRoute('POST', '/api/sessions/:sessionId/rename', async (req, res, params) =>
     });
     jsonRes(res, 200, { ok: true, title });
 });
+// 会话锁定：保护被锁定会话不被 dashboard「清理空闲」批量关闭。锁定是会话元数据，
+// 不影响用户显式点击关闭/批量关闭，避免把会话变成不可管理状态。
+ipcRoute('POST', '/api/sessions/:sessionId/lock', async (req, res, params) => {
+    let body;
+    try {
+        body = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    if (typeof body.locked !== 'boolean')
+        return jsonRes(res, 400, { ok: false, error: 'bad_locked' });
+    const session = findSessionRecord(params.sessionId);
+    if (!session)
+        return jsonRes(res, 404, { ok: false, error: 'session_not_found' });
+    if (body.locked)
+        session.locked = true;
+    else
+        delete session.locked;
+    sessionStore.updateSession(session);
+    const locked = !!session.locked;
+    dashboardEventBus.publish({
+        type: 'session.update',
+        body: { sessionId: params.sessionId, patch: { locked } },
+    });
+    jsonRes(res, 200, { ok: true, locked });
+});
 /**
  * Mint the WRITABLE web-terminal link for a live session — the dashboard
  * counterpart to the Lark card's "🔑 获取操作链接" button. Returns the URL with
@@ -863,9 +943,11 @@ ipcRoute('POST', '/api/trigger', async (req, res) => {
                 ? 403
                 : result.errorCode === 'session_not_found'
                     ? 404
-                    : result.errorCode === 'target_required' || result.errorCode === 'bad_request'
-                        ? 400
-                        : 500;
+                    : result.errorCode === 'wait_timeout'
+                        ? 504
+                        : result.errorCode === 'target_required' || result.errorCode === 'bad_request'
+                            ? 400
+                            : 500;
         return jsonRes(res, status, result);
     }
     catch (e) {
@@ -1180,6 +1262,18 @@ ipcRoute('GET', '/api/bot-default-oncall', async (_req, res) => {
             p2pMode = 'chat';
     }
     catch { /* default thread */ }
+    let cliId = '';
+    let wrapperCli = null;
+    let model = null;
+    let agentSelectionKey = '';
+    try {
+        const cfg = getBot(cachedLarkAppId).config;
+        cliId = cfg.cliId;
+        wrapperCli = typeof cfg.wrapperCli === 'string' && cfg.wrapperCli.trim() ? cfg.wrapperCli : null;
+        model = typeof cfg.model === 'string' && cfg.model.trim() ? cfg.model : null;
+        agentSelectionKey = selectionKeyForBot(cliId, wrapperCli ?? undefined);
+    }
+    catch { /* no registered bot */ }
     let maxLiveWorkers = null;
     try {
         const m = getBot(cachedLarkAppId).config.maxLiveWorkers;
@@ -1218,6 +1312,10 @@ ipcRoute('GET', '/api/bot-default-oncall', async (_req, res) => {
     jsonRes(res, 200, {
         larkAppId: cachedLarkAppId,
         botName: getBotName(),
+        cliId,
+        wrapperCli,
+        model,
+        agentSelectionKey,
         defaultOncall: defaultOncall ?? { enabled: false, workingDir: '', since: 0 },
         defaultWorkingDir,
         autoboundChatCount: autoboundChats.length,
@@ -1242,6 +1340,7 @@ ipcRoute('GET', '/api/bot-default-oncall', async (_req, res) => {
         startupCommands,
         launchShell: getBot(cachedLarkAppId).config.launchShell ?? '',
         env,
+        summaryRange: summaryRangeFromBotConfig(getBot(cachedLarkAppId).config),
         skills: getBot(cachedLarkAppId).config.skills ?? null,
     });
 });
@@ -1279,7 +1378,7 @@ ipcRoute('PUT', '/api/bot-card-prefs', async (req, res) => {
         if (m)
             patch.regularGroupReplyMode = m;
     }
-    if (body.regularGroupMentionMode === 'always' || body.regularGroupMentionMode === 'topic' || body.regularGroupMentionMode === 'never') {
+    if (body.regularGroupMentionMode === 'always' || body.regularGroupMentionMode === 'topic' || body.regularGroupMentionMode === 'never' || body.regularGroupMentionMode === 'ambient') {
         patch.regularGroupMentionMode = body.regularGroupMentionMode;
     }
     if (body.docSubscribeDefaultMode === 'mention-only' || body.docSubscribeDefaultMode === 'all') {
@@ -1292,6 +1391,41 @@ ipcRoute('PUT', '/api/bot-card-prefs', async (req, res) => {
         return jsonRes(res, 400, { ok: false, error: r.reason });
     jsonRes(res, 200, { ok: true, ...r.prefs });
 });
+// Per-bot explicit `/summary` history range. Body `{ limit, sinceHours }`.
+ipcRoute('PUT', '/api/bot-summary-range', async (req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { error: 'larkAppId_not_set' });
+    let raw;
+    try {
+        raw = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    const r = await updateDashboardSummaryRange(cachedLarkAppId, raw);
+    if (!r.ok)
+        return jsonRes(res, 400, { ok: false, error: r.reason });
+    jsonRes(res, 200, { ok: true, summaryRange: r.summaryRange });
+});
+// Backward-compatible dashboard endpoint from the short-lived keyword-trigger UI.
+ipcRoute('PUT', '/api/bot-summary-trigger', async (req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { error: 'larkAppId_not_set' });
+    let raw;
+    try {
+        raw = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    const body = raw && typeof raw === 'object' && !Array.isArray(raw)
+        ? { limit: raw.limit, sinceHours: raw.sinceHours }
+        : raw;
+    const r = await updateDashboardSummaryRange(cachedLarkAppId, body);
+    if (!r.ok)
+        return jsonRes(res, 400, { ok: false, error: r.reason });
+    jsonRes(res, 200, { ok: true, summaryRange: r.summaryRange });
+});
 // Per-bot 授权偏好。Body 任意子集：
 //   • restrictGrantCommands: boolean       — 限制被授权人只能纯对话
 //   • autoGrantRequestCards: boolean       — 未授权 @ 被挡住时是否发 grant 申请卡
@@ -1347,6 +1481,60 @@ ipcRoute('PUT', '/api/bot-brand-label', async (req, res) => {
         return jsonRes(res, 400, { ok: false, error: r.reason });
     jsonRes(res, 200, { ok: true, brandLabel: r.brandLabel });
 });
+// Per-bot agent launch settings. Body `{ cliId, model }` where `cliId` is the
+// dashboard selection key (plain adapter id or a wrapper option such as
+// `ttadk-x-codex`). Changes affect the next spawned CLI session.
+ipcRoute('PUT', '/api/bot-agent', async (req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { error: 'larkAppId_not_set' });
+    let body;
+    try {
+        body = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    const key = typeof body.cliId === 'string' && body.cliId.trim() ? body.cliId.trim() : '';
+    if (!key)
+        return jsonRes(res, 400, { ok: false, error: 'cli_required' });
+    let selected;
+    try {
+        selected = resolveCliSelection(key);
+    }
+    catch (err) {
+        return jsonRes(res, 400, { ok: false, error: 'invalid_cli', message: err?.message ?? String(err) });
+    }
+    const model = typeof body.model === 'string' ? body.model.trim() : '';
+    const r = await rmwBotEntry(cachedLarkAppId, (entry) => {
+        entry.cliId = selected.cliId;
+        if (selected.wrapperCli)
+            entry.wrapperCli = selected.wrapperCli;
+        else
+            delete entry.wrapperCli;
+        if (model)
+            entry.model = model;
+        else
+            delete entry.model;
+        return { write: true, result: null };
+    });
+    if (!r.ok)
+        return jsonRes(res, 400, { ok: false, error: r.reason });
+    const bot = getBot(cachedLarkAppId);
+    bot.config.cliId = selected.cliId;
+    if (selected.wrapperCli)
+        bot.config.wrapperCli = selected.wrapperCli;
+    else
+        bot.config.wrapperCli = undefined;
+    bot.config.model = model || undefined;
+    const selectionKey = selectionKeyForBot(selected.cliId, selected.wrapperCli);
+    jsonRes(res, 200, {
+        ok: true,
+        cliId: selected.cliId,
+        wrapperCli: selected.wrapperCli ?? null,
+        model: model || null,
+        selectionKey,
+    });
+});
 // Per-bot 私聊单聊模式 p2pMode。Body `{ p2pMode: 'chat' | 'thread' }`:
 //   • 'chat'           → 私聊走扁平连续 chat-scope 会话
 //   • 'thread'（默认）  → 清回每条 DM 独立 thread-scope 会话