jinzd-ai-cli 0.1.47 → 0.1.49

package/CLAUDE.md

@@ -38,8 +38,8 @@ src/
 │   ├── config-manager.ts           # 读写 ~/.aicli/config.json，三层优先级：env > file > default
 │   └── env-loader.ts               # AICLI_API_KEY_* 等环境变量映射
 ├── session/
-│   ├── session.ts                  # Session（addMessage / clear / compact / toJSON / fromJSON）
-│   └── session-manager.ts          # CRUD for ~/.aicli/history/*.json
+│   ├── session.ts                  # Session（addMessage / clear / compact / fork / toJSON / fromJSON）
+│   └── session-manager.ts          # CRUD + forkSession for ~/.aicli/history/*.json
 ├── repl/
 │   ├── repl.ts                     # 主 REPL 循环（MAX_TOOL_ROUNDS=20，handleChatWithTools agentic loop）
 │   ├── renderer.ts                 # 终端输出（renderStream / renderResponse 均不加前置 \n）
@@ -47,7 +47,7 @@ src/
 │   ├── dev-state.ts                # 开发状态交接（provider/model 切换时快照生成、save/load/clear）
 │   ├── setup-wizard.ts             # @inquirer/prompts 首次运行交互式设置
 │   └── commands/
-│       └── index.ts                # CommandRegistry + 33个命令（/help /about /provider /model /clear /compact /plan /session /system /context /status /search /undo /export /copy /cost /init /skill /tools /plugins /mcp /config /checkpoint /review /commands /test /scaffold /add-dir /memory /doctor /bug /think /exit）
+│       └── index.ts                # CommandRegistry + 35个命令（/help /about /provider /model /clear /compact /plan /session /system /context /status /search /undo /export /copy /cost /init /skill /tools /plugins /mcp /config /checkpoint /review /commands /test /scaffold /add-dir /memory /doctor /bug /think /diff /fork /exit）
 │   ├── custom-commands.ts          # CustomCommandManager（~/.aicli/commands/*.md 用户自定义命令）
 ├── skills/
 │   ├── types.ts                    # Skill/SkillMeta 接口、parseSkillFile（YAML frontmatter 解析）
@@ -350,6 +350,81 @@ const stdinLines = Array.isArray(rawStdin) ? rawStdin.map(String)
 - [x] **web_fetch DNS 解析时 SSRF 防护**（v0.1.25）：新增 `resolveAndCheck()` 函数，用 `dns.promises.lookup()` 预解析域名，检查结果 IP 是否为私有地址。初始 URL 和 redirect 目标均校验。
 - [ ] **`persistentCwd` 全局状态**：bash 工具的当前工作目录是模块级全局变量，多 session 并发时可能串扰。现阶段单 session REPL 无影响，GUI 多会话扩展时需重构为 per-session 状态。
 
+## 本轮开发完成记录（2026-03-08，v0.1.47 → v0.1.48）
+
+### Tier 2 体验增强：/undo 增强 + /fork 对话分支
+
+**Feature 1：/undo 增强 — bash 工具文件追踪 + 命令增强**
+
+| 文件 | 变更 |
+|------|------|
+| `src/tools/undo-stack.ts` | `UndoEntry` 新增 `isDirectory?: boolean` + `pushNewFile()` / `pushNewDir()` 方法 + `undo()` 目录分支 |
+| `src/tools/builtin/bash.ts` | 三辅助函数 + `execute()` 集成 |
+| `src/repl/commands/index.ts` | `/undo` 重写为 `/undo [list\|<n>]` |
+
+- **UndoStack 扩展**：新增 `pushNewFile(filePath, desc)` 和 `pushNewDir(dirPath, desc)` 方法，previousContent=null 表示新建（undo 时删除）。`undo()` 新增 `isDirectory` 分支，用 `rmdirSync` 尝试删除空目录，非空给出提示。
+- **Bash 工具文件追踪**（浅层 CWD 快照 + 命令模式解析）：
+  - `snapshotDir(dir)` — `readdirSync` 获取目录下所有条目的绝对路径 Set
+  - `parseCreationTargets(command, cwd)` — 正则解析 touch/mkdir/echo>/cp/New-Item 等常见创建命令的目标路径
+  - `pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, cwd)` — 对比前后快照 + 解析目标，为新建文件/目录推入 undo 条目
+  - 集成到 `execute()`：执行前快照 + 构建目标存在状态 Map；执行后（成功/失败均）调用 pushBashUndoEntries
+- **/undo 命令增强**：
+  - `/undo` — 撤销最近 1 次（向后兼容）
+  - `/undo list` — 显示完整 undo 栈（编号、类型标签 `[new]`/`[mod]`/`[dir]`、描述、时间）
+  - `/undo <n>` — 连续撤销最近 N 次操作，逐条显示进度
+
+**Feature 2：/fork 对话分支**
+
+| 文件 | 变更 |
+|------|------|
+| `src/session/session.ts` | 静态 `fork(original, newId, messageCount, newTitle?)` 方法 |
+| `src/session/session-manager.ts` | `forkSession(messageCount, title?)` 方法 |
+| `src/repl/commands/index.ts` | `/fork` 命令 + `CommandContext.forkSession` |
+| `src/repl/repl.ts` | ctx.forkSession 注入 + tab 补全（/undo list, /fork checkpoint 名称） |
+
+- **Session.fork()**：复制 messages[0..messageCount]，保留范围内 checkpoints（深拷贝），新 UUID，title 默认 "Fork of <原标题>"
+- **SessionManager.forkSession()**：先保存原始 session → Session.fork 创建分叉 → 设为当前 → 保存并返回
+- **/fork 命令**：
+  - `/fork` — 从当前位置分叉（复制全部消息）
+  - `/fork <checkpoint-name>` — 从指定 checkpoint 分叉（仅复制到该 checkpoint 的消息）
+  - 显示原始/新 session ID、title、消息数、保留 checkpoint 数
+  - 提示用户 `/session load <id>` 切回原始
+- **Tab 补全**：`/undo` 提供 `list`；`/fork` 提供当前 session 的 checkpoint 名称列表
+
+### 版本与收尾
+- `src/core/constants.ts`：VERSION `0.1.47` → `0.1.48`
+- `package.json`：version 同步
+- `src/repl/renderer.ts`：命令计数 34 → 35，命令列表新增 `/fork`，新增 1 条特性（/fork 对话分支），更新 /undo 描述
+- 构建验证：`npm run build` 零错误（ESM + CJS 双产物）
+- 发布：`npm publish` → `jinzd-ai-cli@0.1.48`
+
+### 本轮变更文件汇总
+
+| 文件 | 变更类型 | 说明 |
+|------|---------|------|
+| `src/core/constants.ts` | 修改 | VERSION 0.1.47 → 0.1.48 |
+| `src/tools/undo-stack.ts` | 修改 | isDirectory 字段 + pushNewFile/pushNewDir + undo 目录支持 |
+| `src/tools/builtin/bash.ts` | 修改 | snapshotDir + parseCreationTargets + pushBashUndoEntries + execute 集成 |
+| `src/session/session.ts` | 修改 | 静态 fork() 方法 |
+| `src/session/session-manager.ts` | 修改 | forkSession() 方法 |
+| `src/repl/commands/index.ts` | 修改 | /undo 增强 + /fork 命令 + CommandContext.forkSession + /help 更新 |
+| `src/repl/repl.ts` | 修改 | ctx.forkSession 注入 + tab 补全（/undo, /fork） |
+| `src/repl/renderer.ts` | 修改 | /about 35 命令 + 特性更新 |
+| `package.json` | 修改 | version 0.1.47 → 0.1.48 |
+
+### 下一步建议
+
+#### Tier 2 — 体验增强（剩余）
+1. **L1 低危**：`run-tests.ts` 的 `JSON.parse(package.json)` 细粒度错误处理
+2. **IDE 集成**：VS Code 扩展（架构已准备就绪，core/providers/tools 无终端依赖）
+3. **OAuth/浏览器登录**：无需手动填 API Key，打开浏览器完成 OAuth 流程自动保存 token
+
+#### Tier 3 — 长远方向
+4. **Web UI**：基于 EventBus + WebSocket 的浏览器界面，复用 core/providers/tools 层
+5. **GitHub 仓库迁移**：从 gitee 迁移到 GitHub，npm 包受众更广
+
+---
+
 ## 本轮开发完成记录（2026-03-07，v0.1.40 → v0.1.41）
 
 ### Bug 修复：Kimi 虚假完成声明（方案 C）
