jinzd-ai-cli 0.4.80 → 0.4.82

package/README.zh-CN.md

@@ -20,7 +20,9 @@
 - **Unified Diff Patch 编辑**（v0.4.72+）— `edit_file` 支持标准 `@@ -a,b +c,d @@` hunk，大文件多处小改最省 token；容忍 ±200 行漂移与空白差异
 - **Anthropic Batches API**（v0.4.73+）— `aicli batch submit/list/status/results/cancel` 包 Message Batches（50% 折扣 + 24 小时窗口），适合离线分析和批量 eval
 - **Web UI 会话回放**（v0.4.71+）— 会话列表每项 🎬 按钮打开时间轴回放：消息、工具调用、推理内容、cache-aware token 用量一目了然
-- **对话分支**（v0.4.74+）— REPL 内 `/branch list/new/switch/delete/rename`，Web UI 回放面板每条消息旁 🌿 "fork here" 按钮，任意位置开辟新分支探索不同方向，原对话保持不变
+- **对话分支**（v0.4.74+）— REPL 内 `/branch list/new/switch/delete/rename/diff/cherry-pick`，Web UI 回放面板每条消息旁 🌿 "fork here" 按钮，任意位置开辟新分支探索不同方向，原对话保持不变；v0.4.81 起所有子命令支持 id / title / 唯一前缀
+- **符号索引**（v0.4.76+，C1）— tree-sitter 持久化索引（TS/JS/TSX/JSX/Python）+ 3 个只读 AI 工具（`find_symbol` / `get_outline` / `find_references`）+ `/index status/rebuild/clear`；启动后台增量刷新，`write_file` 后自动 upsert
+- **语义代码搜索**（v0.4.77+，C2）— `search_code` AI 工具 + 本地 sentence embedding（`paraphrase-multilingual-MiniLM-L12-v2`，117 MB 一次性下载，384 维，CPU 运行）；支持中英文自然语言查询代码；`/index semantic-rebuild/semantic-clear` 管理
 - **流式工具调用** — 实时流式展示 AI 推理过程和工具调用
 - **子代理系统** — 将复杂子任务委派给独立子代理执行
 - **深度推理** — Claude Extended Thinking，`/think` 一键切换
@@ -137,7 +139,7 @@ aicli
 
 ## 内置工具（Agentic 能力）
 
-AI 在对话中可自主调用 24 个工具：
+AI 在对话中可自主调用 28 个工具：
 
 | 工具 | 安全级别 | 说明 |
 |------|---------|------|
@@ -165,9 +167,20 @@ AI 在对话中可自主调用 24 个工具：
 | `git_log` | 安全 | 显示提交历史（单行/完整，按文件/作者过滤） |
 | `git_commit` | 写入 | 创建 git 提交（暂存文件、提交信息） |
 | `notebook_edit` | 写入 | 编辑 Jupyter notebook 单元格（增/改/删/移动） |
+| `find_symbol` | 安全 | 按名称精确查找函数/类/方法定义（C1，tree-sitter 索引） |
+| `get_outline` | 安全 | 获取文件的符号大纲（类 → 方法树）（C1） |
+| `find_references` | 安全 | 查找符号的所有引用（C1） |
+| `search_code` | 安全 | 语义代码搜索（C2，自然语言查询，中英文均可） |
 
 **安全级别**：`安全` = 自动执行，`写入` = diff 预览 + 确认，`破坏性` = 醒目警告 + 确认。
 
+### 文档深入阅读
+
+- [`docs/TUTORIAL.zh-CN.md`](docs/TUTORIAL.zh-CN.md) — **10 节动手教程**，1 小时从零到熟练
+- [`docs/USAGE.zh-CN.md`](docs/USAGE.zh-CN.md) — 完整参考手册（所有命令、工具、配置）
+- [`docs/ADVANCED.zh-CN.md`](docs/ADVANCED.zh-CN.md) — 架构与内部原理（开发者向）
+- [`docs/RECIPES.zh-CN.md`](docs/RECIPES.zh-CN.md) — 实战配方（按场景查）
+
 ## 主要 REPL 命令
 
 | 命令 | 说明 |

