botmux 2.95.0 → 2.96.1

package/dist/dashboard-web/style.css

@@ -919,6 +919,22 @@ button.primary {
   border: 1px solid var(--border-soft);
 }
 
+.session-lock-badge {
+  display: inline-flex;
+  align-items: center;
+  min-height: 22px;
+  margin-left: 6px;
+  padding: 0 8px;
+  border-radius: var(--radius-sm);
+  border: 1px solid color-mix(in srgb, var(--warning) 38%, var(--border-soft));
+  background: color-mix(in srgb, var(--warning) 10%, var(--surface-muted));
+  color: var(--warning);
+  font-size: 11px;
+  font-weight: 800;
+  line-height: 1;
+  text-transform: uppercase;
+}
+
 .cli-claude-code { background: #e8f0ff; color: #234fb4; border-color: #c8d9ff; }
 .cli-codex       { background: #fff0df; color: #a14c11; border-color: #ffd8ad; }
 .cli-codex-app   { background: #e9f7ff; color: #11638f; border-color: #bde4fa; }
@@ -1140,6 +1156,10 @@ button.primary {
   background: color-mix(in srgb, var(--accent) 5%, var(--surface-raised));
 }
 
+.session-card.locked {
+  border-color: color-mix(in srgb, var(--warning) 45%, var(--border));
+}
+
 @media (prefers-reduced-motion: reduce) {
   .session-card { animation: none; transition: none; }
   .session-board-needs-you h2::before { animation: none; }
@@ -1197,6 +1217,19 @@ button.primary {
   font-size: 12px;
 }
 
+.session-card-status-group,
+.drawer-status-line {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  flex-wrap: wrap;
+}
+
+.session-card-status-group .session-lock-badge,
+.drawer-status-line .session-lock-badge {
+  margin-left: 0;
+}
+
 .session-signal {
   display: inline-flex;
   align-items: center;
@@ -1487,6 +1520,10 @@ button.primary {
   background: color-mix(in srgb, var(--accent) 4%, var(--surface-raised));
 }
 
+.kanban-card.locked {
+  border-color: color-mix(in srgb, var(--warning) 45%, var(--border));
+}
+
 .kanban-card:focus-visible {
   outline: 2px solid var(--accent);
   outline-offset: 1px;
@@ -1873,6 +1910,11 @@ button.primary {
   border-color: var(--danger);
   background: color-mix(in srgb, var(--danger) 9%, var(--surface-raised));
 }
+.card-act.locked {
+  color: var(--warning);
+  border-color: color-mix(in srgb, var(--warning) 45%, var(--border));
+  background: color-mix(in srgb, var(--warning) 8%, var(--surface-raised));
+}
 .card-act:active { transform: scale(0.9); }
 
 /* 终端访问药丸：左「终端」段(accent ghost·只读旁观) + 右「钥匙」段(accent 实心·
@@ -4216,6 +4258,11 @@ button.contrast:hover { background: var(--danger-soft); border-color: var(--dang
   box-shadow: 0 0 8px color-mix(in srgb, var(--accent) 55%, transparent);
   flex: none;
 }
+.bd-summary-limits {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 10px;
+}
 
 .settings-grid {
   display: grid;

package/dist/dashboard.js

@@ -174,6 +174,7 @@ function resolveDashboardSettings() {
     return {
         publicReadOnly: dashboard.publicReadOnly ?? config.dashboard.publicReadOnly,
         openTerminalInFeishu: dashboard.openTerminalInFeishu === true,
+        chatBotDiscovery: dashboard.chatBotDiscovery !== false, // default ON
         repoPickerMode: global.repoPickerMode ?? 'all',
         maintenance: global.maintenance ?? {},
         localDevInstall: isLocalDevInstall(),
@@ -475,8 +476,27 @@ function configuredCliIds() {
         return new Map();
     }
 }
+function configuredBotAgentFields() {
+    try {
+        return new Map(loadBotConfigs().map(b => [b.larkAppId, {
+                cliId: b.cliId,
+                wrapperCli: b.wrapperCli,
+                model: b.model,
+            }]));
+    }
+    catch {
+        return new Map();
+    }
+}
 function withConfiguredCliId(bot, ids) {
-    return bot.cliId ? bot : { ...bot, cliId: ids.get(bot.larkAppId) };
+    const raw = ids.get(bot.larkAppId);
+    const fallback = typeof raw === 'string' ? { cliId: raw } : raw;
+    return {
+        ...bot,
+        cliId: bot.cliId || fallback?.cliId,
+        wrapperCli: bot.wrapperCli || fallback?.wrapperCli,
+        model: bot.model || fallback?.model,
+    };
 }
 function liveBots() {
     const ids = configuredCliIds();
@@ -1526,9 +1546,9 @@ const server = createServer(async (req, res) => {
                 return jsonRes(res, 400, { ok: false, error: 'bad_request' });
             return jsonRes(res, 200, { ok: true, entry });
         }
-        // 看板放置 / 重命名：带 JSON body 的会话写操作，原样转发给 owner daemon。
+        // 看板放置 / 重命名 / 锁定：带 JSON body 的会话写操作，原样转发给 owner daemon。
         // 不在公开读白名单内 → 只读访客在 decideDashboardAuth 已被 401。
-        if (req.method === 'POST' && (m = url.pathname.match(/^\/api\/sessions\/([^/]+)\/(board|rename)$/))) {
+        if (req.method === 'POST' && (m = url.pathname.match(/^\/api\/sessions\/([^/]+)\/(board|rename|lock)$/))) {
             const sid = decodeURIComponent(m[1]);
             const op = m[2];
             const owner = aggregator.ownerOf(sid);
@@ -1894,8 +1914,8 @@ const server = createServer(async (req, res) => {
         //                                          [{larkAppId, botName, defaultOncall, ...}]
         // PUT  /api/bots/:appId/default-oncall   — proxy to that bot's daemon
         if (req.method === 'GET' && url.pathname === '/api/bots') {
-            const cliIds = configuredCliIds();
-            const onlineBots = [...registry.list()].map(b => withConfiguredCliId(b, cliIds)).sort((a, b) => a.botIndex - b.botIndex);
+            const agentFields = configuredBotAgentFields();
+            const onlineBots = [...registry.list()].map(b => withConfiguredCliId(b, agentFields)).sort((a, b) => a.botIndex - b.botIndex);
             const out = await Promise.all(onlineBots.map(async (d) => {
                 try {
                     const r = await fetch(`http://127.0.0.1:${d.ipcPort}/api/bot-default-oncall`);
@@ -1903,7 +1923,13 @@ const server = createServer(async (req, res) => {
                         return botDefaultsPayload(d, undefined, `http_${r.status}`);
                     }
                     const j = await r.json();
-                    return botDefaultsPayload({ ...d, botName: d.botName ?? j.botName }, j);
+                    return botDefaultsPayload({
+                        ...d,
+                        botName: d.botName ?? j.botName,
+                        cliId: j.cliId || d.cliId,
+                        wrapperCli: j.wrapperCli || d.wrapperCli,
+                        model: j.model || d.model,
+                    }, j);
                 }
                 catch (e) {
                     return botDefaultsPayload(d, undefined, e?.message ?? String(e));
@@ -1946,6 +1972,24 @@ const server = createServer(async (req, res) => {
             res.end(await upstream.text());
             return;
         }
+        // PUT /api/bots/:appId/agent — proxy to that bot's daemon. Body
+        // `{ cliId, model }`; cliId is the dashboard selection key.
+        let mBotAgent;
+        if (req.method === 'PUT' && (mBotAgent = url.pathname.match(/^\/api\/bots\/([^/]+)\/agent$/))) {
+            const appId = decodeURIComponent(mBotAgent[1]);
+            const chunks = [];
+            for await (const c of req)
+                chunks.push(c);
+            const raw = Buffer.concat(chunks).toString('utf8') || '{}';
+            const upstream = await proxyToDaemon(appId, `/api/bot-agent`, {
+                method: 'PUT',
+                headers: { 'content-type': 'application/json' },
+                body: raw,
+            });
+            res.writeHead(upstream.status, { 'content-type': 'application/json' });
+            res.end(await upstream.text());
+            return;
+        }
         // PUT /api/bots/:appId/skills — proxy to that bot's daemon. Body accepts
         // `{ action:'attach'|'detach', name }` or `{ action:'set', policy|null }`.
         let mBotSkills;
@@ -2071,6 +2115,41 @@ const server = createServer(async (req, res) => {
             res.end(await upstream.text());
             return;
         }
+        // PUT /api/bots/:appId/summary-range — proxy to that bot's daemon. Body
+        // `{ limit, sinceHours }`; daemon updates the explicit /summary range.
+        let mBotSummaryRange;
+        if (req.method === 'PUT' && (mBotSummaryRange = url.pathname.match(/^\/api\/bots\/([^/]+)\/summary-range$/))) {
+            const appId = decodeURIComponent(mBotSummaryRange[1]);
+            const chunks = [];
+            for await (const c of req)
+                chunks.push(c);
+            const raw = Buffer.concat(chunks).toString('utf8') || '{}';
+            const upstream = await proxyToDaemon(appId, `/api/bot-summary-range`, {
+                method: 'PUT',
+                headers: { 'content-type': 'application/json' },
+                body: raw,
+            });
+            res.writeHead(upstream.status, { 'content-type': 'application/json' });
+            res.end(await upstream.text());
+            return;
+        }
+        // Backward-compatible alias from the short-lived keyword-trigger dashboard.
+        let mBotSummaryTrigger;
+        if (req.method === 'PUT' && (mBotSummaryTrigger = url.pathname.match(/^\/api\/bots\/([^/]+)\/summary-trigger$/))) {
+            const appId = decodeURIComponent(mBotSummaryTrigger[1]);
+            const chunks = [];
+            for await (const c of req)
+                chunks.push(c);
+            const raw = Buffer.concat(chunks).toString('utf8') || '{}';
+            const upstream = await proxyToDaemon(appId, `/api/bot-summary-trigger`, {
+                method: 'PUT',
+                headers: { 'content-type': 'application/json' },
+                body: raw,
+            });
+            res.writeHead(upstream.status, { 'content-type': 'application/json' });
+            res.end(await upstream.text());
+            return;
+        }
         // PUT /api/bots/:appId/p2p-mode — proxy to that bot's daemon. Body
         // `{ p2pMode: 'chat' | 'thread' }` ('chat' = flat continuous DM session;
         // anything else clears back to the per-message thread default).