@@ -536,8 +611,8 @@ const stdinLines = Array.isArray(rawStdin) ? rawStdin.map(String)
 4. **L1 低危**：`run-tests.ts` 的 `JSON.parse(package.json)` 细粒度错误处理
 5. **IDE 集成**：VS Code 扩展（架构已准备就绪，core/providers/tools 无终端依赖）
 6. **OAuth/浏览器登录**：无需手动填 API Key，打开浏览器完成 OAuth 流程自动保存 token
-7. **`/undo` 增强**：支持 bash 工具创建的文件/目录的撤销（当前仅支持 write_file / edit_file）
-8. **对话分支（fork）**：`/fork` 从当前对话某个 checkpoint 分叉为新 session，探索不同方案
+7. ~~**`/undo` 增强**~~：✅ 已在 v0.1.48 实现（bash 文件追踪 + /undo list + /undo <n>）
+8. ~~**对话分支（fork）**~~：✅ 已在 v0.1.48 实现（/fork [checkpoint-name]）
 
 #### Tier 3 — 长远方向
 9. **Web UI**：基于 EventBus + WebSocket 的浏览器界面，复用 core/providers/tools 层

package/dist/{chunk-ZUZDWQVG.js → chunk-P4XKHPXU.js}

@@ -8,7 +8,7 @@ import { platform } from "os";
 import chalk from "chalk";
 
 // src/core/constants.ts
-var VERSION = "0.1.47";
+var VERSION = "0.1.49";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/index.js

@@ -29,7 +29,7 @@ import {
   SUBAGENT_MAX_ROUNDS_LIMIT,
   VERSION,
   runTestsTool
-} from "./chunk-ZUZDWQVG.js";
+} from "./chunk-P4XKHPXU.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -1846,6 +1846,26 @@ var Session = class _Session {
       }))
     };
   }
