minimal-agent 0.8.2 → 0.10.0

package/src/ui/MessageList.js

@@ -34,6 +34,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import React from 'react';
 import { Box, Static, Text } from 'ink';
+import { friendlyToolDescription } from '../loop.js';
+import { contentToDisplayText, contentToPlainText } from '../multimodal.js';
+import { splitThinkBlocks } from '../utils/stripThink.js';
+import { figures } from './figures.js';
+import { renderMarkdownLines } from './markdown.js';
+import { theme } from './theme.js';
 /** 中断标记 user message 的固定内容（loop.ts 写入） */
 const INTERRUPT_USER_CONTENT = '(用户按下了 ESC/Ctrl+C 中断了任务)';
 const MAX_TOOL_PREVIEW_LINES = 3;
@@ -41,6 +47,58 @@ const MAX_TOOL_PREVIEW_LINES = 3;
 const NARROW_TERMINAL_ROWS = 28;
 /** reasoning 超过此字符数截尾 —— 防撑爆历史 */
 const REASONING_MAX_CHARS = 2000;
+/**
+ * 把 assistant 最终正文拆成展示行：markdown 管线（src/ui/markdown.ts）产出
+ * prose/code/fence 三类行，⏺ 锚点落在**第一条非空 prose 行**——答案以代码块
+ * 开头时代码顶格在前、⏺ 顺延；全代码答案无 ⏺（代码纯净优先）。
+ * 纯文本无 markdown 特征时走快路径，与旧「按 \n 切 + wrap='end'」逐行一致。
+ */
+export function buildAssistantDisplayLines(text) {
+    if (text.length === 0)
+        return [];
+    let anchorPlaced = false;
+    return renderMarkdownLines(text).map((line) => {
+        if (line.kind !== 'prose') {
+            return { content: line.text, prefix: '', kind: line.kind, wrap: 'end' };
+        }
+        if (!anchorPlaced && line.text.trim() !== '') {
+            anchorPlaced = true;
+            return { content: line.text, prefix: '⏺ ', kind: line.kind, wrap: 'end' };
+        }
+        return { content: line.text, prefix: '  ', kind: line.kind, wrap: 'end' };
+    });
+}
+/**
+ * 扫 history 里全部 assistant.tool_calls，建 tool_call_id → 人话描述 索引。
+ * tool 消息本身只有 content + tool_call_id（不动 history 字节的前提下，
+ * 头行要显示「哪个工具在干什么」只能反查发起方）。<Static> 提交时序保证
+ * assistant(tool_calls) 恒先于对应 tool 消息入 history，索引命中无竞态。
+ */
+export function buildToolCallIndex(history) {
+    const map = new Map();
+    for (const m of history) {
+        if (m.role !== 'assistant' || !m.tool_calls)
+            continue;
+        for (const tc of m.tool_calls) {
+            map.set(tc.id, {
+                toolName: tc.function.name,
+                friendly: friendlyToolDescription(tc.function.name, tc.function.arguments),
+            });
+        }
+    }
+    return map;
+}
+/**
+ * 从 Agent 子任务报告的统计尾巴（agent.ts 固定格式
+ * 「（子任务「x」[type]：N 轮 · M 次工具调用，K 次失败）」）解析统计数。
+ * 失败结果（错误文案）不匹配 → null，头行只显示描述不显示 ✓ 统计。
+ */
+export function agentResultStats(content) {
+    const m = /（子任务「[^」]*」\[[^\]]+\]：(\d+) 轮 · (\d+) 次工具调用(?:，(\d+) 次失败)?）/.exec(content);
+    if (!m)
+        return null;
+    return { turns: Number(m[1]), tools: Number(m[2]), failed: m[3] ? Number(m[3]) : 0 };
+}
 /**
  * 把 assistant message 的两个字符串型 reasoning 字段拼成单字符串。
  * `reasoning_details` 是结构化数组，本期不展开。两个字段任一非空即返回拼接结果；
@@ -80,7 +138,8 @@ export function summarizeTurn(history) {
     const turnStartIndices = [];
     for (let i = 0; i < history.length; i++) {
         const m = history[i];
-        if (m.role === 'user' && m.content !== INTERRUPT_USER_CONTENT) {
+        if (m.role === 'user' &&
+            contentToPlainText(m.content) !== INTERRUPT_USER_CONTENT) {
             turnStartIndices.push(i);
         }
     }
@@ -144,6 +203,7 @@ function formatDuration(ms) {
 export const MessageList = React.memo(function MessageList({ history, compactGeneration, bannerText, terminalRows, }) {
     const items = React.useMemo(() => {
         const turnMetas = summarizeTurn(history);
+        const toolIndex = buildToolCallIndex(history);
         return [
             ...(bannerText
                 ? [
@@ -158,6 +218,7 @@ export const MessageList = React.memo(function MessageList({ history, compactGen
                 kind: 'message',
                 msg: m,
                 turnMeta: turnMetas[idx],
+                toolMeta: m.role === 'tool' ? (toolIndex.get(m.tool_call_id) ?? null) : null,
                 // 纯派生 key：有 id 用 id，没有就用 idx 兜底。绝不在 render 期 mutate 消息对象
                 // （<Static> 已 commit 的行永不重绘，key 仅在 append 对账时用，idx 已足够稳定）。
                 key: m.id ?? `message-${idx}`,
@@ -170,7 +231,7 @@ export const MessageList = React.memo(function MessageList({ history, compactGen
             if (item.kind === 'banner') {
                 return _jsx(BannerRow, { text: item.text }, item.key);
             }
-            return (_jsx(MessageRow, { message: item.msg, turnMeta: item.turnMeta, foldReasoning: foldReasoning }, item.key));
+            return (_jsx(MessageRow, { message: item.msg, turnMeta: item.turnMeta, toolMeta: item.toolMeta, foldReasoning: foldReasoning }, item.key));
         } }, compactGeneration));
 });
 function BannerRow({ text }) {
@@ -179,9 +240,9 @@ function BannerRow({ text }) {
     const splitAt = text.indexOf('  ·');
     const head = splitAt >= 0 ? text.slice(0, splitAt) : text;
     const tail = splitAt >= 0 ? text.slice(splitAt) : '';
-    return (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: "cyan", bold: true, children: head }), tail.length > 0 && _jsx(Text, { color: "gray", children: tail })] }));
+    return (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: theme.user, bold: true, children: head }), tail.length > 0 && _jsx(Text, { color: theme.subtle, children: tail })] }));
 }
-function MessageRow({ message, turnMeta, foldReasoning, }) {
+function MessageRow({ message, turnMeta, toolMeta, foldReasoning, }) {
     switch (message.role) {
         case 'system': {
             // v2.x：ephemeral system message 是 UI 临时提示（slash 命令输出等），
@@ -190,20 +251,27 @@ function MessageRow({ message, turnMeta, foldReasoning, }) {
             if (!ephemeral)
                 return null;
             const lines = message.content.split('\n');
-            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsx(Box, { flexDirection: "column", children: lines.map((line, i) => (_jsx(Text, { color: "gray", dimColor: true, children: line }, `eph-${i}`))) }) }));
+            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsx(Box, { flexDirection: "column", children: lines.map((line, i) => (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: line }, `eph-${i}`))) }) }));
         }
         case 'user': {
+            const rule = figures.hr.repeat(6);
             const headerLine = turnMeta !== null
-                ? `────── Turn ${turnMeta.turnN} · ${formatTime(turnMeta.timestamp)} · ${formatDuration(turnMeta.durationMs)} · ${turnMeta.toolsCount} tools ──────`
+                ? `${rule} Turn ${turnMeta.turnN} · ${formatTime(turnMeta.timestamp)} · ${formatDuration(turnMeta.durationMs)} · ${turnMeta.toolsCount} tools ${rule}`
                 : null;
-            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [headerLine !== null && (_jsx(Text, { color: "gray", dimColor: true, children: headerLine })), _jsxs(Box, { children: [_jsx(Text, { color: "cyan", bold: true, children: '> ' }), _jsx(Text, { color: "cyan", children: message.content })] })] }));
+            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [headerLine !== null && (_jsx(Text, { color: theme.subtle, dimColor: true, children: headerLine })), _jsxs(Box, { children: [_jsx(Text, { color: theme.user, bold: true, children: '> ' }), _jsx(Text, { color: theme.user, wrap: "end", children: contentToDisplayText(message.content) })] })] }));
         }
         case 'assistant': {
             // assistant 可能只有 tool_calls 没有 content（content 为 null）
-            const text = message.content ?? '';
+            const raw = message.content ?? '';
+            // 展示层切分内联 <think>（MiniMax 等把思维链写进 content，内核有意不剥）：
+            // thought 并入 💭 块（灰 dim + 折叠，与结构化 reasoning 同款待遇），
+            // 正文只显示净化后的部分。纯展示层——history 字节零改动（KV 缓存约束）。
+            const { thought, answer } = splitThinkBlocks(raw);
             const tcCount = message.tool_calls?.length ?? 0;
-            // reasoning 拼接
-            let reasoningText = combineReasoning(message);
+            // reasoning 拼接：结构化字段在前，内联 <think> 在后
+            let reasoningText = [combineReasoning(message), thought]
+                .filter(Boolean)
+                .join('\n');
             let truncatedCharsHint = '';
             if (reasoningText.length > REASONING_MAX_CHARS) {
                 const omitted = reasoningText.length - REASONING_MAX_CHARS;
@@ -215,17 +283,35 @@ function MessageRow({ message, turnMeta, foldReasoning, }) {
                 ? reasoningLines.slice(0, 2)
                 : reasoningLines;
             const hiddenReasoningCount = reasoningLines.length - visibleReasoningLines.length;
-            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [visibleReasoningLines.length > 0 && (_jsxs(Box, { flexDirection: "column", children: [visibleReasoningLines.map((line, i) => (_jsx(Text, { color: "gray", dimColor: true, children: i === 0 ? `💭 ${line}` : `   ${line}` }, `r-${i}`))), hiddenReasoningCount > 0 && (_jsx(Text, { color: "gray", dimColor: true, children: `   ▾ ${hiddenReasoningCount} 行 reasoning 折叠（终端高度 < ${NARROW_TERMINAL_ROWS}）` })), truncatedCharsHint.length > 0 && (_jsx(Text, { color: "gray", dimColor: true, children: `   ${truncatedCharsHint}` }))] })), text.length > 0 &&
-                        text.split('\n').map((line, i) => i === 0 ? (_jsxs(Box, { children: [_jsx(Text, { color: "green", bold: true, children: '⏺ ' }), _jsx(Text, { children: line.length > 0 ? line : ' ' })] }, `a-${i}`)) : (_jsx(Text, { children: `  ${line}` }, `a-${i}`))), tcCount > 0 && (_jsx(Text, { color: "yellow", dimColor: true, children: `  └─ 调用了 ${tcCount} 个工具：${(message.tool_calls ?? [])
+            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [visibleReasoningLines.length > 0 && (_jsxs(Box, { flexDirection: "column", children: [visibleReasoningLines.map((line, i) => (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: i === 0 ? `${figures.thought} ${line}` : `   ${line}` }, `r-${i}`))), hiddenReasoningCount > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `   ${figures.fold} ${hiddenReasoningCount} 行 reasoning 折叠（终端高度 < ${NARROW_TERMINAL_ROWS}）` })), truncatedCharsHint.length > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `   ${truncatedCharsHint}` }))] })), buildAssistantDisplayLines(answer).map((line, i) => {
+                        if (line.kind === 'fence') {
+                            return (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: line.wrap, children: line.content }, `a-${i}`));
+                        }
+                        if (line.kind === 'code') {
+                            return (_jsx(Text, { wrap: line.wrap, children: line.content.length > 0 ? line.content : ' ' }, `a-${i}`));
+                        }
+                        return line.prefix === '⏺ ' ? (_jsxs(Box, { children: [_jsx(Text, { color: theme.anchor, bold: true, wrap: line.wrap, children: line.prefix }), _jsx(Text, { wrap: line.wrap, children: line.content.length > 0 ? line.content : ' ' })] }, `a-${i}`)) : (_jsx(Text, { wrap: line.wrap, children: `${line.prefix}${line.content}`.length > 0
+                                ? `${line.prefix}${line.content}`
+                                : ' ' }, `a-${i}`));
+                    }), tcCount > 0 && (_jsx(Text, { color: theme.warning, dimColor: true, wrap: "end", children: `  ${figures.corner} 调用了 ${tcCount} 个工具：${(message.tool_calls ?? [])
                             .map((tc) => tc.function.name)
                             .join(', ')}` }))] }));
         }
         case 'tool': {
             const lines = message.content.split('\n');
-            const preview = lines.slice(0, MAX_TOOL_PREVIEW_LINES).join('\n');
+            const previewLines = lines.slice(0, MAX_TOOL_PREVIEW_LINES);
             const hidden = Math.max(0, lines.length - MAX_TOOL_PREVIEW_LINES);
             const shortId = message.tool_call_id.slice(-8);
-            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "gray", dimColor: true, children: `[tool result · #${shortId}]` }), _jsx(Text, { color: "gray", children: preview }), hidden > 0 && (_jsx(Text, { color: "gray", dimColor: true, children: `... ▾ 完整 ${lines.length} 行（输入 /show ${shortId} 查看）` }))] }) }));
+            // 头行升级：有 toolMeta（发起方反查命中）显示人话描述；Agent 子任务
+            // 再解析统计尾巴显示 ✓ N 轮 · M 次工具。无 meta（历史重载等）兜底旧格式。
+            const stats = toolMeta?.toolName === 'Agent' ? agentResultStats(message.content) : null;
+            const statsTail = stats
+                ? ` ${figures.ok} ${stats.turns} 轮 · ${stats.tools} 次工具${stats.failed > 0 ? `（${stats.failed} 次失败）` : ''}`
+                : '';
+            const headText = toolMeta
+                ? `[${toolMeta.friendly} · #${shortId}]${statsTail}`
+                : `[tool result · #${shortId}]`;
+            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: headText }), previewLines.map((line, i) => (_jsx(Text, { color: theme.subtle, wrap: "end", children: line.length > 0 ? line : ' ' }, `p-${i}`))), hidden > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `... ${figures.fold} 完整 ${lines.length} 行（输入 /show ${shortId} 查看）` }))] }) }));
         }
     }
 }

package/src/ui/ModelPicker.js

@@ -0,0 +1,56 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+import { theme } from './theme.js';
+export function ModelPicker({ models, currentModelId, title, nullOptionLabel, onSelect, onCancel, }) {
+    const enabledModels = models.filter((m) => m.enabled && m.apiKey);
+    const hasNullOption = Boolean(nullOptionLabel);
+    const nullIndex = hasNullOption ? enabledModels.length : -1;
+    const listLength = enabledModels.length + (hasNullOption ? 1 : 0);
+    const initialIdx = (() => {
+        const idx = enabledModels.findIndex((m) => m.id === currentModelId);
+        if (idx >= 0)
+            return idx;
+        if (hasNullOption && !currentModelId)
+            return nullIndex;
+        return 0;
+    })();
+    const [idx, setIdx] = useState(Math.max(0, Math.min(initialIdx, listLength - 1)));
+    useInput((input, key) => {
+        if (key.escape || (key.ctrl && input === 'c')) {
+            onCancel();
+            return;
+        }
+        if (key.upArrow) {
+            setIdx((i) => (i - 1 + listLength) % listLength);
+            return;
+        }
+        if (key.downArrow) {
+            setIdx((i) => (i + 1) % listLength);
+            return;
+        }
+        if (key.return) {
+            if (hasNullOption && idx === nullIndex) {
+                onSelect(null);
+            }
+            else {
+                const target = enabledModels[idx];
+                if (target)
+                    onSelect(target.id);
+            }
+        }
+    });
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: theme.user, bold: true, children: title }) }), _jsx(Text, { color: theme.subtle, children: "\u5728\u5DF2\u914D\u7F6E\u7684\u6A21\u578B\u4E2D\u9009\u62E9\uFF1B\u9009\u62E9\u540E\u7ACB\u5373\u751F\u6548\uFF0C\u540E\u7EED\u8BF7\u6C42\u4F7F\u7528\u65B0\u6A21\u578B\u3002" }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [enabledModels.map((m, i) => {
+                        const active = i === idx;
+                        const isCurrent = m.id === currentModelId;
+                        const displayName = m.displayName || m.model;
+                        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: active ? theme.user : undefined, children: [active ? '> ' : '  ', isCurrent ? '✓ ' : '  ', _jsx(Text, { color: active ? theme.user : undefined, bold: isCurrent, children: displayName }), isCurrent ? _jsx(Text, { color: theme.subtle, children: " \uFF08\u5F53\u524D\uFF09" }) : null] }), _jsxs(Text, { color: theme.subtle, children: ['        ', m.model, " \u00B7 ", formatContextWindow(m.contextWindow)] })] }, m.id));
+                    }), hasNullOption && (_jsxs(Text, { color: idx === nullIndex ? theme.user : theme.subtle, children: [idx === nullIndex ? '> ' : '  ', !currentModelId ? '✓ ' : '  ', nullOptionLabel] }))] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.subtle, children: "\u2191\u2193 \u9009\u62E9 \u00B7 Enter \u786E\u8BA4 \u00B7 ESC \u53D6\u6D88" }) })] }));
+}
+function formatContextWindow(tokens) {
+    if (tokens >= 1_000_000)
+        return `${(tokens / 1_000_000).toFixed(1)}M context`;
+    if (tokens >= 1_000)
+        return `${Math.round(tokens / 1_000)}K context`;
+    return `${tokens} context`;
+}

package/src/ui/QueuedMessagesBanner.js

@@ -0,0 +1,14 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { Box, Text } from 'ink';
+import { theme } from './theme.js';
+function truncate(s, maxLen) {
+    const oneLine = s.replace(/\n/g, ' ').trim();
+    if (oneLine.length <= maxLen)
+        return oneLine;
+    return `${oneLine.slice(0, maxLen - 1)}…`;
+}
+export function QueuedMessagesBanner({ items }) {
+    if (items.length === 0)
+        return null;
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.warning, paddingX: 1, marginBottom: 1, children: [_jsx(Box, { children: _jsxs(Text, { color: theme.warning, bold: true, children: ["\uD83D\uDCEC \u6392\u961F\u4E2D ", items.length, " \u6761\u8865\u5145\u6D88\u606F\uFF08\u5F53\u524D\u4EFB\u52A1\u7ED3\u675F\u540E\u5C06\u9010\u6761\u5904\u7406\uFF09\uFF1A"] }) }), items.map((item, idx) => (_jsxs(Box, { children: [_jsxs(Text, { color: theme.subtle, dimColor: true, children: [idx + 1, ".", ' '] }), _jsx(Text, { color: theme.user, children: truncate(item.value, 80) })] }, item.id)))] }));
+}

package/src/ui/Root.js

@@ -4,15 +4,16 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *  src/ui/Root.tsx —— TUI 顶层 phase 切换器
  * ------------------------------------------------------------
  *  作为 Ink 渲染树的根节点，根据"有没有 Provider 配置"决定渲染：
- *    - 没有 → <ConfigWizard>：用户填完 + 测试通过后切到 App
+ *    - 没有 → <ConfigMenu mode="first-run">：菜单式分段配置，完成基座
+ *      模型配置（可选顺带配其它项）后切到 App
  *    - 有 → <App>：常规对话界面
  *
  *  为什么需要这一层而不是直接在 main.tsx 二选一渲染？
- *    向导成功后必须直接进 App，不能让用户手动重跑命令。在 React 树里用 state
- *    切换是最自然的方式，无需 ink unmount/remount 的额外开销。
+ *    菜单里选"完成退出"后必须直接进 App，不能让用户手动重跑命令。在 React
+ *    树里用 state 切换是最自然的方式，无需 ink unmount/remount 的额外开销。
  *
- *  initialHistory 的构造（buildFullSystemPrompt + 历史持久化加载）在向导后才跑，
- *  因为：
+ *  initialHistory 的构造（buildFullSystemPrompt + 历史持久化加载）在菜单退出
+ *  后才跑，因为：
  *    - 系统提示词本身不依赖 provider，但流程上推迟到"确定要进 App"那一刻
  *      最干净。
  *    - 第一次启动时常常没历史可加载，buildInitialHistory 行为是只返 system
@@ -22,11 +23,15 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { Box, Text } from 'ink';
 import { getWorkingDir } from '../bootstrap/workingDir.js';
-import { ConfigWizard } from '../cli/configWizard.js';
+import { ConfigMenu } from '../cli/configMenu.js';
 import { loadContext } from '../context/persistContext.js';
+import { getActiveSession } from '../context/sessionRegistry.js';
+import { resolveSessionFile } from '../context/sessionPath.js';
+import { workspaceIndexService } from '../context/workspaceIndex.js';
 import { buildFullSystemPrompt } from '../prompts/system.js';
 import { ALL_TOOLS } from '../tools/index.js';
 import { App } from './App.js';
+import { theme } from './theme.js';
 export function Root({ initialProvider }) {
     const [phase, setPhase] = useState(initialProvider
         ? { kind: 'loading-history', provider: initialProvider }
@@ -46,12 +51,13 @@ export function Root({ initialProvider }) {
         };
     }, [phase]);
     if (phase.kind === 'wizard') {
-        return (_jsx(ConfigWizard, { onSuccess: (provider) => {
-                setPhase({ kind: 'loading-history', provider });
+        return (_jsx(ConfigMenu, { mode: "first-run", onDone: (provider) => {
+                if (provider)
+                    setPhase({ kind: 'loading-history', provider });
             } }));
     }
     if (phase.kind === 'loading-history') {
-        return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: "gray", children: "\u6B63\u5728\u52A0\u8F7D\u5386\u53F2\u4E0A\u4E0B\u6587..." }) }));
+        return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: theme.subtle, children: "\u6B63\u5728\u52A0\u8F7D\u5386\u53F2\u4E0A\u4E0B\u6587..." }) }));
     }
     return _jsx(App, { provider: phase.provider, initialHistory: phase.initialHistory });
 }
@@ -60,9 +66,11 @@ export function Root({ initialProvider }) {
  * 这里独立一份是为了让 Root 内部能在向导成功后即时构造，不必返工 main.tsx。
  */
 async function buildInitialHistory() {
+    await workspaceIndexService.register(getWorkingDir()).catch(() => { });
     const content = await buildFullSystemPrompt(getWorkingDir(), ALL_TOOLS);
     const fresh = { role: 'system', content };
-    const persisted = await loadContext();
+    const activeSession = await getActiveSession(getWorkingDir());
+    const persisted = await loadContext(await resolveSessionFile(getWorkingDir(), activeSession));
     if (!persisted || persisted.length === 0)
         return [fresh];
     const rest = persisted[0]?.role === 'system' ? persisted.slice(1) : persisted;

package/src/ui/SessionPicker.js

@@ -0,0 +1,102 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+/**
+ * ============================================================
+ *  src/ui/SessionPicker.tsx —— /session /sessions /resume 的会话选择界面
+ * ------------------------------------------------------------
+ *  内核（context/sessionRegistry.ts）早就支持同一工作目录下多个隔离 session，
+ *  这个组件只是给 TUI 补上一个真实的"列出 + 选择 + 新建"入口——此前 App.tsx
+ *  的 /session /sessions 只回显固定提示语，不做真正的切换/列出。
+ *
+ *  交互设计照抄已验证过的 AskQuestion.tsx：手写 useInput，↑↓ 移动 + Enter 确认 +
+ *  ESC 取消，零新依赖（不引 ink-select-input）。列表末尾追加一个"+ 新建会话"伪
+ *  选项，选中后进入文本子模式输入标题——与 AskQuestion.tsx 处理"其他（自由输入）"
+ *  伪选项完全同构。
+ * ============================================================
+ */
+import { useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+import { theme } from './theme.js';
+const PREVIEW_MAX = 60;
+function clampPreview(s) {
+    const oneLine = s.replace(/\s+/g, ' ').trim();
+    return oneLine.length > PREVIEW_MAX ? `${oneLine.slice(0, PREVIEW_MAX - 1)}…` : oneLine;
+}
+/** 粗粒度相对时间，够用即可（不追求 Claude Code 那种精确到分钟的实现）。 */
+function formatRelativeTime(ms) {
+    const diff = Date.now() - ms;
+    if (diff < 60_000)
+        return '刚刚';
+    const minutes = Math.floor(diff / 60_000);
+    if (minutes < 60)
+        return `${minutes}分钟前`;
+    const hours = Math.floor(minutes / 60);
+    if (hours < 24)
+        return `${hours}小时前`;
+    const days = Math.floor(hours / 24);
+    return `${days}天前`;
+}
+/** 一行元数据：相对时间 · 最后一条消息预览（借用 kakadeai formatLogMetadata 的 parts+join 写法，简化到本项目实际有的字段）。 */
+function formatMetaLine(s) {
+    const parts = [formatRelativeTime(s.updatedAt)];
+    if (s.lastMessagePreview)
+        parts.push(clampPreview(s.lastMessagePreview));
+    return parts.join(' · ');
+}
+export function SessionPicker({ sessions, activeSessionId, onSelect, onCreate, onCancel, }) {
+    // 末尾"+ 新建会话"伪选项占据下标 sessions.length
+    const createIndex = sessions.length;
+    const listLength = sessions.length + 1;
+    const [idx, setIdx] = useState(0);
+    const [textMode, setTextMode] = useState(false);
+    const [draft, setDraft] = useState('');
+    useInput((input, key) => {
+        if (textMode) {
+            if (key.escape) {
+                // 退回列表，不取消整个 picker
+                setTextMode(false);
+                setDraft('');
+                return;
+            }
+            if (key.return) {
+                const title = draft.trim();
+                onCreate(title); // 空标题时 createSession 会用它自己的默认标题兜底
+                return;
+            }
+            if (key.backspace || key.delete) {
+                setDraft((s) => s.slice(0, -1));
+                return;
+            }
+            if (input && !key.meta && !key.ctrl) {
+                setDraft((s) => s + input);
+            }
+            return;
+        }
+        if (key.escape || (key.ctrl && input === 'c')) {
+            onCancel();
+            return;
+        }
+        if (key.upArrow) {
+            setIdx((i) => (i - 1 + listLength) % listLength);
+            return;
+        }
+        if (key.downArrow) {
+            setIdx((i) => (i + 1) % listLength);
+            return;
+        }
+        if (key.return) {
+            if (idx === createIndex) {
+                setTextMode(true);
+                setDraft('');
+                return;
+            }
+            const target = sessions[idx];
+            if (target)
+                onSelect(target.id);
+        }
+    });
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.user, bold: true, children: ["\u9009\u62E9\u4F1A\u8BDD\uFF08\u5F53\u524D ", sessions.length, " \u4E2A\uFF09"] }) }), textMode ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.subtle, children: "\u270F\uFE0F \u65B0\u4F1A\u8BDD\u6807\u9898\uFF08\u7559\u7A7A\u4F7F\u7528\u9ED8\u8BA4\u6807\u9898\uFF09\uFF1A" }), _jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: "cyan", paddingX: 1, children: _jsx(Text, { children: draft || ' ' }) }), _jsx(Text, { color: theme.subtle, children: "\u8F93\u5165\u540E Enter \u521B\u5EFA \u00B7 ESC \u8FD4\u56DE\u5217\u8868" })] })) : (_jsxs(Box, { flexDirection: "column", children: [sessions.map((s, i) => {
+                        const active = i === idx;
+                        const isCurrent = s.id === activeSessionId;
+                        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: active ? theme.user : undefined, children: [active ? '> ' : '  ', s.title, isCurrent ? ' (当前)' : ''] }), _jsxs(Text, { color: theme.subtle, children: ['      ', formatMetaLine(s)] })] }, s.id));
+                    }), _jsxs(Text, { color: idx === createIndex ? theme.user : undefined, children: [idx === createIndex ? '> ' : '  ', "+ \u65B0\u5EFA\u4F1A\u8BDD"] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.subtle, children: "\u2191\u2193 \u9009\u62E9 \u00B7 Enter \u786E\u8BA4 \u00B7 ESC \u53D6\u6D88" }) })] }))] }));
+}

