zen-gitsync 2.16.16 → 2.16.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "2.16.16",
+  "version": "2.16.17",
   "description": "Auto commit, scheduled sync, and visual GUI for Git. Run `g` in any repo for one-key commit & push, AI commit messages, scheduled background sync, and a drag-and-drop workflow builder.",
   "main": "index.js",
   "type": "module",

package/src/cli/ai/agent.js

@@ -56,8 +56,8 @@ import {
   printOk, printWarn, printError, printDim,
 } from './termui.js'
 import { readClipboardImage, checkImageFile, imageToDataUrl, formatBytes } from './images.js'
-import { runModelSetup, collectModelInput, buildModelConfig } from './modelSetup.js'
-import { genSessionId, autoTitle, writeSession, enforceRetention } from './sessionStore.js'
+import { runModelSetup, collectModelInput, buildModelConfig, selectFromList } from './modelSetup.js'
+import { genSessionId, autoTitle, writeSession, enforceRetention, listSessions } from './sessionStore.js'
 
 // truncateDisplay 已迁移到 termui.js;这里 re-export 保持既有测试/外部引用不断
 export { truncateDisplay } from './termui.js'
@@ -83,6 +83,8 @@ const STRINGS = {
     busy: '智能体正在执行中,请稍候(Ctrl+C 结束会话)…',
     bye: '已退出 g ai',
     cleared: '对话历史已清空',
+    newConversation: '已开启新对话',
+    operationCancelled: '已取消当前操作',
     thinkOn: '思考过程显示: 开',
     thinkOff: '思考过程显示: 关(模型仍会思考,只是不回显)',
     modelSwitched: (label) => `已切换模型: ${label}`,
@@ -112,6 +114,10 @@ const STRINGS = {
     addModelSaved: (name) => `✓ 模型 "${name}" 已添加并切换为当前模型`,
     addModelCancelled: '已取消添加模型',
     addModelSaveError: (msg) => `保存配置失败: ${msg}`,
+    resumeTitle: '选择要恢复的对话',
+    resumeEmpty: '没有可恢复的历史对话',
+    resumeCancelled: '已取消恢复对话',
+    resumeDone: (title, count) => `已恢复对话: ${title} (${count} 条消息)`,
   },
   en: {
     noModel: 'No AI model configured. Add one in GUI settings first (run `g ui`).',
@@ -123,6 +129,8 @@ const STRINGS = {
     busy: 'Agent is working, please wait (Ctrl+C to end session)…',
     bye: 'Bye',
     cleared: 'Conversation cleared',
+    newConversation: 'Started a new conversation',
+    operationCancelled: 'Current operation cancelled',
     thinkOn: 'Thinking display: on',
     thinkOff: 'Thinking display: off (model still thinks, just hidden)',
     modelSwitched: (label) => `Switched model: ${label}`,
@@ -152,6 +160,10 @@ const STRINGS = {
     addModelSaved: (name) => `✓ Model "${name}" added and switched to`,
     addModelCancelled: 'Add model cancelled',
     addModelSaveError: (msg) => `Failed to save: ${msg}`,
+    resumeTitle: 'Choose a conversation to resume',
+    resumeEmpty: 'No previous conversations to resume',
+    resumeCancelled: 'Resume cancelled',
+    resumeDone: (title, count) => `Resumed: ${title} (${count} messages)`,
   },
 }
 
@@ -590,6 +602,8 @@ function printSlashHelp(t, locale) {
     '  /cd <路径>        切换智能体工作目录',
     '  /image [路径]     查看待发送图片;/image <路径> 附加本地图片;/image clear 清除',
     '  /think            开关思考过程显示',
+    '  /new              开启新对话',
+    '  /resume           选择并恢复之前的对话',
     '  /clear            清空对话历史',
     '  /exit, /quit      退出',
     '',
@@ -604,6 +618,8 @@ function printSlashHelp(t, locale) {
     '  /cd <path>        Change agent working directory',
     '  /image [path]     List pending images; attach a file; /image clear to reset',
     '  /think            Toggle thinking display',
+    '  /new              Start a new conversation',
+    '  /resume           Choose and resume a previous conversation',
     '  /clear            Clear conversation history',
     '  /exit, /quit      Quit',
     '',
@@ -621,12 +637,86 @@ async function handleSlashCommand(state, input, t) {
 
   if (cmd === '/exit' || cmd === '/quit') return 'exit'
   if (cmd === '/help') { printSlashHelp(t, state.locale); return 'ok' }
-  if (cmd === '/clear') {
+  if (cmd === '/clear' || cmd === '/new') {
     state.messages = [state.messages[0]]
     // 开新会话 ID,旧会话保留在磁盘上
     state.sessionId = genSessionId()
     state.sessionCreatedAt = new Date().toISOString()
-    printOk(t.cleared)
+    printOk(cmd === '/new' ? t.newConversation : t.cleared)
+    return 'ok'
+  }
+  if (cmd === '/resume') {
+    if (state.busy) {
+      printDim(t.busy)
+      return 'ok'
+    }
+    const sessions = (await listSessions())
+      .filter(session => session.sessionId !== state.sessionId && session.messages.length > 1)
+    if (sessions.length === 0) {
+      printDim(t.resumeEmpty)
+      return 'ok'
+    }
+
+    const zh = !String(state.locale || '').startsWith('en')
+    const cleanLabel = (value, fallback) => String(value || fallback).replace(/[\r\n\x00-\x1f\x7f]/g, ' ').trim()
+    const items = sessions.map((session) => {
+      const title = cleanLabel(session.title, zh ? '(未命名对话)' : '(untitled)')
+      const updated = new Date(session.updatedAt || session.createdAt || 0)
+      const date = Number.isNaN(updated.getTime()) ? '' : updated.toLocaleString(state.locale)
+      const count = session.messages.filter(message => message?.role !== 'system').length
+      return {
+        label: `${title}  ${chalk.dim(`${date} · ${count} ${zh ? '条消息' : 'messages'}`)}`,
+        value: session,
+      }
+    })
+    const selectStrings = {
+      navHint: zh ? '↑↓ 切换,Enter 确认' : '↑↓ navigate, Enter confirm',
+      selectPrompt: (min, max) => zh ? `请选择(${min}-${max}):` : `Choose (${min}-${max}):`,
+      invalidChoice: (min, max) => zh ? `请输入 ${min}-${max} 之间的序号` : `Enter a number from ${min} to ${max}`,
+    }
+    const asker = {
+      ask(prompt) {
+        return new Promise(resolve => state.rl.question(`${prompt} `, answer => resolve(String(answer || '').trim())))
+      },
+    }
+
+    state.inWizard = true
+    try {
+      const selected = await selectFromList({
+        rl: state.rl,
+        asker,
+        title: t.resumeTitle,
+        items,
+        t: selectStrings,
+      })
+      if (!selected?.value) return 'ok'
+
+      const session = selected.value
+      const { promises: fsp } = await import('node:fs')
+      if (session.cwd) {
+        try {
+          const stat = await fsp.stat(session.cwd)
+          if (stat.isDirectory()) state.ctx.cwd = session.cwd
+        } catch { /* 已删除的旧目录不阻断恢复,沿用当前目录 */ }
+      }
+      state.sessionId = session.sessionId
+      state.sessionCreatedAt = session.createdAt || new Date().toISOString()
+      state.messages = session.messages.map(message => ({ ...message }))
+      const systemMessage = {
+        role: 'system',
+        content: buildSystemPrompt({ cwd: state.ctx.cwd, locale: state.locale, shellDesc: state.shellDesc }),
+      }
+      if (state.messages[0]?.role === 'system') state.messages[0] = systemMessage
+      else state.messages.unshift(systemMessage)
+      state.pendingImages = []
+      const count = state.messages.filter(message => message?.role !== 'system').length
+      printOk(t.resumeDone(cleanLabel(session.title, session.sessionId), count))
+    } catch (err) {
+      if (err?.cancelled) printDim(t.resumeCancelled)
+      else printError(err.message)
+    } finally {
+      state.inWizard = false
+    }
     return 'ok'
   }
   if (cmd === '/think') {
@@ -809,6 +899,7 @@ export async function runAiAgent(argv = []) {
     shellDesc,
     currentChild: null,
     abortController: null,
+    cancelRequested: false,
     busy: false,
     showThinking: true,     // /think 切换:是否回显模型的思考过程
     pendingImages: [],      // Alt+V / /image 附加的待发送图片 [{path, bytes}]
@@ -933,7 +1024,7 @@ export async function runAiAgent(argv = []) {
     if (!state.busy) safeShowPrompt()
   }
 
-  // ── 斜杠命令即时提示(支持 ↑↓ 切换 / Tab 补全 / Enter 提交) ──
+  // ── 斜杠命令即时提示(支持 ↑↓ 切换 / Tab、Enter 补全) ──
   // 在提示符下方浮现匹配到的命令,随输入过滤;不移动光标(用 DECSC/DECRC 保存-恢复)。
   // slashHintRows 记录当前提示占了几行,下次刷新/提交时据此擦除,避免残影。
   // slashHintBaseLine:本次 hint 显示时"输入行的基线值" — ↑↓ 时 readline 已经把
@@ -953,10 +1044,20 @@ export async function runAiAgent(argv = []) {
     slashHintRows = 0
   }
   const drawSlashHint = () => {
-    const body = renderSlashHintBody(slashHintMatches, slashHintIndex)
+    const body = renderSlashHintBody(slashHintMatches, slashHintIndex, state.locale)
+    const hadVisibleHint = slashHintRows > 0
     eraseSlashHint()
     if (!body) return
     const rows = body.split('\n')
+    if (!hadVisibleHint) {
+      // CSI B(光标下移)到达终端底部后只会停在最后一行,不会自动滚屏,
+      // 所以候选项会被裁掉。第一次显示提示时先用换行真实预留空间,
+      // 再上移相同行数回到输入行；无论中途是否发生滚屏,都能回到原内容所在行。
+      let reserve = ''
+      for (let i = 0; i < rows.length; i++) reserve += '\n\x1b[2K'
+      reserve += `\x1b[${rows.length}A`
+      process.stdout.write(reserve)
+    }
     // 保存光标,逐行下移打印(每行先清行防止与旧内容叠字),最后恢复光标回输入行
     let seq = '\x1b7'
     for (const r of rows) seq += '\x1b[1B\x1b[2K\r' + r
@@ -986,10 +1087,8 @@ export async function runAiAgent(argv = []) {
     rl.cursor = slashHintBaseLine.length
     if (typeof rl._refreshLine === 'function') rl._refreshLine()
   }
-  // Tab / Enter:把 rl.line 替换为补全文本 + 清掉 hint 状态
-  //   Tab:补全文本末尾加空格,便于用户继续打参数(不回车)
-  //   Enter:不用此函数 — 用 state.slashHintSubmitLine 标志 + line handler 替换
-  //     (readline 自己处理 Enter,我们不能事后改 rl.line 触发提交)
+  // Tab / Enter:把 rl.line 替换为补全文本 + 清掉 hint 状态。
+  // Enter 会先被 readline 提交,因此由下方 line handler 在处理命令前调用本函数。
   const applyHintCompletion = (newLine) => {
     rl.line = newLine
     rl.cursor = newLine.length
@@ -1001,6 +1100,47 @@ export async function runAiAgent(argv = []) {
     if (typeof rl._refreshLine === 'function') rl._refreshLine()
   }
 
+  const neutralizeKeyForReadline = (key) => {
+    key.name = 'escape'
+    key.sequence = ''
+    key.ctrl = false
+    key.meta = false
+    key.shift = false
+  }
+
+  // readline 自己会优先处理 Enter/Ctrl+C。用 prependListener 在它之前完成补全
+  // 或取消当前操作,再把本次按键变成 readline 会忽略的 Esc。
+  const interceptInteractiveControlKeys = (_ch, key) => {
+    if (!key) return
+    if (key.ctrl && key.name === 'c') {
+      if (state.inWizard) {
+        neutralizeKeyForReadline(key)
+        rl.emit('operationCancel')
+        return
+      }
+      if (state.busy) {
+        neutralizeKeyForReadline(key)
+        state.cancelRequested = true
+        try { state.abortController?.abort() } catch (_) {}
+        try { state.currentChild?.kill('SIGTERM') } catch (_) {}
+        return
+      }
+      if (slashHintRows > 0) {
+        neutralizeKeyForReadline(key)
+        applyHintCompletion('')
+        return
+      }
+      return
+    }
+    if (key.name !== 'return' && key.name !== 'enter') return
+    if (slashHintRows === 0 || slashHintMatches.length === 0 || state.busy || state.inWizard) return
+    const selected = slashHintMatches[slashHintIndex]
+    if (!selected) return
+    applyHintCompletion(selected.cmd + ' ')
+    neutralizeKeyForReadline(key)
+  }
+  rl.input.prependListener('keypress', interceptInteractiveControlKeys)
+
   // Alt+V 粘贴剪贴板图片(node 把 ESC+v 解析为 meta+v;部分终端不发 Alt,可用 /image 兜底)
   const pasteFromClipboard = async () => {
     if (state.pasting) return
@@ -1028,7 +1168,7 @@ export async function runAiAgent(argv = []) {
     // 仅在 hint 已显示且有匹配项时拦截,readline 的 default 行为(历史浏览等)
     // 我们在 handler 里事后回滚 rl.line 来抵消
     const action = parseKeyForSlashHint(key)
-    const hintActive = action === 'prev' || action === 'next' || action === 'complete' || action === 'submit' || action === 'cancel'
+    const hintActive = action === 'prev' || action === 'next' || action === 'complete' || action === 'cancel'
       ? (slashHintRows > 0 && slashHintMatches.length > 0 && !state.busy && !state.inWizard)
       : false
 
@@ -1050,29 +1190,6 @@ export async function runAiAgent(argv = []) {
         applyHintCompletion(newLine)
         return
       }
-      if (action === 'submit') {
-        // Enter:把 rl.line 替换为补全命令,然后手动调用 rl._line() 触发 line 事件。
-        // 这样提交的就是补全后的命令,而不是用户敲到一半的前缀。
-        // 必须 return — 否则 readline 自己也会按 Enter 把当前 rl.line(用户原始输入) 提交一遍。
-        const sel = slashHintMatches[slashHintIndex]
-        const newLine = sel.cmd
-        console.error('[DEBUG-ENTER] sel.cmd=' + JSON.stringify(sel.cmd) + ' rl.line before=' + JSON.stringify(rl.line))
-        rl.line = newLine
-        rl.cursor = newLine.length
-        eraseSlashHint()
-        slashHintMatches = []
-        slashHintIndex = 0
-        slashHintRows = 0
-        slashHintBaseLine = newLine
-        if (typeof rl._refreshLine === 'function') rl._refreshLine()
-        // readline 的 _line() 内部会 this.emit('line', this.line) — 用补全后的 line
-        if (typeof rl._line === 'function') {
-          try { rl._line(); console.error('[DEBUG-ENTER] _line ok, rl.line after=' + JSON.stringify(rl.line)) } catch (e) { console.error('[DEBUG-ENTER] _line err: ' + e.message); rl.emit('line', newLine) }
-        } else {
-          rl.emit('line', newLine)
-        }
-        return
-      }
       if (action === 'cancel') {
         // Esc:只清 hint,不动输入行
         eraseSlashHint()
@@ -1082,7 +1199,7 @@ export async function runAiAgent(argv = []) {
       }
     }
 
-    // submit(Enter)走默认 readline 提交,line 事件里统一擦除 hint;
+    // Enter 走默认 readline 提交,line 事件里把选中项恢复到输入框;
     // 其他普通按键:重算匹配 + 重画 hint
     if (!(key.name === 'return' || key.name === 'enter')) {
       refreshSlashHint()
@@ -1130,21 +1247,25 @@ export async function runAiAgent(argv = []) {
     if (images.length > 0) printDim(t.imageSending(images.length))
 
     state.busy = true
+    state.cancelRequested = false
     state.abortController = new AbortController()
     try {
       await runAgentTurn(state, input, t, images)
       // 每轮对话结束后持久化到磁盘,供 Web UI 读取
       await persistSession()
     } catch (err) {
-      printError(err.message)
+      if (state.cancelRequested) printDim(t.operationCancelled)
+      else printError(err.message)
     } finally {
       state.busy = false
+      state.cancelRequested = false
       state.abortController = null
       safeShowPrompt()
     }
   })
 
   rl.on('close', () => {
+    rl.input.removeListener('keypress', interceptInteractiveControlKeys)
     printWarn('\n' + t.bye)
   })
 

package/src/cli/ai/modelSetup.js

@@ -384,10 +384,44 @@ function createAsker(rl) {
    */
   function ask(prompt, defaultValue) {
     return new Promise((resolve, reject) => {
+      let settled = false
+      const controller = new AbortController()
       const display = defaultValue != null && defaultValue !== ''
         ? chalk.cyan(prompt) + chalk.dim(` (${defaultValue})`)
         : chalk.cyan(prompt)
-      rl.question(display + ' ', (answer) => {
+
+      const cleanup = () => {
+        rl.removeListener?.('close', onClose)
+        rl.removeListener?.('operationCancel', onCancel)
+        rl.input?.removeListener?.('keypress', onKeypressCancel)
+      }
+      const cancel = () => {
+        if (settled) return
+        settled = true
+        controller.abort()
+        cleanup()
+        reject({ cancelled: true })
+      }
+      const onClose = () => cancel()
+      const onCancel = () => cancel()
+      const onKeypressCancel = (_str, key) => {
+        if (!key?.ctrl || key.name !== 'c') return
+        // 必须在 readline 内置 listener 前消费,否则它会直接关闭整个 REPL。
+        key.name = 'escape'
+        key.sequence = ''
+        key.ctrl = false
+        key.meta = false
+        key.shift = false
+        cancel()
+      }
+      rl.once('close', onClose)
+      rl.once('operationCancel', onCancel)
+      rl.input?.prependListener?.('keypress', onKeypressCancel)
+
+      rl.question(display + ' ', { signal: controller.signal }, (answer) => {
+        if (settled) return
+        settled = true
+        cleanup()
         const trimmed = (answer || '').trim()
         if (trimmed === '' && defaultValue != null && defaultValue !== '') {
           resolve(defaultValue)
@@ -395,10 +429,6 @@ function createAsker(rl) {
           resolve(trimmed)
         }
       })
-      // Ctrl+C / Ctrl+D: 用户取消
-      rl.once('close', () => {
-        reject({ cancelled: true })
-      })
     })
   }
   return { ask }
@@ -446,7 +476,7 @@ async function askYesNo(asker, prompt) {
  *   - null:选中额外项
  *   - 抛出 { cancelled: true }:用户取消整个 wizard(Ctrl+C / Esc / readline close)
  */
-async function selectFromList({ rl, asker, title, items, t, extraOptionLabel } = {}) {
+export async function selectFromList({ rl, asker, title, items, t, extraOptionLabel } = {}) {
   const safeItems = Array.isArray(items) ? items : []
   const extraActive = !!extraOptionLabel
   const totalItems = safeItems.length + (extraActive ? 1 : 0)
@@ -504,10 +534,12 @@ async function selectFromList({ rl, asker, title, items, t, extraOptionLabel } =
     }
   }
 
+  const questionController = new AbortController()
   return new Promise((resolve, reject) => {
     const cleanup = () => {
       if (finished) return
       finished = true
+      questionController.abort()
       if (rl && rl.input) rl.input.removeListener('keypress', keyHandler)
       if (rl) rl.removeListener('close', onClose)
     }
@@ -548,6 +580,13 @@ async function selectFromList({ rl, asker, title, items, t, extraOptionLabel } =
 
       if (action === 'cancel') {
         // Esc / Ctrl+C — 让用户取消整个 wizard
+        if (key.ctrl && key.name === 'c') {
+          key.name = 'escape'
+          key.sequence = ''
+          key.ctrl = false
+          key.meta = false
+          key.shift = false
+        }
         cleanup()
         reject({ cancelled: true })
         return
@@ -557,7 +596,8 @@ async function selectFromList({ rl, asker, title, items, t, extraOptionLabel } =
       // 其他字符(字母/数字但 line buffer 非空)让 readline 自然处理
     }
 
-    rl.input.on('keypress', keyHandler)
+    // 必须先于 readline 内置 listener,这样 Ctrl+C 才是取消向导而不是关闭 REPL。
+    rl.input.prependListener('keypress', keyHandler)
     rl.once('close', onClose)
 
     // 提示词:列出可选范围 + 导航提示
@@ -566,7 +606,7 @@ async function selectFromList({ rl, asker, title, items, t, extraOptionLabel } =
     const navHint = t.navHint  // "↑↓ 切换,Enter 确认,数字直跳"
     const promptStr = `${chalk.cyan(t.selectPrompt(minIdx, maxIdx))}${chalk.dim(navHint ? '  ' + navHint : '')} `
 
-    rl.question(promptStr, (answer) => {
+    rl.question(promptStr, { signal: questionController.signal }, (answer) => {
       cleanup()
       const trimmed = (answer || '').trim()
       let idx = Number.parseInt(trimmed, 10)

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

@@ -17,6 +17,7 @@
 // buildModelConfig / testModelConnection(注入 mock fetch)。
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
+import { EventEmitter } from 'node:events'
 import {
   getBuiltinModels,
   findProviderByUrl,
@@ -371,26 +372,36 @@ test('BUILTIN_MODELS: 每个 key 都能在 PROVIDERS 中找到', () => {
  * @param {object} [opts]
  * @param {number} [opts.closeOnQuestion=-1] - 在第 N 次 question 时触发 close 事件(模拟取消),-1=不触发
  */
-function createMockRl(answers, { closeOnQuestion = -1 } = {}) {
+function createMockRl(answers, { closeOnQuestion = -1, cancelOnQuestion = -1, ctrlCOnQuestion = -1 } = {}) {
   const queue = [...answers]
-  const closeHandlers = []
   let qNum = 0
-  return {
-    question(_prompt, cb) {
-      qNum++
-      if (qNum === closeOnQuestion) {
-        // 先让 once('close') 注册,再在 nextTick 触发(模拟用户 Ctrl+D)
-        process.nextTick(() => { for (const h of closeHandlers) h() })
-        return
-      }
-      const answer = queue.shift() ?? ''
-      process.nextTick(() => cb(answer))
-    },
-    once(event, cb) {
-      if (event === 'close') closeHandlers.push(cb)
-    },
-    close() {},
+  const rl = new EventEmitter()
+  rl.input = new EventEmitter()
+  rl.closed = false
+  rl.question = (_prompt, options, callback) => {
+    const cb = typeof options === 'function' ? options : callback
+    qNum++
+    if (qNum === closeOnQuestion) {
+      process.nextTick(() => { rl.closed = true; rl.emit('close') })
+      return
+    }
+    if (qNum === cancelOnQuestion) {
+      process.nextTick(() => rl.emit('operationCancel'))
+      return
+    }
+    if (qNum === ctrlCOnQuestion) {
+      process.nextTick(() => {
+        const key = { name: 'c', sequence: '\x03', ctrl: true, meta: false, shift: false }
+        rl.input.emit('keypress', '\x03', key)
+        rl.lastCtrlCKey = key
+      })
+      return
+    }
+    const answer = queue.shift() ?? ''
+    process.nextTick(() => cb(answer))
   }
+  rl.close = () => { rl.closed = true; rl.emit('close') }
+  return rl
 }
 
 /** 静默 console.log/error/warn,避免交互式测试刷屏;返回 restore 函数 */
@@ -495,6 +506,39 @@ test('collectModelInput: 用户取消(触发 close)→ 返回 null', async () =>
   }
 })
 
+test('collectModelInput: operationCancel 取消当前问题但不关闭 readline', async () => {
+  const restore = silenceConsole()
+  try {
+    const rl = createMockRl([], { cancelOnQuestion: 1 })
+    const result = await collectModelInput({
+      locale: 'zh-CN',
+      rl,
+      fetchFn: mockFetch({ status: 200, ok: true }),
+    })
+    assert.equal(result, null)
+    assert.equal(rl.closed, false, '取消向导后 REPL readline 应继续可用')
+  } finally {
+    restore()
+  }
+})
+
+test('collectModelInput: Ctrl+C 只取消当前问题并阻止 readline 关闭', async () => {
+  const restore = silenceConsole()
+  try {
+    const rl = createMockRl([], { ctrlCOnQuestion: 1 })
+    const result = await collectModelInput({
+      locale: 'zh-CN',
+      rl,
+      fetchFn: mockFetch({ status: 200, ok: true }),
+    })
+    assert.equal(result, null)
+    assert.equal(rl.closed, false)
+    assert.equal(rl.lastCtrlCKey.name, 'escape', 'Ctrl+C 应在 readline 处理前被中和')
+  } finally {
+    restore()
+  }
+})
+
 test('collectModelInput: API 返回模型列表时优先使用 → 返回收集的字段', async () => {
   const restore = silenceConsole()
   try {

package/src/cli/ai/sessionStore.js

@@ -77,6 +77,30 @@ export async function readSession(sessionId) {
   return JSON.parse(await fsp.readFile(file, 'utf-8'));
 }
 
+/**
+ * 列出可恢复的会话,按最近更新时间倒序排列。
+ * 单个损坏的 JSON 不应阻断整个列表,因此会静默跳过。
+ */
+export async function listSessions(directory = SESSIONS_DIR) {
+  const files = await fsp.readdir(directory).catch(() => []);
+  const sessions = await Promise.all(
+    files.filter(file => file.endsWith('.json')).map(async (file) => {
+      try {
+        const raw = await fsp.readFile(path.join(directory, file), 'utf-8');
+        const data = JSON.parse(raw);
+        if (!data || typeof data !== 'object' || !Array.isArray(data.messages)) return null;
+        const sessionId = file.slice(0, -'.json'.length);
+        return { ...data, sessionId };
+      } catch {
+        return null;
+      }
+    }),
+  );
+  return sessions
+    .filter(Boolean)
+    .sort((a, b) => Date.parse(b.updatedAt || b.createdAt || 0) - Date.parse(a.updatedAt || a.createdAt || 0));
+}
+
 /**
  * 保留策略:超过 MAX_SESSIONS 时删最旧的,保留 KEEP_SESSIONS 个
  */

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

@@ -0,0 +1,35 @@
+// Copyright 2026 xz333221
+// Licensed under the Apache License, Version 2.0
+
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import fsp from 'node:fs/promises'
+import os from 'node:os'
+import path from 'node:path'
+import { listSessions } from './sessionStore.js'
+
+test('listSessions: 按更新时间倒序列出有效会话并跳过损坏文件', async (t) => {
+  const directory = await fsp.mkdtemp(path.join(os.tmpdir(), 'zen-gitsync-sessions-'))
+  t.after(() => fsp.rm(directory, { recursive: true, force: true }))
+
+  await Promise.all([
+    fsp.writeFile(path.join(directory, 'older.json'), JSON.stringify({
+      sessionId: 'wrong-id',
+      title: '旧对话',
+      updatedAt: '2026-01-01T00:00:00.000Z',
+      messages: [{ role: 'user', content: 'old' }],
+    })),
+    fsp.writeFile(path.join(directory, 'newer.json'), JSON.stringify({
+      title: '新对话',
+      updatedAt: '2026-02-01T00:00:00.000Z',
+      messages: [{ role: 'user', content: 'new' }],
+    })),
+    fsp.writeFile(path.join(directory, 'broken.json'), '{not json'),
+    fsp.writeFile(path.join(directory, 'not-a-session.json'), JSON.stringify({ title: 'missing messages' })),
+    fsp.writeFile(path.join(directory, 'ignored.txt'), 'ignored'),
+  ])
+
+  const sessions = await listSessions(directory)
+  assert.deepEqual(sessions.map(session => session.sessionId), ['newer', 'older'])
+  assert.deepEqual(sessions.map(session => session.title), ['新对话', '旧对话'])
+})