zen-gitsync 2.16.1 → 2.16.2

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

@@ -0,0 +1,253 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// src/cli/ai/platformGuard.js 单元测试
+// 覆盖纯函数(splitCommandSegments / extractCommandName / detectUnixOnlyCommands)
+// 和异步主接口(guardCommand,注入 mock exec 避免 PATH 依赖)。
+import { test, beforeEach } from 'node:test'
+import assert from 'node:assert/strict'
+import {
+  splitCommandSegments,
+  extractCommandName,
+  detectUnixOnlyCommands,
+  guardCommand,
+  checkCommandAvailability,
+  _clearAvailabilityCache,
+  UNIX_ONLY_COMMANDS,
+} from './platformGuard.js'
+
+// ── splitCommandSegments ──────────────────────
+
+test('splitCommandSegments: 按管道切分', () => {
+  assert.deepEqual(
+    splitCommandSegments('npm test | tail -60'),
+    ['npm test', 'tail -60'],
+  )
+})
+
+test('splitCommandSegments: 按 && 切分', () => {
+  assert.deepEqual(
+    splitCommandSegments('echo a && echo b'),
+    ['echo a', 'echo b'],
+  )
+})
+
+test('splitCommandSegments: 按 || 和 ; 切分', () => {
+  assert.deepEqual(
+    splitCommandSegments('echo a || echo b ; echo c'),
+    ['echo a', 'echo b', 'echo c'],
+  )
+})
+
+test('splitCommandSegments: 空串/纯空白返回空数组', () => {
+  assert.deepEqual(splitCommandSegments(''), [])
+  assert.deepEqual(splitCommandSegments('   '), [])
+})
+
+test('splitCommandSegments: 无操作符的命令返回单段', () => {
+  assert.deepEqual(splitCommandSegments('echo hello'), ['echo hello'])
+})
+
+// ── extractCommandName ────────────────────────
+
+test('extractCommandName: 提取第一个 token 并小写', () => {
+  assert.equal(extractCommandName('TAIL -60'), 'tail')
+  assert.equal(extractCommandName('node -e "code"'), 'node')
+})
+
+test('extractCommandName: 跳过 sudo/doas 前缀', () => {
+  assert.equal(extractCommandName('sudo tail -f log'), 'tail')
+  assert.equal(extractCommandName('doas grep pattern'), 'grep')
+})
+
+test('extractCommandName: 空串返回空', () => {
+  assert.equal(extractCommandName(''), '')
+})
+
+// ── detectUnixOnlyCommands ────────────────────
+
+test('detectUnixOnlyCommands: 检测管道中的 Unix 命令', () => {
+  // 复现用户踩坑场景:npm test | tail -60
+  assert.deepEqual(detectUnixOnlyCommands('npm test | tail -60'), ['tail'])
+})
+
+test('detectUnixOnlyCommands: 检测多个不同的 Unix 命令', () => {
+  assert.deepEqual(
+    detectUnixOnlyCommands('cat file.txt | grep foo | wc -l'),
+    ['cat', 'grep', 'wc'],
+  )
+})
+
+test('detectUnixOnlyCommands: 同一命令去重', () => {
+  assert.deepEqual(
+    detectUnixOnlyCommands('grep a && grep b'),
+    ['grep'],
+  )
+})
+
+test('detectUnixOnlyCommands: 没有 Unix 命令时返回空数组', () => {
+  assert.deepEqual(detectUnixOnlyCommands('npm test'), [])
+  assert.deepEqual(detectUnixOnlyCommands('node -e "console.log(1)"'), [])
+  assert.deepEqual(detectUnixOnlyCommands('git status'), [])
+})
+
+test('detectUnixOnlyCommands: 带路径前缀的命令也能检测', () => {
+  // /usr/bin/tail → tail
+  assert.deepEqual(detectUnixOnlyCommands('/usr/bin/tail -f log'), ['tail'])
+})
+
+test('detectUnixOnlyCommands: 空输入返回空数组', () => {
+  assert.deepEqual(detectUnixOnlyCommands(''), [])
+  assert.deepEqual(detectUnixOnlyCommands(null), [])
+  assert.deepEqual(detectUnixOnlyCommands(undefined), [])
+})
+
+test('detectUnixOnlyCommands: 不误判 Windows 自带命令', () => {
+  // sort/find/where 在 Windows 上存在(行为不同但不是 Unix-only)
+  assert.deepEqual(detectUnixOnlyCommands('sort file.txt'), [])
+  assert.deepEqual(detectUnixOnlyCommands('where node'), [])
+})
+
+// ── guardCommand:非 Windows 平台 ─────────────
+
+test('guardCommand: 非 Windows 平台直接放行', async () => {
+  const r = await guardCommand('tail -f log', { platform: 'linux' })
+  assert.equal(r.blocked, false)
+  assert.equal(r.reason, null)
+})
+
+test('guardCommand: macOS 也放行', async () => {
+  const r = await guardCommand('cat file | grep foo', { platform: 'darwin' })
+  assert.equal(r.blocked, false)
+})
+
+test('guardCommand: 空/非字符串命令放行', async () => {
+  assert.equal((await guardCommand('', { platform: 'win32' })).blocked, false)
+  assert.equal((await guardCommand(null, { platform: 'win32' })).blocked, false)
+})
+
+// ── guardCommand:Windows + mock exec ──────────
+//
+// 注入 mock execFn 模拟 `where` 的成功/失败,避免依赖真实 PATH。
+// 每个测试前清空缓存,确保 mock 不互相污染。
+
+// mock exec:commands 里列出的命令名返回"找到"(无 err),其余返回"找不到"(err)
+function createMockExec(notFoundCommands = []) {
+  const notFound = new Set(notFoundCommands)
+  return (cmd, _opts, cb) => {
+    // 提取 `where <cmd>` 中的 cmd 名
+    const m = cmd.match(/^where\s+(\S+)/)
+    const name = m?.[1] || ''
+    if (notFound.has(name)) {
+      cb(new Error('not found'), '')
+    } else {
+      cb(null, `C:\\fake\\${name}.exe`)
+    }
+  }
+}
+
+beforeEach(() => {
+  _clearAvailabilityCache()
+})
+
+test('guardCommand: Windows 上 tail 不存在 → 拦截并给出替代方案', async () => {
+  const r = await guardCommand('npm test | tail -60', {
+    platform: 'win32',
+    execFn: createMockExec(['tail']),
+  })
+  assert.equal(r.blocked, true)
+  assert.match(r.reason, /tail/)
+  assert.match(r.reason, /Select-Object/)
+  assert.match(r.reason, /npm test \| tail -60/)
+})
+
+test('guardCommand: Windows 上 tail 存在(如 Git Bash) → 放行', async () => {
+  const r = await guardCommand('npm test | tail -60', {
+    platform: 'win32',
+    execFn: createMockExec([]), // 所有命令都"找到"
+  })
+  assert.equal(r.blocked, false)
+})
+
+test('guardCommand: Windows 上无 Unix 命令 → 放行', async () => {
+  const r = await guardCommand('npm test', {
+    platform: 'win32',
+    execFn: createMockExec(),
+  })
+  assert.equal(r.blocked, false)
+})
+
+test('guardCommand: 多个 Unix 命令都不存在 → 全部列出', async () => {
+  const r = await guardCommand('cat file | grep foo | wc -l', {
+    platform: 'win32',
+    execFn: createMockExec(['cat', 'grep', 'wc']),
+  })
+  assert.equal(r.blocked, true)
+  assert.match(r.reason, /cat/)
+  assert.match(r.reason, /grep/)
+  assert.match(r.reason, /wc/)
+})
+
+test('guardCommand: 多个 Unix 命令,部分存在部分不存在 → 只拦截不存在的', async () => {
+  // grep 存在(Git Bash),cat/wc 不存在
+  const r = await guardCommand('cat file | grep foo | wc -l', {
+    platform: 'win32',
+    execFn: createMockExec(['cat', 'wc']),
+  })
+  assert.equal(r.blocked, true)
+  assert.match(r.reason, /cat/)
+  assert.doesNotMatch(r.reason, /• grep/)
+  assert.match(r.reason, /wc/)
+})
+
+test('guardCommand: 拦截原因包含原始命令', async () => {
+  const cmd = 'echo hello | tail -5'
+  const r = await guardCommand(cmd, {
+    platform: 'win32',
+    execFn: createMockExec(['tail']),
+  })
+  assert.match(r.reason, new RegExp(cmd.replace(/\|/g, '\\|')))
+})
+
+// ── checkCommandAvailability:缓存行为 ────────
+
+test('checkCommandAvailability: 缓存结果,第二次不调 exec', async () => {
+  let callCount = 0
+  const execFn = (cmd, _opts, cb) => {
+    callCount++
+    cb(new Error('not found'), '')
+  }
+  _clearAvailabilityCache()
+  const a1 = await checkCommandAvailability('tail', { execFn })
+  const a2 = await checkCommandAvailability('tail', { execFn })
+  assert.equal(a1, false)
+  assert.equal(a2, false)
+  assert.equal(callCount, 1, '第二次应命中缓存,不调 exec')
+})
+
+// ── 数据完整性 ────────────────────────────────
+
+test('UNIX_ONLY_COMMANDS: 每个条目都有非空的替代方案说明', () => {
+  for (const [name, hint] of Object.entries(UNIX_ONLY_COMMANDS)) {
+    assert.ok(typeof name === 'string' && name.length > 0)
+    assert.ok(typeof hint === 'string' && hint.length > 10, `${name} 的替代方案说明过短`)
+  }
+})
+
+test('UNIX_ONLY_COMMANDS: 不包含 Windows 自带命令(防误杀)', () => {
+  const windowsBuiltins = ['sort', 'find', 'where', 'dir', 'type', 'copy', 'move', 'del']
+  for (const w of windowsBuiltins) {
+    assert.ok(!UNIX_ONLY_COMMANDS[w], `${w} 是 Windows 自带命令,不应在 Unix-only 清单中`)
+  }
+})