package/src/ui/StatusLine.js

@@ -14,6 +14,7 @@ import { homedir } from 'node:os';
 import { sep } from 'node:path';
 import { getWorkingDir } from '../bootstrap/workingDir.js';
 import { useTokenUsage } from './hooks/useTokenUsage.js';
+import { theme } from './theme.js';
 /**
  * React.memo 包装。
  *
@@ -23,12 +24,20 @@ import { useTokenUsage } from './hooks/useTokenUsage.js';
  *
  * 流式 streamingText 高频更新不影响 history 引用，StatusLine 不会被带着 rerender。
  */
-export const StatusLine = React.memo(function StatusLine({ provider, history, pluginProgress, }) {
-    const usage = useTokenUsage(history, provider);
+export const StatusLine = React.memo(function StatusLine({ provider, history, pluginProgress, contextUsage, }) {
+    const estimated = useTokenUsage(history, provider);
+    const usage = contextUsage
+        ? {
+            tokens: contextUsage.usedTokens,
+            threshold: contextUsage.compactThreshold,
+            contextWindow: contextUsage.contextWindow,
+            toThreshold: contextUsage.compactThreshold - contextUsage.usedTokens,
+        }
+        : estimated;
     const ratio = usage.tokens / usage.threshold;
-    const color = ratio >= 1 ? 'red' : ratio >= 0.7 ? 'yellow' : 'green';
+    const color = ratio >= 1 ? theme.error : ratio >= 0.7 ? theme.warning : theme.ok;
     const cwdDisplay = shortenPath(getWorkingDir());
-    return (_jsxs(Box, { children: [pluginProgress && (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "magenta", children: ["\uD83D\uDD04 ", pluginProgress.pluginId, " "] }), _jsxs(Text, { color: "magenta", children: [pluginProgress.current, "/", pluginProgress.max] }), _jsx(Text, { color: "gray", children: ' · ' })] })), _jsx(Text, { color: "cyan", children: "cwd " }), _jsx(Text, { color: "gray", children: cwdDisplay }), _jsx(Text, { color: "gray", children: ' · ' }), _jsxs(Text, { color: "gray", children: [provider.name, "/", provider.model] }), _jsx(Text, { color: "gray", children: ' · ' }), _jsxs(Text, { color: color, children: ["tokens ", fmt(usage.tokens), " / ", fmt(usage.contextWindow)] }), _jsx(Text, { color: "gray", children: ' · ' }), _jsx(Text, { color: color, children: usage.toThreshold > 0 ? `距压缩 ${fmt(usage.toThreshold)}` : `已超阈值（下轮压缩）` })] }));
+    return (_jsxs(Box, { children: [pluginProgress && (_jsxs(_Fragment, { children: [_jsxs(Text, { color: theme.plugin, children: ["\uD83D\uDD04 ", pluginProgress.pluginId, " "] }), pluginProgress.current !== undefined && (_jsxs(Text, { color: theme.plugin, children: [pluginProgress.current, "/", pluginProgress.max ?? '?'] })), _jsx(Text, { color: theme.subtle, children: ' · ' })] })), _jsx(Text, { color: theme.user, children: "cwd " }), _jsx(Text, { color: theme.subtle, children: cwdDisplay }), _jsx(Text, { color: theme.subtle, children: ' · ' }), _jsxs(Text, { color: theme.subtle, children: [provider.name, "/", provider.model] }), _jsx(Text, { color: theme.subtle, children: ' · ' }), _jsxs(Text, { color: color, children: ["tokens ", fmt(usage.tokens), " / ", fmt(usage.contextWindow)] }), _jsx(Text, { color: theme.subtle, children: ' · ' }), _jsx(Text, { color: color, children: usage.toThreshold > 0 ? `距压缩 ${fmt(usage.toThreshold)}` : `已超阈值（下轮压缩）` })] }));
 });
 /** 把整数格式化为 1.2K / 12.3K / 1.5M */
 function fmt(n) {

package/src/ui/WorkspacePicker.js

@@ -0,0 +1,55 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useMemo, useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+import { theme } from './theme.js';
+export function WorkspacePicker({ workspaces, currentPath, currentSessionId, onSelect, onCancel }) {
+    const available = useMemo(() => workspaces.filter((workspace) => workspace.sessions.length > 0), [workspaces]);
+    const [workspaceIndex, setWorkspaceIndex] = useState(0);
+    const [selectedWorkspace, setSelectedWorkspace] = useState(null);
+    const [sessionIndex, setSessionIndex] = useState(0);
+    const items = selectedWorkspace?.sessions ?? available;
+    const index = selectedWorkspace ? sessionIndex : workspaceIndex;
+    const setIndex = selectedWorkspace ? setSessionIndex : setWorkspaceIndex;
+    useInput((input, key) => {
+        if (key.escape || (key.ctrl && input === 'c')) {
+            if (selectedWorkspace) {
+                setSelectedWorkspace(null);
+                setSessionIndex(0);
+            }
+            else
+                onCancel();
+            return;
+        }
+        if (!items.length)
+            return;
+        if (key.upArrow) {
+            setIndex((value) => (value - 1 + items.length) % items.length);
+            return;
+        }
+        if (key.downArrow) {
+            setIndex((value) => (value + 1) % items.length);
+            return;
+        }
+        if (!key.return)
+            return;
+        if (!selectedWorkspace) {
+            const workspace = available[workspaceIndex];
+            if (workspace) {
+                if (!workspace.available)
+                    return;
+                setSelectedWorkspace(workspace);
+                const activeIndex = workspace.sessions.findIndex((session) => session.id === workspace.activeSessionId);
+                setSessionIndex(Math.max(0, activeIndex));
+            }
+            return;
+        }
+        const session = selectedWorkspace.sessions[sessionIndex];
+        if (session)
+            onSelect(selectedWorkspace.displayPath, session.id);
+    });
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: theme.user, bold: true, children: selectedWorkspace ? `${selectedWorkspace.displayName} · 选择会话` : `选择工作区（${available.length}）` }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [!items.length ? _jsx(Text, { color: theme.subtle, children: "\u6682\u65E0\u53EF\u6062\u590D\u7684\u5DE5\u4F5C\u533A\u4F1A\u8BDD" }) : null, selectedWorkspace
+                        ? selectedWorkspace.sessions.map((session, itemIndex) => (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: itemIndex === sessionIndex ? theme.user : undefined, children: [itemIndex === sessionIndex ? '> ' : '  ', session.title, selectedWorkspace.displayPath === currentPath && session.id === currentSessionId ? ' (当前)' : ''] }), session.lastMessagePreview ? _jsxs(Text, { color: theme.subtle, children: ["    ", session.lastMessagePreview.slice(0, 72)] }) : null] }, session.id)))
+                        : available.map((workspace, itemIndex) => (_jsxs(Text, { color: itemIndex === workspaceIndex ? theme.user : workspace.available ? undefined : theme.subtle, children: [itemIndex === workspaceIndex ? '> ' : '  ', workspace.displayName, " \u00B7 ", workspace.sessions.length, " \u4E2A\u4F1A\u8BDD", !workspace.available ? ' · 未连接' : ''] }, workspace.id)))] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.subtle, children: !selectedWorkspace && available[workspaceIndex]?.available === false
+                        ? '该工作区未连接，重新挂载磁盘后才能打开 · ESC 取消'
+                        : `↑↓ 选择 · Enter 确认${selectedWorkspace ? ' · ESC 返回工作区' : ' · ESC 取消'}` }) })] }));
+}

