zen-gitsync 2.17.5 → 2.17.7

package/src/cli/ai/termui.js

@@ -16,10 +16,10 @@
 //
 //   - 盒式输入框(Codex composer 风格):╭───╮ + ❯ 提示符 + ╰───╯
 //   - 等待 spinner(ora):首个 token 到达前持续转动
-//   - 思考过程:✻ 思考 头 + 橙黄斜体流式输出
+//   - 思考过程:琥珀色标题 + 灰色流式预览，可切换完整显示
 //   - 工具调用块(Claude Code 风格):⚙ 工具头 + 智能参数摘要,
 //     结果用 │ 缩进槽,按退出码/错误前缀着色
-//   - 正文:➤ 子弹头 + 逐行缓冲的轻量 markdown 渲染
+//   - 正文:独立回答标题 + 自适应行宽的轻量 markdown 渲染
 //     (**bold**、`code`、# 标题、``` 代码块、- 列表)
 //
 // 设计约束:
@@ -29,6 +29,8 @@
 
 import chalk from 'chalk'
 import ora from 'ora'
+import stringWidth from 'string-width'
+import { stripVTControlCharacters } from 'node:util'
 import { boxenAdaptive } from '../ui.js'
 
 // ──────────────────────────────────────────────
@@ -54,7 +56,32 @@ export function termWidth(fallback = 100) {
 
 /** 去掉 ANSI 转义(测试断言用) */
 export function stripAnsi(s) {
-  return String(s).replace(/\x1b\[[0-9;]*m/g, '')
+  return stripVTControlCharacters(String(s))
+}
+
+/** Wrap terminal cells, preserving colour and CJK/emoji widths. */
+export function wrapTerminalText(text, width = 100) {
+  const rows = []
+  let row = '', cells = 0, lastBreak = -1, breakCells = 0
+  const segmenter = new Intl.Segmenter(undefined, { granularity: 'grapheme' })
+  for (const part of String(text).split(/(\x1b\[[0-9;]*m)/g)) {
+    if (/^\x1b\[/.test(part)) { row += part; continue }
+    for (const { segment } of segmenter.segment(part.replace(/\t/g, '  '))) {
+      if (segment === '\n') { rows.push(row); row = ''; cells = 0; lastBreak = -1; continue }
+      const size = stringWidth(segment)
+      if (cells && cells + size > Math.max(1, width)) {
+        if (lastBreak > 0 && breakCells >= width / 3) {
+          rows.push(row.slice(0, lastBreak)); row = row.slice(lastBreak); cells -= breakCells
+        } else { rows.push(row); row = ''; cells = 0 }
+        lastBreak = -1
+      }
+      row += segment
+      cells += size
+      if (/^[ \t]$/.test(segment)) { lastBreak = row.length; breakCells = cells }
+    }
+  }
+  rows.push(row)
+  return rows
 }
 
 /**
@@ -117,6 +144,8 @@ export const SLASH_COMMANDS = [
   { cmd: '/cd',       descZh: '切换工作目录',         descEn: 'Change working directory' },
   { cmd: '/image',    descZh: '附加 / 查看图片',      descEn: 'Attach / list images' },
   { cmd: '/think',    descZh: '开关思考过程显示',      descEn: 'Toggle thinking display' },
+  { cmd: '/tools',    descZh: '切换工具结果：精简 / 完整', descEn: 'Toggle compact / full tool output' },
+  { cmd: '/stats',    descZh: '查看耗时与 Token 用量', descEn: 'Show timing and token usage' },
   { cmd: '/new',      descZh: '开启新对话',            descEn: 'Start a new chat' },
   { cmd: '/resume',   descZh: '恢复之前的对话',         descEn: 'Resume a previous chat' },
   { cmd: '/clear',    descZh: '清空对话历史',         descEn: 'Clear conversation' },
@@ -341,6 +370,7 @@ export function drawInputBottom(write = (s) => process.stdout.write(s)) {
 // 非 TTY 时 ora 自动退化为只打印一次文本。
 
 export function startSpinner(text) {
+  const started = performance.now()
   const spinner = ora({
     // 琥珀色加粗,与思考内容同色系,dim 太浅看不清
     text: chalk.hex('#e8a33d').bold(text),
@@ -355,9 +385,14 @@ export function startSpinner(text) {
     discardStdin: false,
   })
   spinner.start()
+  const timer = spinner.isSpinning ? setInterval(() => {
+    spinner.text = chalk.hex('#e8a33d')(text) + chalk.gray(` · ${formatDuration(performance.now() - started)}`)
+  }, 100) : null
+  timer?.unref()
   return {
     stop() {
-      if (spinner.isSpinning) spinner.stop()
+      clearInterval(timer)
+      spinner.stop()
     },
   }
 }
@@ -392,7 +427,11 @@ function renderInline(line, resetFg = '') {
  */
 export function createAssistantWriter({
   showThinking = true,
-  thinkingHeader = '✻ 思考',
+  thinkingHeader = '思考',
+  answerHeader = '回答',
+  thinkingLimit = Infinity,
+  thinkingHint = '… 思考预览已收起，/think full 显示完整过程',
+  width = Math.min(100, termWidth() - 4),
   write = (s) => process.stdout.write(s),
 } = {}) {
   let mode = null          // null | 'thinking' | 'content'
@@ -401,18 +440,36 @@ export function createAssistantWriter({
   let contentLines = 0     // 已输出正文行数(首行带 ➤ 子弹头)
   let lastBlank = false    // 上一行是空白行(连续空行合并,避免模型输出头部/分隔空行刷屏)
   let thinkAtLineStart = true  // 思考流当前是否在行首(用于逐行缩进 + 计算与正文的分隔)
-  // ➤ 后留 2 个空格,后续行 3 空格对齐 — 图标与文字之间别太挤
-  // 正文 🤖(亮绿):模型最终回复的视觉锚点;用亮绿 + 加粗图标,普通绿在深背景上偏暗
-  const BULLET_FIRST = chalk.bold(chalk.hex('#5eff8b')('🤖')) + '  '
-  const BULLET_REST = '   '
+  let thinkingCells = 0, thinkingRows = 0, thinkingClipped = false
+  let answerShown = false
+  // 回答正文统一缩进；标题作为独立的视觉锚点。
+  const BULLET_FIRST = '  '
+  const BULLET_REST = '  '
   // whiteBright ANSI 码:行内 code 的 \x1b[39m 会清掉外层色,用此恢复正文亮白色
-  const WB = '\x1b[97m'
+  const WB = chalk.level ? '\x1b[97m' : ''
   // 思考内容整体右移,与正文文字左缘对齐,视觉上成为独立子块
-  const THINK_INDENT = '   '
-  // 思考用橙黄色斜体(gray/dim 太浅看不清;橙黄既醒目又与正文白、工具青区分开)
-  const thinkStyle = (s) => chalk.hex('#e8a33d').italic(s)
-  // 思考图标:🧠 大脑 — 紧贴最左(0 缩进),与工具头、正文对齐到同一左缘
-  const THINK_ICON = '🧠'
+  const THINK_INDENT = chalk.gray('  │ ')
+  // 思考正文降低视觉权重，仅标题用琥珀色。
+  const thinkStyle = (s) => chalk.hex('#aab2c0')(s)
+  // 使用单色符号，避免 emoji 在不同终端中的宽度差异。
+  const THINK_ICON = chalk.hex('#e8a33d')('◇')
+  const clipThinking = () => {
+    if (!thinkAtLineStart) write('\n')
+    write(wrapTerminalText(thinkingHint, Math.max(8, width - 2)).map(row => THINK_INDENT + chalk.gray(row)).join('\n') + '\n')
+    thinkingClipped = true
+    thinkAtLineStart = true
+  }
+
+  const showAnswerHeader = () => {
+    if (answerShown) return
+    answerShown = true
+    write(chalk.greenBright.bold(`◆ ${answerHeader}`) + '\n\n')
+  }
+  const writeContentRows = (prefix, body, withNewline) => {
+    showAnswerHeader()
+    const rows = wrapTerminalText(body, Math.max(8, width))
+    write(rows.map(row => prefix + row).join('\n') + (withNewline ? '\n' : ''))
+  }
 
   const emitContentLine = (raw, withNewline = true) => {
     // 围栏标记行:切换状态,用一个淡淡的槽线代替裸 ```
@@ -421,7 +478,8 @@ export function createAssistantWriter({
       const bullet = contentLines === 0 ? BULLET_FIRST : BULLET_REST
       contentLines++
       lastBlank = false
-      write(bullet + chalk.dim(inFence ? '┄ code ' + '┄'.repeat(8) : '┄'.repeat(14)) + (withNewline ? '\n' : ''))
+      const language = raw.trim().slice(3).trim() || 'code'
+      writeContentRows(bullet, chalk.gray(inFence ? '┌─ ' + language : '└' + '─'.repeat(12)), withNewline)
       return
     }
     // 围栏内:代码行原样带槽线(空行也保留,代码格式不能动)
@@ -429,7 +487,8 @@ export function createAssistantWriter({
       const bullet = contentLines === 0 ? BULLET_FIRST : BULLET_REST
       contentLines++
       lastBlank = false
-      write(bullet + chalk.dim('│ ') + raw + (withNewline ? '\n' : ''))
+      showAnswerHeader()
+      write(wrapTerminalText(raw, Math.max(8, width - 2)).map(row => bullet + chalk.gray('│ ') + row).join('\n') + (withNewline ? '\n' : ''))
       return
     }
     // 空白行:首个正文行之前不输出;连续空行合并为一行
@@ -447,7 +506,7 @@ export function createAssistantWriter({
     const body = h
       ? chalk.bold.whiteBright(renderInline(h[2], WB))
       : chalk.whiteBright(renderInline(raw, WB))
-    write(bullet + body + (withNewline ? '\n' : ''))
+    writeContentRows(bullet, body, withNewline)
   }
 
   const flushLineBuf = (withNewline = true) => {
@@ -459,30 +518,34 @@ export function createAssistantWriter({
   return {
     /** 思考段:橙黄斜体 + 整体右缩进(不做 markdown),段头只打印一次 */
     writeThinking(text) {
-      if (!showThinking || !text) return
+      if (!showThinking || !text || thinkingClipped) return
       if (mode !== 'thinking') {
         flushLineBuf()
         mode = 'thinking'
         // 图标 🧠 靠最左(0 缩进),与 ⚙ 工具头、➤ 正文对齐同一左缘
         // 段头前空一行与上文(spinner / 上一轮输出)分隔,视觉更清晰
-        write('\n' + THINK_ICON + '  ' + thinkStyle(chalk.bold(thinkingHeader)) + '\n')
+        write('\n' + THINK_ICON + ' ' + chalk.hex('#e8a33d').bold(thinkingHeader) + '\n')
         thinkAtLineStart = true
       }
       // 按换行切段,整段着色(避免逐字符 escape 刷屏);每逢行首补一层缩进,
       // 使多行思考整体右移成独立子块。流式 token 可能不以换行结尾,
       // 故用 thinkAtLineStart 记住跨调用的行首状态。
-      const parts = text.split('\n')
-      for (let i = 0; i < parts.length; i++) {
-        const seg = parts[i]
-        if (seg) {
-          if (thinkAtLineStart) write(THINK_INDENT)
-          write(thinkStyle(seg))
-          thinkAtLineStart = false
+      for (const char of text) {
+        if (thinkingRows >= thinkingLimit) {
+          clipThinking()
+          break
         }
-        if (i < parts.length - 1) {   // 段间的换行(最后一段后不补)
-          write('\n')
-          thinkAtLineStart = true
+        if (char === '\n' || thinkingCells + stringWidth(char) > Math.max(8, width - 2)) {
+          write('\n'); thinkingRows++; thinkingCells = 0; thinkAtLineStart = true
+          if (char === '\n') continue
+          if (thinkingRows >= thinkingLimit) {
+            clipThinking(); break
+          }
         }
+        if (thinkAtLineStart) write(THINK_INDENT)
+        write(thinkStyle(char))
+        thinkingCells += stringWidth(char)
+        thinkAtLineStart = false
       }
     },
 
@@ -535,6 +598,43 @@ export function formatDuration(ms) {
   return `${m}m${rem}s`
 }
 
+export function renderTurnSummary(stats, { locale = 'zh-CN', session, width = Math.min(100, termWidth() - 4) } = {}) {
+  const zh = !String(locale).startsWith('en')
+  const number = n => n == null ? '—' : Math.round(n).toLocaleString('en-US')
+  const usageLine = (usage, reported, requests) => {
+    if (!usage) return zh ? 'Token：服务端未返回用量' : 'Tokens: not reported by provider'
+    const parts = [
+      `Token ${number(usage.totalTokens)}`,
+      `${zh ? '输入' : 'in'} ${number(usage.inputTokens)}`,
+      `${zh ? '输出' : 'out'} ${number(usage.outputTokens)}`,
+    ]
+    if (usage.cachedTokens != null) parts.push(`${zh ? '输入含缓存' : 'cached input'} ${number(usage.cachedTokens)}`)
+    if (usage.reasoningTokens != null) parts.push(`${zh ? '输出含推理' : 'reasoning output'} ${number(usage.reasoningTokens)}`)
+    if (reported < requests) parts.push(zh ? `部分用量（${reported}/${requests} 次请求）` : `partial usage (${reported}/${requests} requests)`)
+    return parts.join(' · ')
+  }
+  const status = zh
+    ? ({ completed: '完成', cancelled: '已停止', failed: '失败', limit: '达到调用上限' }[stats.status] || '进行中')
+    : ({ completed: 'Done', cancelled: 'Stopped', failed: 'Failed', limit: 'Tool limit reached' }[stats.status] || 'Running')
+  const time = stats.completedAt ? new Date(stats.completedAt).toLocaleTimeString(zh ? 'zh-CN' : 'en-GB', { hour12: false }) : ''
+  const timing = [status + (time ? ` ${time}` : ''), `${zh ? '总耗时' : 'total'} ${formatDuration(stats.totalMs)}`]
+  if (stats.firstTokenMs != null) timing.push(`${zh ? '首响应' : 'first token'} ${formatDuration(stats.firstTokenMs)}`)
+  if (stats.firstAnswerMs != null) timing.push(`${zh ? '正文等待' : 'first answer'} ${formatDuration(stats.firstAnswerMs)}`)
+  const lines = [
+    timing.join(' · '),
+    `${zh ? '模型' : 'model'} ${formatDuration(stats.llmMs)} · ${zh ? '工具' : 'tools'} ${formatDuration(stats.toolsMs)} (${stats.toolCalls}) · ${zh ? '请求' : 'requests'} ${stats.requests}`,
+    usageLine(stats.usage, stats.usageRequests, stats.requests),
+  ]
+  if (session) lines.push(`${zh ? '会话累计' : 'Session'} (${session.turns}) · ${usageLine(session.usage, session.usageRequests, session.requests)}`)
+  const rows = lines.flatMap(line => wrapTerminalText(line, Math.max(12, width)))
+  return '\n' + chalk.gray('  ' + '─'.repeat(Math.max(12, Math.min(56, width)))) + '\n'
+    + rows.map(row => '  ' + chalk.hex('#aab2c0')(row)).join('\n') + '\n'
+}
+
+export function printTurnSummary(stats, options, write = s => process.stdout.write(s)) {
+  write(renderTurnSummary(stats, options))
+}
+
 // ──────────────────────────────────────────────
 // 工具调用块(Claude Code 风格)
 // ──────────────────────────────────────────────
@@ -568,13 +668,14 @@ export function summarizeToolArgs(name, args, { chars = '字符' } = {}) {
 }
 
 /** 工具头:▶  name  参数摘要(青色三角表示"工具执行";name 加粗白色,摘要灰色,避免整块青色) */
-export function printToolHeader(name, summary, write = (s) => process.stdout.write(s)) {
+export function printToolHeader(name, summary, write = (s) => process.stdout.write(s), { locale = 'zh-CN' } = {}) {
   // ▶ 保留青色作为工具执行的标识色;name 用白色加粗与下方结果区分;
   // summary 用浅灰(#a0aec0)— dim 在黑底下太暗看不清,浅灰可读且仍比 name 低调
-  write('\n' + chalk.cyan('▶') + '  '
-    + chalk.bold.white(name)
-    + (summary ? '  ' + chalk.hex('#a0aec0')(summary) : '')
-    + '\n')
+  const labels = { run_command: '执行命令', read_file: '读取文件', write_file: '写入文件', edit_file: '修改文件', list_files: '浏览目录', search_text: '搜索内容' }
+  const rows = wrapTerminalText(summary || '', Math.max(16, Math.min(100, termWidth() - 6)))
+  const label = String(locale).startsWith('en') ? name : labels[name] || name
+  write('\n' + chalk.cyan('▸ ') + chalk.bold.white(label) + (label !== name ? chalk.gray(`  ${name}`) : '') + '\n')
+  if (summary) write(rows.map(row => '  ' + chalk.hex('#aab2c0')(row)).join('\n') + '\n')
 }
 
 /**
@@ -590,22 +691,31 @@ export function printToolHeader(name, summary, write = (s) => process.stdout.wri
  * @param {(s: string) => void} [write] - 输出函数,默认写 stdout
  * @param {number} [durationMs] - 执行耗时(毫秒),有值时在结果末尾追加 ⏱ 计时行
  */
-export function printToolResult(result, write = (s) => process.stdout.write(s), durationMs) {
-  const text = truncateDisplay(result)
+export function printToolResult(result, write = (s) => process.stdout.write(s), durationMs, { full = false, locale = 'zh-CN', width = Math.min(100, termWidth() - 6) } = {}) {
+  const text = stripAnsi(result)
   // 先把 "$ <command>\n" 这一行回显从展示里剥掉(退出码仍在第二行里识别)
-  const visible = text.replace(/^\$[^\n]*\n/, '')
+  const visible = text.replace(/^\$[^\n]*\n/, '').replace(/^\(exit \d+\)\n?/, '')
   const exitMatch = text.match(/^\$[^\n]*\n\(exit (\d+)\)/)
   const exitCode = exitMatch ? Number(exitMatch[1]) : null
+  const isCancelled = /命令已由用户停止|Cancelled by user/.test(text)
   const isError = exitCode !== null && exitCode !== 0
     || /^(错误|已拒绝|Error)/.test(text.trim())
   // 正文用柔和灰蓝(#94a3b8)— 不再用青色,避免与工具头同色连成一片;
   // 错误用琥珀色(#f0a020)比黄色更醒目
   const colorize = isError ? chalk.hex('#f0a020') : chalk.hex('#94a3b8')
-  const lines = visible.split('\n')
-  const rendered = lines.map((l) => chalk.dim('  │  ') + colorize(l)).join('\n')
+  const zh = !String(locale).startsWith('en')
+  let lines = wrapTerminalText(visible.trimEnd(), Math.max(8, width))
+  const maxRows = isError ? 10 : 6
+  if (!full && lines.length > maxRows) {
+    const omitted = lines.length - maxRows + 1
+    const hint = width < 35 ? `… +${omitted}` : zh ? `… 回显省略 ${omitted} 行 · /tools full` : `… +${omitted} lines · /tools full`
+    lines = [...lines.slice(0, 3), hint, ...lines.slice(-(maxRows - 4))]
+  }
+  const rendered = lines.map((l) => chalk.gray('  │ ') + colorize(l)).join('\n')
   // 有耗时时在结果末尾追加 ⏱ 计时行(与结果块同缩进)
   const timingLine = (durationMs != null && Number.isFinite(durationMs))
-    ? '\n' + chalk.dim('  │  ⏱ ') + chalk.hex('#7a87a0')(formatDuration(durationMs))
+    ? '\n' + chalk.gray('  └ ') + colorize(isCancelled ? (zh ? '已停止' : 'Stopped') : isError ? (zh ? '失败' : 'Failed') : (zh ? '完成' : 'Done'))
+      + chalk.gray(` · ${formatDuration(durationMs)}${exitCode !== null ? ` · exit ${exitCode}` : ''}`)
     : ''
   write(rendered + timingLine + '\n')
 }
@@ -640,6 +750,9 @@ export default {
   summarizeToolArgs,
   printToolHeader,
   printToolResult,
+  printTurnSummary,
+  renderTurnSummary,
+  wrapTerminalText,
   printOk,
   printWarn,
   printError,

package/src/cli/ai/termui.test.js

@@ -21,7 +21,7 @@ import chalk from 'chalk'
 import {
   stripAnsi, truncateDisplay, summarizeToolArgs,
   createAssistantWriter, printToolHeader, printToolResult,
-  formatDuration,
+  formatDuration, wrapTerminalText, renderTurnSummary,
   filterSlashCommands, renderSlashHintBody, parseKeyForSlashHint, SLASH_COMMANDS,
   renderSelectableListBody, parseKeyForSelectableList,
 } from './termui.js'
@@ -110,15 +110,16 @@ test('writer: showThinking=false 时丢弃思考段', () => {
   assert.ok(text.includes('正文'))
 })
 
-test('writer: 正文首行 🤖 子弹头,后续行缩进对齐', () => {
+test('writer: 回答标题独立显示,正文各行缩进对齐', () => {
   const c = collect()
   const w = createAssistantWriter({ write: c.write })
   w.writeContent('第一行\n第二行\n第三行')
   w.finish()
   const lines = c.lines()
-  assert.ok(lines.some(l => l.startsWith('🤖  第一行')))
-  assert.ok(lines.some(l => l.startsWith('   第二行')))
-  assert.ok(lines.some(l => l.startsWith('   第三行')))
+  assert.equal(lines.filter(l => l === '◆ 回答').length, 1)
+  assert.ok(lines.includes('  第一行'))
+  assert.ok(lines.includes('  第二行'))
+  assert.ok(lines.includes('  第三行'))
 })
 
 test('writer: 行内 markdown — bold 标记被消费,code 反引号被消费', () => {
@@ -194,19 +195,19 @@ test('writer: 头部空白行被吞掉,连续空白行合并(真实 MiniMax 输
   const lines = c.lines()
   // null→content 自动在 🤖 上方加一空行,跳过空行找正文首行
   const firstContent = lines.find(l => l !== '')
-  assert.equal(firstContent, '🤖  答案', `首行应为 🤖  答案,实际: ${JSON.stringify(lines)}`)
+  assert.equal(firstContent, '◆ 回答')
   // "答案"与"下一段"之间最多一个空行,且空行不带缩进
-  const midBlank = lines.slice(1, lines.indexOf('   下一段')).filter(l => l === '').length
+  const midBlank = lines.slice(lines.indexOf('  答案') + 1, lines.indexOf('  下一段')).filter(l => l === '').length
   assert.ok(midBlank <= 1, `空行应被合并,实际行: ${JSON.stringify(lines)}`)
-  assert.ok(lines.includes('   下一段'))
+  assert.ok(lines.includes('  下一段'))
 })
 
 // ── 工具块 ──
-test('printToolHeader: ▶ + 名称(粗)+ 摘要(粗)', () => {
+test('printToolHeader: 工具标签与参数分行显示', () => {
   const c = collect()
   printToolHeader('run_command', '$ npm test', c.write)
   const text = c.text()
-  assert.ok(text.includes('▶  run_command'))
+  assert.ok(text.includes('▸ 执行命令  run_command'))
   assert.ok(text.includes('$ npm test'))
 })
 
@@ -214,7 +215,7 @@ test('printToolResult: 全部行统一 │ 槽线(无 └─ 拐角)', () => {
   const c = collect()
   printToolResult('$ ls\n(exit 0)\nfile1\nfile2', c.write)
   const lines = c.lines()
-  assert.ok(lines.every(l => l.startsWith('  │  ') || l === ''), `每行都应为 │ 槽线,实际: ${JSON.stringify(lines)}`)
+  assert.ok(lines.every(l => l.startsWith('  │ ') || l === ''), `每行都应为 │ 槽线,实际: ${JSON.stringify(lines)}`)
   assert.ok(!lines.some(l => l.includes('└─')), '不应出现 └─ 拐角字符')
 })
 
@@ -252,15 +253,15 @@ test('formatDuration: 无效输入返回空串', () => {
 })
 
 // ── printToolResult 带耗时 ──
-test('printToolResult: 传入 durationMs 时末尾追加 ⏱ 计时行', () => {
+test('printToolResult: 结果末尾显示状态与耗时', () => {
   const c = collect()
   printToolResult('hello world', c.write, 1500)
   // 去掉末尾空行(split('\n') 在末尾 \n 后产生空串)
   const lines = c.lines().filter(l => l !== '')
   const lastLine = lines[lines.length - 1]
-  assert.ok(lastLine.includes('⏱'), `应包含 ⏱,实际: ${lastLine}`)
+  assert.ok(lastLine.includes('完成'), `应包含状态,实际: ${lastLine}`)
   assert.ok(lastLine.includes('1.5s'), `应包含 1.5s,实际: ${lastLine}`)
-  assert.ok(lastLine.startsWith('  │  '), `计时行应与结果块同缩进,实际: ${lastLine}`)
+  assert.ok(lastLine.startsWith('  └ '), `计时行应与结果块同缩进,实际: ${lastLine}`)
 })
 
 test('printToolResult: 不传 durationMs 时无计时行(向后兼容)', () => {
@@ -272,6 +273,54 @@ test('printToolResult: 不传 durationMs 时无计时行(向后兼容)', () => {
 
 // ── 斜杠命令即时提示 ──
 
+test('compact tools bound physical rows while full output preserves every line', () => {
+  const output = Array.from({ length: 80 }, (_, i) => `row ${i}`).join('\n')
+  const compact = collect(), full = collect()
+  printToolResult(output, compact.write, 10)
+  printToolResult(output, full.write, 10, { full: true })
+  assert.ok(compact.lines().filter(Boolean).length <= 7)
+  assert.ok(compact.text().includes('row 0'))
+  assert.ok(compact.text().includes('row 79'))
+  assert.ok(full.text().includes('row 40'))
+  assert.doesNotMatch(full.text(), /省略/)
+})
+
+test('thinking previews stop after their row budget and still render the answer', () => {
+  const c = collect()
+  const w = createAssistantWriter({ write: c.write, thinkingLimit: 2, width: 30 })
+  w.writeThinking('first\nsecond\nthird\nfourth')
+  w.writeThinking('hidden more')
+  w.writeContent('answer')
+  w.finish()
+  assert.match(c.text(), /first\n/)
+  assert.doesNotMatch(c.text(), /third|fourth|hidden more/)
+  assert.match(c.text(), /answer/)
+})
+
+test('terminal wrapping respects wide glyphs and preserves text', () => {
+  const text = '中文🙂中文abcdef'
+  const rows = wrapTerminalText(chalk.cyan(text), 6)
+  assert.equal(stripAnsi(rows.join('')), text)
+  assert.ok(rows.length >= 3)
+})
+
+test('turn summaries distinguish missing and partial usage, and show cancellation', () => {
+  const stats = { status: 'cancelled', totalMs: 2000, llmMs: 1800, toolsMs: 100,
+    firstTokenMs: 200, firstAnswerMs: 500, requests: 2, toolCalls: 1, usageRequests: 0, usage: null }
+  let text = stripAnsi(renderTurnSummary(stats, { width: 200 }))
+  assert.match(text, /已停止/)
+  assert.match(text, /首响应 200ms/)
+  assert.match(text, /正文等待 500ms/)
+  assert.match(text, /服务端未返回/)
+  assert.doesNotMatch(text, /Token 0/)
+  stats.usage = { totalTokens: 120, inputTokens: 100, outputTokens: 20, cachedTokens: 80, reasoningTokens: 5 }
+  stats.usageRequests = 1
+  text = stripAnsi(renderTurnSummary(stats, { width: 200 }))
+  assert.match(text, /Token 120/)
+  assert.match(text, /部分用量（1\/2/)
+  assert.match(text, /输入含缓存 80/)
+})
+
 test('filterSlashCommands: 单个 / 返回全部命令', () => {
   const got = filterSlashCommands('/', 'zh').map(m => m.cmd)
   assert.deepEqual(got, SLASH_COMMANDS.map(c => c.cmd))

package/src/cli/ai/tools.js

@@ -24,7 +24,7 @@
 //   - 工具内部异常一律 catch 成字符串返回,不抛给 agent 循环 ——
 //     让模型看到错误信息自己修正,而不是中断整轮对话
 
-import { exec } from 'node:child_process'
+import { exec, execFile } from 'node:child_process'
 import { promises as fs } from 'node:fs'
 import path from 'node:path'
 import iconv from 'iconv-lite'
@@ -196,20 +196,39 @@ function decodeOutput(buf) {
 
 // 包装 exec 为 Promise,stdout/stderr 合并返回;出错(非零退出)也正常返回输出
 // encoding:'buffer' 拿原始字节,由 decodeOutput 决定真实编码
+export function terminateCommand(child) {
+  if (!child?.pid || child.exitCode !== null) return Promise.resolve()
+  if (process.platform === 'win32') {
+    return new Promise(resolve => execFile('taskkill', ['/PID', String(child.pid), '/T', '/F'], { windowsHide: true }, () => resolve()))
+  }
+  try { process.kill(-child.pid, 'SIGTERM') } catch { try { child.kill('SIGTERM') } catch {} }
+  return Promise.resolve()
+}
+
 function execCommand(command, options) {
   return new Promise((resolve) => {
-    const child = exec(command, { ...options, encoding: 'buffer' }, (err, stdout, stderr) => {
+    const { signal, timeout, onChild, ...execOptions } = options
+    let timedOut = false
+    const abort = () => { void terminateCommand(child) }
+    const child = exec(command, { ...execOptions, detached: process.platform !== 'win32', encoding: 'buffer' }, (err, stdout, stderr) => {
+      clearTimeout(timer)
+      signal?.removeEventListener('abort', abort)
       resolve({
         code: err ? (typeof err.code === 'number' ? err.code : 1) : 0,
-        killed: !!err?.killed,
+        killed: timedOut,
+        cancelled: !!signal?.aborted,
         stdout: decodeOutput(stdout),
         stderr: decodeOutput(stderr),
         errorMessage: err && !('code' in err) ? err.message : null,
       })
     })
+    const timer = setTimeout(() => { timedOut = true; void terminateCommand(child) }, timeout)
+    timer.unref()
+    signal?.addEventListener('abort', abort, { once: true })
+    if (signal?.aborted) abort()
     trackChild(child)
     // 把 child 暴露给 agent 循环,支持用户 Ctrl+C 时立即中止当前命令
-    if (typeof options.onChild === 'function') options.onChild(child)
+    if (typeof onChild === 'function') onChild(child)
   })
 }
 
@@ -253,9 +272,11 @@ async function toolRunCommand(args, ctx) {
     windowsHide: true,
     env: { ...process.env, FORCE_COLOR: '0' },
     onChild: ctx.onChild,
+    signal: ctx.signal,
   })
 
   const parts = []
+  if (result.cancelled) parts.push('[命令已由用户停止]')
   if (result.killed) parts.push(`[命令超时被终止(>${timeoutSec}s)]`)
   if (result.stdout) parts.push(result.stdout.trimEnd())
   if (result.stderr) parts.push(`[stderr]\n${result.stderr.trimEnd()}`)
@@ -333,7 +354,7 @@ async function toolEditFile(args, ctx) {
     return `错误: old_string 在 ${filePath} 中出现 ${count} 次,不唯一。请提供更多上下文让它唯一,或显式传 replace_all=true 全部替换。`
   }
 
-  const updated = args.replace_all ? raw.split(oldStr).join(newStr) : raw.replace(oldStr, newStr)
+  const updated = args.replace_all ? raw.split(oldStr).join(newStr) : raw.replace(oldStr, () => newStr)
   try {
     await fs.writeFile(filePath, updated, 'utf-8')
     return `已修改 ${filePath} (替换 ${args.replace_all ? count : 1} 处)`
@@ -478,6 +499,7 @@ const TOOL_HANDLERS = {
  * @param {{ cwd: string, onChild?: (child: object) => void }} ctx
  */
 export async function executeTool(name, args, ctx) {
+  if (ctx.signal?.aborted) return 'Cancelled by user; this tool was not executed.'
   const handler = TOOL_HANDLERS[name]
   if (!handler) return `错误: 未知工具 "${name}",可用工具: ${Object.keys(TOOL_HANDLERS).join(', ')}`
   try {

package/src/cli/ai/tools.test.js

@@ -35,6 +35,29 @@ after(async () => {
 
 // ========== schema 基本形态 ==========
 
+test('edit_file preserves literal replacement tokens', async () => {
+  await executeTool('write_file', { path: 'literal.txt', content: 'before' }, ctx)
+  const replacement = '$& $$ $` $\x27'
+  await executeTool('edit_file', { path: 'literal.txt', old_string: 'before', new_string: replacement }, ctx)
+  assert.equal(await fs.readFile(path.join(tmpDir, 'literal.txt'), 'utf8'), replacement)
+})
+
+test('run_command cancellation terminates a running command promptly', async () => {
+  const controller = new AbortController()
+  const started = performance.now()
+  const result = await executeTool('run_command', { command: 'node -e "setInterval(()=>{},1000)"' }, {
+    ...ctx, signal: controller.signal, onChild: () => setTimeout(() => controller.abort(), 80),
+  })
+  assert.match(result, /用户停止/)
+  assert.ok(performance.now() - started < 5000)
+})
+
+test('an already cancelled tool does not write files', async () => {
+  const result = await executeTool('write_file', { path: 'cancelled.txt', content: 'no' }, { ...ctx, signal: AbortSignal.abort() })
+  assert.match(result, /not executed/)
+  await assert.rejects(fs.stat(path.join(tmpDir, 'cancelled.txt')), { code: 'ENOENT' })
+})
+
 test('TOOL_DEFINITIONS 符合 OpenAI function calling 格式', () => {
   assert.ok(Array.isArray(TOOL_DEFINITIONS))
   assert.ok(TOOL_DEFINITIONS.length >= 5)