jinzd-ai-cli 0.1.23 → 0.1.25

package/CLAUDE.md

@@ -45,15 +45,21 @@ src/
 │   ├── dev-state.ts                # 开发状态交接（provider/model 切换时快照生成、save/load/clear）
 │   ├── setup-wizard.ts             # @inquirer/prompts 首次运行交互式设置
 │   └── commands/
-│       └── index.ts                # CommandRegistry + 19个命令（/help /about /provider /model /clear /compact /plan /session /system /context /status /search /undo /export /tools /plugins /mcp /config /exit）
+│       └── index.ts                # CommandRegistry + 26个命令（/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 /exit）
+│   ├── custom-commands.ts          # CustomCommandManager（~/.aicli/commands/*.md 用户自定义命令）
+├── skills/
+│   ├── types.ts                    # Skill/SkillMeta 接口、parseSkillFile（YAML frontmatter 解析）
+│   └── manager.ts                  # SkillManager（加载/激活/停用技能，工具白名单过滤）
 ├── mcp/
 │   ├── types.ts                    # MCP 协议类型定义（JSON-RPC、工具 schema、服务器配置）
 │   ├── client.ts                   # McpClient（单个 MCP 服务器 STDIO 连接，JSON-RPC 通信）
 │   └── manager.ts                  # McpManager（多服务器管理，工具发现与注册，MCP→Tool 转换）
 └── tools/
-    ├── types.ts                    # ToolDefinition / ToolCall / ToolResult / DangerLevel / getDangerLevel
+    ├── types.ts                    # ToolDefinition / ToolCall / ToolResult / DangerLevel / getDangerLevel / isFileWriteTool
     ├── registry.ts                 # ToolRegistry（注册全部内置工具，共15个）
-    ├── executor.ts                 # ToolExecutor（确认逻辑 + printToolCall/printToolResult）
+    ├── hooks.ts                    # 工具执行钩子（runHook，shell 命令模板替换 + execSync）
+    ├── permissions.ts              # 基于规则的工具权限控制（checkPermission，首匹配规则）
+    ├── executor.ts                 # ToolExecutor（确认逻辑 + 批量文件写入预览 + batchConfirm + hooks + permissions）
     └── builtin/
         ├── bash.ts                 # bash 工具（Windows: PowerShell + Buffer→UTF-8；Unix: $SHELL）
         ├── read-file.ts            # read_file 工具
@@ -312,29 +318,169 @@ const stdinLines = Array.isArray(rawStdin) ? rawStdin.map(String)
 - [x] **Plan Mode 规划模式**（2026-02-25）：`/plan` 进入只读规划（AI 只能用只读工具白名单），提示符显示 `[PLAN]` 黄色标记，`/plan execute` 切回正常模式，`/plan exit` 放弃计划。
 - [x] **Sub-agents 系统**（2026-02-27）：`spawn_agent` 工具在同进程中运行独立 agentic 循环。子代理拥有隔离对话、过滤后的工具集（SUBAGENT_ALLOWED_TOOLS）、自动确认 write 操作、阻止 destructive 操作。SubAgentExecutor 带前缀终端输出。
 
-### P1 — 重要差距
-- [ ] **Agent Skills 系统**：可复用的专业技能包（`.aicli/skills/`）
-- [ ] **`/init` 项目初始化**：扫描项目结构自动生成 `AICLI.md`
-- [ ] **`/copy` 剪贴板支持**：将最后回答复制到系统剪贴板
-- [ ] **多文件编辑预览**：diff preview + 批量 apply/reject
-- [ ] **Token 用量统计 `/cost`**：实时显示 input/output token 数，累计 session 用量
+### P1 — 重要差距（已全部完成 2026-02-28）
+- [x] **Agent Skills 系统**（2026-02-28）：`~/.aicli/skills/*.md` 可复用技能包，YAML frontmatter 声明 name/description/tools 白名单。`/skill list|<name>|off|reload` 命令。激活时注入 system prompt + 过滤工具集（Plan Mode 优先）。
+- [x] **`/init` 项目初始化**（2026-02-28）：扫描项目类型（Node/Rust/Python/Go/Java 等）+ 目录结构树，调用当前 AI 生成结构化 AICLI.md。已存在时需 `--force` 覆盖。
+- [x] **`/copy` 剪贴板支持**（2026-02-28）：跨平台复制最后 AI 回答到系统剪贴板（Windows: clip / macOS: pbcopy / Linux: xclip 或 xsel），无外部 npm 依赖。
+- [x] **多文件编辑预览**（2026-02-28）：`executeAll()` 重构为三组分流（safe→fileWrite→other）。文件写入 2+ 个时走 `executeBatchFileWrites()` 批量 diff 预览 + `batchConfirm()`（`[a]pprove all / [r]eject all / [1,3,5]` 选择性 approve）。
+- [x] **Token 用量统计 `/cost`**（2026-02-28）：显示 session 累计 input/output/total tokens + provider/model/消息数。`/cost reset` 重置计数器。
 
 ### P2 — 增强功能
-- [ ] **Hooks 系统**：pre/post tool execution hooks
-- [ ] **Permission Rules**：基于规则的工具权限控制
-- [ ] **Checkpointing**：会话检查点，可回退到任意历史点
-- [ ] **`/review` 代码审查**：集成 git diff，输出结构化审查意见
-- [ ] **Custom Commands**：用户自定义 REPL 命令（`~/.aicli/commands/`）
+- [x] **Hooks 系统**（2026-02-28）：pre/post tool execution shell 命令钩子（`config.hooks`），模板变量 `{tool}/{dangerLevel}/{args}/{status}`
+- [x] **Permission Rules**（2026-02-28）：基于规则的工具权限控制（`config.permissionRules`），auto-approve/deny/confirm，首匹配规则
+- [x] **Checkpointing**（2026-02-28）：`/checkpoint save/restore/list/delete`，检查点元数据随 session JSON 持久化
+- [x] **`/review` 代码审查**（2026-02-28）：读取 git diff + 上下文，AI 生成结构化审查意见（`--staged`/`--detailed`）
+- [x] **Custom Commands**（2026-02-28）：`~/.aicli/commands/*.md` 用户自定义命令，YAML frontmatter + `{{input}}/{{git-diff}}/{{git-context}}/{{file:path}}` 模板变量
 
 ## 已知待改进项
 
 ### 低优先级
 - [ ] **macOS/Linux 完整测试**：跨平台逻辑已处理（`$SHELL` fallback、UTF-8 env vars），但尚未在非 Windows 环境实际运行验证。
-- [ ] **Token 用量显示**：`ui.showTokenCount` 配置字段已有，但终端展示逻辑未完整实现。
+- [x] **Token 用量显示**：已通过 `/cost` 命令实现（v0.1.23），显示 session 累计 input/output/total tokens。
 - [ ] **GitHub 仓库迁移**：当前在 gitee，npm 包受众需要 GitHub 托管。
 - [ ] **web_fetch DNS 解析时 SSRF 防护**：当前只检查 URL hostname 字符串，若 hostname 是域名（非裸 IP）则未检查其解析后的 IP 是否为私有地址。需在发起请求后对实际连接 IP 做二次校验（复杂，低频风险）。
 - [ ] **`persistentCwd` 全局状态**：bash 工具的当前工作目录是模块级全局变量，多 session 并发时可能串扰。现阶段单 session REPL 无影响，GUI 多会话扩展时需重构为 per-session 状态。
 