package/src/cli/ai/termui.js

@@ -100,6 +100,54 @@ export function printBanner({ title, modelLabel, baseURL, cwd, modelText, cwdTex
   )
 }
 
+// ──────────────────────────────────────────────
+// 斜杠命令即时提示(输入 / 时在提示符下方浮现,随输入过滤)
+// ──────────────────────────────────────────────
+//
+// 命令元数据集中放这里,printSlashHelp(agent.js)与即时提示共用同一份来源,
+// 新增命令时只改这一处。desc 分中英,由调用方按 locale 取用。
+
+export const SLASH_COMMANDS = [
+  { cmd: '/help',     descZh: '显示帮助',            descEn: 'Show help' },
+  { cmd: '/model',    descZh: '列出 / 切换模型',      descEn: 'List / switch models' },
+  { cmd: '/addmodel', descZh: '添加模型配置(向导)',  descEn: 'Add a model (wizard)' },
+  { cmd: '/cd',       descZh: '切换工作目录',         descEn: 'Change working directory' },
+  { cmd: '/image',    descZh: '附加 / 查看图片',      descEn: 'Attach / list images' },
+  { cmd: '/think',    descZh: '开关思考过程显示',      descEn: 'Toggle thinking display' },
+  { cmd: '/clear',    descZh: '清空对话历史',         descEn: 'Clear conversation' },
+  { cmd: '/exit',     descZh: '退出',                descEn: 'Quit' },
+  { cmd: '/quit',     descZh: '退出',                descEn: 'Quit' },
+]
+
+/**
+ * 按当前输入过滤斜杠命令(纯函数,便于单测)。
+ *   - 仅当输入以 / 开头、且尚未输入空格(还在敲命令名)时才提示
+ *   - 前缀匹配,大小写不敏感
+ *   - 精确等于某命令且无后续参数时仍然展示该命令(便于确认拼写)
+ * @returns {{cmd:string, desc:string}[]}
+ */
+export function filterSlashCommands(input, locale) {
+  const zh = !String(locale || '').startsWith('en')
+  const line = String(input || '')
+  if (!line.startsWith('/') || /\s/.test(line)) return []
+  const q = line.toLowerCase()
+  return SLASH_COMMANDS
+    .filter((c) => c.cmd.startsWith(q))
+    .map((c) => ({ cmd: c.cmd, desc: zh ? c.descZh : c.descEn }))
+}
+
+/**
+ * 生成即时提示面板的 ANSI 字符串(不含定位,由调用方负责保存/恢复光标)。
+ * 每行:两空格缩进 + 青色命令名(左对齐补齐)+ 灰色说明。
+ * 空数组返回空串。
+ */
+export function renderSlashHintBody(matches) {
+  if (!Array.isArray(matches) || matches.length === 0) return ''
+  return matches
+    .map((m) => '  ' + chalk.cyan(String(m.cmd).padEnd(12)) + chalk.dim(m.desc))
+    .join('\n')
+}
+
 /** 盒式帮助面板 */
 export function printHelpPanel(title, lines) {
   const body = [chalk.bold(title), ...lines].join('\n')
@@ -209,9 +257,14 @@ export function createAssistantWriter({
   let inFence = false      // ``` 代码块状态
   let contentLines = 0     // 已输出正文行数(首行带 ⏺ 子弹头)
   let lastBlank = false    // 上一行是空白行(连续空行合并,避免模型输出头部/分隔空行刷屏)
+  let thinkAtLineStart = true  // 思考流当前是否在行首(用于逐行缩进 + 计算与正文的分隔)
   // ⏺ 后留 2 个空格,后续行 3 空格对齐 — 图标与文字之间别太挤
   const BULLET_FIRST = chalk.green('⏺') + '  '
   const BULLET_REST = '   '
+  // 思考内容整体右移,与正文文字左缘对齐,视觉上成为独立子块
+  const THINK_INDENT = '   '
+  // 思考用橙黄色斜体(gray/dim 太浅看不清;橙黄既醒目又与正文白、工具青区分开)
+  const thinkStyle = (s) => chalk.hex('#e8a33d').italic(s)
 
   const emitContentLine = (raw, withNewline = true) => {
     // 围栏标记行:切换状态,用一个淡淡的槽线代替裸 ```
@@ -253,22 +306,40 @@ export function createAssistantWriter({
   }
 
   return {
-    /** 思考段:灰斜体直写(不做 markdown),段头只打印一次 */
+    /** 思考段:橙黄斜体 + 整体右缩进(不做 markdown),段头只打印一次 */
     writeThinking(text) {
       if (!showThinking || !text) return
       if (mode !== 'thinking') {
         flushLineBuf()
         mode = 'thinking'
-        write('\n' + chalk.dim.italic(thinkingHeader) + '\n')
+        // 段头前空一行与上文分隔;头部本身也缩进,和内容左缘对齐
+        write('\n' + THINK_INDENT + thinkStyle(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
+        }
+        if (i < parts.length - 1) {   // 段间的换行(最后一段后不补)
+          write('\n')
+          thinkAtLineStart = true
+        }
       }
-      write(chalk.dim.italic(text))
     },
 
     /** 正文段:⏺ 子弹头 + 逐行 markdown 渲染 */
     writeContent(text) {
       if (!text) return
       if (mode !== 'content') {
-        if (mode === 'thinking') write('\n')
+        // 思考→正文:补足换行 + 空一行,让思考块与正文之间有呼吸间隔(不再紧挨)
+        if (mode === 'thinking') write((thinkAtLineStart ? '' : '\n') + '\n')
         mode = 'content'
       }
       lineBuf += text
@@ -329,7 +400,7 @@ export function printToolHeader(name, summary, write = (s) => process.stdout.wri
  * 工具结果块:
  *   └─ 首行
  *   │  后续行…
- * 退出码非 0 → 黄色;"错误/已拒绝"开头 → 红色;其余暗色。
+ * 退出码非 0 → 黄色;"错误/已拒绝"开头 → 红色;其余用青色(cyan,dim/gray 太浅看不清)。
  * (首行用 └─ 而不是 Claude 的 ⎿:box-drawing 字符在 Windows 终端字体里渲染更稳,
  *  且与输入框 ╭╰ 边框同一字符族,视觉更统一)
  */
@@ -339,7 +410,8 @@ export function printToolResult(result, write = (s) => process.stdout.write(s))
   const exitCode = exitMatch ? Number(exitMatch[1]) : null
   const isError = exitCode !== null && exitCode !== 0
     || /^(错误|已拒绝|Error)/.test(text.trim())
-  const colorize = isError ? chalk.yellow : chalk.dim
+  // 正文用 cyan(比 dim/gray 亮,能看清);错误保持黄色告警。槽线仍用 dim 当装饰导轨
+  const colorize = isError ? chalk.yellow : chalk.cyan
   const lines = text.split('\n')
   const rendered = lines.map((l, i) => {
     const gutter = i === 0 ? chalk.dim('  └─ ') : chalk.dim('  │  ')
@@ -363,6 +435,9 @@ export default {
   truncateDisplay,
   printBanner,
   printHelpPanel,
+  SLASH_COMMANDS,
+  filterSlashCommands,
+  renderSlashHintBody,
   drawInputTop,
   drawInputBottom,
   inputBottomBorder,

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

@@ -20,6 +20,7 @@ import assert from 'node:assert/strict'
 import {
   stripAnsi, truncateDisplay, summarizeToolArgs,
   createAssistantWriter, printToolHeader, printToolResult,
+  filterSlashCommands, renderSlashHintBody, SLASH_COMMANDS,
 } from './termui.js'
 
 // 收集 write 输出的辅助:返回 {text(), lines()}
@@ -213,3 +214,40 @@ test('printToolResult: 超长结果被截断并含省略标记', () => {
   printToolResult(long, c.write)
   assert.match(c.text(), /回显省略/)
 })
+
+// ── 斜杠命令即时提示 ──
+
+test('filterSlashCommands: 单个 / 返回全部命令', () => {
+  const got = filterSlashCommands('/', 'zh').map(m => m.cmd)
+  assert.deepEqual(got, SLASH_COMMANDS.map(c => c.cmd))
+})
+
+test('filterSlashCommands: 前缀过滤,大小写不敏感', () => {
+  assert.deepEqual(filterSlashCommands('/m', 'zh').map(m => m.cmd), ['/model'])
+  assert.deepEqual(filterSlashCommands('/AD', 'zh').map(m => m.cmd), ['/addmodel'])
+  assert.deepEqual(filterSlashCommands('/exit', 'zh').map(m => m.cmd), ['/exit'])
+})
+
+test('filterSlashCommands: 已输入空格(进入参数)时不再提示', () => {
+  assert.deepEqual(filterSlashCommands('/model 2', 'zh'), [])
+  assert.deepEqual(filterSlashCommands('/cd ..', 'zh'), [])
+})
+
+test('filterSlashCommands: 非 slash 输入 / 无匹配返回空', () => {
+  assert.deepEqual(filterSlashCommands('hello', 'zh'), [])
+  assert.deepEqual(filterSlashCommands('', 'zh'), [])
+  assert.deepEqual(filterSlashCommands('/xyz', 'zh'), [])
+})
+
+test('filterSlashCommands: locale 决定说明语言', () => {
+  const zh = filterSlashCommands('/help', 'zh')[0]
+  const en = filterSlashCommands('/help', 'en')[0]
+  assert.equal(zh.desc, '显示帮助')
+  assert.equal(en.desc, 'Show help')
+})
+
+test('renderSlashHintBody: 每行含命令名与说明,空输入返回空串', () => {
+  assert.equal(renderSlashHintBody([]), '')
+  const body = stripAnsi(renderSlashHintBody(filterSlashCommands('/m', 'en')))
+  assert.match(body, /\/model\s+List \/ switch models/)
+})

package/src/cli/ai/tools.js

@@ -30,6 +30,7 @@ import path from 'node:path'
 import iconv from 'iconv-lite'
 import { trackChild } from '../cleanup.js'
 import { checkDangerousCommand } from './safety.js'
+import { guardCommand } from './platformGuard.js'
 
 // ──────────────────────────────────────────────
 // 常量
@@ -226,6 +227,13 @@ async function toolRunCommand(args, ctx) {
     return `已拒绝执行(安全守卫): ${danger.reason}\n命令: ${command}\n如果你确认需要类似效果,请换一种不破坏系统的方式,或明确告知用户需要他手动执行。`
   }
 
+  // 平台兼容性守卫 — 拦截"在当前 shell 里注定失败"的命令
+  // (如 Windows cmd 上跑 tail/grep/ls 等 Unix-only 命令)
+  const platform = await guardCommand(command)
+  if (platform.blocked) {
+    return `已拒绝执行(平台守卫): ${platform.reason}`
+  }
+
   const cwd = resolvePath(ctx, args.cwd)
   let timeoutSec = Number(args.timeout_seconds) || CMD_TIMEOUT_DEFAULT
   timeoutSec = Math.max(1, Math.min(CMD_TIMEOUT_MAX, timeoutSec))