package/src/ui/figures.js

@@ -0,0 +1,44 @@
+/**
+ * ============================================================
+ *  src/ui/figures.ts —— TUI 符号表（单一出处）
+ * ------------------------------------------------------------
+ *  借鉴 Claude Code 的 constants/figures.ts：所有语义符号集中一处，
+ *  组件不再散落硬编码字符。
+ *
+ *  ⚠️ 出现在 LiveArea（live 区）的字形必须被 liveViewport.charWidth
+ *  按宽度 2 上界覆盖（INV-1 行宽记账依赖它，宁宽不窄）——新增符号时
+ *  确认其码点落在 charWidth 已覆盖的区间内。
+ *
+ *  SPINNER_FRAMES 留在 LiveArea 本地：它是动画帧组不是语义符号。
+ * ============================================================
+ */
+export const figures = {
+    /** 答案锚点（assistant 首条 prose 行前缀） */
+    anchor: '⏺',
+    /** 思维链块 */
+    thought: '💭',
+    /** 折叠提示 */
+    fold: '▾',
+    /** 工作流步骤开始 */
+    step: '▶',
+    /** 成功 */
+    ok: '✓',
+    /** 失败 */
+    fail: '✗',
+    /** 跳过 */
+    skip: '⊘',
+    /** 树分支（非末条） */
+    branch: '├─',
+    /** 树末条 */
+    corner: '└─',
+    /** 树竖线 */
+    pipe: '│',
+    /** 结果/子行连接符（借鉴 Claude Code 的 ⎿ 语汇） */
+    elbow: '⎿',
+    /** 蜂群（并行子任务）头行 */
+    swarm: '⚡',
+    /** 引用块竖条 */
+    quote: '▎',
+    /** 水平分隔 */
+    hr: '─',
+};