+## 本轮开发完成记录（2026-02-28，v0.1.24 → v0.1.25）
+
+### 新增功能：Tab 自动补全 + 流式 Token 计数
+
+**功能 1：Tab 自动补全**
+- `src/repl/repl.ts`：`readline.createInterface` 注入 `completer` 回调
+- 新增 `completeInput(line)` 方法：根据输入上下文分发补全逻辑
+  - 命令名补全：`/pro<TAB>` → `/provider`（内置 + 自定义命令）
+  - 子命令参数：`/provider <TAB>` → provider 列表；`/model <TAB>` → 模型列表；`/checkpoint <TAB>` → save/restore/list/delete 等
+  - `@` 文件路径补全：`@src/re<TAB>` → `@src/repl/`（递进目录补全，跳过隐藏文件）
+- 新增 `completeFilePath(partial)` 辅助方法：`readdirSync` + `statSync` 扫描目录，目录追加 `/` 后缀
+
+**功能 2：流式 Token 计数（内联显示）**
+- `src/repl/renderer.ts`：`renderStream()` 签名扩展 `showTokens?` + `sessionTotal?`
+  - 流结束后在 `\n\n` 之前立即内联显示 token 计数
+  - 有精确 usage（OpenAI/Gemini）→ 显示完整 `📊 in X + out Y = Z tokens │ session total: N`
+  - 无精确 usage（Claude streaming）→ 基于字符数估算 `📊 ~X output tokens (estimated)`
+  - 返回值新增 `tokensShown: boolean` 标志，防止 REPL 重复调用 `renderUsage()`
+- `src/repl/repl.ts`：`handleChatSimple()` + tee 流式路径传入 `showTokens`/`sessionTotal`，条件跳过后续 `renderUsage()`
+
+**版本与收尾**
+- `src/core/constants.ts`：VERSION `0.1.24` → `0.1.25`
+- `package.json`：version 同步
+- `src/repl/renderer.ts`：/about 新增 2 条特性条目
+
+---
+
+## 本轮开发完成记录（2026-02-28，v0.1.22 → v0.1.23）
+
+### P1 全部 5 个功能实现
+
+**背景**：P0 全部完成后，进入 P1 重要差距功能开发。一次性实现全部 5 项。
+
+### 功能 1：`/copy` 剪贴板支持
+
+**实现**：`src/repl/commands/index.ts`
+- `copyToClipboard()` 辅助函数：跨平台调用原生命令（Windows: `clip` / macOS: `pbcopy` / Linux: `xclip -selection clipboard`，fallback `xsel --clipboard --input`）
+- 通过 `execSync` 管道写入，无外部 npm 依赖
+- `CommandContext` 新增 `getLastResponse: () => string`
+- `repl.ts` ctx 注入：`getLastResponse: () => lastResponseStore.content`
+
+### 功能 2：`/cost` Token 用量统计
+
+**实现**：`src/repl/commands/index.ts`
+- 显示 session 累计 input/output/total tokens + provider/model/消息数
+- `/cost reset` 重置计数器
+- 使用已有 `ctx.getSessionTokenUsage()` 和 `ctx.resetSessionTokenUsage()`
+
+### 功能 3：`/init` 项目初始化
+
+**实现**：`src/repl/commands/index.ts`
+- `SCAN_SKIP_DIRS` Set（node_modules、.git、dist 等 20+ 目录）
+- `ProjectInfo` 接口 + `scanDirTree()` 递归目录树（深度 4，每层 30 项）
+- `scanProject()` 检测项目类型（package.json/Cargo.toml/pyproject.toml/go.mod 等）
+- `buildInitPrompt()` 构造 AI 提示词，要求生成结构化 AICLI.md
+- `CommandContext` 新增 `chatOnce(prompt, options?)` 方法
+- `repl.ts` ctx 实现：调用 provider.chat() 非流式，temperature=0.3
+- 已存在 AICLI.md 时需 `/init --force` 覆盖
+
+### 功能 4：Agent Skills 系统
+
+**新文件**：
+- `src/skills/types.ts`：`SkillMeta`（name/description/tools?）、`Skill`（meta/content/filePath）接口；`parseSimpleYaml()`（regex key:value）、`parseYamlArray()`（`[a, b, c]` 格式）、`parseSkillFile()`（读取 .md → 提取 YAML frontmatter → 返回 Skill）
+- `src/skills/manager.ts`：`SkillManager` 类——`loadSkills()`（扫描 skillsDir，自动创建目录）、`activate(name)` / `deactivate()`、`getActivePromptContent()` / `getActiveToolFilter()`（返回工具名 Set）
+
+**集成**（`src/repl/repl.ts`）：
+- `private skillManager: SkillManager | null` 字段
+- `start()` 中初始化 SkillManager、加载技能、显示数量
+- `buildCurrentSystemPrompt()` 注入激活技能的 content（在项目上下文之后，plan mode 之前）
+- `handleChatWithTools()` 工具过滤：Plan Mode > Skill 白名单 > 全部工具
+- `refreshPrompt()` 显示 `[skill:name]` 洋红色标记
+
+**命令**（`/skill`）：
+- `/skill` 或 `/skill list`：列出所有技能
+- `/skill <name>`：激活指定技能
+- `/skill off`：停用当前技能
+- `/skill reload`：重新扫描技能目录
+
+**常量**：`src/core/constants.ts` 新增 `SKILLS_DIR_NAME = 'skills'`
+
+### 功能 5：多文件编辑预览（批量确认）
+
+**修改**：
+- `src/tools/types.ts`：新增 `isFileWriteTool(name)` 判断 write_file / edit_file
+- `src/tools/executor.ts`：`executeAll()` 重构为三组分流：
+  1. `safeCalls`（safe 级别）→ 先执行（保证 mkdir 等前置操作完成）
+  2. `fileWriteCalls`（isFileWriteTool && write）→ 单个走原有确认，2+ 个走批量
+  3. `otherCalls`（剩余 write/destructive）→ 逐个原有确认流程
+- 新增 `executeBatchFileWrites(calls)`：展示编号列表 + diff 预览 → `batchConfirm()`
+- 新增 `batchConfirm(count)`：`[a]pprove all / [r]eject all / [1,3,5] approve specific`
+  - 使用 `rl.once('line')` 读整行（与 `confirm()` 模式一致）
+  - 解析逗号分隔数字编号，返回 `'all' | 'none' | Set<number>`
+  - 支持 Ctrl+C 取消（复用 `cancelConfirmFn`）
+
+### 架构变更
+- `src/repl/commands/index.ts`：CommandContext 新增 `getLastResponse` / `chatOnce` / `refreshPrompt` / `getSkillManager`；新增 /copy /cost /init /skill 共 4 个命令；/help 更新
+- `src/repl/repl.ts`：SkillManager 集成 + 4 个新 ctx 方法
+- `src/repl/renderer.ts`：`/about` REPL 命令 19 → 23，新增 3 条特性（Agent Skills / /init / 多文件编辑预览）
+
+### 版本与发布
+- `src/core/constants.ts`：VERSION `0.1.22` → `0.1.23`
+- `package.json`：version `0.1.22` → `0.1.23`
+
+---
+
+## 本轮开发完成记录（2026-02-28，v0.1.23 → v0.1.24）
+
+### P2 全部 5 功能实现
+
+**功能 1：Hooks 系统（pre/post tool execution）**
+- 新增 `src/tools/hooks.ts`：`ToolHookConfig` 接口 + `runHook(template, vars)` 函数（模板变量替换 → execSync 5s 超时，失败 stderr 警告）
+- `src/config/schema.ts`：新增 `hooks` 可选字段（`preToolExecution`/`postToolExecution`）
+- `src/tools/executor.ts`：新增 `setConfig()` 方法；`execute()` 中 getDangerLevel 后调 pre hook，工具完成/失败后调 post hook
+
+**功能 2：Permission Rules（基于规则的工具权限）**
+- 新增 `src/tools/permissions.ts`：`PermissionRule` 接口 + `checkPermission()` 纯函数（首匹配规则，tool 支持 `*` 通配，when 条件含 dangerLevel/pathPattern）
+- `src/config/schema.ts`：新增 `permissionRules` 数组 + `defaultPermission`（默认 `confirm`）
+- `src/tools/executor.ts`：execute() 中 getDangerLevel 后调 checkPermission → deny 直接拒绝 / auto-approve 跳过 confirm / confirm 走原有流程
+
+**功能 3：Checkpointing（会话检查点）**
+- `src/session/session.ts`：新增 `CheckpointMeta` 接口（name/messageIndex/timestamp）、`checkpoints` 数组、4 个方法（createCheckpoint/restoreCheckpoint/listCheckpoints/deleteCheckpoint）、toJSON/fromJSON 更新
+- `src/repl/commands/index.ts`：新增 `/checkpoint` 命令（save/restore/list/delete 子命令）
+
+**功能 4：`/review` 代码审查**
+- `src/repl/commands/index.ts`：新增 `buildReviewPrompt()` 辅助函数（中文结构化审查 prompt）+ `/review` 命令（`--staged`/`--detailed`，diff 超 8000 字截断保头尾）
+
+**功能 5：Custom Commands（用户自定义命令）**
+- 新增 `src/repl/custom-commands.ts`：`CustomCommandManager` 类（loadCommands/listCommands/getCommand）+ `expandTemplate()` 模板变量展开（`{{input}}/{{file:path}}/{{git-diff}}/{{git-context}}`）
+- `src/core/constants.ts`：新增 `CUSTOM_COMMANDS_DIR_NAME = 'commands'`
+- `src/repl/repl.ts`：CustomCommandManager 集成（初始化 + handleCommand fallback + ctx 方法）
+- `src/repl/commands/index.ts`：新增 `/commands` 命令（list/reload）
+
+**版本与收尾**
+- `src/core/constants.ts`：VERSION `0.1.23` → `0.1.24`
+- `package.json`：version 同步
+- `src/repl/renderer.ts`：/about 命令计数 23 → 26，新增 5 条 P2 特性条目
+- 所有 P2 路线图条目标记为已完成
+
+---
+
 ## 本轮开发完成记录（2026-02-27，v0.1.21 → v0.1.22）
 
 ### 新增功能：Sub-Agent 子代理系统（`spawn_agent` 工具）

