zen-gitsync 2.16.10 → 2.16.12

package/README.md

@@ -1,4 +1,4 @@
-# zen-gitsync
+# zen-gitsync
 
 [English](#zen-gitsync) | [中文](#zh)
 
@@ -7,7 +7,7 @@ A Git automation platform with interactive commits, scheduled sync, custom comma
 ## Table of Contents
 
 - [Installation](#installation)
-- [What''s New](#v2xx--whats-new)
+- [What's New](#v2xx--whats-new)
 - [GUI](#gui)
   - [Core Git Panel](#core-git-panel)
   - [Branch Management](#branch-management)
@@ -38,7 +38,7 @@ npm install -g zen-gitsync
 
 ---
 
-## v2.x.x — What''s New
+## v2.x.x — What's New
 
 - **Visual GUI** — Full graphical interface for Git operations
 - **Branch management** — Create, switch, and track local/remote branches
@@ -62,7 +62,7 @@ npm install -g zen-gitsync
 - **Accessibility (WCAG 2.1 AA)** — Dialog focus trap & restore, role-based separators, keyboard-only panel resize (`← → ↑ ↓`), screen-reader friendly commit context menu, ARIA-pressed toggle buttons, commit button `aria-busy` during in-flight commits, Git SHA hashes meet ≥ 4.5:1 contrast in both light and dark themes
 - **Faster cold start** — `monaco-editor` / `@vue-flow` / `flow-mindmap` / `dagre` are split into independent chunks and lazy-loaded so the Git panel boots without waiting on the code editor or visual workflow designer
 
-> Detailed per-release change log (a11y/perf fixes, i18n missing translations, dead-code removals, etc.) lives in [CHANGELOG.md](./CHANGELOG.md).
+> Detailed per-release changes can be found via `git log` or the [GitHub Releases](https://github.com/xz333221/zen-gitsync/releases) page.
 
 ---
 
@@ -410,16 +410,7 @@ git add --renormalize .
 
 ### Package manager
 
-All `package.json` scripts use **npm** (`npm install`, `npm run dev`, `npm run release`, etc.). The repo also has a `pnpm-lock.yaml` checked in for reproducibility on machines that prefer pnpm — both managers work because `package.json` is the single source of truth. The CLI's own `bin` entry and most devDeps are pinned to caret ranges; either manager will resolve to compatible versions.
-
-If you switch managers, delete the other manager's lockfile so only one is in the tree:
-
-```bash
-rm -f pnpm-lock.yaml   # when running on npm
-rm -f package-lock.json # when running on pnpm
-```
-
-`.gitignore` already lists both `pnpm-lock.yaml` and `package-lock.json`, so neither is forced into version control.
+All `package.json` scripts use **npm** (`npm install`, `npm run dev`, `npm run release`, etc.). The `package-lock.json` is git-ignored, so each developer generates it locally. The CLI's own `bin` entry and most devDeps are pinned to caret ranges.
 
 ---
 
@@ -437,6 +428,11 @@ $ g ai "fix the failing test"   # one-shot task, then exit
 $ g ai --model=2                # pick the 2nd configured model (index or name)
 ```
 
+The first-run setup wizard and `/addmodel` provider/model lists support **↑↓ keys to switch
+selection + Enter to confirm** (typing a number also jumps directly; `0` selects the trailing
+"custom / manual input" entry). Non-TTY environments (CI, piped input) automatically fall back
+to numeric input. `Esc` or `Ctrl+C` cancels the wizard cleanly.
+
 In-session commands: `/help`, `/model`, `/addmodel`, `/cd <path>`, `/image [path]`, `/think`, `/clear`, `/exit`.
 
 Images: press `Alt+V` in the REPL to paste a clipboard image (screenshot), or attach a
@@ -603,7 +599,7 @@ npm install -g zen-gitsync
 - **可访问性(WCAG 2.1 AA)** — 弹窗焦点陷阱与归还、`role="separator"` 键盘可达的分隔条、纯键盘(`← → ↑ ↓`)调整面板宽度、屏幕阅读器友好的提交右键菜单、ARIA-pressed 切换按钮、提交按钮在提交过程中挂 `aria-busy`、Git 提交哈希在明/暗主题下对比度均 ≥ 4.5:1
 - **更快的冷启动** — `monaco-editor` / `@vue-flow` / `flow-mindmap` / `dagre` 拆分为独立 chunk 并按需懒加载,Git 面板首屏不再等待代码编辑器或可视化流程编排模块
 
-> 每个版本的详细变更日志(可访问性/性能修复、i18n 漏译、死代码清理等)见 [CHANGELOG.md](./CHANGELOG.md)。
+> 每个版本的详细变更可通过 `git log` 或 [GitHub Releases](https://github.com/xz333221/zen-gitsync/releases) 页面查看。
 
 ---
 
@@ -918,7 +914,7 @@ Activity Bar 中的机器人图标视图，可直接在浏览器中与内置 AI
 
 ![用户设置弹窗 — 通用 tab](https://raw.githubusercontent.com/xz333221/zen-gitsync/main/public/images/settings-general.png)
 
-> 点击顶部条右上角齿轮图标。tab 包含 **通用 / Git / 提交 / AI / 主题 / 语言 / 文件锁定 / NPM 路径**。大部分开关即时生效，无需重启 GUI。
+> 点击顶部条右上角齿轮图标。tab 包含 **通用 / Git / 提交 / AI / 主题 / 语言 / 文件锁定 / NPM 路径**。大部分开关即时生效，无需重启 GUI。点击底栏的 **默认模型** 名称可一键定位到「AI 模型」tab。
 
 | 设置项 | 说明 |
 |---|---|
@@ -928,6 +924,7 @@ Activity Bar 中的机器人图标视图，可直接在浏览器中与内置 AI
 | 语言 | 中文 / English |
 | 文件锁定 | 锁定文件，使其永远不被暂存或储藏 |
 | NPM 路径 | 配置 `package.json` 的扫描位置 |
+| AI 模型 | 配置 OpenAI / Claude 等兼容 OpenAI 协议的 LLM 端点（API Key、baseURL、模型名），可设置默认模型，多套配置并存 |
 
 ---
 
@@ -966,6 +963,10 @@ $ g ai "修复失败的测试"           # 单发模式：执行一轮后退出
 $ g ai --model=2                # 使用第 2 个已配置的模型（序号或名称）
 ```
 
+启动配置向导与 `/addmodel` 的"服务商 / 模型"列表支持 **↑↓ 键切换 + Enter 确认**（也可
+直接输入数字跳转，`0` = 列表底部的"自定义 / 手动输入"）；非 TTY 环境下自动回退为数字输入。
+`Esc` 或 `Ctrl+C` 一键取消整个向导。
+
 会话内命令：`/help`、`/model`、`/addmodel`、`/cd <路径>`、`/image [路径]`、`/think`、`/clear`、`/exit`。
 
 图片：在 REPL 中按 `Alt+V` 粘贴剪贴板图片（截图），或用 `/image <路径>` 附加本地图片；

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "2.16.10",
+  "version": "2.16.12",
   "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/scripts/release.js

@@ -50,10 +50,10 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms))
 
 // 显式白名单:只有这些文件路径会被 git add。
 // 禁止 `git add .` 防止把工作区脏文件 / 临时调试文件一起带上 release commit。
-// lockfile (package-lock.json / pnpm-lock.yaml) 都在 .gitignore 里,
+// lockfile (package-lock.json) 在 .gitignore 里,
 // 即便列在白名单也会被 git 拒绝 add,所以这里不列。
-// 实际入 release commit 的只有 package.json(版本号)+ CHANGELOG.md。
-const RELEASE_FILES = ['package.json', 'CHANGELOG.md']
+// 实际入 release commit 的只有 package.json(版本号)。
+const RELEASE_FILES = ['package.json']
 
 function createReadlineInterface() {
   return readline.createInterface({ input: process.stdin, output: process.stdout })

package/src/cli/ai/modelSetup.js

@@ -34,7 +34,7 @@
 import readline from 'node:readline'
 import chalk from 'chalk'
 import config from '../../config.js'
-import { startSpinner } from './termui.js'
+import { startSpinner, renderSelectableListBody, parseKeyForSelectableList } from './termui.js'
 
 // ──────────────────────────────────────────────
 // 预设服务商列表
@@ -131,6 +131,7 @@ const STRINGS = {
     selectProvider: '选择 AI 服务商:',
     customOption: '自定义',
     selectPrompt: (min, max) => `请选择 (${min}-${max}): `,
+    navHint: '↑↓ 切换,Enter 确认,数字直跳(0 = 上一行)',
     invalidChoice: (min, max) => `无效选择,请输入 ${min}-${max} 之间的数字`,
     endpointLabel: '接口地址',
     endpointPrompt: (def) => `接口地址 [${def}]: `,
@@ -166,6 +167,7 @@ const STRINGS = {
     selectProvider: 'Select an AI provider:',
     customOption: 'Custom',
     selectPrompt: (min, max) => `Choose (${min}-${max}): `,
+    navHint: '↑↓ to switch, Enter to confirm, number to jump (0 = extra)',
     invalidChoice: (min, max) => `Invalid choice, enter a number between ${min} and ${max}`,
     endpointLabel: 'Endpoint URL',
     endpointPrompt: (def) => `Endpoint [${def}]: `,
@@ -413,32 +415,201 @@ async function askYesNo(asker, prompt) {
 }
 
 /**
- * 让用户从数字列表中选择一项。
- * @param {object} asker
- * @param {string} title - 列表标题
- * @param {Array<{label: string, value: any}>} items
- * @param {object} t - i18n strings
- * @param {number} [extraOption] - 额外选项的序号(如"手动输入"用 0)
- * @param {string} [extraLabel]
- * @returns {Promise<{index: number, value: any}|null>} 选中的项,null = 用户选了额外选项
+ * 让用户从列表中选择一项。
+ *
+ * 两条路径:
+ *   - TTY(终端)且传入了 rl → 上下键切换 + Enter 提交(类似 Codex CLI 的列表选择)
+ *     - 数字键 1..9 / 0 也可直跳(0 = 额外项)
+ *     - Esc / Ctrl+C 视作取消整个 wizard(调用方按 { cancelled: true } 走 catch 分支)
+ *   - 其他情况 → 回退到原数字输入(由 asker.ask 提示,数字 + 回车确认;非法输入不退出,
+ *     提示 t.invalidChoice 让用户重新输)
+ *
+ * 设计要点:
+ *   - 列表用 renderSelectableListBody 渲染,选中行整行反白(可视化锚点固定,跟斜杠命令
+ *     提示一样的"反白起点严格对齐"思路)
+ *   - 方向键会触发 readline 默认历史浏览,我们用"清空 rl.line + 调 _refreshLine"撤销
+ *     (参考 agent.js 对斜杠命令提示的处理)
+ *   - 按 Enter 时 rl.question 回调自然拿到 line 字符串;空字符串 → 用当前 selectedIndex,
+ *     数字 → 直接选中,非数字 → 视为无效,保持当前列表继续等待输入(不重画列表)
+ *
+ * @param {object} opts
+ * @param {import('node:readline').Interface} [opts.rl] - 用于挂 keypress + rl.question;
+ *   不传或非 TTY 时退回数字输入
+ * @param {{ask:(p:string,d?:string)=>Promise<string>}} opts.asker - 数字输入回退路径的 asker;
+ *   TTY 路径不需要,但参数签名上必须传(避免 collectModelInput 内部拆开两个调用)
+ * @param {string} opts.title
+ * @param {Array<{label: string, value: any}>} opts.items
+ * @param {object} opts.t - i18n strings
+ * @param {string} [opts.extraOptionLabel] - 额外项(编号 0)
+ * @returns {Promise<{index: number, value: any}|null>}
+ *   - { index, value }:选中标准项
+ *   - null:选中额外项
+ *   - 抛出 { cancelled: true }:用户取消整个 wizard(Ctrl+C / Esc / readline close)
  */
-async function selectFromList(asker, title, items, t, extraOptionLabel) {
+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)
+  if (totalItems === 0) return null
+
   console.log()
   console.log(chalk.bold(title))
+
+  // 判断走哪条路
+  const interactive = !!(rl && rl.input && process.stdout.isTTY && process.stdin.isTTY)
+
+  if (!interactive) {
+    // 非 TTY / 没 rl:走数字输入回退(原行为,保留 CI / 管道环境的可脚本化能力)
+    return selectByDigits({ asker, items: safeItems, t, extraOptionLabel })
+  }
+
+  // ── TTY 路径:方向键列表选择 ──
+  let selectedIndex = 0
+  let finished = false
+
+  // 渲染初始列表
+  const initialBody = renderSelectableListBody(safeItems, 0, extraOptionLabel)
+  process.stdout.write(initialBody + '\n')
+  const listRows = initialBody.split('\n').length
+
+  /**
+   * 重画列表:用 ANSI 把光标逐行上移 + 清行,然后重新打印,光标回到列表首行行首,
+   * 不影响 readline 在 listRows+1 行的 prompt 行。
+   * 用 \x1b[2K(清整行)+ \x1b[1A(上移一行)循环 N 次,等价于
+   * "清掉光标以上 N 行"但不污染更下面的内容;最后 \r 回到行首方便后续输出起点对齐。
+   */
+  const redraw = () => {
+    for (let i = 0; i < listRows; i++) {
+      process.stdout.write('\x1b[1A\x1b[2K')
+    }
+    process.stdout.write('\r')
+    process.stdout.write(renderSelectableListBody(safeItems, selectedIndex, extraOptionLabel) + '\n')
+  }
+
+  /**
+   * 撤销 readline 内置行为对 rl.line 的副作用:
+   *   - 方向键:readline 读 history 一条回填到 rl.line + _refreshLine 重画 prompt
+   *     用户本来在 prompt 行没敲任何字符,历史回填会让用户突然看到历史的脏字符。
+   *     所以清空 line buffer 让 prompt 行保持空(类似 agent.js 对斜杠命令提示的做法)。
+   *   - 数字键(jump:N):用户在 prompt 行确实敲了数字,该数字已经在 rl.line 里,
+   *     不能撤销(否则用户按 "8" 看不到 "8")— 但目前的 jump 路径用 rl.line.length === 0 守门,
+   *     等于已经避免和 readline 的字符输入重叠,所以 prev/next 路径才需要清,数字路径不用清。
+   */
+  const clearLineBuffer = () => {
+    if (!rl) return
+    rl.line = ''
+    rl.cursor = 0
+    if (typeof rl._refreshLine === 'function') {
+      try { rl._refreshLine() } catch { /* 兜底 — 某些 readline 版本没有 _refreshLine */ }
+    }
+  }
+
+  return new Promise((resolve, reject) => {
+    const cleanup = () => {
+      if (finished) return
+      finished = true
+      if (rl && rl.input) rl.input.removeListener('keypress', keyHandler)
+      if (rl) rl.removeListener('close', onClose)
+    }
+    const onClose = () => {
+      cleanup()
+      reject({ cancelled: true })
+    }
+
+    const keyHandler = (_str, key) => {
+      if (finished || !key) return
+      const action = parseKeyForSelectableList(key)
+      const max = totalItems - 1
+
+      if (action === 'prev' || action === 'next') {
+        if (action === 'prev') {
+          selectedIndex = selectedIndex > 0 ? selectedIndex - 1 : max
+        } else {
+          selectedIndex = selectedIndex < max ? selectedIndex + 1 : 0
+        }
+        clearLineBuffer()   // 撤销 readline 历史回填
+        redraw()
+        return
+      }
+
+      if (typeof action === 'string' && action.startsWith('jump:')) {
+        // 只在用户当前没敲字符时接受 jump,避免和 readline 正常字符输入冲突
+        if (rl.line && rl.line.length > 0) return
+        const n = Number(action.slice(5))
+        let target = -1
+        if (n === 0 && extraActive) target = safeItems.length
+        else if (n >= 1 && n <= safeItems.length) target = n - 1
+        if (target >= 0) {
+          selectedIndex = target
+          redraw()   // 数字已进 rl.line,不清;用户会看到 prompt 行同步显示这个数字
+        }
+        return
+      }
+
+      if (action === 'cancel') {
+        // Esc / Ctrl+C — 让用户取消整个 wizard
+        cleanup()
+        reject({ cancelled: true })
+        return
+      }
+
+      // 'confirm' (Enter) 不处理,让 readline 自然触发 line 事件 → rl.question 回调拿 answer
+      // 其他字符(字母/数字但 line buffer 非空)让 readline 自然处理
+    }
+
+    rl.input.on('keypress', keyHandler)
+    rl.once('close', onClose)
+
+    // 提示词:列出可选范围 + 导航提示
+    const minIdx = extraActive ? 0 : 1
+    const maxIdx = safeItems.length
+    const navHint = t.navHint  // "↑↓ 切换,Enter 确认,数字直跳"
+    const promptStr = `${chalk.cyan(t.selectPrompt(minIdx, maxIdx))}${chalk.dim(navHint ? '  ' + navHint : '')} `
+
+    rl.question(promptStr, (answer) => {
+      cleanup()
+      const trimmed = (answer || '').trim()
+      let idx = Number.parseInt(trimmed, 10)
+      if (Number.isFinite(idx) && idx >= minIdx && idx <= maxIdx) {
+        if (idx === 0) return resolve(null)
+        return resolve({ index: idx - 1, value: safeItems[idx - 1].value })
+      }
+      if (trimmed === '') {
+        // 空回答:用当前 selectedIndex
+        if (selectedIndex >= safeItems.length) return resolve(null)
+        return resolve({ index: selectedIndex, value: safeItems[selectedIndex].value })
+      }
+      // 非法输入:在当前列表下方打印提示,不重画列表(列表还在可见)
+      console.log(chalk.yellow(t.invalidChoice(minIdx, maxIdx)))
+      resolve('__retry__')
+    })
+  }).then(async (r) => {
+    if (r === '__retry__') {
+      // 递归重试(重新调一次)— 列表会再画一遍,实测可接受;保持 wizard 流程的简洁
+      return selectFromList({ rl, asker, title, items, t, extraOptionLabel })
+    }
+    return r
+  })
+}
+
+/**
+ * 数字输入回退路径(原 selectFromList 的实现)。
+ * 保留给非 TTY / 无 readline 的场景(管道、CI、测试)。
+ */
+async function selectByDigits({ asker, items, t, extraOptionLabel }) {
   items.forEach((item, i) => {
     console.log(`  ${chalk.cyan(String(i + 1).padStart(2))}. ${item.label}`)
   })
   if (extraOptionLabel) {
     console.log(`  ${chalk.dim('0')}. ${chalk.dim(extraOptionLabel)}`)
   }
-
   const min = extraOptionLabel ? 0 : 1
   const max = items.length
   while (true) {
     const answer = await asker.ask(t.selectPrompt(min, max))
     const idx = Number.parseInt(answer, 10)
     if (Number.isFinite(idx) && idx >= min && idx <= max) {
-      if (idx === 0) return null // 额外选项
+      if (idx === 0) return null
       return { index: idx - 1, value: items[idx - 1].value }
     }
     console.log(chalk.yellow(t.invalidChoice(min, max)))
@@ -481,7 +652,13 @@ export async function collectModelInput({ locale = 'zh-CN', rl: injectedRl, fetc
       label: `${p.label} ${chalk.dim(p.url)}`,
       value: p,
     }))
-    const providerChoice = await selectFromList(asker, t.selectProvider, providerItems, t, t.customOption)
+    const providerChoice = await selectFromList({
+      rl, asker,
+      title: t.selectProvider,
+      items: providerItems,
+      t,
+      extraOptionLabel: t.customOption,
+    })
 
     let baseURL
     if (providerChoice) {
@@ -528,7 +705,13 @@ export async function collectModelInput({ locale = 'zh-CN', rl: injectedRl, fetc
     let model
     if (modelList.length > 0) {
       const modelItems = modelList.map(m => ({ label: m, value: m }))
-      const modelChoice = await selectFromList(asker, t.builtinModels, modelItems, t, t.manualInput)
+      const modelChoice = await selectFromList({
+        rl, asker,
+        title: t.builtinModels,
+        items: modelItems,
+        t,
+        extraOptionLabel: t.manualInput,
+      })
       if (modelChoice) {
         model = modelChoice.value
       } else {

package/src/cli/ai/sessionStore.js

@@ -1,97 +1,97 @@
-// 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.
-//
-// CLI 侧智能体会话持久化。
-//
-// 与 Web 端 (src/ui/server/routes/workbench/agentSessionStore.js) 共享同一数据目录
-// (~/.zen-gitsync/agent-sessions/) 和同一 JSON 格式,这样:
-//   - CLI 对话在 Web UI 的智能体 tab 里可见(带 CLI 标记)
-//   - Web UI 可以读取/继续 CLI 创建的会话
-//
-// 本模块刻意不依赖服务器代码,仅用 node 内置 fs/path/os,保持 CLI 自包含。
-
-import fsp from 'fs/promises';
-import path from 'path';
-import os from 'os';
-
-const SESSIONS_DIR = path.join(os.homedir(), '.zen-gitsync', 'agent-sessions');
-const MAX_SESSIONS = 200;
-const KEEP_SESSIONS = 100;
-
-/**
- * 生成会话 ID: ag-{时间戳base36}-{随机base36}
- */
-export function genSessionId() {
-  return `ag-${Date.now().toString(36).slice(-8)}-${Math.random().toString(36).slice(2, 10)}`;
-}
-
-/**
- * 从第一条 user 消息自动生成标题(取第一行,截断 40 字符)
- */
-export function autoTitle(messages) {
-  for (const m of messages) {
-    if (m.role === 'user') {
-      let text = '';
-      if (typeof m.content === 'string') {
-        text = m.content;
-      } else if (Array.isArray(m.content)) {
-        text = m.content.filter(p => p?.type === 'text').map(p => p.text).join(' ');
-      }
-      text = text.trim();
-      if (text) {
-        const firstLine = text.split('\n')[0].trim();
-        return firstLine.length > 40 ? firstLine.slice(0, 40) + '…' : firstLine;
-      }
-    }
-  }
-  return '(新会话)';
-}
-
-/**
- * 写入会话(原子操作: tmp + rename)
- */
-export async function writeSession(sessionId, data) {
-  await fsp.mkdir(SESSIONS_DIR, { recursive: true });
-  const file = path.join(SESSIONS_DIR, `${sessionId}.json`);
-  const tmp = `${file}.tmp.${process.pid}.${Date.now()}`;
-  await fsp.writeFile(tmp, JSON.stringify(data, null, 2), 'utf-8');
-  await fsp.rename(tmp, file);
-}
-
-/**
- * 读取会话
- */
-export async function readSession(sessionId) {
-  const file = path.join(SESSIONS_DIR, `${sessionId}.json`);
-  return JSON.parse(await fsp.readFile(file, 'utf-8'));
-}
-
-/**
- * 保留策略:超过 MAX_SESSIONS 时删最旧的,保留 KEEP_SESSIONS 个
- */
-export async function enforceRetention() {
-  const files = await fsp.readdir(SESSIONS_DIR).catch(() => []);
-  const jsonFiles = files.filter(f => f.endsWith('.json'));
-  if (jsonFiles.length < MAX_SESSIONS) return;
-  const stats = await Promise.all(jsonFiles.map(async f => {
-    const full = path.join(SESSIONS_DIR, f);
-    const s = await fsp.stat(full);
-    return { file: full, mtime: s.mtimeMs };
-  }));
-  stats.sort((a, b) => b.mtime - a.mtime);
-  const toDelete = stats.slice(KEEP_SESSIONS);
-  await Promise.all(toDelete.map(s => fsp.unlink(s.file).catch(() => {})));
-}
-
-export { SESSIONS_DIR };
+// 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.
+//
+// CLI 侧智能体会话持久化。
+//
+// 与 Web 端 (src/ui/server/routes/workbench/agentSessionStore.js) 共享同一数据目录
+// (~/.zen-gitsync/agent-sessions/) 和同一 JSON 格式,这样:
+//   - CLI 对话在 Web UI 的智能体 tab 里可见(带 CLI 标记)
+//   - Web UI 可以读取/继续 CLI 创建的会话
+//
+// 本模块刻意不依赖服务器代码,仅用 node 内置 fs/path/os,保持 CLI 自包含。
+
+import fsp from 'fs/promises';
+import path from 'path';
+import os from 'os';
+
+const SESSIONS_DIR = path.join(os.homedir(), '.zen-gitsync', 'agent-sessions');
+const MAX_SESSIONS = 200;
+const KEEP_SESSIONS = 100;
+
+/**
+ * 生成会话 ID: ag-{时间戳base36}-{随机base36}
+ */
+export function genSessionId() {
+  return `ag-${Date.now().toString(36).slice(-8)}-${Math.random().toString(36).slice(2, 10)}`;
+}
+
+/**
+ * 从第一条 user 消息自动生成标题(取第一行,截断 40 字符)
+ */
+export function autoTitle(messages) {
+  for (const m of messages) {
+    if (m.role === 'user') {
+      let text = '';
+      if (typeof m.content === 'string') {
+        text = m.content;
+      } else if (Array.isArray(m.content)) {
+        text = m.content.filter(p => p?.type === 'text').map(p => p.text).join(' ');
+      }
+      text = text.trim();
+      if (text) {
+        const firstLine = text.split('\n')[0].trim();
+        return firstLine.length > 40 ? firstLine.slice(0, 40) + '…' : firstLine;
+      }
+    }
+  }
+  return '(新会话)';
+}
+
+/**
+ * 写入会话(原子操作: tmp + rename)
+ */
+export async function writeSession(sessionId, data) {
+  await fsp.mkdir(SESSIONS_DIR, { recursive: true });
+  const file = path.join(SESSIONS_DIR, `${sessionId}.json`);
+  const tmp = `${file}.tmp.${process.pid}.${Date.now()}`;
+  await fsp.writeFile(tmp, JSON.stringify(data, null, 2), 'utf-8');
+  await fsp.rename(tmp, file);
+}
+
+/**
+ * 读取会话
+ */
+export async function readSession(sessionId) {
+  const file = path.join(SESSIONS_DIR, `${sessionId}.json`);
+  return JSON.parse(await fsp.readFile(file, 'utf-8'));
+}
+
+/**
+ * 保留策略:超过 MAX_SESSIONS 时删最旧的,保留 KEEP_SESSIONS 个
+ */
+export async function enforceRetention() {
+  const files = await fsp.readdir(SESSIONS_DIR).catch(() => []);
+  const jsonFiles = files.filter(f => f.endsWith('.json'));
+  if (jsonFiles.length < MAX_SESSIONS) return;
+  const stats = await Promise.all(jsonFiles.map(async f => {
+    const full = path.join(SESSIONS_DIR, f);
+    const s = await fsp.stat(full);
+    return { file: full, mtime: s.mtimeMs };
+  }));
+  stats.sort((a, b) => b.mtime - a.mtime);
+  const toDelete = stats.slice(KEEP_SESSIONS);
+  await Promise.all(toDelete.map(s => fsp.unlink(s.file).catch(() => {})));
+}
+
+export { SESSIONS_DIR };