package/dist/{batch-OUBKAHXG.js → batch-2NLB5ZUL.js}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import {
   ConfigManager
-} from "./chunk-C5QENJ4P.js";
+} from "./chunk-CUIALV3O.js";
 import "./chunk-2ZD3YTVM.js";
-import "./chunk-2ERX5Q55.js";
+import "./chunk-KBVJGOD6.js";
 
 // src/cli/batch.ts
 import Anthropic from "@anthropic-ai/sdk";

package/dist/{chunk-63R2GIRK.js → chunk-3A6FQYJZ.js}

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

package/dist/{chunk-IGHC7D62.js → chunk-6GVBLOS3.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   TEST_TIMEOUT
-} from "./chunk-2ERX5Q55.js";
+} from "./chunk-KBVJGOD6.js";
 
 // src/tools/builtin/run-tests.ts
 import { execSync } from "child_process";

package/dist/{chunk-C5QENJ4P.js → chunk-CUIALV3O.js}

@@ -8,7 +8,7 @@ import {
   CONFIG_FILE_NAME,
   HISTORY_DIR_NAME,
   PLUGINS_DIR_NAME
-} from "./chunk-2ERX5Q55.js";
+} from "./chunk-KBVJGOD6.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";

package/dist/{chunk-CU5ZSHGU.js → chunk-JHQMDIV4.js}

@@ -19,7 +19,7 @@ import {
 } from "./chunk-6VRJGH25.js";
 import {
   runTestsTool
-} from "./chunk-IGHC7D62.js";
+} from "./chunk-6GVBLOS3.js";
 import {
   CONFIG_DIR_NAME,
   DEFAULT_MAX_TOOL_OUTPUT_CHARS_CAP,
@@ -27,7 +27,7 @@ import {
   SUBAGENT_ALLOWED_TOOLS,
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT
-} from "./chunk-2ERX5Q55.js";
+} from "./chunk-KBVJGOD6.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";

package/dist/{chunk-2ERX5Q55.js → chunk-KBVJGOD6.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/core/constants.ts
-var VERSION = "0.4.80";
+var VERSION = "0.4.82";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-6HZTXVTF.js → chunk-PS7IEXHQ.js}

@@ -2,7 +2,7 @@
 import {
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-CU5ZSHGU.js";
+} from "./chunk-JHQMDIV4.js";
 import {
   AuthError,
   ProviderError,
@@ -18,7 +18,7 @@ import {
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
   VERSION
-} from "./chunk-2ERX5Q55.js";
+} from "./chunk-KBVJGOD6.js";
 
 // src/providers/claude.ts
 import Anthropic from "@anthropic-ai/sdk";
@@ -2376,6 +2376,37 @@ var Session = class _Session {
     this.updated = /* @__PURE__ */ new Date();
     return true;
   }
+  /**
+   * Resolve a user-supplied branch reference (v0.4.81+).
+   *
+   * Accepts the 6-hex branch id, the branch's display title, or an unambiguous
+   * id prefix (≥2 chars). This exists because users naturally type the title
+   * they chose at `/branch new`, not the auto-generated id — every other
+   * `/branch <sub>` used to error on that with "not found".
+   *
+   * Resolution order:
+   *   1. Exact id match
+   *   2. Exact title match (unique)
+   *   3. Id prefix match (unique, length ≥ 2)
+   *
+   * @returns `{ ok: true, id }` on success; on failure `{ ok: false, reason, matches }`
+   *          where `matches` lists candidates for ambiguous input so callers
+   *          can render a helpful error.
+   */
+  resolveBranchRef(ref) {
+    if (!ref) return { ok: false, reason: "not-found", matches: [] };
+    const byId = this.branches.find((b) => b.id === ref);
+    if (byId) return { ok: true, id: byId.id };
+    const byTitle = this.branches.filter((b) => b.title === ref);
+    if (byTitle.length === 1) return { ok: true, id: byTitle[0].id };
+    if (byTitle.length > 1) return { ok: false, reason: "ambiguous", matches: byTitle };
+    if (ref.length >= 2) {
+      const byPrefix = this.branches.filter((b) => b.id.startsWith(ref));
+      if (byPrefix.length === 1) return { ok: true, id: byPrefix[0].id };
+      if (byPrefix.length > 1) return { ok: false, reason: "ambiguous", matches: byPrefix };
+    }
+    return { ok: false, reason: "not-found", matches: [] };
+  }
   /** Messages of any branch (active or inactive) — read-only copy. */
   getBranchMessages(id) {
     if (id === this.activeBranchId) return this.messages.slice();

package/dist/electron-server.js

@@ -36,7 +36,7 @@ import {
   VERSION,
   buildUserIdentityPrompt,
   runTestsTool
-} from "./chunk-63R2GIRK.js";
+} from "./chunk-3A6FQYJZ.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -2757,6 +2757,37 @@ var Session = class _Session {
     this.updated = /* @__PURE__ */ new Date();
     return true;
   }