package/dist/index.js

@@ -84,6 +84,22 @@ var ConfigSchema = z.object({
     env: z.record(z.string()).optional(),
     timeout: z.number().default(3e4)
   })).default({}),
+  // 工具执行钩子（shell 命令，模板变量：{tool} {dangerLevel} {args} {status}）
+  hooks: z.object({
+    preToolExecution: z.string().optional(),
+    postToolExecution: z.string().optional()
+  }).optional(),
+  // 工具权限规则（按顺序匹配第一个生效）
+  permissionRules: z.array(z.object({
+    tool: z.string(),
+    action: z.enum(["auto-approve", "deny", "confirm"]),
+    when: z.object({
+      dangerLevel: z.enum(["safe", "write", "destructive"]).optional(),
+      pathPattern: z.string().optional()
+    }).optional()
+  })).default([]),
+  // 无规则匹配时的默认权限动作
+  defaultPermission: z.enum(["auto-approve", "deny", "confirm"]).default("confirm"),
   // 插件加载开关（安全控制）
   // 默认 false：不自动加载 ~/.aicli/plugins/ 中的插件文件。
   // 插件以完整 Node.js 权限在主进程中执行（可读写文件、访问网络、执行命令），
@@ -129,13 +145,14 @@ var EnvLoader = class {
 };
 
 // src/core/constants.ts
-var VERSION = "0.1.23";
+var VERSION = "0.1.25";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";
 var HISTORY_DIR_NAME = "history";
 var PLUGINS_DIR_NAME = "plugins";
 var SKILLS_DIR_NAME = "skills";
+var CUSTOM_COMMANDS_DIR_NAME = "commands";
 var CONTEXT_FILE_CANDIDATES = ["AICLI.md", "CLAUDE.md"];
 var MEMORY_FILE_NAME = "memory.md";
 var MEMORY_MAX_CHARS = 1e4;