+  /**
+   * 从现有 session 分叉创建新 session。
+   *
+   * 复制 messages[0..messageCount]，保留范围内的 checkpoints。
+   * 新 session 拥有独立 UUID，title 默认 "Fork of <原标题>"。
+   *
+   * @param original  原始 session
+   * @param newId     新 session 的 UUID
+   * @param messageCount  复制的消息数量（0 = 空 session，> messages.length 则取全部）
+   * @param newTitle  可选的新标题
+   */
+  static fork(original, newId, messageCount, newTitle) {
+    const forked = new _Session(newId, original.provider, original.model);
+    forked.title = newTitle ?? (original.title ? `Fork of ${original.title}` : void 0);
+    const clampedCount = Math.min(Math.max(messageCount, 0), original.messages.length);
+    forked.messages = original.messages.slice(0, clampedCount).map((m) => ({ ...m }));
+    forked.checkpoints = original.checkpoints.filter((c) => c.messageIndex <= clampedCount).map((c) => ({ ...c, timestamp: new Date(c.timestamp.getTime()) }));
+    forked.updated = /* @__PURE__ */ new Date();
+    return forked;
+  }
   /**
    * 从磁盘 JSON 数据恢复 Session 实例。
    * 添加运行时校验：损坏或不兼容的历史文件会抛出明确错误，而非 TypeError 崩溃。
@@ -1961,6 +1981,26 @@ var SessionManager = class {
     }
     return metas.sort((a, b) => b.updated.getTime() - a.updated.getTime());
   }
+  /**
+   * 从当前 session 分叉创建新 session。
+   *
+   * 先保存原始 session（保留完整历史），然后创建分叉（截取到 messageCount），
+   * 将分叉设为当前 session 并保存。
+   *
+   * @param messageCount  复制的消息数量
+   * @param title         可选的新标题
+   * @returns 新的分叉 session
+   */
+  async forkSession(messageCount, title) {
+    if (!this._current) {
+      throw new Error("No active session to fork");
+    }
+    await this.save();
+    const forked = Session.fork(this._current, uuidv4(), messageCount, title);
+    this._current = forked;
+    await this.save();
+    return forked;
+  }
   /**
    * 跨 session 全文搜索。
    * 遍历所有历史 JSON 文件，逐条匹配消息内容（不区分大小写），
@@ -2021,8 +2061,8 @@ var SessionManager = class {
 
 // src/repl/repl.ts
 import * as readline from "readline";
-import { existsSync as existsSync19, readFileSync as readFileSync13, readdirSync as readdirSync9, statSync as statSync7 } from "fs";
-import { join as join14, resolve as resolve4, extname as extname4, dirname as dirname5, basename as basename5 } from "path";
+import { existsSync as existsSync19, readFileSync as readFileSync13, readdirSync as readdirSync11, statSync as statSync8 } from "fs";
+import { join as join14, resolve as resolve5, extname as extname4, dirname as dirname6, basename as basename6 } from "path";
 import chalk10 from "chalk";
 
 // src/repl/renderer.ts
@@ -2231,12 +2271,12 @@ var Renderer = class {
     console.log(tool("spawn_agent", "\u59D4\u6D3E\u72EC\u7ACB\u5B50\u4EE3\u7406\u6267\u884C\u7279\u5B9A\u4EFB\u52A1\uFF08\u9694\u79BB\u5BF9\u8BDD + \u81EA\u52A8\u5DE5\u5177\u8C03\u7528\u5FAA\u73AF\uFF09"));
     console.log(tool("run_tests", "\u8FD0\u884C\u9879\u76EE\u6D4B\u8BD5\u5E76\u8FD4\u56DE\u7ED3\u6784\u5316\u62A5\u544A\uFF08\u81EA\u52A8\u68C0\u6D4B Maven/npm/pytest \u7B49\uFF09"));
     console.log(HR);
-    console.log(theme.dim("  REPL \u547D\u4EE4\uFF0834\u4E2A\uFF09\uFF1A"));
+    console.log(theme.dim("  REPL \u547D\u4EE4\uFF0835\u4E2A\uFF09\uFF1A"));
     console.log(theme.dim("    /help  /about  /provider  /model  /clear  /compact  /plan  /session"));
     console.log(theme.dim("    /system  /context  /status  /search  /undo  /export  /copy  /cost"));
     console.log(theme.dim("    /init  /skill  /tools  /plugins  /mcp  /config  /checkpoint  /review"));
     console.log(theme.dim("    /commands  /test  /scaffold  /add-dir  /memory  /doctor  /bug  /think"));
-    console.log(theme.dim("    /diff  /exit"));
+    console.log(theme.dim("    /diff  /fork  /exit"));
     console.log(HR);
     console.log(theme.dim("  \u4E3B\u8981\u7279\u6027\uFF1A"));
     console.log(feat("Agentic \u5FAA\u73AF\uFF08\u6700\u591A 25 \u8F6E\u5DE5\u5177\u8C03\u7528\uFF0C\u6700\u7EC8\u56DE\u7B54\u6D41\u5F0F\u8F93\u51FA\uFF09"));
@@ -2244,7 +2284,7 @@ var Renderer = class {
     console.log(feat("Git \u4E0A\u4E0B\u6587\u611F\u77E5\uFF1A\u542F\u52A8\u81EA\u52A8\u6CE8\u5165\u5206\u652F\u540D\u4E0E\u6587\u4EF6\u53D8\u66F4\u72B6\u6001"));
     console.log(feat("\u9879\u76EE\u4E0A\u4E0B\u6587\u6587\u4EF6\uFF1A\u81EA\u52A8\u52A0\u8F7D AICLI.md / CLAUDE.md\uFF08\u4E09\u5C42\u7EA7\uFF1A\u5168\u5C40/\u9879\u76EE/\u5B50\u76EE\u5F55\uFF09"));
     console.log(feat("\u8DE8 session \u5386\u53F2\u5168\u6587\u641C\u7D22\uFF08/search <\u5173\u952E\u8BCD>\uFF09"));
-    console.log(feat("\u6587\u4EF6\u64CD\u4F5C\u64A4\u9500\uFF08/undo\uFF0C\u652F\u6301 write_file / edit_file\uFF09"));
+    console.log(feat("\u6587\u4EF6\u64CD\u4F5C\u64A4\u9500\uFF08/undo [list|<n>]\uFF0C\u652F\u6301 write_file / edit_file / bash \u521B\u5EFA\u7684\u6587\u4EF6/\u76EE\u5F55\uFF09"));
     console.log(feat("Thinking \u6A21\u5F0F\u6298\u53E0\uFF08<think> \u5757\u81EA\u52A8\u6298\u53E0\uFF0CGLM-5 \u7B49\uFF09"));
     console.log(feat("Token \u7528\u91CF\u8FFD\u8E2A\uFF08\u6BCF\u6B21\u56DE\u590D + session \u7D2F\u8BA1\uFF0C\u652F\u6301 Gemini/Claude/DeepSeek \u7B49\uFF09"));
     console.log(feat("MCP \u534F\u8BAE\u652F\u6301\uFF1A\u63A5\u5165\u5916\u90E8 MCP \u670D\u52A1\u5668\u5DE5\u5177\uFF08config.json mcpServers \u914D\u7F6E\uFF09"));
@@ -2286,6 +2326,7 @@ var Renderer = class {
     console.log(feat("/config set|get|show\uFF1AREPL \u5185\u5FEB\u6377\u8BFB\u5199\u914D\u7F6E\uFF0C\u65E0\u9700\u8FDB\u5165\u5411\u5BFC\uFF08\u70B9\u5206\u8DEF\u5F84 + \u81EA\u52A8\u7C7B\u578B\u8F6C\u6362\uFF09"));
     console.log(feat("\u5DE5\u5177\u8C03\u7528\u6700\u7EC8\u56DE\u7B54\u6D41\u5F0F\u5316\uFF1A\u6A21\u62DF\u6253\u5B57\u673A\u6548\u679C\u9010\u5757\u8F93\u51FA\uFF0C\u96F6\u989D\u5916 API \u8C03\u7528\uFF0C\u652F\u6301 Escape \u4E2D\u65AD"));
     console.log(feat("/diff \u547D\u4EE4\uFF1A\u663E\u793A\u5F53\u524D session \u5185\u6240\u6709\u6587\u4EF6\u4FEE\u6539\u7684\u6C47\u603B diff\uFF08\u5408\u5E76\u540C\u6587\u4EF6\u591A\u6B21\u4FEE\u6539\uFF09"));
+    console.log(feat("/fork \u5BF9\u8BDD\u5206\u652F\uFF1A\u4ECE\u5F53\u524D\u4F4D\u7F6E\u6216\u6307\u5B9A checkpoint \u5206\u53C9\u4E3A\u65B0 session\uFF0C\u63A2\u7D22\u4E0D\u540C\u65B9\u6848"));
     console.log();
   }
   printPrompt(provider, _model) {
@@ -2385,8 +2426,8 @@ var Renderer = class {
       process.stdout.write("\n\n");
     }
     if (fileStream) {
-      await new Promise((resolve5, reject) => {
-        fileStream.end((err) => err ? reject(err) : resolve5());
+      await new Promise((resolve6, reject) => {
+        fileStream.end((err) => err ? reject(err) : resolve6());
       });
       const kb = (Buffer.byteLength(fullContent, "utf-8") / 1024).toFixed(1);
       process.stdout.write(theme.success(`  \u2705 \u5DF2\u4FDD\u5B58: ${options.saveToFile} (${kb} KB)
@@ -2441,7 +2482,7 @@ var Renderer = class {
       process.stdout.write(displayed.slice(pos, end));
       pos = end;
       if (pos < displayed.length) {
-        await new Promise((resolve5) => setTimeout(resolve5, DELAY_MS));
+        await new Promise((resolve6) => setTimeout(resolve6, DELAY_MS));
       }
     }
     process.stdout.write("\n\n");
@@ -2595,7 +2636,7 @@ function formatGitContextForPrompt(ctx) {
 }
 
 // src/tools/undo-stack.ts
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, unlinkSync, existsSync as existsSync4 } from "fs";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, unlinkSync, rmdirSync, existsSync as existsSync4 } from "fs";
 var MAX_UNDO_DEPTH = 20;
 var UndoStack = class {
   stack = [];
@@ -2623,6 +2664,37 @@ var UndoStack = class {
       this.stack.shift();
     }
   }
+  /**
+   * 推入一个新建文件的条目（previousContent=null），undo 时删除该文件。
+   * 用于 bash 工具执行后检测到的新建文件。
+   */
+  pushNewFile(filePath, description) {
+    this.stack.push({
+      filePath,
+      previousContent: null,
+      description,
+      timestamp: /* @__PURE__ */ new Date()
+    });
+    if (this.stack.length > MAX_UNDO_DEPTH) {
+      this.stack.shift();
+    }
+  }
+  /**
+   * 推入一个新建目录的条目（previousContent=null, isDirectory=true），
+   * undo 时尝试 rmdir（仅空目录可删）。
+   */
+  pushNewDir(dirPath, description) {
+    this.stack.push({
+      filePath: dirPath,
+      previousContent: null,
+      description,
+      timestamp: /* @__PURE__ */ new Date(),
+      isDirectory: true
+    });
+    if (this.stack.length > MAX_UNDO_DEPTH) {
+      this.stack.shift();
+    }
+  }
   /**
    * 弹出并执行最近一次撤销操作。
    * @returns 撤销结果描述，或 null（栈为空时）
@@ -2632,10 +2704,22 @@ var UndoStack = class {
     if (!entry) return null;
     try {
       if (entry.previousContent === null) {
-        if (existsSync4(entry.filePath)) {
-          unlinkSync(entry.filePath);
+        if (entry.isDirectory) {
+          if (existsSync4(entry.filePath)) {
+            try {
+              rmdirSync(entry.filePath);
+              return { entry, result: `Removed newly created directory: ${entry.filePath}` };
+            } catch {
+              return { entry, result: `Cannot remove directory (not empty): ${entry.filePath}` };
+            }
+          }
+          return { entry, result: `Directory already removed: ${entry.filePath}` };
+        } else {
+          if (existsSync4(entry.filePath)) {
+            unlinkSync(entry.filePath);
+          }
+          return { entry, result: `Deleted newly created file: ${entry.filePath}` };
         }
-        return { entry, result: `Deleted newly created file: ${entry.filePath}` };
       } else {
         writeFileSync3(entry.filePath, entry.previousContent, "utf-8");
         const lines = entry.previousContent.split("\n").length;
@@ -3173,7 +3257,7 @@ function createDefaultCommands() {
           "  /context                 - Show or reload hierarchical context layers",
           "  /status                  - Show current status",
           "  /search <keyword>        - Search across all session histories",
-          "  /undo                    - Undo the last file write/edit operation",
+          "  /undo [list|<n>]         - Undo file ops (list stack, undo N times)",
           "  /export [md|json] [file] - Export session to file (default: auto-named .md)",
           "  /tools                   - List all AI tools available",
           "  /plugins                 - Show plugin directory and loaded plugins",
@@ -3193,6 +3277,7 @@ function createDefaultCommands() {
           "  /doctor                  - Health check (API keys, config, MCP status)",
           "  /bug [--copy]            - Generate bug report template (--copy to clipboard)",
           "  /diff [--stats]          - Show all file modifications in this session",
+          "  /fork [checkpoint]       - Fork session from checkpoint or current position",
           "  /exit                    - Exit"
         ] : [];
         console.log("\nAvailable commands:");
@@ -3581,23 +3666,53 @@ ${text}
     },
     {
       name: "undo",
-      description: "Undo the last file write or edit operation",
-      usage: "/undo",
-      execute(_args, ctx) {
-        const top = undoStack.peek();
-        if (!top) {
+      description: "Undo file operations (supports: /undo, /undo list, /undo <n>)",
+      usage: "/undo [list | <n>]",
+      execute(args, ctx) {
+        const sub = args.trim();
+        if (sub === "list") {
+          const history = undoStack.getHistory();
+          if (history.length === 0) {
+            ctx.renderer.printInfo("Undo stack is empty.");
+            return;
+          }
+          console.log(theme.heading("\n  Undo Stack (" + history.length + " entries, newest last):\n"));
+          history.forEach((entry, i) => {
+            const timeStr = entry.timestamp.toLocaleTimeString();
+            const typeTag = entry.isDirectory ? theme.accent("[dir]") : entry.previousContent === null ? theme.accent("[new]") : theme.dim("[mod]");
+            console.log(`  ${theme.dim(String(i + 1).padStart(3))}  ${typeTag}  ${entry.description}  ${theme.dim(timeStr)}`);
+          });
+          console.log("");
+          return;
+        }
+        const n = sub ? parseInt(sub, 10) : 1;
+        if (isNaN(n) || n < 1) {
+          ctx.renderer.printInfo("Usage: /undo [list | <n>]  \u2014 n must be a positive integer.");
+          return;
+        }
+        if (undoStack.depth === 0) {
           ctx.renderer.printInfo("Nothing to undo.");
           return;
         }
-        const timeStr = top.timestamp.toLocaleTimeString();
-        ctx.renderer.printInfo(
-          `Undoing: ${top.description}  (${timeStr})`
-        );
-        const undoResult = undoStack.undo();
-        if (undoResult) {
-          ctx.renderer.printSuccess(undoResult.result);
-        } else {
+        const count = Math.min(n, undoStack.depth);
+        const results = [];
+        for (let i = 0; i < count; i++) {
+          const top = undoStack.peek();
+          if (!top) break;
+          const timeStr = top.timestamp.toLocaleTimeString();
+          ctx.renderer.printInfo(`Undoing [${i + 1}/${count}]: ${top.description}  (${timeStr})`);
+          const undoResult = undoStack.undo();
+          if (undoResult) {
+            results.push(undoResult.result);
+            ctx.renderer.printSuccess("  " + undoResult.result);
+          }
+        }
+        if (results.length === 0) {
           ctx.renderer.printInfo("Nothing to undo.");
+        } else if (results.length > 1) {
+          console.log(theme.success(`
+  \u2713 ${results.length} operations undone.
+`));
         }
       }
     },
@@ -4173,7 +4288,7 @@ ${hint}` : "")
       description: "Run project tests and show structured report",
       usage: "/test [command|filter]",
       async execute(args, _ctx) {
-        const { executeTests } = await import("./run-tests-EM3QNRWV.js");
+        const { executeTests } = await import("./run-tests-JJVZWQKI.js");
         const argStr = args.join(" ").trim();
         let testArgs = {};
         if (argStr) {
@@ -4500,6 +4615,57 @@ Summary: ${fileMap.size} file(s) \u2014 ${newFiles} new, ${modifiedFiles} modifi
         console.log();
       }
     },
+    {
+      name: "fork",
+      description: "Fork current session from a checkpoint or current position",
+      usage: "/fork [checkpoint-name]",
+      async execute(args, ctx) {
+        const session = ctx.sessions.current;
+        if (!session) {
+          ctx.renderer.printInfo("No active session to fork.");
+          return;
+        }
+        const sub = args.join(" ").trim();
+        let messageCount = session.messages.length;
+        let fromLabel = "current position";
+        if (sub) {
+          const cp = session.checkpoints.find((c) => c.name === sub);
+          if (!cp) {
+            const available = session.checkpoints.map((c) => c.name);
+            if (available.length > 0) {
+              ctx.renderer.printInfo(
+                `Checkpoint "${sub}" not found. Available: ${available.join(", ")}`
+              );
+            } else {
+              ctx.renderer.printInfo(
+                `Checkpoint "${sub}" not found. No checkpoints saved. Use /checkpoint save <name> first.`
+              );
+            }
+            return;
+          }
+          messageCount = cp.messageIndex;
+          fromLabel = `checkpoint "${cp.name}" (${cp.messageIndex} messages)`;
+        }
+        try {
+          const originalId = session.id.slice(0, 8);
+          const originalTitle = session.title ?? "(untitled)";
+          const forked = await ctx.forkSession(messageCount);
+          console.log(theme.heading("\n  Session Forked\n"));
+          console.log(`  ${theme.dim("Original:")}  ${theme.accent(originalId)}  "${originalTitle}"`);
+          console.log(`  ${theme.dim("Forked:  ")}  ${theme.accent(forked.id.slice(0, 8))}  "${forked.title ?? "(untitled)"}"`);
+          console.log(`  ${theme.dim("From:    ")}  ${fromLabel}`);
+          console.log(`  ${theme.dim("Messages:")}  ${forked.messages.length} copied, ${forked.checkpoints.length} checkpoint(s) preserved`);
+          console.log("");
+          console.log(theme.dim(`  Use /session load ${originalId} to switch back to original.`));
+          console.log("");
+          ctx.refreshPrompt();
+        } catch (err) {
+          ctx.renderer.printError(
+            `Fork failed: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
+    },
     {
       name: "exit",
       description: "Exit the REPL",
@@ -4519,7 +4685,7 @@ var IGNORE_ENTER_MS = 80;
 function selectFromList(prompt, items, initialIndex = 0) {
   if (items.length === 0) return Promise.resolve(null);
   const PAGE = 12;
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     let selected = Math.max(0, Math.min(initialIndex, items.length - 1));
     let windowStart = Math.max(0, selected - Math.floor(PAGE / 2));
     let lastRenderedLines = 0;
@@ -4594,7 +4760,7 @@ function selectFromList(prompt, items, initialIndex = 0) {
         process.stdout.write(chalk5.dim(`  \u2714 ${result}
 `));
       }
-      resolve5(result);
+      resolve6(result);
     };
     const handleSequence = (seq) => {
       if (seq === "\x1B") {
@@ -4658,13 +4824,13 @@ function selectFromList(prompt, items, initialIndex = 0) {
       }
     };
     if (!process.stdin.isTTY) {
-      resolve5(items[0]?.value ?? null);
+      resolve6(items[0]?.value ?? null);
       return;
     }
     try {
       process.stdin.setRawMode(true);
     } catch {
-      resolve5(items[0]?.value ?? null);
+      resolve6(items[0]?.value ?? null);
       return;
     }
     savedDataListeners = process.stdin.rawListeners("data");
@@ -4677,7 +4843,7 @@ function selectFromList(prompt, items, initialIndex = 0) {
 
 // src/tools/builtin/bash.ts
 import { execSync as execSync4 } from "child_process";
-import { existsSync as existsSync7 } from "fs";
+import { existsSync as existsSync7, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
 import { platform as platform2 } from "os";
 import { resolve as resolve2 } from "path";
 var IS_WINDOWS = platform2() === "win32";
@@ -4749,6 +4915,12 @@ var bashTool = {
     } else {
       actualCommand = command;
     }
+    const beforeSnapshot = snapshotDir(effectiveCwd);
+    const parsedTargets = parseCreationTargets(command, effectiveCwd);
+    const parsedTargetsBefore = /* @__PURE__ */ new Map();
+    for (const t of parsedTargets) {
+      parsedTargetsBefore.set(t, existsSync7(t));
+    }
     try {
       const output = execSync4(actualCommand, {
         timeout,
@@ -4763,9 +4935,11 @@ var bashTool = {
         }
       });
       updateCwdFromCommand(command, effectiveCwd);
+      pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
       const result = IS_WINDOWS && Buffer.isBuffer(output) ? output.toString("utf-8") : output;
       return result || "(command completed with no output)";
     } catch (err) {
+      pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
       if (err && typeof err === "object" && "status" in err) {
         const execErr = err;
         const stderr = IS_WINDOWS && Buffer.isBuffer(execErr.stderr) ? execErr.stderr.toString("utf-8").trim() : execErr.stderr?.toString().trim() ?? "";
@@ -4798,6 +4972,69 @@ function fixWindowsDeleteCommand(command) {
     }
   );
 }