+  /**
+   * Resolve a user-supplied branch reference (v0.4.81+).
+   *
+   * Accepts the 6-hex branch id, the branch's display title, or an unambiguous
+   * id prefix (≥2 chars). This exists because users naturally type the title
+   * they chose at `/branch new`, not the auto-generated id — every other
+   * `/branch <sub>` used to error on that with "not found".
+   *
+   * Resolution order:
+   *   1. Exact id match
+   *   2. Exact title match (unique)
+   *   3. Id prefix match (unique, length ≥ 2)
+   *
+   * @returns `{ ok: true, id }` on success; on failure `{ ok: false, reason, matches }`
+   *          where `matches` lists candidates for ambiguous input so callers
+   *          can render a helpful error.
+   */
+  resolveBranchRef(ref) {
+    if (!ref) return { ok: false, reason: "not-found", matches: [] };
+    const byId = this.branches.find((b) => b.id === ref);
+    if (byId) return { ok: true, id: byId.id };
+    const byTitle = this.branches.filter((b) => b.title === ref);
+    if (byTitle.length === 1) return { ok: true, id: byTitle[0].id };
+    if (byTitle.length > 1) return { ok: false, reason: "ambiguous", matches: byTitle };
+    if (ref.length >= 2) {
+      const byPrefix = this.branches.filter((b) => b.id.startsWith(ref));
+      if (byPrefix.length === 1) return { ok: true, id: byPrefix[0].id };
+      if (byPrefix.length > 1) return { ok: false, reason: "ambiguous", matches: byPrefix };
+    }
+    return { ok: false, reason: "not-found", matches: [] };
+  }
   /** Messages of any branch (active or inactive) — read-only copy. */
   getBranchMessages(id) {
     if (id === this.activeBranchId) return this.messages.slice();
@@ -10622,6 +10653,17 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         const sub = args[0]?.toLowerCase();
+        const resolve6 = (ref) => {
+          const r = session.resolveBranchRef(ref);
+          if (r.ok) return r.id;
+          if (r.reason === "ambiguous") {
+            const list = r.matches.map((m) => `${m.id} (${m.title})`).join(", ");
+            this.send({ type: "error", message: `Ambiguous branch reference "${ref}". Matches: ${list}. Use the 6-char id.` });
+          } else {
+            this.send({ type: "error", message: `Branch "${ref}" not found. Use /branch list to see all branches.` });
+          }
+          return null;
+        };
         if (!sub || sub === "list") {
           const branches = session.listBranches();
           const lines = [`\u{1F33F} Branches (${branches.length}):`, ""];
@@ -10632,7 +10674,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             lines.push(`  ${marker}${b.id.padEnd(10)} ${b.title.padEnd(20)} (${count} msgs)${parent}`);
           }
           lines.push("");
-          lines.push("Usage: /branch new <msgIndex> [title] | switch <id> | delete <id> | rename <id> <title> | diff <id> | cherry-pick <id> <msgIndex>");
+          lines.push("Usage: /branch new <msgIndex> [title] | switch <id|title> | delete <id|title> | rename <id|title> <new title> | diff <id|title> | cherry-pick <id|title> <msgIndex>");
           this.send({ type: "info", message: lines.join("\n") });
           break;
         }
