@ghenya/clinn 0.8.8 → 0.9.1

package/Src/index.jsx

@@ -11,7 +11,7 @@ import os from "os";
 const require = createRequire(import.meta.url);
 
 const Tools = require("../Tools");
-const { listRecentTurns, searchHistory, getFileList, loadFileTurns } = require("../Mem/history");
+const { listRecentTurns, searchHistory, getFileList, loadFileTurns, listSessions, getSession, loadSessionTurns, globalSearch, endSession, startSession } = require("../Mem/history");
 const kao = require("../Tools/kaomoji");
 
 const __filename = new URL(import.meta.url).pathname;
@@ -22,7 +22,7 @@ const CLINN_CONFIG = path.join(CLINN_DIR, "config.json");
 const PKG_CONFIG = path.join(__dirname, "..", "config.json");
 const LOGO_PATH = path.join(__dirname, "..", "Logos", "StartLogo.txt");
 
-const VER = "0.8.8";
+const VER = "0.9.1";
 
 function ensureDir() { if (!fs.existsSync(CLINN_DIR)) fs.mkdirSync(CLINN_DIR, { recursive: true }); }
 function loadConfig() {
@@ -133,7 +133,6 @@ function formatMd(text, maxW) {
 }
 
 function Msg({ role, content }) {
-  const lines = content.split("\n");
   const C = {
     user: "greenBright",
     system: "yellow",
@@ -143,12 +142,23 @@ function Msg({ role, content }) {
   const face = content._kao || kao.matchFace(content, role);
   const displayLabel = `${face} ${label}`;
   const bodyColor = role === "user" ? "white" : role === "system" ? "yellow" : undefined;
+
+  const MAX = role === "user" ? 300 : 99999;
+  const folded = content.length > MAX;
+  const lines = (folded ? content.slice(0, 200) : content).split("\n");
+  const hidden = folded ? content.length - 200 : 0;
+
   return (
     <Box flexDirection="column">
       <Text color={C[role]} bold>{displayLabel}</Text>
       <Text color={bodyColor}>
         {lines.map((l, i) => (i === 0 ? "" : "\n") + "   " + (l || " ")).join("")}
       </Text>
+      {folded && (
+        <Text color="gray" dimColor>
+          {"   [+" + Math.ceil(hidden / 100) * 100 + " MORE]"}
+        </Text>
+      )}
     </Box>
   );
 }
@@ -169,24 +179,82 @@ function Streaming({ content }) {
   );
 }
 
-function ToolLog({ tools }) {
+function ToolLog({ tools, collapsed }) {
   if (!tools.length) return null;
+
+  function colorResult(text) {
+    if (!text) return null;
+    const lower = text.toLowerCase();
+    let color = "gray";
+    let sym = "";
+    if (/error|失败|错误|eacces|eperm|enoent/i.test(lower)) { color = "red"; sym = "✗ "; }
+    else if (/\[ok\]|完成|成功|created|wrote|写入|创建|已保存|passed/i.test(lower)) { color = "green"; sym = "  "; }
+    else if (/deleted|删除|移除|removed/i.test(lower)) { color = "red"; sym = "✗ "; }
+    else if (/modified|修改|更新|patched|changed/i.test(lower)) { color = "yellow"; sym = "~ "; }
+    else if (/not found|未找到|不存在|no match/i.test(lower)) { color = "red"; sym = "? "; }
+    return { text: sym + text.slice(0, 100), color };
+  }
+
+  if (collapsed) {
+    return (
+      <Box flexDirection="column" paddingLeft={2}>
+        <Text color="gray" dimColor>{"─".repeat(50)} 工具调用 ({tools.length})</Text>
+        {tools.map((t, i) => {
+          const cr = colorResult(t.result);
+          return (
+            <Box key={i} flexDirection="row">
+              {t.status === "done"
+                ? <Text color="green"> ✓ </Text>
+                : <Text color="yellow"><Spinner /></Text>}
+              <Text color="cyan">{t.name}</Text>
+              {cr ? <Text color={cr.color}> {cr.text}</Text> : null}
+            </Box>
+          );
+        })}
+      </Box>
+    );
+  }
+
   return (
     <Box flexDirection="column" paddingLeft={2}>
+      <Text color="gray" dimColor>{"─".repeat(50)} 工具调用 ({tools.length})</Text>
       {tools.map((t, i) => (
-        <Box key={i} flexDirection="column">
-          <Box>
+        <Box key={i} flexDirection="column" marginBottom={1}>
+          <Box flexDirection="row">
             {t.status === "done"
               ? <Text color="green">✓ </Text>
-              : <Text color="yellow"><Spinner /> </Text>}
-            <Text dimColor>{t.name}</Text>
-            {t.args ? <Text color="gray"> {t.args}</Text> : null}
+              : <Text color="yellow"><Spinner type="dots" /> </Text>}
+            <Text color="cyan" bold>{t.name}</Text>
           </Box>
-          {t.result ? (
-            <Box paddingLeft={4}>
-              <Text color="gray">{t.result.slice(0, 120)}</Text>
+          {t.args ? (
+            <Box paddingLeft={3}>
+              <Text color="gray">{t.args}</Text>
             </Box>
           ) : null}
+          {t.result ? (() => {
+            const lines = t.result.split("\n").filter(l => l.trim());
+            if (lines.length <= 1) {
+              const cr = colorResult(t.result);
+              return (
+                <Box paddingLeft={3}>
+                  <Text color={cr?.color || "gray"}>{t.result.slice(0, 200)}</Text>
+                </Box>
+              );
+            }
+            return (
+              <Box flexDirection="column" paddingLeft={3}>
+                {lines.map((l, j) => {
+                  const cr = colorResult(l);
+                  return (
+                    <Text key={j} color={cr?.color || "gray"}>
+                      {cr?.text || l.slice(0, 200)}
+                    </Text>
+                  );
+                }).slice(0, 6)}
+                {lines.length > 6 ? <Text color="gray" dimColor>... (+{lines.length - 6} 行)</Text> : null}
+              </Box>
+            );
+          })() : null}
         </Box>
       ))}
     </Box>
@@ -236,6 +304,9 @@ const COMMANDS = [
   { cmd: "/history files", desc: "历史文件列表" },
   { cmd: "/history search", desc: "搜索历史" },
   { cmd: "/history read", desc: "读取历史文件" },
+  { cmd: "/sessions", desc: "列出对话 session" },
+  { cmd: "/session", desc: "查看某个 session" },
+  { cmd: "/session_search", desc: "全局搜索 session" },
   { cmd: "/trusted", desc: "查看受信任工具" },
   { cmd: "/trust", desc: "永久信任工具" },
   { cmd: "/untrust", desc: "取消信任" },
@@ -253,29 +324,27 @@ function App() {
   const [thinking, setThinking] = useState(false);
   const [streaming, setStreaming] = useState("");
   const [tools, setTools] = useState([]);
+  const [toolsCollapsed, setToolsCollapsed] = useState(false);
   const [ctxPct, setCtxPct] = useState(0);
   const [blocked, setBlocked] = useState(false);
   const [slashIdx, setSlashIdx] = useState(0);
   const [mascotFace, setMascotFace] = useState(kao.mascotForFrame());
   const [promptFace, setPromptFace] = useState(kao.promptFace(""));
+  const [queue, setQueue] = useState([]);
+  const abortRef = useRef(null);
 
-  // 状态栏每 8 秒切换表情
   useEffect(() => {
     const timer = setInterval(() => setMascotFace(kao.mascotForFrame()), 1000);
     return () => clearInterval(timer);
   }, []);
 
-  // 输入框表情: 启动动画 + 根据输入内容实时匹配
   useEffect(() => {
     const timer = setInterval(() => setPromptFace(kao.promptFace(input)), 150);
     return () => clearInterval(timer);
   }, [input]);
-  const [msgs, setMsgs] = useState([
-    { role: "system", content: `欢迎来到 Clinn v${VER}！Ink 全屏终端界面。` },
-    { role: "system", content: "按 / 查看命令菜单 ↑↓选择 回车选取" },
-  ]);
+  const [msgs, setMsgs] = useState([]);
+  const [started, setStarted] = useState(false);
 
-  // 启动时从 agent 获取真实上下文占比
   useEffect(() => {
     setCtxPct(getAgent().estimateContextPct());
   }, []);
@@ -293,50 +362,80 @@ function App() {
     setThinking(true);
     setStreaming("");
     setTools([]);
+    setToolsCollapsed(false);
+
+    const controller = new AbortController();
+    abortRef.current = controller;
 
     let buf = "";
     const toolMap = new Map();
 
     try {
-      await getAgent().run(query, {
-        onContent: (tok) => {
-          buf += tok;
-          setStreaming(buf.replace(/\*\*(.+?)\*\*/g, "$1"));
-        },
-        onToolCall: (name, args = {}) => {
-          const short = Object.entries(args).map(([k, v]) => {
-            const s = String(v);
-            return k + "=" + (s.length > 50 ? s.slice(0, 50) + "…" : s);
-          }).join(" ");
-          toolMap.set(name, { name, args: short, status: "running", result: "" });
-          setTools([...toolMap.values()]);
-        },
-        onToolResult: (name, result) => {
-          const t = toolMap.get(name);
-          if (t) {
-            t.status = "done";
-            t.result = String(result || "").replace(/\n/g, " ").slice(0, 150);
-          }
-          setTools([...toolMap.values()]);
-        },
-        onContextPct: (pct) => setCtxPct(pct),
-      });
+      await Promise.race([
+        getAgent().run(query, {
+          onContent: (tok) => {
+            buf += tok;
+            setStreaming(buf.replace(/\*\*(.+?)\*\*/g, "$1"));
+          },
+          onToolCall: (name, args = {}) => {
+            const short = Object.entries(args).map(([k, v]) => {
+              const s = String(v);
+              return k + "=" + (s.length > 50 ? s.slice(0, 50) + "\u2026" : s);
+            }).join(" ");
+            toolMap.set(name, { name, args: short, status: "running", result: "" });
+            setTools([...toolMap.values()]);
+          },
+          onToolResult: (name, result) => {
+            const t = toolMap.get(name);
+            if (t) {
+              t.status = "done";
+              t.result = String(result || "").slice(0, 500);
+            }
+            setTools([...toolMap.values()]);
+          },
+          onContextPct: (pct) => setCtxPct(pct),
+        }),
+        new Promise((_, reject) => {
+          controller.signal.addEventListener("abort", () => reject(new DOMException("Aborted", "AbortError")));
+        }),
+      ]);
     } catch (e) {
-      addMsg("system", "错误: " + e.message);
+      if (e.name === "AbortError" || e.message === "Aborted") {
+        addMsg("system", "\u23f9 已中断");
+        buf = "";
+      } else {
+        addMsg("system", "\u2717 错误: " + e.message);
+      }
     }
 
     if (buf) addMsg("assistant", formatMd(buf, cols - 4));
     setStreaming("");
     setThinking(false);
-    setTools([]);
-    setBlocked(false);
+    setToolsCollapsed(true);
+    abortRef.current = null;
+
+    // 处理队列中的下一条
+    setQueue(prev => {
+      if (prev.length <= 1) {
+        setBlocked(false);
+        return [];
+      }
+      // delay next to allow React to update
+      const [done, ...rest] = prev;
+      setTimeout(() => {
+        const next = rest[0];
+        addMsg("user", next);
+        run(next);
+      }, 50);
+      return rest;
+    });
   }, [blocked, addMsg, cols]);
 
   const slashRef = useRef({ filtered: [], clamped: 0 });
 
   const handleSubmit = useCallback((val) => {
     const v = val.trim();
-    if (!v || thinking) return;
+    if (!v) return;
     const { filtered, clamped } = slashRef.current;
     if (filtered.length > 0 && clamped < filtered.length) {
       const sel = filtered[clamped].cmd;
@@ -346,8 +445,21 @@ function App() {
         return;
       }
     }
+
+    // 如果正在执行中，加入队列而非阻塞
+    if (blocked || thinking) {
+      if (v === "/reset" || v === "/clear" || v === "/exit" || v === "/help" || v === "/version" || v === "/status" || v === "/ctx") {
+        // 这些命令仍可直接执行（不阻塞）
+      } else {
+        setQueue(prev => [...prev, v]);
+        setInput("");
+        return;
+      }
+    }
+
     addMsg("user", v);
     setInput("");
+    setStarted(true);
 
     const parts = v.slice(1).trim().split(/\s+/);
     const cmd = parts[0].toLowerCase();
@@ -357,48 +469,54 @@ function App() {
 
     if (v === "/help") {
       say([
-        "╭────────────────────────────────────╮",
-        "│  /help              查看帮助       │",
-        "│  /exit              退出程序       │",
-        "│  /reset             重置对话       │",
-        "│  /clear             清除对话       │",
-        "│  /version           查看版本       │",
-        "│  /status            当前状态       │",
-        "│  /ctx               上下文使用量   │",
-        "│  /tools             列出工具       │",
-        "│  /tools_more        全部工具       │",
-        "│  /tool_search <q>   搜索工具       │",
-        "│  /tool_list_saved   列出持久化工具 │",
-        "│  /tool_save <name>  持久化保存工具 │",
-        "│  /tool_del <name>   删除持久化工具 │",
-        "│  /temp <0-2>        设置温度       │",
-        "│  /token <n>         设置maxTokens  │",
-        "│  /memory            记忆统计       │",
-        "│  /memory_list [n]   列出记忆条目   │",
-        "│  /memory_search <q> 搜索记忆       │",
-        "│  /memory_del <id>   删除记忆       │",
-        "│  /memory_clear      清空记忆       │",
-        "│  /compress          手动压缩上下文 │",
-        "│  /history [n]       最近历史       │",
-        "│  /history files     历史文件列表   │",
-        "│  /history search <q>搜索历史       │",
-        "│  /history read <f>  读取历史文件   │",
-        "│  /trusted           受信任工具     │",
-        "│  /trust <name>      永久信任工具   │",
-        "│  /untrust <name>    取消信任       │",
-        "│  /api               查看API配置    │",
-        "│  /api key <K>       设置Key        │",
-        "│  /api url <U>       设置地址       │",
-        "│  /api model <M>     设置模型       │",
-        "╰────────────────────────────────────╯",
+        "\u256d\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+        "\u2502  /help              查看帮助       \u2502",
+        "\u2502  /exit              退出程序       \u2502",
+        "\u2502  /reset             重置对话       \u2502",
+        "\u2502  /clear             清除对话       \u2502",
+        "\u2502  /version           查看版本       \u2502",
+        "\u2502  /status            当前状态       \u2502",
+        "\u2502  /ctx               上下文使用量   \u2502",
+        "\u2502  /tools             列出工具       \u2502",
+        "\u2502  /tools_more        全部工具       \u2502",
+        "\u2502  /tool_search <q>   搜索工具       \u2502",
+        "\u2502  /tool_list_saved   列出持久化工具 \u2502",
+        "\u2502  /tool_save <name>  持久化保存工具 \u2502",
+        "\u2502  /tool_del <name>   删除持久化工具 \u2502",
+        "\u2502  /temp <0-2>        设置温度       \u2502",
+        "\u2502  /token <n>         设置maxTokens  \u2502",
+        "\u2502  /memory            记忆统计       \u2502",
+        "\u2502  /memory_list [n]   列出记忆条目   \u2502",
+        "\u2502  /memory_search <q> 搜索记忆       \u2502",
+        "\u2502  /memory_del <id>   删除记忆       \u2502",
+        "\u2502  /memory_clear      清空记忆       \u2502",
+        "\u2502  /compress          手动压缩上下文 \u2502",
+        "\u2502  /history [n]       最近历史       \u2502",
+        "\u2502  /history files     历史文件列表   \u2502",
+        "\u2502  /history search <q>搜索历史       \u2502",
+        "\u2502  /history read <f>  读取历史文件   \u2502",
+        "\u2502  /sessions [n]      列出对话session\u2502",
+        "\u2502  /session <id>      查看session   \u2502",
+        "\u2502  /session_search <q>全局搜索session\u2502",
+        "\u2502  /trusted           受信任工具     \u2502",
+        "\u2502  /trust <name>      永久信任工具   \u2502",
+        "\u2502  /untrust <name>    取消信任       \u2502",
+        "\u2502  /api               查看API配置    \u2502",
+        "\u2502  /api key <K>       设置Key        \u2502",
+        "\u2502  /api url <U>       设置地址       \u2502",
+        "\u2502  /api model <M>     设置模型       \u2502",
+        "\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
       ].join("\n"));
     }
     else if (cmd === "exit") process.exit(0);
     else if (cmd === "reset") {
-      getAgent().reset();
-      setMsgs([{ role: "system", content: "对话已重置。" }]);
+      const a = getAgent();
+      endSession(a.sessionId);
+      a.reset();
+      a.sessionId = startSession();
+      setMsgs([{ role: "system", content: "对话已重置，新 session 已创建。" }]);
       setCtxPct(0);
-      say("对话已重置 (历史+token计数已清零)");
+      say("对话已重置, 新 session 已创建");
     }
     else if (cmd === "clear") {
       setMsgs([{ role: "system", content: "对话已清除。" }]);
@@ -414,13 +532,13 @@ function App() {
       const pct = a.estimateContextPct();
       const names = Tools.listToolNames();
       say([
-        "╭────────────────────────────────────╮",
+        "\u256d\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
         "  模型: " + CONFIG.llm.model + "  温度: " + CONFIG.llm.temperature,
         "  Tokens: 输入" + usage.prompt + " · 输出" + usage.completion,
         "  上下文: " + pct + "% (上限 " + a.getMaxContextTokens() + " tokens)",
-        "  记忆: " + mem.entries + "/" + mem.maxEntries + " 条 · 历史 " + mem.historyMessages + " 轮",
+        "  记忆: ROM" + (mem.romEntries || mem.entries) + " RAM" + (mem.ramEntries || 0) + " · 历史 " + mem.historyMessages + " 轮",
         "  工具: " + names.length + " 个 — " + names.slice(0, 8).join(", ") + (names.length > 8 ? " ..." : ""),
-        "╰────────────────────────────────────╯",
+        "\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
       ].join("\n"));
     }
     else if (cmd === "ctx") {
@@ -430,7 +548,7 @@ function App() {
       const barW = 30;
       const filled = Math.max(1, Math.round(pct / 100 * barW));
       const empty = barW - filled;
-      const bar = "█".repeat(filled) + "─".repeat(empty);
+      const bar = "\u2588".repeat(filled) + "\u2500".repeat(empty);
       say([
         "上下文: [" + bar + "] " + pct + "%",
         "上限: " + a.getMaxContextTokens() + " tokens",
@@ -440,13 +558,16 @@ function App() {
     }
     else if (cmd === "memory") {
       const s = getAgent().memory.stats();
-      say("记忆: " + s.entries + "/" + s.maxEntries + " 条 · 历史消息 " + s.historyMessages + " 轮");
+      say("记忆: ROM" + (s.romEntries || s.entries) + " RAM" + (s.ramEntries || 0) + " · 历史消息 " + s.historyMessages + " 轮");
     }
     else if (cmd === "memory_list") {
       const n = parseInt(rest) || 20;
       const all = getAgent().memory.getAllEntries().slice(-n);
       if (!all.length) { say("(无记忆条目)"); return; }
-      say(all.map((e) => "#" + e.id + " [" + (e.tags?.join(",") || "-") + "] " + e.text).join("\n"));
+      say(all.map((e) => {
+        const tag = e._type === "ram" ? "[RAM]" : "[ROM]";
+        return tag + " #" + e.id + " [" + (e.tags?.join(",") || "-") + "] " + e.text;
+      }).join("\n"));
     }
     else if (cmd === "memory_search") {
       if (!rest) { say("用法: /memory_search <关键词>"); return; }
@@ -461,15 +582,15 @@ function App() {
       say(ok ? "已删除 #" + id : "不存在 #" + id);
     }
     else if (cmd === "memory_clear") {
-      getAgent().memory.clearEntries();
-      say("记忆已全部清空");
+      getAgent().memory.clearAllEntries();
+      say("记忆已全部清空 (ROM+RAM)");
     }
     else if (cmd === "compress") {
       const a = getAgent();
       const compressed = a.memory.compressHistory();
       if (!compressed) { say("对话太短, 无需压缩"); return; }
       a.memory.clear();
-      a.memory.addEntry("手动压缩: " + compressed.slice(0, 180), ["manual-summary"]);
+      a.memory.addRamEntry("手动压缩: " + compressed.slice(0, 180), ["manual-summary"]);
       say("上下文已压缩, 历史清空, 摘要已存入记忆");
     }
     else if (cmd === "tools") {
@@ -542,6 +663,59 @@ function App() {
         say(turns.map((t, i) => (i + 1) + ". [" + (t.time?.slice(0, 16) || "?") + "] " + (t.user || "").slice(0, 120)).join("\n"));
       }
     }
+    else if (cmd === "sessions") {
+      const n = parseInt(rest) || 20;
+      const sessions = listSessions(n);
+      if (!sessions.length) { say("(暂无对话 session)"); return; }
+      const lines = sessions.map((s, i) => {
+        const marker = s.status === "active" ? "\u25cf" : "\u25cb";
+        return (i + 1) + ". " + marker + " [" + (s.started || "?").slice(0, 16) + "] " +
+          (s.title || "(无标题)") + " | " + s.turnCount + "轮" +
+          (s.status === "active" ? " \u25c0 当前" : "");
+      });
+      say("对话 Sessions (" + sessions.length + "):\n" + lines.join("\n") +
+        "\n\n用 /session <编号> 查看详情, /session_search <关键词> 搜索");
+    }
+    else if (cmd === "session") {
+      if (!rest) { say("用法: /session <session_id 或列表序号>\n请先用 /sessions 查看列表"); return; }
+      const sessions = listSessions(999);
+      let sid = rest.trim();
+      if (/^\d+$/.test(sid)) {
+        const idx = parseInt(sid) - 1;
+        if (idx < 0 || idx >= sessions.length) { say("序号超出范围 (1-" + sessions.length + ")"); return; }
+        sid = sessions[idx].id;
+      }
+      const session = getSession(sid);
+      if (!session) { say("未找到 session: " + sid); return; }
+      const turns = loadSessionTurns(sid, 30);
+      const header = "=== " + (session.title || "(无标题)") + " ===\n" +
+        "ID: " + session.id + "  |  " + (session.started || "?").slice(0, 16) + "  |  " + session.turnCount + "轮\n";
+      if (!turns.length) { say(header + "\n(这个 session 暂无对话轮次)"); return; }
+      const body = turns.map((t, i) => {
+        return "[" + (i + 1) + "] " + (t.time || "?").slice(0, 16) + "\n" +
+          "  问: " + (t.user || "").slice(0, 300) + "\n" +
+          "  答: " + (t.assistant || "").slice(0, 300);
+      }).join("\n\n");
+      say(header + "\n" + body + "\n\n(共 " + turns.length + " 轮, 显示最近 30 轮)");
+    }
+    else if (cmd === "session_search") {
+      if (!rest) { say("用法: /session_search <关键词> [数量]\n在整个历史中搜索相关 session"); return; }
+      const parts = rest.trim().split(/\s+/);
+      const limit = parseInt(parts[parts.length - 1]) || 10;
+      const query = isNaN(parseInt(parts[parts.length - 1])) ? rest.trim() : parts.slice(0, -1).join(" ");
+      const results = globalSearch(query, limit);
+      if (!results.length) { say("全史搜索未找到 \"" + query + "\""); return; }
+      const lines = [];
+      for (const [i, r] of results.entries()) {
+        lines.push((i + 1) + ". [" + (r.sessionStarted || "?").slice(0, 16) + "] " +
+          r.sessionTitle + " | " + r.matchCount + "处匹配 | 得分" + r.totalScore);
+        for (const m of r.topMatches) {
+          lines.push("    · " + (m.user || "").slice(0, 100));
+        }
+      }
+      say("搜索 \"" + query + "\" — " + results.length + " 个 session:\n" + lines.join("\n") +
+        "\n\n用 /session <编号> 查看详情");
+    }
     else if (cmd === "trusted") {
       const trusted = CONFIG.tools?.trustedTools || [];
       if (!trusted.length) { say("(暂无受信任工具)"); return; }
@@ -590,7 +764,7 @@ function App() {
       }
     }
     else { run(v); }
-  }, [thinking, addMsg, run]);
+  }, [thinking, blocked, addMsg, run]);
 
   const slashInput = input.startsWith("/");
   const slashFiltered = slashInput
@@ -599,7 +773,17 @@ function App() {
   const slashClamped = Math.max(0, Math.min(slashIdx, slashFiltered.length - 1));
   slashRef.current = { filtered: slashFiltered, clamped: slashClamped };
 
-  useInput((_, key) => {
+  useInput((inputVal, key) => {
+    if (key.ctrl && inputVal === "c") {
+      if (abortRef.current) {
+        abortRef.current.abort();
+        return;
+      }
+      if (input.length > 0) {
+        setInput("");
+      }
+      return;
+    }
     if (key.escape) process.exit(0);
     if (!slashInput || !slashFiltered.length) return;
     if (key.upArrow) setSlashIdx((slashClamped - 1 + slashFiltered.length) % slashFiltered.length);
@@ -607,7 +791,34 @@ function App() {
   });
 
   return (
-    <Box borderStyle="round" borderColor="cyan" flexDirection="column" paddingX={1}>
+    <Box flexDirection="column" paddingLeft={1}>
+      {!started ? (
+        <Box flexDirection="column" flexShrink={0}>
+          {/* 启动页: LOGO + 欢迎框 */}
+          <Box flexDirection="row">
+            {/* 左边 LOGO */}
+            <Box flexDirection="column" paddingRight={2}>
+              {LOGO_LINES.map((line, i) => (
+                <Text key={i} color="cyanBright">{line}</Text>
+              ))}
+              <Text color="green">{CONFIG.llm.model} · {CONFIG.llm.contextWindow || 131072} tokens</Text>
+            </Box>
+            {/* 右边欢迎框 */}
+            <Box borderStyle="round" borderColor="cyan" flexDirection="column" paddingX={2} paddingY={1}>
+              <Text color="cyanBright" bold>Clinn v{VER}</Text>
+              <Text color="magenta" dimColor>Self-Evolving AI · Terminal Agent · Ink</Text>
+              <Text> </Text>
+              <Text dimColor>Terminal-native AI coding assistant</Text>
+              <Text> </Text>
+              <Text dimColor>/ command menu · ↑↓ select · Enter confirm</Text>
+            </Box>
+          </Box>
+          <Box marginTop={1}>
+            <Text color="gray" dimColor>{"─".repeat(cols - 2)}</Text>
+          </Box>
+        </Box>
+      ) : (
+      <Box flexDirection="column" flexGrow={1}>
       <Box flexDirection="column" flexShrink={0}>
         {LOGO_LINES.map((line, i) => (
           <Text key={i} color="cyanBright">{line}</Text>
@@ -615,16 +826,21 @@ function App() {
         <Box marginTop={1}>
           <Text color="magenta" dimColor>Self-Evolving AI · Terminal Agent · Ink</Text>
         </Box>
-        <Text color="gray">{"─".repeat(cols - 4)}</Text>
+        <Text color="gray" dimColor>{"─".repeat(cols - 2)}</Text>
       </Box>
 
-      <Box flexDirection="column" flexGrow={1}>
+      <Box flexDirection="column">
         {msgs.map((m, i) => (
           <Msg key={i} role={m.role} content={m.content} />
         ))}
         {streaming ? <Streaming content={streaming} /> : null}
         {thinking && !streaming ? <Thinking /> : null}
-        <ToolLog tools={tools} />
+        {tools.length > 0 && (
+          <Box flexDirection="column">
+            <Text color="gray" dimColor>{"\u2500\u2500\u2500".repeat(8)}</Text>
+            <ToolLog tools={tools} collapsed={toolsCollapsed} />
+          </Box>
+        )}
       </Box>
 
       {slashInput && slashFiltered.length > 0 && (
@@ -633,20 +849,22 @@ function App() {
             const sel = i === slashClamped;
             return (
               <Box key={c.cmd} paddingLeft={1}>
-                <Text color={sel ? "cyan" : "gray"}>{sel ? "▸ " : "  "}</Text>
+                <Text color={sel ? "cyan" : "gray"}>{sel ? "\u25b8 " : "  "}</Text>
                 <Text color={sel ? "cyanBright" : undefined} bold={sel}>{c.cmd}</Text>
-                <Text color="gray">{" · " + c.desc}</Text>
+                <Text color="gray">{" \u00b7 " + c.desc}</Text>
               </Box>
             );
           })}
           <Box paddingLeft={1}>
-            <Text color="gray">  ↑↓ 切换 · 回车 选取</Text>
+            <Text color="gray">  \u2191\u2193 切换 \u00b7 回车 选取</Text>
           </Box>
         </Box>
       )}
 
+      </Box>
+      )}
       <Box flexDirection="column" flexShrink={0}>
-        <Text color="gray">{"─".repeat(cols - 4)}</Text>
+        <Text color="gray" dimColor>{"─".repeat(cols - 2)}</Text>
         <Box paddingX={1}>
           <Text dimColor>
             <Text color="cyan">{mascotFace}</Text> {CONFIG.llm.model}
@@ -659,20 +877,60 @@ function App() {
           </Text>
         </Box>
 
-        <Box paddingY={1}>
-          <Box borderStyle="round" borderColor="cyan" paddingX={1} width={cols - 4}>
-            <Text color="greenBright" bold>{promptFace}  </Text>
+        {queue.length > 0 && (
+          <Box paddingX={1} paddingBottom={1}>
+            <Text color="yellow" dimColor>
+              {"│ "}队列: {queue.length} 条待执行
+              {queue.slice(0, 3).map((q, i) => (
+                <Text key={i} color="gray">{" · "}{q.slice(0, 30)}{q.length > 30 ? "…" : ""}</Text>
+              ))}
+              {queue.length > 3 ? <Text color="gray"> ...</Text> : null}
+            </Text>
+          </Box>
+        )}
+
+        <Text color="cyan">{"─".repeat(cols - 2)}</Text>
+
+        {input.length > 200 && (
+          <Box paddingX={1}>
+            <Text color="gray" dimColor>  [{input.length} chars]</Text>
+          </Box>
+        )}
+
+        <Box paddingY={0} flexDirection="row">
+          <Text color="greenBright" bold>{promptFace}  </Text>
+          <Box flexGrow={1}>
             <TextInput
-              value={input}
-              onChange={v => { setInput(v); setSlashIdx(0); }}
+              value={input.length > 500 ? "…" + input.slice(-300) : input}
+              onChange={v => {
+                setSlashIdx(0);
+                if (v.startsWith("…")) {
+                  setInput(input.slice(0, Math.max(0, input.length - 300)) + v.slice(1));
+                } else {
+                  setInput(v);
+                }
+              }}
               onSubmit={handleSubmit}
-              placeholder={thinking ? "思考中，请稍候..." : "输入你的问题，或按 / 查看命令…"}
+              placeholder={thinking ? "thinking..." : "> "}
             />
           </Box>
         </Box>
+
+        <Text color="cyan">{"─".repeat(cols - 2)}</Text>
       </Box>
     </Box>
   );
 }
 
 const { waitUntilExit } = render(<App />);
+
+// 拦截 SIGINT：Ctrl+C 由 Ink useInput 处理，不直接退出
+let sigintCount = 0;
+process.on("SIGINT", () => {
+  sigintCount++;
+  if (sigintCount >= 3) {
+    process.exit(0);
+  }
+  // 单次/双次 Ctrl+C 不退出，交给 Ink 的 useInput 处理
+  setTimeout(() => { sigintCount = 0; }, 1000);
+});