+function snapshotDir(dir) {
+  try {
+    return new Set(readdirSync3(dir).map((name) => resolve2(dir, name)));
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+}
+function parseCreationTargets(command, cwd) {
+  const targets = [];
+  for (const m of command.matchAll(/(?:echo|cat|printf)\s+[^>]*>\s*(['"]?)([^\s;&|'"]+)\1/g)) {
+    if (m[2]) targets.push(resolve2(cwd, m[2]));
+  }
+  for (const m of command.matchAll(/\btouch\s+((?:['"]?[^\s;&|'"]+['"]?\s*)+)/g)) {
+    for (const f of m[1].trim().split(/\s+/)) {
+      const clean = f.replace(/^['"]|['"]$/g, "");
+      if (clean && !clean.startsWith("-")) targets.push(resolve2(cwd, clean));
+    }
+  }
+  for (const m of command.matchAll(/\bmkdir\s+(?:-\w+\s+)*((?:['"]?[^\s;&|'"]+['"]?\s*)+)/g)) {
+    for (const d of m[1].trim().split(/\s+/)) {
+      const clean = d.replace(/^['"]|['"]$/g, "");
+      if (clean && !clean.startsWith("-")) targets.push(resolve2(cwd, clean));
+    }
+  }
+  for (const m of command.matchAll(/\bcp\s+(?:-\w+\s+)*['"]?[^\s;&|'"]+['"]?\s+(['"]?)([^\s;&|'"]+)\1/g)) {
+    if (m[2]) targets.push(resolve2(cwd, m[2]));
+  }
+  for (const m of command.matchAll(/\bNew-Item\s+(?:-(?:Path|ItemType)\s+\w+\s+)*['"]?([^\s;&|'"]+)['"]?/gi)) {
+    if (m[1] && !m[1].startsWith("-")) targets.push(resolve2(cwd, m[1]));
+  }
+  return [...new Set(targets)];
+}
+function pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, cwd) {
+  const tracked = /* @__PURE__ */ new Set();
+  const afterSnapshot = snapshotDir(cwd);
+  for (const absPath of afterSnapshot) {
+    if (!beforeSnapshot.has(absPath)) {
+      try {
+        const st = statSync3(absPath);
+        if (st.isDirectory()) {
+          undoStack.pushNewDir(absPath, `bash (new dir): ${absPath}`);
+        } else {
+          undoStack.pushNewFile(absPath, `bash (new file): ${absPath}`);
+        }
+        tracked.add(absPath);
+      } catch {
+      }
+    }
+  }
+  for (const [target, existedBefore] of parsedTargetsBefore) {
+    if (!existedBefore && !tracked.has(target) && existsSync7(target)) {
+      try {
+        const st = statSync3(target);
+        if (st.isDirectory()) {
+          undoStack.pushNewDir(target, `bash (new dir): ${target}`);
+        } else {
+          undoStack.pushNewFile(target, `bash (new file): ${target}`);
+        }
+      } catch {
+      }
+    }
+  }
+}
 function updateCwdFromCommand(command, baseCwd) {
   const cdMatches = [...command.matchAll(/(?:^|[;&|])\s*cd\s+(['"]?)([^\s;&|'"]+)\1/g)];
   if (cdMatches.length === 0) return;
@@ -4814,8 +5051,9 @@ function updateCwdFromCommand(command, baseCwd) {
 }
 
 // src/tools/builtin/read-file.ts
-import { readFileSync as readFileSync5, existsSync as existsSync8, statSync as statSync3 } from "fs";
-import { extname, resolve as resolve3, basename as basename2, sep } from "path";
+import { readFileSync as readFileSync5, existsSync as existsSync8, statSync as statSync4, readdirSync as readdirSync4 } from "fs";
+import { execSync as execSync5 } from "child_process";
+import { extname, resolve as resolve3, basename as basename2, sep, dirname as dirname3 } from "path";
 import { homedir as homedir2 } from "os";
 var MAX_FILE_BYTES = 10 * 1024 * 1024;
 function getSensitiveWarning(normalizedPath) {
@@ -4883,6 +5121,55 @@ function isBinaryBuffer(buf) {
   }
   return nullCount / sample.length > 0.1;
 }
+function findSimilarFiles(filePath) {
+  const targetName = basename2(filePath).toLowerCase();
+  if (!targetName) return [];
+  const cwd = process.cwd();
+  const candidates = [];
+  try {
+    for (const entry of readdirSync4(cwd, { withFileTypes: true })) {
+      if (entry.isFile() && entry.name.toLowerCase() === targetName) {
+        candidates.push(entry.name);
+      }
+      if (entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "node_modules") {
+        try {
+          const subDir = resolve3(cwd, entry.name);
+          for (const sub of readdirSync4(subDir, { withFileTypes: true })) {
+            if (sub.isFile() && sub.name.toLowerCase() === targetName) {
+              candidates.push(`${entry.name}/${sub.name}`);
+            }
+          }
+        } catch {
+        }
+      }
+    }
+  } catch {
+  }
+  return candidates.slice(0, 5);
+}
+function tryExtractPdfText(absPath) {
+  try {
+    const output = execSync5(`pdftotext "${absPath}" -`, {
+      timeout: 15e3,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    if (output.trim().length > 0) return output;
+  } catch {
+  }
+  try {
+    const pyScript = `import sys; exec("try:\\n from pdfminer.high_level import extract_text\\n print(extract_text(sys.argv[1]))\\nexcept: pass")`;
+    const output = execSync5(`python -c "${pyScript}" "${absPath}"`, {
+      timeout: 15e3,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      env: { ...process.env, PYTHONUTF8: "1", PYTHONIOENCODING: "utf-8" }
+    });
+    if (output.trim().length > 0) return output;
+  } catch {
+  }
+  return null;
+}
 var readFileTool = {
   definition: {
     name: "read_file",
@@ -4907,8 +5194,24 @@ var readFileTool = {
     const encoding = args["encoding"] ?? "utf-8";
     if (!filePath) throw new Error("path is required");
     const normalizedPath = resolve3(filePath);
-    if (!existsSync8(normalizedPath)) throw new Error(`File not found: ${filePath}`);
-    const { size } = statSync3(normalizedPath);
+    if (!existsSync8(normalizedPath)) {
+      const suggestions = findSimilarFiles(filePath);
+      if (suggestions.length > 0) {
+        throw new Error(
+          `File not found: ${filePath}
+\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55: ${process.cwd()}
+\u627E\u5230\u540C\u540D\u6587\u4EF6\uFF0C\u4F60\u662F\u5426\u8981\u627E\uFF1A
+` + suggestions.map((s) => `  \u2192 ${s}`).join("\n") + `
+\u8BF7\u4F7F\u7528\u6B63\u786E\u7684\u76F8\u5BF9\u8DEF\u5F84\u91CD\u8BD5\u3002`
+        );
+      }
+      throw new Error(
+        `File not found: ${filePath}
+\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55: ${process.cwd()}
+\u8BF7\u4F7F\u7528 list_dir \u786E\u8BA4\u6587\u4EF6\u8DEF\u5F84\u540E\u91CD\u8BD5\u3002`
+      );
+    }
+    const { size } = statSync4(normalizedPath);
     if (size > MAX_FILE_BYTES) {
       const mb = (size / 1024 / 1024).toFixed(1);
       return `[File too large: ${filePath} (${mb} MB)]
@@ -4920,12 +5223,31 @@ var readFileTool = {
     }
     const sensitiveWarning = getSensitiveWarning(normalizedPath);
     const ext = extname(normalizedPath).toLowerCase();
+    if (ext === ".pdf") {
+      const pdfText = tryExtractPdfText(normalizedPath);
+      if (pdfText) {
+        const lines2 = pdfText.split("\n").length;
+        return `[PDF extracted: ${filePath} | ${lines2} lines]
+
+${pdfText}`;
+      }
+      const dir = dirname3(normalizedPath);
+      const nameNoExt = basename2(normalizedPath, ext);
+      const textAlts = [".md", ".txt", ".html"].map((e) => resolve3(dir, nameNoExt + e)).filter(existsSync8);
+      return `[Binary file: ${filePath}]
+PDF \u6587\u672C\u63D0\u53D6\u5931\u8D25\uFF08pdftotext \u548C pdfminer \u5747\u4E0D\u53EF\u7528\uFF09\u3002
+` + (textAlts.length > 0 ? `\u627E\u5230\u53EF\u66FF\u4EE3\u7684\u6587\u672C\u7248\u672C\uFF1A
+${textAlts.map((p) => `  \u2192 ${basename2(p)}`).join("\n")}
+\u8BF7\u4F7F\u7528 read_file \u8BFB\u53D6\u4E0A\u8FF0\u6587\u4EF6\u3002` : `\u5982\u9700\u4F7F\u7528\u5176\u5185\u5BB9\uFF0C\u8BF7\u4F7F\u7528 bash \u5DE5\u5177\u5B89\u88C5\u5E76\u8C03\u7528 pdftotext\uFF1A
+  pip install pdfminer.six  # \u5B89\u88C5 Python PDF \u5E93
+\u6216\u5C06 PDF \u624B\u52A8\u8F6C\u6362\u4E3A .md / .txt \u6587\u4EF6\u540E\u518D\u8BFB\u53D6\u3002`);
+    }
     if (BINARY_EXTENSIONS.has(ext)) {
       return `[Binary file: ${filePath}]
 \u6B64\u6587\u4EF6\u4E3A\u4E8C\u8FDB\u5236\u683C\u5F0F\uFF08${ext}\uFF09\uFF0C\u65E0\u6CD5\u4F5C\u4E3A\u6587\u672C\u8BFB\u53D6\u3002
 \u5982\u9700\u4F7F\u7528\u5176\u5185\u5BB9\uFF0C\u8BF7\u8003\u8651\uFF1A
   1. \u5C06\u6587\u4EF6\u8F6C\u6362\u4E3A\u6587\u672C\u683C\u5F0F\u540E\u518D\u8BFB\u53D6
-  2. \u4F7F\u7528 bash \u5DE5\u5177\u8C03\u7528\u5916\u90E8\u8F6C\u6362\u7A0B\u5E8F\uFF08\u5982 pdftotext\u3001pandoc \u7B49\uFF09
+  2. \u4F7F\u7528 bash \u5DE5\u5177\u8C03\u7528\u5916\u90E8\u8F6C\u6362\u7A0B\u5E8F\uFF08\u5982 pandoc \u7B49\uFF09
   3. \u82E5\u6709\u5BF9\u5E94\u7684\u7EAF\u6587\u672C\u7248\u672C\uFF08.md / .txt\uFF09\uFF0C\u8BF7\u76F4\u63A5\u8BFB\u53D6\u90A3\u4E2A\u6587\u4EF6`;
     }
     const buf = readFileSync5(normalizedPath);
@@ -4949,7 +5271,7 @@ ${content}`;
 
 // src/tools/builtin/write-file.ts
 import { writeFileSync as writeFileSync5, appendFileSync as appendFileSync2, mkdirSync as mkdirSync5 } from "fs";
-import { dirname as dirname3 } from "path";
+import { dirname as dirname4 } from "path";
 var writeFileTool = {
   definition: {
     name: "write_file",
@@ -4989,7 +5311,7 @@ var writeFileTool = {
     if (!appendMode) {
       undoStack.push(filePath, `write_file: ${filePath}`);
     }
-    mkdirSync5(dirname3(filePath), { recursive: true });
+    mkdirSync5(dirname4(filePath), { recursive: true });
     if (appendMode) {
       appendFileSync2(filePath, content, encoding);
     } else {
@@ -5221,8 +5543,8 @@ function truncatePreview(str, maxLen = 80) {
 }
 
 // src/tools/builtin/list-dir.ts
-import { readdirSync as readdirSync3, statSync as statSync4, existsSync as existsSync10 } from "fs";
-import { join as join6 } from "path";
+import { readdirSync as readdirSync5, statSync as statSync5, existsSync as existsSync10 } from "fs";
+import { join as join6, basename as basename3 } from "path";
 var listDirTool = {
   definition: {
     name: "list_dir",
@@ -5244,7 +5566,33 @@ var listDirTool = {
   async execute(args) {
     const dirPath = String(args["path"] ?? process.cwd());
     const recursive = Boolean(args["recursive"] ?? false);
-    if (!existsSync10(dirPath)) throw new Error(`Directory not found: ${dirPath}`);
+    if (!existsSync10(dirPath)) {
+      const targetName = basename3(dirPath).toLowerCase();
+      const cwd = process.cwd();
+      const suggestions = [];
+      try {
+        for (const entry of readdirSync5(cwd, { withFileTypes: true })) {
+          if (entry.isDirectory() && entry.name.toLowerCase() === targetName) {
+            suggestions.push(entry.name);
+          }
+        }
+      } catch {
+      }
+      if (suggestions.length > 0) {
+        throw new Error(
+          `Directory not found: ${dirPath}
+\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55: ${cwd}
+\u627E\u5230\u540C\u540D\u76EE\u5F55\uFF1A
+` + suggestions.map((s) => `  \u2192 ${s}`).join("\n") + `
+\u8BF7\u4F7F\u7528\u6B63\u786E\u7684\u76F8\u5BF9\u8DEF\u5F84\u91CD\u8BD5\u3002`
+        );
+      }
+      throw new Error(
+        `Directory not found: ${dirPath}
+\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55: ${cwd}
+\u8BF7\u5148\u4F7F\u7528 list_dir\uFF08\u4E0D\u4F20 path\uFF09\u67E5\u770B\u5F53\u524D\u76EE\u5F55\u7ED3\u6784\u3002`
+      );
+    }
     const lines = [`Directory: ${dirPath}
 `];
     listRecursive(dirPath, "", recursive, lines);
@@ -5254,7 +5602,7 @@ var listDirTool = {
 function listRecursive(basePath, indent, recursive, lines) {
   let entries;
   try {
-    entries = readdirSync3(basePath, { withFileTypes: true });
+    entries = readdirSync5(basePath, { withFileTypes: true });
   } catch {
     lines.push(`${indent}(permission denied)`);
     return;
@@ -5277,7 +5625,7 @@ function listRecursive(basePath, indent, recursive, lines) {
       }
     } else {
       try {
-        const stat = statSync4(join6(basePath, entry.name));
+        const stat = statSync5(join6(basePath, entry.name));
         const size = formatSize(stat.size);
         lines.push(`${indent}\u{1F4C4} ${entry.name}  (${size})`);
       } catch {
@@ -5293,7 +5641,7 @@ function formatSize(bytes) {
 }
 
 // src/tools/builtin/grep-files.ts
-import { readdirSync as readdirSync4, readFileSync as readFileSync7, statSync as statSync5, existsSync as existsSync11 } from "fs";
+import { readdirSync as readdirSync6, readFileSync as readFileSync7, statSync as statSync6, existsSync as existsSync11 } from "fs";
 import { join as join7, relative } from "path";
 var grepFilesTool = {
   definition: {
@@ -5354,7 +5702,7 @@ var grepFilesTool = {
       regex = new RegExp(escaped, ignoreCase ? "gi" : "g");
     }
     const results = [];
-    const stat = statSync5(rootPath);
+    const stat = statSync6(rootPath);
     if (stat.isFile()) {
       searchInFile(rootPath, rootPath, regex, contextLines, maxResults, results);
     } else {
@@ -5410,7 +5758,7 @@ function collectFiles(dirPath, filePattern, results, regex, contextLines, maxRes
   if (results.length >= maxResults) return;
   let entries;
   try {
-    entries = readdirSync4(dirPath, { withFileTypes: true });
+    entries = readdirSync6(dirPath, { withFileTypes: true });
   } catch {
     return;
   }
@@ -5463,8 +5811,8 @@ function searchInFile(fullPath, displayPath, regex, contextLines, maxResults, re
 }
 
 // src/tools/builtin/glob-files.ts
-import { readdirSync as readdirSync5, statSync as statSync6, existsSync as existsSync12 } from "fs";
-import { join as join8, relative as relative2, basename as basename3 } from "path";
+import { readdirSync as readdirSync7, statSync as statSync7, existsSync as existsSync12 } from "fs";
+import { join as join8, relative as relative2, basename as basename4 } from "path";
 var globFilesTool = {
   definition: {
     name: "glob_files",
@@ -5568,7 +5916,7 @@ function collectMatchingFiles(dirPath, rootPath, regex, results, maxResults) {
   if (results.length >= maxResults) return;
   let entries;
   try {
-    entries = readdirSync5(dirPath, { withFileTypes: true });
+    entries = readdirSync7(dirPath, { withFileTypes: true });
   } catch {
     return;
   }
@@ -5580,9 +5928,9 @@ function collectMatchingFiles(dirPath, rootPath, regex, results, maxResults) {
       collectMatchingFiles(fullPath, rootPath, regex, results, maxResults);
     } else if (entry.isFile()) {
       const relPath = relative2(rootPath, fullPath).replace(/\\/g, "/");
-      if (regex.test(relPath) || regex.test(basename3(relPath))) {
+      if (regex.test(relPath) || regex.test(basename4(relPath))) {
         try {
-          const stat = statSync6(fullPath);
+          const stat = statSync7(fullPath);
           results.push({ relPath, absPath: fullPath, mtime: stat.mtimeMs });
         } catch {
           results.push({ relPath, absPath: fullPath, mtime: 0 });
@@ -5656,7 +6004,7 @@ var runInteractiveTool = {
       PYTHONDONTWRITEBYTECODE: "1"
     };
     const prefixWarnings = [argsTypeWarning, stdinTypeWarning].filter(Boolean).join("");
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       const child = spawn(executable, cmdArgs.map(String), {
         cwd: process.cwd(),
         env,
@@ -5689,22 +6037,22 @@ var runInteractiveTool = {
       setTimeout(writeNextLine, 400);
       const timer = setTimeout(() => {
         child.kill();
-        resolve5(`${prefixWarnings}[Timeout after ${timeout}ms]
+        resolve6(`${prefixWarnings}[Timeout after ${timeout}ms]
 ${buildOutput(stdout, stderr)}`);
       }, timeout);
       child.on("close", (code) => {
         clearTimeout(timer);
         const output = buildOutput(stdout, stderr);
         if (code !== 0 && code !== null) {
-          resolve5(`${prefixWarnings}Exit code ${code}:
+          resolve6(`${prefixWarnings}Exit code ${code}:
 ${output}`);
         } else {
-          resolve5(`${prefixWarnings}${output || "(no output)"}`);
+          resolve6(`${prefixWarnings}${output || "(no output)"}`);
         }
       });
       child.on("error", (err) => {
         clearTimeout(timer);
-        resolve5(
+        resolve6(
           `${prefixWarnings}Failed to start process "${executable}": ${err.message}
 Hint: On Windows, use the full path to the executable, e.g.:
   C:\\Users\\Jinzd\\anaconda3\\envs\\python312\\python.exe`
@@ -5925,7 +6273,7 @@ var webFetchTool = {
 
 // src/tools/builtin/save-last-response.ts
 import { writeFileSync as writeFileSync7, mkdirSync as mkdirSync6 } from "fs";
-import { dirname as dirname4 } from "path";
+import { dirname as dirname5 } from "path";
 var lastResponseStore = { content: "" };
 var saveLastResponseTool = {
   definition: {
@@ -5958,7 +6306,7 @@ var saveLastResponseTool = {
       throw new Error("\u6CA1\u6709\u53EF\u4FDD\u5B58\u7684\u5185\u5BB9\uFF1AAI \u5C1A\u672A\u4EA7\u751F\u4EFB\u4F55\u56DE\u590D\uFF0C\u6216\u4E0A\u6B21\u56DE\u590D\u4E3A\u7A7A\u3002");
     }
     undoStack.push(filePath, `save_last_response: ${filePath}`);
-    mkdirSync6(dirname4(filePath), { recursive: true });
+    mkdirSync6(dirname5(filePath), { recursive: true });
     writeFileSync7(filePath, content, "utf-8");
     const lines = content.split("\n").length;
     return `File saved: ${filePath} (${lines} lines, ${content.length} bytes)`;
@@ -6051,7 +6399,7 @@ function promptUser(rl, question) {
   console.log();
   console.log(chalk6.cyan("\u2753 ") + chalk6.bold(question));
   process.stdout.write(chalk6.cyan("> "));
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     let completed = false;
     const cleanup = (answer) => {
       if (completed) return;
@@ -6061,7 +6409,7 @@ function promptUser(rl, question) {
       rl.pause();
       rlAny.output = savedOutput;
       askUserContext.prompting = false;
-      resolve5(answer);
+      resolve6(answer);
     };
     const onLine = (line) => {
       cleanup(line);
@@ -6553,7 +6901,7 @@ var spawnAgentTool = {
 
 // src/tools/registry.ts
 import { pathToFileURL } from "url";
-import { existsSync as existsSync14, mkdirSync as mkdirSync8, readdirSync as readdirSync6 } from "fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync8, readdirSync as readdirSync8 } from "fs";
 import { join as join10 } from "path";
 var ToolRegistry = class {
   tools = /* @__PURE__ */ new Map();
@@ -6636,7 +6984,7 @@ var ToolRegistry = class {
     }
     let files;
     try {
-      files = readdirSync6(pluginsDir).filter((f) => f.endsWith(".js"));
+      files = readdirSync8(pluginsDir).filter((f) => f.endsWith(".js"));
     } catch {
       return 0;
     }
@@ -6690,7 +7038,7 @@ import chalk9 from "chalk";
 import { existsSync as existsSync15, readFileSync as readFileSync9 } from "fs";
 
 // src/tools/hooks.ts
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync6 } from "child_process";
 function runHook(template, vars) {
   if (!template) return;
   let cmd = template;
@@ -6699,7 +7047,7 @@ function runHook(template, vars) {
   cmd = cmd.replace(/\{args\}/g, vars.args ?? "");
   cmd = cmd.replace(/\{status\}/g, vars.status ?? "");
   try {
-    execSync5(cmd, {
+    execSync6(cmd, {
       timeout: 5e3,
       stdio: ["pipe", "pipe", "pipe"],
       encoding: "utf-8"
@@ -6960,7 +7308,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(prompt);
     this.confirming = true;
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       let completed = false;
       const cleanup = (result) => {
         if (completed) return;
@@ -6970,7 +7318,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve5(result);
+        resolve6(result);
       };
       const onLine = (line) => {
         const input2 = line.trim().toLowerCase();
@@ -7131,7 +7479,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(color("Proceed? [y/N] (type y + Enter to confirm) "));
     this.confirming = true;
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       let completed = false;
       const cleanup = (answer) => {
         if (completed) return;
@@ -7141,7 +7489,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve5(answer === "y");
+        resolve6(answer === "y");
       };
       const onLine = (line) => {
         cleanup(line.trim().toLowerCase());
@@ -7396,9 +7744,9 @@ Managing ${displayName} API Key`);
 };
 
 // src/repl/custom-commands.ts
-import { existsSync as existsSync16, readFileSync as readFileSync10, readdirSync as readdirSync7, mkdirSync as mkdirSync9 } from "fs";
+import { existsSync as existsSync16, readFileSync as readFileSync10, readdirSync as readdirSync9, mkdirSync as mkdirSync9 } from "fs";
 import { join as join11, extname as extname3 } from "path";
-import { execSync as execSync6 } from "child_process";
+import { execSync as execSync7 } from "child_process";
 function parseSimpleYaml(text) {
   const result = {};
   for (const line of text.split("\n")) {
@@ -7443,7 +7791,7 @@ function expandTemplate(template, args) {
   });
   result = result.replace(/\{\{git-diff\}\}/g, () => {
     try {
-      return execSync6("git diff", { encoding: "utf-8", timeout: 1e4 }).trim();
+      return execSync7("git diff", { encoding: "utf-8", timeout: 1e4 }).trim();
     } catch {
       return "[No git diff available]";
     }
@@ -7466,7 +7814,7 @@ var CustomCommandManager = class {
       return 0;
     }
     let count = 0;
-    for (const file of readdirSync7(this.commandsDir)) {
+    for (const file of readdirSync9(this.commandsDir)) {
       if (extname3(file) !== ".md") continue;
       const cmd = parseCommandFile(join11(this.commandsDir, file));
       if (cmd) {
@@ -7693,7 +8041,7 @@ var McpClient = class {
   // 内部方法：JSON-RPC 通信
   // ══════════════════════════════════════════════════════════════════
   sendRequest(method, params) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       if (!this.process?.stdin?.writable) {
         return reject(new Error(`MCP server [${this.serverId}] stdin not writable`));
       }
@@ -7716,7 +8064,7 @@ var McpClient = class {
       this.pendingRequests.set(id, {
         resolve: (result) => {
           cleanup();
-          resolve5(result);
+          resolve6(result);
         },
         reject: (error) => {
           cleanup();
@@ -7787,13 +8135,13 @@ var McpClient = class {
   }
   /** Promise 超时包装 */
   withTimeout(promise, ms, label) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const timer = setTimeout(() => {
         reject(new Error(`MCP [${this.serverId}] ${label} timed out after ${ms}ms`));
       }, ms);
       promise.then((val) => {
         clearTimeout(timer);
-        resolve5(val);
+        resolve6(val);
       }).catch((err) => {
         clearTimeout(timer);
         reject(err);
@@ -8058,12 +8406,12 @@ var McpManager = class {
 };
 
 // src/skills/manager.ts
-import { existsSync as existsSync18, readdirSync as readdirSync8, mkdirSync as mkdirSync11 } from "fs";
+import { existsSync as existsSync18, readdirSync as readdirSync10, mkdirSync as mkdirSync11 } from "fs";
 import { join as join13 } from "path";
 
 // src/skills/types.ts
 import { readFileSync as readFileSync12 } from "fs";
-import { basename as basename4 } from "path";
+import { basename as basename5 } from "path";
 function parseSimpleYaml2(yaml) {
   const result = {};
   for (const line of yaml.split("\n")) {
@@ -8092,7 +8440,7 @@ function parseSkillFile(filePath) {
   if (!frontmatterMatch) {
     return {
       meta: {
-        name: basename4(filePath, ".md"),
+        name: basename5(filePath, ".md"),
         description: ""
       },
       content: raw.trim(),
@@ -8103,7 +8451,7 @@ function parseSkillFile(filePath) {
   const parsed = parseSimpleYaml2(yaml);
   return {
     meta: {
-      name: parsed["name"] ?? basename4(filePath, ".md"),
+      name: parsed["name"] ?? basename5(filePath, ".md"),
       description: parsed["description"] ?? "",
       tools: parsed["tools"] ? parseYamlArray(parsed["tools"]) : void 0
     },
@@ -8133,7 +8481,7 @@ var SkillManager = class {
     }
     let entries;
     try {
-      entries = readdirSync8(this.skillsDir);
+      entries = readdirSync10(this.skillsDir);
     } catch {
       return 0;
     }
@@ -8244,7 +8592,7 @@ function parseAtReferences(input2, cwd) {
   let match;
   while ((match = atPattern.exec(input2)) !== null) {
     const rawPath = match[1] ?? match[2] ?? match[3] ?? "";
-    const absPath = resolve4(cwd, rawPath);
+    const absPath = resolve5(cwd, rawPath);
     const ext = extname4(rawPath).toLowerCase();
     const mime = IMAGE_MIME[ext];
     if (!existsSync19(absPath)) {
@@ -8252,7 +8600,7 @@ function parseAtReferences(input2, cwd) {
       continue;
     }
     if (mime) {
-      const fileSize = statSync7(absPath).size;
+      const fileSize = statSync8(absPath).size;
       if (fileSize > MAX_IMAGE_BYTES) {
         refs.push({ path: rawPath, type: "toolarge" });
         continue;
@@ -8450,7 +8798,7 @@ var Repl = class {
       if (depth > 2 || entryCount >= MAX_TREE_ENTRIES) return;
       let entries;
       try {
-        entries = readdirSync9(dir);
+        entries = readdirSync11(dir);
       } catch {
         return;
       }
@@ -8462,7 +8810,7 @@ var Repl = class {
         const connector = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
         let isDir;
         try {
-          isDir = statSync7(fullPath).isDirectory();
+          isDir = statSync8(fullPath).isDirectory();
         } catch {
           continue;
         }
@@ -8484,7 +8832,7 @@ ${treeLines.join("\n")}`
       if (totalChars >= MAX_TOTAL_CHARS) return;
       let entries;
       try {
-        entries = readdirSync9(dir);
+        entries = readdirSync11(dir);
       } catch {
         return;
       }
@@ -8494,7 +8842,7 @@ ${treeLines.join("\n")}`
         const fullPath = join14(dir, name);
         let st;
         try {
-          st = statSync7(fullPath);
+          st = statSync8(fullPath);
         } catch {
           continue;
         }
@@ -8535,13 +8883,13 @@ ${content}
    * 已添加时返回 added=false（无重复添加）。
    */
   addExtraContextDir(dirPath) {
-    const absPath = resolve4(dirPath);
+    const absPath = resolve5(dirPath);
     if (!existsSync19(absPath)) {
       return { success: false, charCount: 0, added: false, error: `Directory not found: ${dirPath}` };
     }
     let isDir;
     try {
-      isDir = statSync7(absPath).isDirectory();
+      isDir = statSync8(absPath).isDirectory();
     } catch {
       return { success: false, charCount: 0, added: false, error: `Cannot access: ${dirPath}` };
     }
@@ -8558,7 +8906,7 @@ ${content}
   }
   /** 从额外上下文中移除目录。返回 true 表示成功移除，false 表示未找到。 */
   removeExtraContextDir(dirPath) {
-    const absPath = resolve4(dirPath);
+    const absPath = resolve5(dirPath);
     const idx = this.extraContextDirs.findIndex((d) => d.dir === absPath);
     if (idx === -1) return false;
     this.extraContextDirs.splice(idx, 1);
@@ -8641,8 +8989,8 @@ ${content}
     if (setting === false) return { layers: [], mergedContent: "" };
     const cwd = process.cwd();
     if (setting !== "auto") {
-      const fullPath = resolve4(cwd, String(setting));
-      if (!fullPath.startsWith(resolve4(cwd))) {
+      const fullPath = resolve5(cwd, String(setting));
+      if (!fullPath.startsWith(resolve5(cwd))) {
         process.stderr.write(
           `[Warning] contextFile path "${setting}" is outside current directory, ignoring.
 `
@@ -8685,8 +9033,8 @@ ${content}
         charCount: projectCtx.content.length
       });
     }
-    const normalizedCwd = resolve4(cwd);
-    const normalizedRoot = resolve4(projectRoot);
+    const normalizedCwd = resolve5(cwd);
+    const normalizedRoot = resolve5(projectRoot);
     if (normalizedCwd !== normalizedRoot) {
       const localCtx = this.findContextFile(cwd);
       if (localCtx) {
@@ -9092,7 +9440,7 @@ Session '${this.resumeSessionId}' not found.
       this.handleExit();
     });
     this.showPrompt();
-    await new Promise((resolve5) => {
+    await new Promise((resolve6) => {
       let processing = false;
       this.rl.on("line", async (line) => {
         if (this.toolExecutor.confirming) return;
@@ -9127,13 +9475,13 @@ Session '${this.resumeSessionId}' not found.
             process.stdin.resume();
             this.showPrompt();
           } else {
-            resolve5();
+            resolve6();
           }
         }
       });
       this.rl.on("close", () => {
         if (!processing) {
-          resolve5();
+          resolve6();
         }
       });
     });
@@ -9386,6 +9734,12 @@ Session '${this.resumeSessionId}' not found.
         return ["reload"];
       case "mcp":
         return ["reconnect"];
+      case "undo":
+        return ["list"];
+      case "fork": {
+        const cps = this.sessions.current?.checkpoints.map((c) => c.name) ?? [];
+        return cps;
+      }
       case "compact":
       case "review":
       case "init":
@@ -9402,18 +9756,18 @@ Session '${this.resumeSessionId}' not found.
   completeFilePath(partial) {
     try {
       const normalized = partial.replace(/\\/g, "/");
-      const dir = normalized.includes("/") ? dirname5(normalized) : ".";
-      const prefix = normalized.includes("/") ? basename5(normalized) : normalized;
-      const absDir = resolve4(process.cwd(), dir);
+      const dir = normalized.includes("/") ? dirname6(normalized) : ".";
+      const prefix = normalized.includes("/") ? basename6(normalized) : normalized;
+      const absDir = resolve5(process.cwd(), dir);
       if (!existsSync19(absDir)) return [];
-      const entries = readdirSync9(absDir);
+      const entries = readdirSync11(absDir);
       const results = [];
       for (const entry of entries) {
         if (entry.startsWith(".")) continue;
         if (!entry.toLowerCase().startsWith(prefix.toLowerCase())) continue;
         try {
           const fullPath = join14(absDir, entry);
-          const stat = statSync7(fullPath);
+          const stat = statSync8(fullPath);
           const rel = dir === "." ? entry : `${dir}/${entry}`;
           results.push(stat.isDirectory() ? `${rel}/` : rel);
         } catch {
@@ -9943,6 +10297,7 @@ Tip: You can continue the conversation by asking the AI to proceed.`
       addContextDir: (dirPath) => this.addExtraContextDir(dirPath),
       removeContextDir: (dirPath) => this.removeExtraContextDir(dirPath),
       listContextDirs: () => [...this.extraContextDirs],
+      forkSession: (messageCount, title) => this.sessions.forkSession(messageCount, title),
       exit: () => this.handleExit()
     };
     await cmd.execute(args, ctx);
@@ -10071,10 +10426,10 @@ async function setupProxy(configProxy) {
 }
 async function readStdin() {
   if (process.stdin.isTTY) return "";
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const chunks = [];
     process.stdin.on("data", (chunk) => chunks.push(chunk));
-    process.stdin.on("end", () => resolve5(Buffer.concat(chunks).toString("utf-8").trimEnd()));
+    process.stdin.on("end", () => resolve6(Buffer.concat(chunks).toString("utf-8").trimEnd()));
     process.stdin.on("error", reject);
   });
 }

package/dist/{run-tests-EM3QNRWV.js → run-tests-JJVZWQKI.js}

@@ -2,7 +2,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-ZUZDWQVG.js";
+} from "./chunk-P4XKHPXU.js";
 export {
   executeTests,
   runTestsTool

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinzd-ai-cli",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "description": "Cross-platform REPL-style AI CLI with multi-provider support",
   "type": "module",
   "main": "./dist/index.js",