@@ -10660,11 +10702,13 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         if (sub === "switch") {
-          const id = args[1];
-          if (!id) {
-            this.send({ type: "error", message: "Usage: /branch switch <id>" });
+          const ref = args[1];
+          if (!ref) {
+            this.send({ type: "error", message: "Usage: /branch switch <id|title>" });
             break;
           }
+          const id = resolve6(ref);
+          if (!id) break;
           const ok = session.switchBranch(id);
           if (ok) {
             await this.sessions.save();
@@ -10673,33 +10717,37 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             this.sendSessionMessages();
             this.sendStatus();
           } else {
-            this.send({ type: "error", message: `Cannot switch to "${id}" (not found or already active).` });
+            this.send({ type: "error", message: `Cannot switch to "${id}" (already active).` });
           }
           break;
         }
         if (sub === "delete") {
-          const id = args[1];
-          if (!id) {
-            this.send({ type: "error", message: "Usage: /branch delete <id>" });
+          const ref = args[1];
+          if (!ref) {
+            this.send({ type: "error", message: "Usage: /branch delete <id|title>" });
             break;
           }
+          const id = resolve6(ref);
+          if (!id) break;
           const ok = session.deleteBranch(id);
           if (ok) {
             await this.sessions.save();
             this.send({ type: "info", message: `\u2713 Deleted branch "${id}"` });
             this.sendStatus();
           } else {
-            this.send({ type: "error", message: `Cannot delete "${id}" (not found, active, or last remaining branch).` });
+            this.send({ type: "error", message: `Cannot delete "${id}" (active, or last remaining branch).` });
           }
           break;
         }
         if (sub === "rename") {
-          const id = args[1];
+          const ref = args[1];
           const title = args.slice(2).join(" ").trim();
-          if (!id || !title) {
-            this.send({ type: "error", message: "Usage: /branch rename <id> <new title>" });
+          if (!ref || !title) {
+            this.send({ type: "error", message: "Usage: /branch rename <id|title> <new title>" });
             break;
           }
+          const id = resolve6(ref);
+          if (!id) break;
           const ok = session.renameBranch(id, title);
           if (ok) {
             await this.sessions.save();
@@ -10711,11 +10759,13 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         if (sub === "diff") {
-          const id = args[1];
-          if (!id) {
-            this.send({ type: "error", message: "Usage: /branch diff <id>" });
+          const ref = args[1];
+          if (!ref) {
+            this.send({ type: "error", message: "Usage: /branch diff <id|title>" });
             break;
           }
+          const id = resolve6(ref);
+          if (!id) break;
           const d = session.diffBranches(id);
           if (!d) {
             this.send({ type: "error", message: `Branch "${id}" not found.` });
@@ -10750,12 +10800,14 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         if (sub === "cherry-pick") {
-          const id = args[1];
+          const ref = args[1];
           const idxStr = args[2];
-          if (!id || !idxStr) {
-            this.send({ type: "error", message: "Usage: /branch cherry-pick <source-id> <msg-index>" });
+          if (!ref || !idxStr) {
+            this.send({ type: "error", message: "Usage: /branch cherry-pick <source-id|title> <msg-index>" });
             break;
           }
+          const id = resolve6(ref);
+          if (!id) break;
           const idx = parseInt(idxStr, 10);
           if (Number.isNaN(idx)) {
             this.send({ type: "error", message: `Invalid message index: "${idxStr}"` });
@@ -10763,7 +10815,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           }
           const picked = session.cherryPickMessage(id, idx);
           if (!picked) {
-            this.send({ type: "error", message: `Cherry-pick failed \u2014 branch "${id}" not found, or index ${idx} out of range.` });
+            this.send({ type: "error", message: `Cherry-pick failed \u2014 index ${idx} out of range for branch "${id}".` });
             break;
           }
           await this.sessions.save();
@@ -11018,7 +11070,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-4PZKLURD.js");
+          const { executeTests } = await import("./run-tests-QJDIKKPF.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{hub-SFJU4KJK.js → hub-6UHFVBNR.js}

@@ -385,7 +385,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-RVKRP6LI.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-2QGCYWCI.js");
   const orchestrator = new TaskOrchestrator(config, providers, configManager);
   let interrupted = false;
   const onSigint = () => {

package/dist/index.js

@@ -30,10 +30,10 @@ import {
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-6HZTXVTF.js";
+} from "./chunk-PS7IEXHQ.js";
 import {
   ConfigManager
-} from "./chunk-C5QENJ4P.js";
+} from "./chunk-CUIALV3O.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -49,7 +49,7 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-CU5ZSHGU.js";
+} from "./chunk-JHQMDIV4.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   fileCheckpoints
@@ -58,7 +58,7 @@ import "./chunk-NHNWUBXB.js";
 import "./chunk-CQQQFNND.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-PFYAAX2S.js";
-import "./chunk-IGHC7D62.js";
+import "./chunk-6GVBLOS3.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -80,7 +80,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-2ERX5Q55.js";
+} from "./chunk-KBVJGOD6.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -2254,7 +2254,7 @@ ${hint}` : "")
     {
       name: "branch",
       description: "Manage conversation branches (fork/switch/list/delete/rename)",
-      usage: "/branch [list | new <msgIndex> [title] | switch <id> | delete <id> | rename <id> <title> | diff <id> | cherry-pick <id> <msgIndex>]",
+      usage: "/branch [list | new <msgIndex> [title] | switch <id|title> | delete <id|title> | rename <id|title> <new> | diff <id|title> | cherry-pick <id|title> <msgIndex>]",
       async execute(args, ctx) {
         const session = ctx.sessions.current;
         if (!session) {
@@ -2262,6 +2262,17 @@ ${hint}` : "")
           return;
         }
         const sub = args[0]?.toLowerCase();
+        const resolve3 = (ref) => {
+          const r = session.resolveBranchRef(ref);
+          if (r.ok) return r.id;
+          if (r.reason === "ambiguous") {
+            const list = r.matches.map((m) => `${m.id} (${m.title})`).join(", ");
+            ctx.renderer.renderError(`Ambiguous branch reference "${ref}". Matches: ${list}. Use the 6-char id.`);
+          } else {
+            ctx.renderer.renderError(`Branch "${ref}" not found. Try /branch list to see all branches.`);
+          }
+          return null;
+        };
         if (!sub || sub === "list") {
           const branches = session.listBranches();
           console.log(theme.heading(`
@@ -2276,12 +2287,13 @@ ${hint}` : "")
             );
           }
           console.log();
-          console.log(theme.dim("  /branch new <msgIndex> [title]  \u2014 fork active branch at message N"));
-          console.log(theme.dim("  /branch switch <id>             \u2014 switch active branch"));
-          console.log(theme.dim("  /branch delete <id>             \u2014 delete inactive branch"));
-          console.log(theme.dim("  /branch rename <id> <title>     \u2014 rename a branch"));
-          console.log(theme.dim("  /branch diff <id>                \u2014 compare branch with active, list divergent messages"));
-          console.log(theme.dim("  /branch cherry-pick <id> <idx>   \u2014 copy one message from branch <id> into active"));
+          console.log(theme.dim("  /branch new <msgIndex> [title]       \u2014 fork active branch at message N"));
+          console.log(theme.dim("  /branch switch <id|title>            \u2014 switch active branch"));
+          console.log(theme.dim("  /branch delete <id|title>            \u2014 delete inactive branch"));
+          console.log(theme.dim("  /branch rename <id|title> <new>      \u2014 rename a branch"));
+          console.log(theme.dim("  /branch diff <id|title>              \u2014 compare branch with active, list divergent messages"));
+          console.log(theme.dim("  /branch cherry-pick <id|title> <idx> \u2014 copy one message from branch into active"));
+          console.log(theme.dim("  (id, title, or unique id-prefix all work)"));
           console.log();
           return;
         }
@@ -2310,11 +2322,13 @@ ${hint}` : "")
           return;
         }
         if (sub === "switch") {
-          const id = args[1];
-          if (!id) {
-            ctx.renderer.renderError("Usage: /branch switch <id>");
+          const ref = args[1];
+          if (!ref) {
+            ctx.renderer.renderError("Usage: /branch switch <id|title>");
             return;
           }
+          const id = resolve3(ref);
+          if (!id) return;
           const ok = session.switchBranch(id);
           if (ok) {
             await ctx.sessions.save();
@@ -2324,16 +2338,18 @@ ${hint}` : "")
             console.log(theme.dim(`    ${session.messages.length} messages on this branch
 `));
           } else {
-            ctx.renderer.renderError(`Cannot switch to "${id}" (not found or already active).`);
+            ctx.renderer.renderError(`Cannot switch to "${id}" (already active).`);
           }
           return;
         }
         if (sub === "delete") {
-          const id = args[1];
-          if (!id) {
-            ctx.renderer.renderError("Usage: /branch delete <id>");
+          const ref = args[1];
+          if (!ref) {
+            ctx.renderer.renderError("Usage: /branch delete <id|title>");
             return;
           }
+          const id = resolve3(ref);
+          if (!id) return;
           const ok = session.deleteBranch(id);
           if (ok) {
             await ctx.sessions.save();
@@ -2342,18 +2358,20 @@ ${hint}` : "")
 `));
           } else {
             ctx.renderer.renderError(
-              `Cannot delete "${id}" (not found, active, or last remaining branch).`
+              `Cannot delete "${id}" (active, or last remaining branch).`
             );
           }
           return;
         }
         if (sub === "rename") {
-          const id = args[1];
+          const ref = args[1];
           const title = args.slice(2).join(" ").trim();
-          if (!id || !title) {
-            ctx.renderer.renderError("Usage: /branch rename <id> <new title>");
+          if (!ref || !title) {
+            ctx.renderer.renderError("Usage: /branch rename <id|title> <new title>");
             return;
           }
+          const id = resolve3(ref);
+          if (!id) return;
           const ok = session.renameBranch(id, title);
           if (ok) {
             await ctx.sessions.save();
@@ -2366,11 +2384,13 @@ ${hint}` : "")
           return;
         }
         if (sub === "diff") {
-          const id = args[1];
-          if (!id) {
-            ctx.renderer.renderError("Usage: /branch diff <id> \u2014 diff the given branch against the active branch");
+          const ref = args[1];
+          if (!ref) {
+            ctx.renderer.renderError("Usage: /branch diff <id|title> \u2014 diff the given branch against the active branch");
             return;
           }
+          const id = resolve3(ref);
+          if (!id) return;
           const d = session.diffBranches(id);
           if (!d) {
             ctx.renderer.renderError(`Branch "${id}" not found.`);
@@ -2408,12 +2428,14 @@ ${hint}` : "")
           return;
         }
         if (sub === "cherry-pick") {
-          const id = args[1];
+          const ref = args[1];
           const idxStr = args[2];
-          if (!id || !idxStr) {
-            ctx.renderer.renderError("Usage: /branch cherry-pick <source-id> <msg-index>");
+          if (!ref || !idxStr) {
+            ctx.renderer.renderError("Usage: /branch cherry-pick <source-id|title> <msg-index>");
             return;
           }
+          const id = resolve3(ref);
+          if (!id) return;
           const idx = parseInt(idxStr, 10);
           if (Number.isNaN(idx)) {
             ctx.renderer.renderError(`Invalid message index: "${idxStr}"`);
@@ -2421,7 +2443,7 @@ ${hint}` : "")
           }
           const picked = session.cherryPickMessage(id, idx);
           if (!picked) {
-            ctx.renderer.renderError(`Cherry-pick failed \u2014 branch "${id}" not found, or index ${idx} out of range.`);
+            ctx.renderer.renderError(`Cherry-pick failed \u2014 index ${idx} out of range for branch "${id}".`);
             return;
           }
           await ctx.sessions.save();
@@ -2570,7 +2592,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-7N2WILA3.js");
+          const { executeTests } = await import("./run-tests-KDJI6VFZ.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -6463,7 +6485,7 @@ program.command("web").description("Start Web UI server with browser-based chat
     console.error("Error: Invalid port number. Must be between 1 and 65535.");
     process.exit(1);
   }
-  const { startWebServer } = await import("./server-HJ64OR7A.js");
+  const { startWebServer } = await import("./server-VBR2F6YU.js");
   await startWebServer({ port, host: options.host });
 });
 program.command("user [action] [username]").description("Manage Web UI users (list | create <name> | delete <name> | reset-password <name> | migrate <name>)").action(async (action, username) => {
@@ -6586,7 +6608,7 @@ program.command("sessions").description("List recent conversation sessions").act
 });
 program.command("batch <action> [arg] [arg2]").description("Anthropic Message Batches: submit | list | status <id> | results <id> [out] | cancel <id>").option("--dry-run", "Parse and validate input without submitting (submit only)").action(async (action, arg, arg2, options) => {
   try {
-    const batch = await import("./batch-OUBKAHXG.js");
+    const batch = await import("./batch-2NLB5ZUL.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -6746,7 +6768,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-SFJU4KJK.js");
+  const { startHub } = await import("./hub-6UHFVBNR.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-7N2WILA3.js → run-tests-KDJI6VFZ.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-IGHC7D62.js";
-import "./chunk-2ERX5Q55.js";
+} from "./chunk-6GVBLOS3.js";
+import "./chunk-KBVJGOD6.js";
 export {
   executeTests,
   runTestsTool

package/dist/{run-tests-4PZKLURD.js → run-tests-QJDIKKPF.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-63R2GIRK.js";
+} from "./chunk-3A6FQYJZ.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-HJ64OR7A.js → server-VBR2F6YU.js}

@@ -20,10 +20,10 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-6HZTXVTF.js";
+} from "./chunk-PS7IEXHQ.js";
 import {
   ConfigManager
-} from "./chunk-C5QENJ4P.js";
+} from "./chunk-CUIALV3O.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -41,14 +41,14 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-CU5ZSHGU.js";
+} from "./chunk-JHQMDIV4.js";
 import "./chunk-2ZD3YTVM.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-NHNWUBXB.js";
 import "./chunk-CQQQFNND.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-PFYAAX2S.js";
-import "./chunk-IGHC7D62.js";
+import "./chunk-6GVBLOS3.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -67,7 +67,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-2ERX5Q55.js";
+} from "./chunk-KBVJGOD6.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -1812,6 +1812,17 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         const sub = args[0]?.toLowerCase();
+        const resolve3 = (ref) => {
+          const r = session.resolveBranchRef(ref);
+          if (r.ok) return r.id;
+          if (r.reason === "ambiguous") {
+            const list = r.matches.map((m) => `${m.id} (${m.title})`).join(", ");
+            this.send({ type: "error", message: `Ambiguous branch reference "${ref}". Matches: ${list}. Use the 6-char id.` });
+          } else {
+            this.send({ type: "error", message: `Branch "${ref}" not found. Use /branch list to see all branches.` });
+          }
+          return null;
+        };
         if (!sub || sub === "list") {
           const branches = session.listBranches();
           const lines = [`\u{1F33F} Branches (${branches.length}):`, ""];
@@ -1822,7 +1833,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             lines.push(`  ${marker}${b.id.padEnd(10)} ${b.title.padEnd(20)} (${count} msgs)${parent}`);
           }
           lines.push("");
-          lines.push("Usage: /branch new <msgIndex> [title] | switch <id> | delete <id> | rename <id> <title> | diff <id> | cherry-pick <id> <msgIndex>");
+          lines.push("Usage: /branch new <msgIndex> [title] | switch <id|title> | delete <id|title> | rename <id|title> <new title> | diff <id|title> | cherry-pick <id|title> <msgIndex>");
           this.send({ type: "info", message: lines.join("\n") });
           break;
         }
@@ -1850,11 +1861,13 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         if (sub === "switch") {
-          const id = args[1];
-          if (!id) {
-            this.send({ type: "error", message: "Usage: /branch switch <id>" });
+          const ref = args[1];
+          if (!ref) {
+            this.send({ type: "error", message: "Usage: /branch switch <id|title>" });
             break;
           }
+          const id = resolve3(ref);
+          if (!id) break;
           const ok = session.switchBranch(id);
           if (ok) {
             await this.sessions.save();
@@ -1863,33 +1876,37 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             this.sendSessionMessages();
             this.sendStatus();
           } else {
-            this.send({ type: "error", message: `Cannot switch to "${id}" (not found or already active).` });
+            this.send({ type: "error", message: `Cannot switch to "${id}" (already active).` });
           }
           break;
         }
         if (sub === "delete") {
-          const id = args[1];
-          if (!id) {
-            this.send({ type: "error", message: "Usage: /branch delete <id>" });
+          const ref = args[1];
+          if (!ref) {
+            this.send({ type: "error", message: "Usage: /branch delete <id|title>" });
             break;
           }
+          const id = resolve3(ref);
+          if (!id) break;
           const ok = session.deleteBranch(id);
           if (ok) {
             await this.sessions.save();
             this.send({ type: "info", message: `\u2713 Deleted branch "${id}"` });
             this.sendStatus();
           } else {
-            this.send({ type: "error", message: `Cannot delete "${id}" (not found, active, or last remaining branch).` });
+            this.send({ type: "error", message: `Cannot delete "${id}" (active, or last remaining branch).` });
           }
           break;
         }
         if (sub === "rename") {
-          const id = args[1];
+          const ref = args[1];
           const title = args.slice(2).join(" ").trim();
-          if (!id || !title) {
-            this.send({ type: "error", message: "Usage: /branch rename <id> <new title>" });
+          if (!ref || !title) {
+            this.send({ type: "error", message: "Usage: /branch rename <id|title> <new title>" });
             break;
           }
+          const id = resolve3(ref);
+          if (!id) break;
           const ok = session.renameBranch(id, title);
           if (ok) {
             await this.sessions.save();
@@ -1901,11 +1918,13 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         if (sub === "diff") {
-          const id = args[1];
-          if (!id) {
-            this.send({ type: "error", message: "Usage: /branch diff <id>" });
+          const ref = args[1];
+          if (!ref) {
+            this.send({ type: "error", message: "Usage: /branch diff <id|title>" });
             break;
           }
+          const id = resolve3(ref);
+          if (!id) break;
           const d = session.diffBranches(id);
           if (!d) {
             this.send({ type: "error", message: `Branch "${id}" not found.` });
@@ -1940,12 +1959,14 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         if (sub === "cherry-pick") {
-          const id = args[1];
+          const ref = args[1];
           const idxStr = args[2];
-          if (!id || !idxStr) {
-            this.send({ type: "error", message: "Usage: /branch cherry-pick <source-id> <msg-index>" });
+          if (!ref || !idxStr) {
+            this.send({ type: "error", message: "Usage: /branch cherry-pick <source-id|title> <msg-index>" });
             break;
           }
+          const id = resolve3(ref);
+          if (!id) break;
           const idx = parseInt(idxStr, 10);
           if (Number.isNaN(idx)) {
             this.send({ type: "error", message: `Invalid message index: "${idxStr}"` });
@@ -1953,7 +1974,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           }
           const picked = session.cherryPickMessage(id, idx);
           if (!picked) {
-            this.send({ type: "error", message: `Cherry-pick failed \u2014 branch "${id}" not found, or index ${idx} out of range.` });
+            this.send({ type: "error", message: `Cherry-pick failed \u2014 index ${idx} out of range for branch "${id}".` });
             break;
           }
           await this.sessions.save();
@@ -2208,7 +2229,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-7N2WILA3.js");
+          const { executeTests } = await import("./run-tests-KDJI6VFZ.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{task-orchestrator-RVKRP6LI.js → task-orchestrator-2QGCYWCI.js}

@@ -4,17 +4,17 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-CU5ZSHGU.js";
+} from "./chunk-JHQMDIV4.js";
 import "./chunk-2ZD3YTVM.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-NHNWUBXB.js";
 import "./chunk-CQQQFNND.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-PFYAAX2S.js";
-import "./chunk-IGHC7D62.js";
+import "./chunk-6GVBLOS3.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-2ERX5Q55.js";
+} from "./chunk-KBVJGOD6.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/package.json

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