thincoder 0.4.0 → 0.5.0

package/src/tui.mjs

@@ -10,7 +10,7 @@ import { basename } from "node:path"
 import { existsSync, readFileSync } from "node:fs"
 import { runAgent, ContinueError } from "./agent.mjs"
 import { estimateTokens } from "./context.mjs"
-import { saveSession, clearSession } from "./session.mjs"
+import { saveSession, clearSession, archiveCurrent, listSlots, switchToSlot, sessionPath } from "./session.mjs"
 import { PROVIDER_PRESETS as PRESETS } from "./config.mjs"
 import { closeAllMcp } from "./mcp.mjs"
 
@@ -207,6 +207,21 @@ export function layoutInput(chars, cursor, width) {
 }
 
 /** 文本按宽度折行（保留 \n），返回行数组 */
+/**
+ * 显示净化：控制字符会破坏终端网格数学（\r 回车覆盖、\t 宽度误判致整帧错位、ANSI/响铃冲屏）。
+ * 只动显示层——模型看到的工具结果原文不变；session 里已存的脏 display 回放时也经此净化。
+ */
+const ANSI_SEQUENCE_RE = /\x1b\[[0-9;?]*[a-zA-Z]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[()][0-9A-B]|\x1b[=>#][0-9]?/g
+export function sanitizeDisplay(s) {
+  return s
+    .replace(ANSI_SEQUENCE_RE, "")
+    .replace(/\r\n/g, "\n")
+    .replace(/\r/g, "\n")
+    .replace(/\t/g, "    ")
+    .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "")
+    .replace(/\n+$/, "")
+}
+
 export function wrapText(text, width) {
   const lines = []
   for (const rawLine of text.split("\n")) {
@@ -301,10 +316,14 @@ export async function startTUI(agent, opts = {}) {
     if (text) keyStream.write(text)
   })
 
+  let cleanedUp = false
   const cleanup = () => {
-    // 退出前保存会话（同步写，保证 exit 路径也能落盘）
+    if (cleanedUp) return
+    cleanedUp = true
+    // 退出前保存会话（同步写）；先归档当前到槽位，再落新——不丢
     try {
-      saveSession(agent)
+      archiveCurrent(agent.cwd)
+      saveSession(agent, state.lines)
     } catch {
       // 存失败不耽误退出
     }
@@ -410,7 +429,7 @@ export async function startTUI(agent, opts = {}) {
     // 对话区内容行（含流式缓冲）；markdown 表格先按显示宽度重排
     const convLines = []
     for (const l of state.lines) {
-      for (const line of formatTables(l.text, cols - 1)) {
+      for (const line of formatTables(sanitizeDisplay(l.text), cols - 1)) {
         for (const wrapped of wrapText(line, cols - 1)) {
           convLines.push({ text: wrapped, color: l.color })
         }
@@ -418,12 +437,12 @@ export async function startTUI(agent, opts = {}) {
     }
     // 思考流（暗色）在正文流之前
     if (state.reasoning) {
-      for (const wrapped of wrapText(state.reasoning, cols - 1)) {
+      for (const wrapped of wrapText(sanitizeDisplay(state.reasoning), cols - 1)) {
         convLines.push({ text: wrapped, color: C.reason })
       }
     }
     if (state.streaming) {
-      for (const line of formatTables(state.streaming, cols - 1)) {
+      for (const line of formatTables(sanitizeDisplay(state.streaming), cols - 1)) {
         for (const wrapped of wrapText(line, cols - 1)) {
           convLines.push({ text: wrapped, color: C.text })
         }
@@ -432,7 +451,7 @@ export async function startTUI(agent, opts = {}) {
     // 工具实时输出（暗色，只保留末尾防刷屏；按工具名隔离防止并行工具串扰）
     const allStreams = Object.values(state.toolStreams).join("")
     if (allStreams) {
-      const tail = allStreams.slice(-4000)
+      const tail = sanitizeDisplay(allStreams.slice(-4000))
       for (const wrapped of wrapText(tail, cols - 1)) {
         convLines.push({ text: wrapped, color: C.dim })
       }
@@ -595,7 +614,7 @@ export async function startTUI(agent, opts = {}) {
     if (state.processing || state.permission || state.question || state.picker || state.wizard?.step === "provider") {
       process.stdout.write(ansi.hideCursor)
     } else {
-      const cursorRow = 1 + convH + taskPanelH + 2 + (layout.cursorLine - inputOffset) // header + 对话区 + todo 面板 + 上边框 + 行偏移
+      const cursorRow = 1 + convH + pickerH + taskPanelH + 2 + (layout.cursorLine - inputOffset) // header + 对话区 + todo 面板 + 上边框 + 行偏移
       const cursorCol = 3 + layout.cursorCol // 左边框 + 空格 + 文本偏移（1 基）
       process.stdout.write(`${ESC}[${cursorRow};${cursorCol}H${ansi.showCursor}`)
     }
@@ -696,6 +715,14 @@ export async function startTUI(agent, opts = {}) {
         pushLine(`  [task] ${done}/${items.length}${current ? ` ▶ ${current.title}` : ""}`, C.dim)
         render()
       },
+      // 增量保存：每 5 个工具 turn 落一次盘，中途崩溃丢失窗口从一整轮缩到几轮
+      onTurnEnd: (() => {
+        let n = 0
+        return () => {
+          if (++n % 5 !== 0) return
+          try { saveSession(agent, state.lines) } catch {}
+        }
+      })(),
     }
 
     for (let resume = false; ; resume = true) {
@@ -747,7 +774,7 @@ export async function startTUI(agent, opts = {}) {
     }
     // 每轮结束后保存会话（崩溃也不丢）
     try {
-      saveSession(agent)
+      saveSession(agent, state.lines)
     } catch {
       // 存失败不打断使用
     }
@@ -782,15 +809,16 @@ export async function startTUI(agent, opts = {}) {
     })
   }
 
-  /** 权限请求的关键信息（按工具定制），返回行数组 */
+  /** 权限请求的关键信息（按工具定制），返回行数组。name 可能带子 agent 前缀（"coder/bash"），取基名匹配 */
   function formatPermission(name, args) {
     const cap = (s, n = 1000) => (s.length > n ? `${s.slice(0, n)}…(共 ${s.length} 字符)` : s)
-    if (name === "bash") return cap(args.command ?? "").split("\n")
-    if (name === "write") {
+    const base = name.includes("/") ? name.split("/").pop() : name
+    if (base === "bash") return cap(args.command ?? "").split("\n")
+    if (base === "write") {
       // 批准写文件必须看得到要写什么：路径 + 内容预览
       return [`${args.path}（写入 ${(args.content ?? "").length} 字符）`, ...cap(args.content ?? "", 1000).split("\n")]
     }
-    if (name === "edit") {
+    if (base === "edit") {
       // 简易 diff：- 旧内容 / + 新内容
       return [
         `${args.path}`,
@@ -799,9 +827,9 @@ export async function startTUI(agent, opts = {}) {
         ...cap(args.new_string ?? "", 500).split("\n").map((l) => `+ ${l}`),
       ]
     }
-    if (name === "delete") return [`${args.path}${args.force ? "（force：跟踪文件也删）" : ""}`]
-    if (name === "subagent") return cap(args.task ?? "", 500).split("\n")
-    if (name === "memory_put") return [`[${args.type ?? ""}] ${args.title ?? ""}`, ...cap(args.content ?? "", 500).split("\n")]
+    if (base === "delete") return [`${args.path}${args.force ? "（force：跟踪文件也删）" : ""}`]
+    if (base === "subagent") return cap(args.task ?? "", 500).split("\n")
+    if (base === "memory_put") return [`[${args.type ?? ""}] ${args.title ?? ""}`, ...cap(args.content ?? "", 500).split("\n")]
     return [cap(summarize(args), 300)]
   }
 
@@ -844,7 +872,8 @@ export async function startTUI(agent, opts = {}) {
     { name: "/provider", group: "Config", desc: "管理 provider（增/删/配 key）" },
     { name: "/config", group: "Config", desc: "配置管理（embedding / agent）" },
     { name: "/reindex", group: "Config", desc: "重建记忆索引" },
-    { name: "/new", group: "Session", desc: "开始新会话" },
+    { name: "/new", group: "Session", desc: "新会话（旧会话归档到槽位）" },
+    { name: "/session", group: "Session", desc: "列出/切换归档会话" },
     { name: "/clear", group: "Session", desc: "清屏" },
     { name: "/distill", group: "Session", desc: "从会话提取知识" },
     { name: "/rewind", group: "Session", desc: "回滚到存档点" },
@@ -870,16 +899,48 @@ export async function startTUI(agent, opts = {}) {
         state.lines = []
         state.streaming = ""
         clearSession(agent.cwd)
-        pushLine("已开始新会话（上一会话已归档）", C.dim)
+        pushLine("已开始新会话（旧会话已归档到槽位；/session 可查看）", C.dim)
         return
       case "/exit":
         cleanup()
         setTimeout(() => process.exit(0), 100) // 延迟一拍：fetch 后立刻 exit 在 Windows/Node 24 会触发 libuv 断言
         return
+      case "/session": {
+        const slotNum = Number(rest[0])
+        if (rest.length > 0 && !isNaN(slotNum)) {
+          // 切换到指定槽位
+          const data = switchToSlot(agent.cwd, slotNum)
+          if (!data) {
+            pushLine(`槽位 ${slotNum} 不存在`, C.dim)
+          } else {
+            applySession(agent, data)
+            state.lines = data.display.length
+              ? data.display.map((l) => ({ text: l.text, color: l.color }))
+              : []
+            state.tasks = agent.tasks ?? []
+            pushLabel(`── 已切换到槽位 ${slotNum}（${data.history.length} 条消息）──`, C.warn)
+            render()
+          }
+        } else {
+          // 列出所有槽位
+          const slots = listSlots(agent.cwd)
+          if (slots.length === 0) {
+            pushLine("没有归档会话（用 /new 后旧会话会自动归档）", C.dim)
+          } else {
+            pushLabel(`归档会话（/session <n> 切换）:`, ansi.bold + C.tool)
+            for (const s of slots) {
+              pushLine(`  槽位 ${s.slot} — ${s.date}`, C.text)
+            }
+          }
+        }
+        return
+      }
       case "/reindex": {
-        const { syncDir } = await import("./memory.mjs")
+        const { syncDir, codeSync, docSync } = await import("./memory.mjs")
         pushLine("[reindex] 重建索引...", C.tool)
         agent.memory.db.prepare("DELETE FROM files").run()
+        agent.memory.db.prepare("DELETE FROM code_chunks").run()
+        agent.memory.db.prepare("DELETE FROM doc_chunks").run()
         let total = 0
         if (distillOpts.projectDir) {
           const s = await syncDir(agent.memory, { layer: "project", dir: distillOpts.projectDir })
@@ -891,7 +952,27 @@ export async function startTUI(agent, opts = {}) {
           total += s.added
           pushLine(`  team: +${s.added} ~${s.updated} -${s.removed}`, C.dim)
         }
-        pushLine(`[reindex] 完成，共 ${total} 条。向量将在下次搜索时惰性生成。`, C.tool)
+        // 重建代码索引
+        pushLine(`  [code] 重建代码索引...`, C.tool)
+        const cr = await codeSync(agent.memory, agent.cwd, {
+          onProgress: (p) => {
+            if (p.phase === "index" && p.current % 20 === 0) {
+              pushLine(`    索引中... ${p.current}/${p.total}`, C.dim)
+            }
+          }
+        })
+        pushLine(`  code: ${cr.total} 文件，+${cr.updated} ~${cr.skipped} -${cr.removed}`, C.dim)
+        // 重建文档索引
+        pushLine(`  [doc] 重建文档索引...`, C.tool)
+        const dr = await docSync(agent.memory, agent.cwd, {
+          onProgress: (p) => {
+            if (p.phase === "index" && p.current % 5 === 0) {
+              pushLine(`    索引中... ${p.current}/${p.total}`, C.dim)
+            }
+          }
+        })
+        pushLine(`  doc: ${dr.total} 文件，+${dr.updated} ~${dr.skipped} -${dr.removed}`, C.dim)
+        pushLine(`[reindex] 完成，共 ${total} 条目。向量将在下次搜索时惰性生成。`, C.tool)
         return
       }
       case "/distill":
@@ -947,14 +1028,15 @@ export async function startTUI(agent, opts = {}) {
         const sub = rest[0]
         if (sub === "set") {
           const text = rest.slice(1).join(" ")
-          if (!text) { pushLine("用法: /goal set <目标描述>（; 分隔完成条件）", C.error); return }
+          if (!text) { pushLine("用法: /goal set <目标描述>（; 分隔完成条件，必须是可机器检查的验证手段）", C.error); return }
           const semi = text.indexOf("；") >= 0 ? "；" : text.indexOf(";") >= 0 ? ";" : null
           const objective = semi ? text.slice(0, semi).trim() : text.trim()
           const criteria = semi ? text.slice(semi + 1).trim() : ""
-          agent.goal = { objective, criteria, setAt: Date.now() }
+          agent.goal = { objective, criteria, setAt: Date.now(), status: "active", turnsUsed: 0, _blockTally: null }
           pushLabel(`❯ Goal`, ansi.bold + C.warn)
           pushLine(`目标已设置: ${objective}`, C.tool)
           if (criteria) pushLine(`  完成条件: ${criteria}`, C.dim)
+          else pushLine(`  ⚠ 未完成条件——agent 用 goal set 设立时会被要求补上可验证的完成条件`, C.warn)
           return
         }
         if (sub === "cancel") {
@@ -964,10 +1046,11 @@ export async function startTUI(agent, opts = {}) {
           return
         }
         if (agent.goal) {
+          const statusText = { active: "进行中", complete: "已完成", blocked: "已阻塞" }[agent.goal.status] ?? agent.goal.status
           pushLabel(`❯ Goal`, ansi.bold + C.warn)
           pushLine(`目标: ${agent.goal.objective}`, C.tool)
           if (agent.goal.criteria) pushLine(`  完成条件: ${agent.goal.criteria}`, C.dim)
-          pushLine(`  设置于: ${new Date(agent.goal.setAt).toLocaleString()}`, C.dim)
+          pushLine(`  状态: ${statusText ?? "进行中"} │ 已用轮数: ${agent.goal.turnsUsed ?? 0} │ 设置于: ${new Date(agent.goal.setAt).toLocaleString()}`, C.dim)
           pushLine("操作: /goal set <描述> 覆盖 | /goal cancel 取消", C.dim)
         } else {
           pushLabel(`❯ Goal`, ansi.bold + C.dim)
@@ -2011,9 +2094,14 @@ export async function startTUI(agent, opts = {}) {
   }
   pushLine(`Tools: ${agent.tools.map((t) => t.name).join(", ")}`, C.dim)
   // 恢复上次会话：重建对话区显示（tool 结果行省略，保持清爽）
-  if (opts.restored?.history?.length) {
+  if (opts.restored?.display?.length) {
+    // 用户视角的恢复：display 是退出前对话区的原样快照，所见即所得
+    state.lines = [...opts.restored.display.map((l) => ({ text: l.text, color: l.color })), ...state.lines]
+    pushLabel(`── 已恢复上次会话（退出前原样回放）；/new 开始新会话 ──`, C.warn)
+  } else if (opts.restored?.history?.length) {
     for (const m of opts.restored.history) {
       if (m.role === "user") {
+        if (typeof m.content === "string" && m.content.startsWith("[System reminder:")) continue
         pushLabel(`❯ You:`, ansi.bold + C.user)
         if (typeof m.content === "string" && m.content) pushLine(m.content, C.text)
       } else if (m.role === "assistant") {
@@ -2027,7 +2115,48 @@ export async function startTUI(agent, opts = {}) {
     }
     pushLabel(`── 已恢复上次会话（${opts.restored.history.length} 条消息）；/new 开始新会话 ──`, C.warn)
   }
+  // 有归档槽位时给个提示
+  if (listSlots(agent.cwd).length > 0) {
+    pushLine("提示：存在归档会话，/session 可查看/切换", C.dim)
+  }
   render()
+
+  // 后台索引（进界面后再跑，不阻塞启动）；进度走底部状态栏，不往对话区塞行
+  ;(async () => {
+    const { codeSync, docSync } = await import("./memory.mjs")
+    const cwd = agent.cwd
+    let codeFiles = 0, docFiles = 0
+    try {
+      state.status = "Indexing code..."
+      render()
+      await codeSync(agent.memory, cwd, {
+        onProgress: (p) => {
+          if (p.phase === "index" && p.current % 30 === 0) {
+            state.status = `Indexing code... ${p.current}/${p.total}`
+            render()
+          }
+        }
+      })
+      codeFiles = agent.memory.db.prepare(`SELECT COUNT(DISTINCT path) AS n FROM code_chunks`).get()?.n ?? 0
+    } catch { /* 不阻塞 */ }
+    try {
+      state.status = "Indexing docs..."
+      render()
+      await docSync(agent.memory, cwd, {
+        onProgress: (p) => {
+          if (p.phase === "index" && p.current % 10 === 0) {
+            state.status = `Indexing docs... ${p.current}/${p.total}`
+            render()
+          }
+        }
+      })
+      docFiles = agent.memory.db.prepare(`SELECT COUNT(DISTINCT path) AS n FROM doc_chunks`).get()?.n ?? 0
+    } catch { /* 不阻塞 */ }
+    state.status = codeFiles || docFiles
+      ? `Ready — idx code ${codeFiles} doc ${docFiles}`
+      : "Ready"
+    render()
+  })()
 }
 
 function summarize(obj) {