@@ -988,7 +1005,7 @@ var DeepSeekProvider = class extends OpenAICompatibleProvider {
       {
         id: "deepseek-chat",
         displayName: "DeepSeek Chat (V3)",
-        contextWindow: 65536,
+        contextWindow: 131072,
         supportsStreaming: true
       },
       {
@@ -1348,6 +1365,7 @@ var Session = class _Session {
   messages = [];
   title;
   tokenUsage = { inputTokens: 0, outputTokens: 0 };
+  checkpoints = [];
   constructor(id, provider, model) {
     this.id = id;
     this.provider = provider;
@@ -1387,6 +1405,32 @@ var Session = class _Session {
     this.updated = /* @__PURE__ */ new Date();
     return removedCount;
   }
+  /** 在当前消息位置创建检查点 */
+  createCheckpoint(name) {
+    this.checkpoints = this.checkpoints.filter((c) => c.name !== name);
+    this.checkpoints.push({
+      name,
+      messageIndex: this.messages.length,
+      timestamp: /* @__PURE__ */ new Date()
+    });
+  }
+  /** 恢复到指定检查点：截断消息到检查点位置，移除后续检查点 */
+  restoreCheckpoint(name) {
+    const cp = this.checkpoints.find((c) => c.name === name);
+    if (!cp) return false;
+    this.messages = this.messages.slice(0, cp.messageIndex);
+    this.checkpoints = this.checkpoints.filter((c) => c.messageIndex <= cp.messageIndex);
+    this.updated = /* @__PURE__ */ new Date();
+    return true;
+  }
+  listCheckpoints() {
+    return [...this.checkpoints];
+  }
+  deleteCheckpoint(name) {
+    const len = this.checkpoints.length;
+    this.checkpoints = this.checkpoints.filter((c) => c.name !== name);
+    return this.checkpoints.length < len;
+  }
   getMeta() {
     return {
       id: this.id,
@@ -1407,6 +1451,11 @@ var Session = class _Session {
       updated: this.updated.toISOString(),
       title: this.title,
       tokenUsage: { ...this.tokenUsage },
+      checkpoints: this.checkpoints.map((c) => ({
+        name: c.name,
+        messageIndex: c.messageIndex,
+        timestamp: c.timestamp.toISOString()
+      })),
       messages: this.messages.map((m) => ({
         ...m,
         timestamp: m.timestamp.toISOString()
@@ -1441,6 +1490,13 @@ var Session = class _Session {
         outputTokens: typeof tu.outputTokens === "number" ? tu.outputTokens : 0
       };
     }
+    if (Array.isArray(d.checkpoints)) {
+      session.checkpoints = d.checkpoints.map((c) => ({
+        name: String(c.name ?? ""),
+        messageIndex: typeof c.messageIndex === "number" ? c.messageIndex : 0,
+        timestamp: new Date(c.timestamp)
+      }));
+    }
     session.messages = d.messages.map((m) => {
       const ts = new Date(m.timestamp);
       return {
@@ -1564,8 +1620,8 @@ var SessionManager = class {
 
 // src/repl/repl.ts
 import * as readline from "readline";
-import { existsSync as existsSync17, readFileSync as readFileSync12 } from "fs";
-import { join as join12, resolve as resolve4, extname as extname3 } from "path";
+import { existsSync as existsSync18, readFileSync as readFileSync13, readdirSync as readdirSync9, statSync as statSync6 } from "fs";
+import { join as join13, resolve as resolve4, extname as extname4, dirname as dirname5, basename as basename5 } from "path";
 import chalk10 from "chalk";
 
 // src/repl/renderer.ts
@@ -1669,10 +1725,11 @@ var Renderer = class {
     console.log(tool("write_todos", "\u62C6\u89E3\u4EFB\u52A1\u4E3A\u5B50\u4EFB\u52A1\u5217\u8868\uFF0C\u5B9E\u65F6\u663E\u793A\u8FDB\u5EA6"));
     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(HR);
-    console.log(chalk.gray("  REPL \u547D\u4EE4\uFF0823\u4E2A\uFF09\uFF1A"));
+    console.log(chalk.gray("  REPL \u547D\u4EE4\uFF0826\u4E2A\uFF09\uFF1A"));
     console.log(chalk.dim("    /help  /about  /provider  /model  /clear  /compact  /plan  /session"));
     console.log(chalk.dim("    /system  /context  /status  /search  /undo  /export  /copy  /cost"));
-    console.log(chalk.dim("    /init  /skill  /tools  /plugins  /mcp  /config  /exit"));
+    console.log(chalk.dim("    /init  /skill  /tools  /plugins  /mcp  /config  /checkpoint  /review"));
+    console.log(chalk.dim("    /commands  /exit"));
     console.log(HR);
     console.log(chalk.gray("  \u4E3B\u8981\u7279\u6027\uFF1A"));
     console.log(feat("Agentic \u5FAA\u73AF\uFF08\u6700\u591A 20 \u8F6E\u5DE5\u5177\u8C03\u7528\uFF0C\u6700\u7EC8\u56DE\u7B54\u6D41\u5F0F\u8F93\u51FA\uFF09"));
@@ -1693,6 +1750,13 @@ var Renderer = class {
     console.log(feat("Agent Skills\uFF1A~/.aicli/skills/ \u53EF\u590D\u7528\u6280\u80FD\u5305\uFF0C\u6CE8\u5165 system prompt + \u5DE5\u5177\u767D\u540D\u5355"));
     console.log(feat("/init \u9879\u76EE\u521D\u59CB\u5316\uFF1A\u626B\u63CF\u9879\u76EE\u7ED3\u6784\uFF0CAI \u751F\u6210 AICLI.md \u4E0A\u4E0B\u6587\u6587\u4EF6"));
     console.log(feat("\u591A\u6587\u4EF6\u7F16\u8F91\u9884\u89C8\uFF1A\u6279\u91CF diff preview + \u9009\u62E9\u6027 approve/reject"));
+    console.log(feat("Hooks \u7CFB\u7EDF\uFF1Apre/post \u5DE5\u5177\u6267\u884C\u94A9\u5B50\uFF08shell \u547D\u4EE4\uFF0C\u6A21\u677F\u53D8\u91CF\u66FF\u6362\uFF09"));
+    console.log(feat("Permission Rules\uFF1A\u57FA\u4E8E\u89C4\u5219\u7684\u5DE5\u5177\u6743\u9650\u63A7\u5236\uFF08auto-approve/deny/confirm\uFF09"));
+    console.log(feat("Checkpointing\uFF1A/checkpoint \u4F1A\u8BDD\u68C0\u67E5\u70B9\u4FDD\u5B58/\u6062\u590D/\u5217\u8868/\u5220\u9664"));
+    console.log(feat("/review \u4EE3\u7801\u5BA1\u67E5\uFF1A\u8BFB\u53D6 git diff\uFF0CAI \u751F\u6210\u7ED3\u6784\u5316\u5BA1\u67E5\u610F\u89C1"));
+    console.log(feat("Custom Commands\uFF1A~/.aicli/commands/*.md \u7528\u6237\u81EA\u5B9A\u4E49 REPL \u547D\u4EE4"));
+    console.log(feat("Tab \u81EA\u52A8\u8865\u5168\uFF1A\u547D\u4EE4\u540D/\u5B50\u547D\u4EE4\u53C2\u6570/@\u6587\u4EF6\u8DEF\u5F84\uFF0C\u6309 Tab \u89E6\u53D1"));
+    console.log(feat("\u6D41\u5F0F Token \u8BA1\u6570\uFF1A\u6D41\u5F0F\u8F93\u51FA\u7ED3\u675F\u540E\u7ACB\u5373\u5185\u8054\u663E\u793A\u7CBE\u786E/\u4F30\u7B97 token \u6570"));
     console.log(feat("\u72EC\u7ACB\u53EF\u6267\u884C\u6587\u4EF6\u6253\u5305\uFF08~56MB\uFF0C\u65E0\u9700 Node.js \u73AF\u5883\uFF09"));
     console.log();
   }
@@ -1755,7 +1819,26 @@ var Renderer = class {
       if (fileStream) fileStream.write(chunk.delta);
       flushBuf();
     }
-    process.stdout.write("\n\n");
+    let tokensShown = false;
+    if (options?.showTokens) {
+      process.stdout.write("\n");
+      if (usage) {
+        const sessionTotal = options.sessionTotal;
+        const updatedTotal = sessionTotal ? { inputTokens: sessionTotal.inputTokens + usage.inputTokens, outputTokens: sessionTotal.outputTokens + usage.outputTokens } : void 0;
+        this.renderUsage(usage, updatedTotal);
+        tokensShown = true;
+      } else if (fullContent.length > 0) {
+        const est = Math.ceil(fullContent.length / 2.5);
+        process.stdout.write(chalk.dim(`\u{1F4CA} ~${est.toLocaleString()} output tokens (estimated)
+
+`));
+        tokensShown = true;
+      } else {
+        process.stdout.write("\n");
+      }
+    } else {
+      process.stdout.write("\n\n");
+    }
     if (fileStream) {
       await new Promise((resolve5, reject) => {
         fileStream.end((err) => err ? reject(err) : resolve5());
@@ -1765,7 +1848,7 @@ var Renderer = class {
 
 `));
     }
-    return { content: fullContent, usage };
+    return { content: fullContent, usage, tokensShown };
   }
   renderResponse(content) {
     process.stdout.write(chalk.cyan("Assistant: "));
@@ -2201,6 +2284,29 @@ function copyToClipboard(text) {
     }
   }
 }
+function buildReviewPrompt(diff, gitContextStr, detailed) {
+  const level = detailed ? "\u8BF7\u8FDB\u884C\u8BE6\u7EC6\u6DF1\u5EA6\u5BA1\u67E5\uFF0C\u5305\u62EC\uFF1A\u5B89\u5168\u6027\u3001\u6027\u80FD\u3001\u53EF\u7EF4\u62A4\u6027\u3001\u9519\u8BEF\u5904\u7406\u3001\u547D\u540D\u89C4\u8303\u3001\u4EE3\u7801\u91CD\u590D\u3002" : "\u8BF7\u8FDB\u884C\u7B80\u660E\u4EE3\u7801\u5BA1\u67E5\uFF0C\u805A\u7126\u4E8E bug\u3001\u5B89\u5168\u95EE\u9898\u548C\u5173\u952E\u6539\u8FDB\u5EFA\u8BAE\u3002";
+  return `# \u4EE3\u7801\u5BA1\u67E5\u8BF7\u6C42
+
+${level}
+
+## Git \u72B6\u6001
+${gitContextStr}
+
+## \u4EE3\u7801\u53D8\u66F4\uFF08diff\uFF09
+\`\`\`diff
+${diff}
+\`\`\`
+
+## \u8F93\u51FA\u683C\u5F0F
+\u8BF7\u6309\u4EE5\u4E0B\u7ED3\u6784\u8F93\u51FA\u5BA1\u67E5\u610F\u89C1\uFF1A
+1. **\u603B\u8BC4**\uFF1A\u4E00\u53E5\u8BDD\u6982\u62EC\u53D8\u66F4\u8D28\u91CF
+2. **\u95EE\u9898\u5217\u8868**\uFF08\u5982\u6709\uFF09\uFF1A\u6BCF\u4E2A\u95EE\u9898\u5305\u542B [\u4E25\u91CD\u7A0B\u5EA6] \u6587\u4EF6:\u884C\u53F7 \u2014 \u95EE\u9898\u63CF\u8FF0 + \u5EFA\u8BAE\u4FEE\u590D
+3. **\u6539\u8FDB\u5EFA\u8BAE**\uFF08\u5982\u6709\uFF09\uFF1A\u975E\u5FC5\u987B\u4F46\u63A8\u8350\u7684\u4F18\u5316
+4. **\u4EAE\u70B9**\uFF08\u5982\u6709\uFF09\uFF1A\u503C\u5F97\u80AF\u5B9A\u7684\u597D\u5B9E\u8DF5
+
+\u4E25\u91CD\u7A0B\u5EA6\u5206\u7EA7\uFF1A\u{1F534} Critical / \u{1F7E1} Warning / \u{1F535} Info`;
+}
 var CommandRegistry = class {
   commands = /* @__PURE__ */ new Map();
   register(command) {
@@ -2245,6 +2351,9 @@ function createDefaultCommands() {
           "  /cost [reset]            - Show session token usage (or reset counters)",
           "  /init [--force]          - Generate AICLI.md by scanning project structure",
           "  /skill [name|off|list]   - Manage agent skills (reusable prompt packs)",
+          "  /checkpoint [save|restore|delete] <name> - Session checkpoints",
+          "  /review [--staged] [--detailed] - AI code review from git diff",
+          "  /commands [reload]       - List/reload custom commands (~/.aicli/commands/)",
           "  /exit                    - Exit"
         ] : [];
         console.log("\nAvailable commands:");
@@ -2943,6 +3052,149 @@ ${text}
         console.log();
       }
     },
+    // ── /checkpoint ────────────────────────────────────────────
+    {
+      name: "checkpoint",
+      description: "Manage session checkpoints (save/restore/list/delete)",
+      usage: "/checkpoint [save <name> | restore <name> | delete <name>]",
+      execute(args, ctx) {
+        const session = ctx.sessions.current;
+        if (!session) {
+          ctx.renderer.renderError("No active session.");
+          return;
+        }
+        const sub = args[0]?.toLowerCase();
+        if (!sub || sub === "list") {
+          const cps = ctx.listCheckpoints();
+          if (cps.length === 0) {
+            console.log(chalk2.dim("  No checkpoints. Use /checkpoint save <name> to create one."));
+            return;
+          }
+          console.log(chalk2.gray(`  Checkpoints (${cps.length}):`));
+          for (const cp of cps) {
+            const ts = cp.timestamp.toLocaleString();
+            console.log(chalk2.cyan(`    ${cp.name.padEnd(20)} `) + chalk2.dim(`msg #${cp.messageIndex}  ${ts}`));
+          }
+          console.log();
+          return;
+        }
+        const name = args.slice(1).join(" ").trim();
+        if (sub === "save") {
+          if (!name) {
+            ctx.renderer.renderError("Usage: /checkpoint save <name>");
+            return;
+          }
+          ctx.createCheckpoint(name);
+          console.log(chalk2.green(`  \u2713 Checkpoint "${name}" saved at message #${session.messages.length}`));
+          return;
+        }
+        if (sub === "restore") {
+          if (!name) {
+            ctx.renderer.renderError("Usage: /checkpoint restore <name>");
+            return;
+          }
+          const ok = ctx.restoreCheckpoint(name);
+          if (ok) {
+            console.log(chalk2.green(`  \u2713 Restored to checkpoint "${name}" (${session.messages.length} messages)`));
+          } else {
+            ctx.renderer.renderError(`Checkpoint "${name}" not found.`);
+          }
+          return;
+        }
+        if (sub === "delete") {
+          if (!name) {
+            ctx.renderer.renderError("Usage: /checkpoint delete <name>");
+            return;
+          }
+          const ok = ctx.deleteCheckpoint(name);
+          if (ok) {
+            console.log(chalk2.green(`  \u2713 Deleted checkpoint "${name}"`));
+          } else {
+            ctx.renderer.renderError(`Checkpoint "${name}" not found.`);
+          }
+          return;
+        }
+        ctx.renderer.renderError(`Unknown subcommand: ${sub}. Use save/restore/list/delete.`);
+      }
+    },
+    // ── /review ──────────────────────────────────────────────────
+    {
+      name: "review",
+      description: "AI code review based on git diff",
+      usage: "/review [--staged] [--detailed]",
+      async execute(args, ctx) {
+        const gitCtx = getGitContext();
+        if (!gitCtx) {
+          ctx.renderer.renderError("Not a git repository.");
+          return;
+        }
+        const staged = args.includes("--staged");
+        const detailed = args.includes("--detailed");
+        let diff;
+        try {
+          const cmd = staged ? "git diff --staged" : "git diff";
+          diff = execSync2(cmd, { encoding: "utf-8", timeout: 1e4 }).trim();
+        } catch {
+          ctx.renderer.renderError("Failed to run git diff.");
+          return;
+        }
+        if (!diff) {
+          console.log(chalk2.dim("  No changes to review." + (staged ? "" : " Try --staged for staged changes.")));
+          return;
+        }
+        const MAX_DIFF = 8e3;
+        let truncated = false;
+        if (diff.length > MAX_DIFF) {
+          const head = diff.slice(0, Math.floor(MAX_DIFF * 0.7));
+          const tail = diff.slice(diff.length - Math.floor(MAX_DIFF * 0.2));
+          diff = head + "\n\n... [diff \u5DF2\u622A\u65AD\uFF0C\u5171 " + diff.length + " \u5B57\u7B26] ...\n\n" + tail;
+          truncated = true;
+        }
+        const prompt = buildReviewPrompt(diff, formatGitContextForPrompt(gitCtx), detailed);
+        console.log(chalk2.dim("  Analyzing changes..."));
+        try {
+          const review = await ctx.chatOnce(prompt, { temperature: 0.3, maxTokens: 8192 });
+          console.log();
+          console.log(review);
+          console.log();
+          if (truncated) {
+            console.log(chalk2.yellow("  \u26A0 Diff was truncated. Consider reviewing smaller changesets."));
+          }
+        } catch (err) {
+          ctx.renderer.renderError(`Review failed: ${err.message}`);
+        }
+      }
+    },
+    // ── /commands ─────────────────────────────────────────────────
+    {
+      name: "commands",
+      description: "List or reload custom commands from ~/.aicli/commands/",
+      usage: "/commands [reload]",
+      execute(args, ctx) {
+        const mgr = ctx.getCustomCommandManager();
+        if (!mgr) {
+          console.log(chalk2.dim("  Custom commands not initialized."));
+          return;
+        }
+        const sub = args[0]?.toLowerCase();
+        if (sub === "reload") {
+          const count = mgr.loadCommands();
+          console.log(chalk2.green(`  \u2713 Reloaded ${count} custom command(s).`));
+          return;
+        }
+        const cmds = mgr.listCommands();
+        if (cmds.length === 0) {
+          console.log(chalk2.dim("  No custom commands found in ~/.aicli/commands/"));
+          console.log(chalk2.dim("  Create .md files with YAML frontmatter (name/description/usage)."));
+          return;
+        }
+        console.log(chalk2.gray(`  Custom commands (${cmds.length}):`));
+        for (const cmd of cmds) {
+          console.log(chalk2.cyan(`    /${cmd.meta.name.padEnd(18)} `) + chalk2.dim(cmd.meta.description));
+        }
+        console.log();
+      }
+    },
     {
       name: "exit",
       description: "Exit the REPL",
@@ -5172,6 +5424,43 @@ function simpleDiff(oldLines, newLines) {
   return result;
 }
 
+// src/tools/hooks.ts
+import { execSync as execSync4 } from "child_process";
+function runHook(template, vars) {
+  if (!template) return;
+  let cmd = template;
+  cmd = cmd.replace(/\{tool\}/g, vars.tool);
+  cmd = cmd.replace(/\{dangerLevel\}/g, vars.dangerLevel ?? "");
+  cmd = cmd.replace(/\{args\}/g, vars.args ?? "");
+  cmd = cmd.replace(/\{status\}/g, vars.status ?? "");
+  try {
+    execSync4(cmd, {
+      timeout: 5e3,
+      stdio: ["pipe", "pipe", "pipe"],
+      encoding: "utf-8"
+    });
+  } catch {
+    process.stderr.write(`\u26A0 Hook failed: ${cmd.slice(0, 100)}
+`);
+  }
+}
+
+// src/tools/permissions.ts
+function checkPermission(toolName, args, dangerLevel, rules, defaultAction = "confirm") {
+  for (const rule of rules) {
+    if (rule.tool !== "*" && rule.tool !== toolName) continue;
+    if (rule.when) {
+      if (rule.when.dangerLevel && rule.when.dangerLevel !== dangerLevel) continue;
+      if (rule.when.pathPattern) {
+        const path = String(args["path"] ?? args["command"] ?? "");
+        if (!path.includes(rule.when.pathPattern)) continue;
+      }
+    }
+    return rule.action;
+  }
+  return defaultAction;
+}
+
 // src/tools/executor.ts
 var MAX_TOOL_OUTPUT_CHARS2 = 12e3;
 function truncateOutput2(content, toolName) {
@@ -5224,6 +5513,17 @@ var ToolExecutor = class {
   setReadline(rl) {
     this.rl = rl;
   }
+  /** 钩子配置（可选） */
+  hookConfig;
+  /** 权限规则（可选） */
+  permissionRules = [];
+  defaultPermission = "confirm";
+  /** 注入 hooks 和 permission rules 配置 */
+  setConfig(opts) {
+    this.hookConfig = opts.hookConfig;
+    if (opts.permissionRules) this.permissionRules = opts.permissionRules;
+    if (opts.defaultPermission) this.defaultPermission = opts.defaultPermission;
+  }
   async execute(call) {
     const tool = this.registry.get(call.name);
     if (!tool) {
@@ -5234,6 +5534,33 @@ var ToolExecutor = class {
       };
     }
     const dangerLevel = getDangerLevel(call.name, call.arguments);
+    runHook(this.hookConfig?.preToolExecution, {
+      tool: call.name,
+      dangerLevel,
+      args: JSON.stringify(call.arguments).slice(0, 200)
+    });
+    if (this.permissionRules.length > 0) {
+      const action = checkPermission(call.name, call.arguments, dangerLevel, this.permissionRules, this.defaultPermission);
+      if (action === "deny") {
+        return { callId: call.id, content: `Permission denied by rule for tool: ${call.name}`, isError: false };
+      }
+      if (action === "auto-approve") {
+        this.printToolCall(call);
+        try {
+          const rawContent = await tool.execute(call.arguments);
+          const content = truncateOutput2(rawContent, call.name);
+          const wasTruncated = content !== rawContent;
+          this.printToolResult(call.name, rawContent, false, wasTruncated);
+          runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "ok" });
+          return { callId: call.id, content, isError: false };
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          this.printToolResult(call.name, message, true, false);
+          runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
+          return { callId: call.id, content: message, isError: true };
+        }
+      }
+    }
     if (dangerLevel === "write") {
       this.printToolCall(call);
       this.printDiffPreview(call);
@@ -5263,10 +5590,12 @@ var ToolExecutor = class {
       const content = truncateOutput2(rawContent, call.name);
       const wasTruncated = content !== rawContent;
       this.printToolResult(call.name, rawContent, false, wasTruncated);
+      runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "ok" });
       return { callId: call.id, content, isError: false };
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       this.printToolResult(call.name, message, true, false);
+      runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
       return { callId: call.id, content: message, isError: true };
     }
   }
@@ -5783,9 +6112,98 @@ Managing ${displayName} API Key`);
   }
 };
 
+// src/repl/custom-commands.ts
+import { existsSync as existsSync15, readFileSync as readFileSync10, readdirSync as readdirSync7, mkdirSync as mkdirSync9 } from "fs";
+import { join as join10, extname as extname3 } from "path";
+import { execSync as execSync5 } from "child_process";
+function parseSimpleYaml(text) {
+  const result = {};
+  for (const line of text.split("\n")) {
+    const match = line.match(/^(\w+)\s*:\s*(.+)$/);
+    if (match) {
+      result[match[1]] = match[2].trim().replace(/^['"]|['"]$/g, "");
+    }
+  }
+  return result;
+}
+function parseCommandFile(filePath) {
+  let content;
+  try {
+    content = readFileSync10(filePath, "utf-8");
+  } catch {
+    return null;
+  }
+  const fmMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/);
+  if (!fmMatch) return null;
+  const yaml = parseSimpleYaml(fmMatch[1]);
+  const name = yaml["name"];
+  if (!name) return null;
+  return {
+    meta: {
+      name,
+      description: yaml["description"] ?? "",
+      usage: yaml["usage"] ?? `/${name}`
+    },
+    promptTemplate: fmMatch[2].trim(),
+    filePath
+  };
+}
+function expandTemplate(template, args) {
+  let result = template;
+  result = result.replace(/\{\{input\}\}/g, args.join(" "));
+  result = result.replace(/\{\{file:([^}]+)\}\}/g, (_m, p) => {
+    try {
+      return readFileSync10(p.trim(), "utf-8");
+    } catch {
+      return `[Error: cannot read ${p.trim()}]`;
+    }
+  });
+  result = result.replace(/\{\{git-diff\}\}/g, () => {
+    try {
+      return execSync5("git diff", { encoding: "utf-8", timeout: 1e4 }).trim();
+    } catch {
+      return "[No git diff available]";
+    }
+  });
+  result = result.replace(/\{\{git-context\}\}/g, () => {
+    const ctx = getGitContext();
+    return ctx ? formatGitContextForPrompt(ctx) : "[Not a git repository]";
+  });
+  return result;
+}
+var CustomCommandManager = class {
+  constructor(commandsDir) {
+    this.commandsDir = commandsDir;
+  }
+  commands = /* @__PURE__ */ new Map();
+  loadCommands() {
+    this.commands.clear();
+    if (!existsSync15(this.commandsDir)) {
+      mkdirSync9(this.commandsDir, { recursive: true });
+      return 0;
+    }
+    let count = 0;
+    for (const file of readdirSync7(this.commandsDir)) {
+      if (extname3(file) !== ".md") continue;
+      const cmd = parseCommandFile(join10(this.commandsDir, file));
+      if (cmd) {
+        this.commands.set(cmd.meta.name, cmd);
+        count++;
+      }
+    }
+    return count;
+  }
+  listCommands() {
+    return [...this.commands.values()];
+  }
+  getCommand(name) {
+    return this.commands.get(name);
+  }
+};
+
 // src/repl/dev-state.ts
-import { existsSync as existsSync15, readFileSync as readFileSync10, writeFileSync as writeFileSync8, unlinkSync as unlinkSync2, mkdirSync as mkdirSync9 } from "fs";
-import { join as join10 } from "path";
+import { existsSync as existsSync16, readFileSync as readFileSync11, writeFileSync as writeFileSync8, unlinkSync as unlinkSync2, mkdirSync as mkdirSync10 } from "fs";
+import { join as join11 } from "path";
 import { homedir as homedir4 } from "os";
 var DEV_STATE_MAX_CHARS = 4e3;
 var SNAPSHOT_PROMPT = `You are about to be replaced by a different AI model. Please generate a structured development state snapshot so the next model can continue seamlessly.
@@ -5824,12 +6242,12 @@ function sessionHasMeaningfulContent(messages) {
   return hasUser && hasAssistant;
 }
 function getDevStatePath() {
-  return join10(homedir4(), CONFIG_DIR_NAME, DEV_STATE_FILE_NAME);
+  return join11(homedir4(), CONFIG_DIR_NAME, DEV_STATE_FILE_NAME);
 }
 function saveDevState(content) {
-  const configDir = join10(homedir4(), CONFIG_DIR_NAME);
-  if (!existsSync15(configDir)) {
-    mkdirSync9(configDir, { recursive: true });
+  const configDir = join11(homedir4(), CONFIG_DIR_NAME);
+  if (!existsSync16(configDir)) {
+    mkdirSync10(configDir, { recursive: true });
   }
   let trimmed = content.trim();
   if (trimmed.length > DEV_STATE_MAX_CHARS) {
@@ -5844,13 +6262,13 @@ function saveDevState(content) {
 }
 function loadDevState() {
   const path = getDevStatePath();
-  if (!existsSync15(path)) return null;
-  const content = readFileSync10(path, "utf-8").trim();
+  if (!existsSync16(path)) return null;
+  const content = readFileSync11(path, "utf-8").trim();
   return content || null;
 }
 function clearDevState() {
   const path = getDevStatePath();
-  if (existsSync15(path)) {
+  if (existsSync16(path)) {
     try {
       unlinkSync2(path);
     } catch {
@@ -6260,13 +6678,13 @@ var McpManager = class {
 };
 
 // src/skills/manager.ts
-import { existsSync as existsSync16, readdirSync as readdirSync7, mkdirSync as mkdirSync10 } from "fs";
-import { join as join11 } from "path";
+import { existsSync as existsSync17, readdirSync as readdirSync8, mkdirSync as mkdirSync11 } from "fs";
+import { join as join12 } from "path";
 
 // src/skills/types.ts
-import { readFileSync as readFileSync11 } from "fs";
+import { readFileSync as readFileSync12 } from "fs";
 import { basename as basename4 } from "path";
-function parseSimpleYaml(yaml) {
+function parseSimpleYaml2(yaml) {
   const result = {};
   for (const line of yaml.split("\n")) {
     const match = line.match(/^(\w+)\s*:\s*(.+)$/);
@@ -6286,7 +6704,7 @@ function parseYamlArray(value) {
 function parseSkillFile(filePath) {
   let raw;
   try {
-    raw = readFileSync11(filePath, "utf-8");
+    raw = readFileSync12(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -6302,7 +6720,7 @@ function parseSkillFile(filePath) {
     };
   }
   const [, yaml, content] = frontmatterMatch;
-  const parsed = parseSimpleYaml(yaml);
+  const parsed = parseSimpleYaml2(yaml);
   return {
     meta: {
       name: parsed["name"] ?? basename4(filePath, ".md"),
@@ -6326,22 +6744,22 @@ var SkillManager = class {
   /** 发现并加载 skillsDir 下所有 .md 文件，返回加载数量 */
   loadSkills() {
     this.skills.clear();
-    if (!existsSync16(this.skillsDir)) {
+    if (!existsSync17(this.skillsDir)) {
       try {
-        mkdirSync10(this.skillsDir, { recursive: true });
+        mkdirSync11(this.skillsDir, { recursive: true });
       } catch {
       }
       return 0;
     }
     let entries;
     try {
-      entries = readdirSync7(this.skillsDir);
+      entries = readdirSync8(this.skillsDir);
     } catch {
       return 0;
     }
     for (const entry of entries) {
       if (!entry.endsWith(".md")) continue;
-      const filePath = join11(this.skillsDir, entry);
+      const filePath = join12(this.skillsDir, entry);
       const skill = parseSkillFile(filePath);
       if (skill) {
         this.skills.set(skill.meta.name, skill);
@@ -6406,14 +6824,14 @@ function parseAtReferences(input2, cwd) {
   while ((match = atPattern.exec(input2)) !== null) {
     const rawPath = match[1] ?? match[2] ?? match[3] ?? "";
     const absPath = resolve4(cwd, rawPath);
-    const ext = extname3(rawPath).toLowerCase();
+    const ext = extname4(rawPath).toLowerCase();
     const mime = IMAGE_MIME[ext];
-    if (!existsSync17(absPath)) {
+    if (!existsSync18(absPath)) {
       refs.push({ path: rawPath, type: "notfound" });
       continue;
     }
     if (mime) {
-      const data = readFileSync12(absPath).toString("base64");
+      const data = readFileSync13(absPath).toString("base64");
       imageParts.push({
         type: "image_url",
         image_url: { url: `data:${mime};base64,${data}` }
@@ -6421,7 +6839,7 @@ function parseAtReferences(input2, cwd) {
       refs.push({ path: rawPath, type: "image" });
       textBody = textBody.replace(match[0], "").trim();
     } else {
-      const content = readFileSync12(absPath, "utf-8");
+      const content = readFileSync13(absPath, "utf-8");
       const inlined = `
 
 [File: ${rawPath}]
@@ -6462,11 +6880,17 @@ var Repl = class {
     this.rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
-      terminal: true
+      terminal: true,
+      completer: (line) => this.completeInput(line)
     });
     this.toolRegistry = new ToolRegistry();
     this.toolExecutor = new ToolExecutor(this.toolRegistry);
     this.toolExecutor.setReadline(this.rl);
+    this.toolExecutor.setConfig({
+      hookConfig: this.config.get("hooks") ?? void 0,
+      permissionRules: this.config.get("permissionRules") ?? [],
+      defaultPermission: this.config.get("defaultPermission") ?? "confirm"
+    });
   }
   rl;
   currentProvider;
@@ -6493,6 +6917,7 @@ var Repl = class {
   planMode = false;
   /** 技能管理器 */
   skillManager = null;
+  customCommandManager = null;
   /**
    * 交互式列表选择器进行中标志。
    * 与 toolExecutor.confirming 类似：主循环 line handler 在此为 true 时忽略 line 事件，
@@ -6505,9 +6930,9 @@ var Repl = class {
    */
   findContextFile(dir, candidates = CONTEXT_FILE_CANDIDATES) {
     for (const candidate of candidates) {
-      const fullPath = join12(dir, candidate);
-      if (existsSync17(fullPath)) {
-        const content = readFileSync12(fullPath, "utf-8").trim();
+      const fullPath = join13(dir, candidate);
+      if (existsSync18(fullPath)) {
+        const content = readFileSync13(fullPath, "utf-8").trim();
         if (content) return { filePath: fullPath, content };
       }
     }
@@ -6531,9 +6956,9 @@ var Repl = class {
     if (setting === false) return { layers: [], mergedContent: "" };
     const cwd = process.cwd();
     if (setting !== "auto") {
-      const fullPath = join12(cwd, setting);
-      if (existsSync17(fullPath)) {
-        const content = readFileSync12(fullPath, "utf-8").trim();
+      const fullPath = join13(cwd, setting);
+      if (existsSync18(fullPath)) {
+        const content = readFileSync13(fullPath, "utf-8").trim();
         if (content) {
           const layer = {
             level: "project",
@@ -6590,9 +7015,9 @@ var Repl = class {
    * 超过 MEMORY_MAX_CHARS 时只取末尾最新部分。
    */
   loadMemoryContent() {
-    const memoryPath = join12(this.config.getConfigDir(), MEMORY_FILE_NAME);
-    if (!existsSync17(memoryPath)) return null;
-    let content = readFileSync12(memoryPath, "utf-8").trim();
+    const memoryPath = join13(this.config.getConfigDir(), MEMORY_FILE_NAME);
+    if (!existsSync18(memoryPath)) return null;
+    let content = readFileSync13(memoryPath, "utf-8").trim();
     if (!content) return null;
     if (content.length > MEMORY_MAX_CHARS) {
       content = content.slice(-MEMORY_MAX_CHARS);
@@ -6868,11 +7293,18 @@ ${response.content.trim()}
       process.stdout.write(chalk10.dim(`  \u{1F50C} Plugins loaded: ${pluginCount} tool(s) from plugins/
 `));
     }
-    const skillsDir = join12(this.config.getConfigDir(), SKILLS_DIR_NAME);
+    const skillsDir = join13(this.config.getConfigDir(), SKILLS_DIR_NAME);
     this.skillManager = new SkillManager(skillsDir);
     const skillCount = this.skillManager.loadSkills();
     if (skillCount > 0) {
       process.stdout.write(chalk10.dim(`  \u{1F3AF} Skills: ${skillCount} available (use /skill to manage)
+`));
+    }
+    const commandsDir = join13(this.config.getConfigDir(), CUSTOM_COMMANDS_DIR_NAME);
+    this.customCommandManager = new CustomCommandManager(commandsDir);
+    const customCmdCount = this.customCommandManager.loadCommands();
+    if (customCmdCount > 0) {
+      process.stdout.write(chalk10.dim(`  \u{1F4CB} Custom commands: ${customCmdCount} loaded (use /commands to list)
 `));
     }
     const mcpServers = this.config.get("mcpServers");
@@ -7038,6 +7470,126 @@ ${response.content.trim()}
       maxTokens: params.maxTokens ?? DEFAULT_MAX_TOKENS
     };
   }
+  // ─── Tab 自动补全 ──────────────────────────────────────────────────────
+  /**
+   * readline completer 回调。根据输入上下文返回候选补全列表。
+   * 返回格式：[candidates, matchedPrefix]
+   */
+  completeInput(line) {
+    if (line.startsWith("/") && !line.includes(" ")) {
+      const prefix = line.toLowerCase();
+      const names = [];
+      for (const cmd of this.commands.listAll()) {
+        const full = `/${cmd.name}`;
+        if (full.startsWith(prefix)) names.push(full);
+      }
+      if (this.customCommandManager) {
+        for (const cmd of this.customCommandManager.listCommands()) {
+          const full = `/${cmd.meta.name}`;
+          if (full.startsWith(prefix) && !names.includes(full)) names.push(full);
+        }
+      }
+      return [names.sort(), line];
+    }
+    if (line.startsWith("/") && line.includes(" ")) {
+      const spaceIdx = line.indexOf(" ");
+      const cmdName = line.slice(1, spaceIdx).toLowerCase();
+      const argPart = line.slice(spaceIdx + 1);
+      const candidates = this.getSubcommandCandidates(cmdName, argPart);
+      if (candidates.length > 0) {
+        const prefix = argPart.toLowerCase();
+        const filtered = candidates.filter((c) => c.toLowerCase().startsWith(prefix));
+        const fullCandidates = filtered.map((c) => `/${cmdName} ${c}`);
+        return [fullCandidates, line];
+      }
+      return [[], line];
+    }
+    const atIdx = line.lastIndexOf("@");
+    if (atIdx !== -1) {
+      const partial = line.slice(atIdx + 1);
+      if (!partial.startsWith('"') && !partial.startsWith("'")) {
+        const fileCandidates = this.completeFilePath(partial);
+        if (fileCandidates.length > 0) {
+          const fullCandidates = fileCandidates.map((f) => line.slice(0, atIdx + 1) + f);
+          return [fullCandidates, line];
+        }
+      }
+    }
+    return [[], line];
+  }
+  /** 根据命令名返回子命令/参数候选列表 */
+  getSubcommandCandidates(cmdName, _argPart) {
+    switch (cmdName) {
+      case "provider": {
+        return this.providers.listAvailable().map((p) => p.info.id);
+      }
+      case "model": {
+        try {
+          const provider = this.providers.get(this.currentProvider);
+          return provider.info.models.map((m) => m.id);
+        } catch {
+          return [];
+        }
+      }
+      case "session":
+        return ["new", "list", "load"];
+      case "checkpoint":
+        return ["save", "restore", "list", "delete"];
+      case "skill": {
+        const skills = this.skillManager?.listSkills().map((s) => s.meta.name) ?? [];
+        return [...skills, "off", "list", "reload"];
+      }
+      case "plan":
+        return ["enter", "execute", "exit", "cancel", "status"];
+      case "commands":
+        return ["list", "reload"];
+      case "export":
+        return ["md", "json"];
+      case "cost":
+        return ["reset"];
+      case "context":
+        return ["reload"];
+      case "mcp":
+        return ["reconnect"];
+      case "compact":
+      case "review":
+      case "init":
+        return [];
+      // 自由文本参数，不补全
+      default:
+        return [];
+    }
+  }
+  /**
+   * 补全 @ 后的文件路径。
+   * partial 为 @ 后的部分（如 "src/re"），返回匹配的路径列表（目录带 / 后缀）。
+   */
+  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);
+      if (!existsSync18(absDir)) return [];
+      const entries = readdirSync9(absDir);
+      const results = [];
+      for (const entry of entries) {
+        if (entry.startsWith(".")) continue;
+        if (!entry.toLowerCase().startsWith(prefix.toLowerCase())) continue;
+        try {
+          const fullPath = join13(absDir, entry);
+          const stat = statSync6(fullPath);
+          const rel = dir === "." ? entry : `${dir}/${entry}`;
+          results.push(stat.isDirectory() ? `${rel}/` : rel);
+        } catch {
+        }
+      }
+      return results.sort();
+    } catch {
+      return [];
+    }
+  }
+  // ─────────────────────────────────────────────────────────────────────────
   shouldShowTokens() {
     return this.config.get("ui").showTokenCount;
   }
@@ -7056,7 +7608,11 @@ ${response.content.trim()}
         timeout: modelParams.timeout,
         thinking: modelParams.thinking
       });
-      const { content, usage } = await this.renderer.renderStream(stream);
+      const showTokens = this.shouldShowTokens();
+      const { content, usage, tokensShown } = await this.renderer.renderStream(stream, {
+        showTokens,
+        sessionTotal: showTokens ? { ...this.sessionTokenUsage } : void 0
+      });
       lastResponseStore.content = content;
       session.addMessage({ role: "assistant", content, timestamp: /* @__PURE__ */ new Date() });
       this.events.emit("message.after", { content });
@@ -7064,7 +7620,7 @@ ${response.content.trim()}
         this.sessionTokenUsage.inputTokens += usage.inputTokens;
         this.sessionTokenUsage.outputTokens += usage.outputTokens;
         session.addTokenUsage(usage);
-        if (this.shouldShowTokens()) {
+        if (showTokens && !tokensShown) {
           this.renderer.renderUsage(usage, this.sessionTokenUsage);
         }
       }
@@ -7178,9 +7734,10 @@ ${response.content.trim()}
               thinking: modelParams.thinking,
               ...extraMessages.length > 0 ? { _extraMessages: extraMessages } : {}
             });
-            const { content: genContent, usage: genUsage } = await this.renderer.renderStream(
+            const teeShowTokens = this.shouldShowTokens();
+            const { content: genContent, usage: genUsage, tokensShown: teeTokShown } = await this.renderer.renderStream(
               genStream,
-              { saveToFile }
+              { saveToFile, showTokens: teeShowTokens, sessionTotal: teeShowTokens ? { ...this.sessionTokenUsage } : void 0 }
             );
             lastResponseStore.content = genContent;
             if (genUsage) {
@@ -7203,7 +7760,7 @@ ${response.content.trim()}
               this.sessionTokenUsage.inputTokens += roundUsage.inputTokens;
               this.sessionTokenUsage.outputTokens += roundUsage.outputTokens;
               session.addTokenUsage(roundUsage);
-              if (this.shouldShowTokens()) {
+              if (teeShowTokens && !teeTokShown) {
                 this.renderer.renderUsage(roundUsage, this.sessionTokenUsage);
               }
             }
@@ -7247,6 +7804,30 @@ ${response.content.trim()}
     const args = parts.slice(1);
     const cmd = this.commands.get(cmdName);
     if (!cmd) {
+      const customCmd = this.customCommandManager?.getCommand(cmdName);
+      if (customCmd) {
+        const prompt = expandTemplate(customCmd.promptTemplate, args);
+        console.log(chalk10.dim(`  Running custom command: /${cmdName}...`));
+        try {
+          const provider = this.providers.get(this.currentProvider);
+          const modelParams = this.getModelParams();
+          const response = await provider.chat({
+            messages: [{ role: "user", content: prompt, timestamp: /* @__PURE__ */ new Date() }],
+            model: this.currentModel,
+            systemPrompt: this.buildCurrentSystemPrompt(),
+            stream: false,
+            temperature: 0.3,
+            maxTokens: modelParams.maxTokens ?? 4096,
+            timeout: modelParams.timeout ?? 6e4
+          });
+          console.log();
+          console.log(response.content);
+          console.log();
+        } catch (err) {
+          this.renderer.renderError(`Custom command failed: ${err.message}`);
+        }
+        return;
+      }
       this.renderer.renderError(
         `Unknown command: /${cmdName}. Type /help for available commands.`
       );
@@ -7341,6 +7922,13 @@ ${response.content.trim()}
       },
       refreshPrompt: () => this.refreshPrompt(),
       getSkillManager: () => this.skillManager ?? null,
+      createCheckpoint: (name) => {
+        this.sessions.current?.createCheckpoint(name);
+      },
+      listCheckpoints: () => this.sessions.current?.listCheckpoints() ?? [],
+      restoreCheckpoint: (name) => this.sessions.current?.restoreCheckpoint(name) ?? false,
+      deleteCheckpoint: (name) => this.sessions.current?.deleteCheckpoint(name) ?? false,
+      getCustomCommandManager: () => this.customCommandManager ?? null,
       exit: () => this.handleExit()
     };
     await cmd.execute(args, ctx);

package/package.json

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