jinzd-ai-cli 0.4.79 → 0.4.81

package/dist/{batch-SMUURFMA.js → batch-JOYUXWBK.js}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import {
   ConfigManager
-} from "./chunk-34OKHMTQ.js";
+} from "./chunk-JWE53S2U.js";
 import "./chunk-2ZD3YTVM.js";
-import "./chunk-RRL5572W.js";
+import "./chunk-BPIKBXGZ.js";
 
 // src/cli/batch.ts
 import Anthropic from "@anthropic-ai/sdk";

package/dist/{chunk-ZT7RZYWE.js → chunk-44MKM6OO.js}

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

package/dist/{chunk-RRL5572W.js → chunk-BPIKBXGZ.js}

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

package/dist/{chunk-HPDDAXFY.js → chunk-CQQQFNND.js}

@@ -12,8 +12,42 @@ import {
 } from "./chunk-PFYAAX2S.js";
 
 // src/symbols/semantic.ts
-function buildEmbeddingText(s) {
-  const parts = [s.kind, s.name];
+function pathTokens(absFile, root) {
+  if (!absFile) return "";
+  const norm = absFile.replace(/\\/g, "/");
+  let rel = norm;
+  if (root) {
+    const rootNorm = root.replace(/\\/g, "/").replace(/\/$/, "") + "/";
+    if (norm.toLowerCase().startsWith(rootNorm.toLowerCase())) {
+      rel = norm.slice(rootNorm.length);
+    }
+  }
+  const noExt = rel.replace(/\.[^./]+$/, "");
+  const parts = noExt.split(/[/.\-_]/).filter((t) => {
+    if (!t) return false;
+    if (t.length < 2) return false;
+    if (/^\d+$/.test(t)) return false;
+    if (t === "src" || t === "lib" || t === "app" || t === "dist") return false;
+    return true;
+  });
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const t of parts) {
+    const lower = t.toLowerCase();
+    if (seen.has(lower)) continue;
+    seen.add(lower);
+    out.push(t);
+    if (out.length >= 6) break;
+  }
+  return out.join(" ");
+}
+function buildEmbeddingText(s, root) {
+  const parts = [];
+  if (root) {
+    const tokens = pathTokens(s.location.file, root);
+    if (tokens) parts.push(tokens);
+  }
+  parts.push(s.kind, s.name);
   if (s.container) parts.push(`in ${s.container}`);
   if (s.signature) parts.push(s.signature);
   if (s.doc) parts.push(s.doc);
@@ -42,7 +76,7 @@ async function rebuildSemanticIndex(root, opts = {}) {
     const batch = [];
     for (let j = i; j < end; j++) {
       symbolIdx[j] = j;
-      batch.push(buildEmbeddingText(index.symbols[j]));
+      batch.push(buildEmbeddingText(index.symbols[j], index.root));
     }
     const batchStart = Date.now();
     const rows = await embed(batch);
@@ -77,6 +111,7 @@ function hasSemanticIndex(root) {
 }
 
 export {
+  pathTokens,
   buildEmbeddingText,
   rebuildSemanticIndex,
   semanticSearch,

package/dist/{chunk-UTCC3UMT.js → chunk-GTKJUEBS.js}

@@ -11,8 +11,42 @@ import {
 } from "./chunk-XMA222FQ.js";
 
 // src/symbols/semantic.ts
-function buildEmbeddingText(s) {
-  const parts = [s.kind, s.name];
+function pathTokens(absFile, root) {
+  if (!absFile) return "";
+  const norm = absFile.replace(/\\/g, "/");
+  let rel = norm;
+  if (root) {
+    const rootNorm = root.replace(/\\/g, "/").replace(/\/$/, "") + "/";
+    if (norm.toLowerCase().startsWith(rootNorm.toLowerCase())) {
+      rel = norm.slice(rootNorm.length);
+    }
+  }
+  const noExt = rel.replace(/\.[^./]+$/, "");
+  const parts = noExt.split(/[/.\-_]/).filter((t) => {
+    if (!t) return false;
+    if (t.length < 2) return false;
+    if (/^\d+$/.test(t)) return false;
+    if (t === "src" || t === "lib" || t === "app" || t === "dist") return false;
+    return true;
+  });
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const t of parts) {
+    const lower = t.toLowerCase();
+    if (seen.has(lower)) continue;
+    seen.add(lower);
+    out.push(t);
+    if (out.length >= 6) break;
+  }
+  return out.join(" ");
+}
+function buildEmbeddingText(s, root) {
+  const parts = [];
+  if (root) {
+    const tokens = pathTokens(s.location.file, root);
+    if (tokens) parts.push(tokens);
+  }
+  parts.push(s.kind, s.name);
   if (s.container) parts.push(`in ${s.container}`);
   if (s.signature) parts.push(s.signature);
   if (s.doc) parts.push(s.doc);
@@ -41,7 +75,7 @@ async function rebuildSemanticIndex(root, opts = {}) {
     const batch = [];
     for (let j = i; j < end; j++) {
       symbolIdx[j] = j;
-      batch.push(buildEmbeddingText(index.symbols[j]));
+      batch.push(buildEmbeddingText(index.symbols[j], index.root));
     }
     const batchStart = Date.now();
     const rows = await embed(batch);
@@ -76,6 +110,7 @@ function hasSemanticIndex(root) {
 }
 
 export {
+  pathTokens,
   buildEmbeddingText,
   rebuildSemanticIndex,
   semanticSearch,

package/dist/{chunk-MOE2D3NR.js → chunk-HFSSDFQN.js}

@@ -13,13 +13,13 @@ import {
 import {
   hasSemanticIndex,
   semanticSearch
-} from "./chunk-HPDDAXFY.js";
+} from "./chunk-CQQQFNND.js";
 import {
   loadIndex
 } from "./chunk-6VRJGH25.js";
 import {
   runTestsTool
-} from "./chunk-ZT7RZYWE.js";
+} from "./chunk-44MKM6OO.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-RRL5572W.js";
+} from "./chunk-BPIKBXGZ.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";

package/dist/{chunk-34OKHMTQ.js → chunk-JWE53S2U.js}

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

package/dist/{chunk-EGJAMKAZ.js → chunk-U7ZSIOKV.js}

@@ -2,7 +2,7 @@
 import {
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-MOE2D3NR.js";
+} from "./chunk-HFSSDFQN.js";
 import {
   AuthError,
   ProviderError,
@@ -18,7 +18,7 @@ import {
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
   VERSION
-} from "./chunk-RRL5572W.js";
+} from "./chunk-BPIKBXGZ.js";
 
 // src/providers/claude.ts
 import Anthropic from "@anthropic-ai/sdk";
@@ -2135,6 +2135,12 @@ function getContentText(content) {
 function makeBranchId() {
   return Math.random().toString(16).slice(2, 8);
 }
+function messagesEqual(a, b) {
+  if (a.role !== b.role) return false;
+  if (JSON.stringify(a.content) !== JSON.stringify(b.content)) return false;
+  if (JSON.stringify(a.toolCalls ?? null) !== JSON.stringify(b.toolCalls ?? null)) return false;
+  return true;
+}
 var Session = class _Session {
   id;
   provider;
@@ -2370,12 +2376,88 @@ 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();
     const m = this._inactiveBranchMessages.get(id);
     return m ? m.slice() : null;
   }
+  // ── B3 Branch diff + cherry-pick (v0.4.80+) ────────────────────────
+  /**
+   * Compare messages between two branches. Finds the longest common prefix
+   * by message equality (role + content + toolCalls shape) — NOT by fork
+   * point metadata, so user-edited histories still diff cleanly.
+   *
+   * @param sourceId  Branch to compare
+   * @param targetId  Branch to compare against (defaults to active branch)
+   * @returns BranchDiff, or null if either branch id is unknown
+   */
+  diffBranches(sourceId, targetId) {
+    const tgt = targetId ?? this.activeBranchId;
+    const src = this.getBranchMessages(sourceId);
+    const dst = this.getBranchMessages(tgt);
+    if (!src || !dst) return null;
+    let i = 0;
+    while (i < src.length && i < dst.length && messagesEqual(src[i], dst[i])) i++;
+    return {
+      sourceId,
+      targetId: tgt,
+      commonPrefix: i,
+      sourceOnly: src.slice(i),
+      targetOnly: dst.slice(i)
+    };
+  }
+  /**
+   * Copy a single message from another branch into the active branch
+   * (appended at the end). Timestamp is reset to now so it's clear when
+   * the cherry-pick happened.
+   *
+   * @returns the cloned message, or null if sourceId / msgIndex is invalid
+   */
+  cherryPickMessage(sourceId, msgIndex) {
+    const src = this.getBranchMessages(sourceId);
+    if (!src) return null;
+    if (msgIndex < 0 || msgIndex >= src.length) return null;
+    const orig = src[msgIndex];
+    const copy = {
+      ...orig,
+      timestamp: /* @__PURE__ */ new Date()
+    };
+    this.messages.push(copy);
+    this.updated = /* @__PURE__ */ new Date();
+    return copy;
+  }
   getMeta() {
     return {
       id: this.id,

package/dist/{chunk-FU6WMYXS.js → chunk-VEWRTIMX.js}

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

package/dist/electron-server.js

@@ -36,11 +36,11 @@ import {
   VERSION,
   buildUserIdentityPrompt,
   runTestsTool
-} from "./chunk-FU6WMYXS.js";
+} from "./chunk-VEWRTIMX.js";
 import {
   hasSemanticIndex,
   semanticSearch
-} from "./chunk-UTCC3UMT.js";
+} from "./chunk-GTKJUEBS.js";
 import {
   loadIndex
 } from "./chunk-BJAT4GNC.js";
@@ -2516,6 +2516,12 @@ function getContentText(content) {
 function makeBranchId() {
   return Math.random().toString(16).slice(2, 8);
 }
+function messagesEqual(a, b) {
+  if (a.role !== b.role) return false;
+  if (JSON.stringify(a.content) !== JSON.stringify(b.content)) return false;
+  if (JSON.stringify(a.toolCalls ?? null) !== JSON.stringify(b.toolCalls ?? null)) return false;
+  return true;
+}
 var Session = class _Session {
   id;
   provider;
@@ -2751,12 +2757,88 @@ 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();
     const m = this._inactiveBranchMessages.get(id);
     return m ? m.slice() : null;
   }
+  // ── B3 Branch diff + cherry-pick (v0.4.80+) ────────────────────────
+  /**
+   * Compare messages between two branches. Finds the longest common prefix
+   * by message equality (role + content + toolCalls shape) — NOT by fork
+   * point metadata, so user-edited histories still diff cleanly.
+   *
+   * @param sourceId  Branch to compare
+   * @param targetId  Branch to compare against (defaults to active branch)
+   * @returns BranchDiff, or null if either branch id is unknown
+   */
+  diffBranches(sourceId, targetId) {
+    const tgt = targetId ?? this.activeBranchId;
+    const src = this.getBranchMessages(sourceId);
+    const dst = this.getBranchMessages(tgt);
+    if (!src || !dst) return null;
+    let i = 0;
+    while (i < src.length && i < dst.length && messagesEqual(src[i], dst[i])) i++;
+    return {
+      sourceId,
+      targetId: tgt,
+      commonPrefix: i,
+      sourceOnly: src.slice(i),
+      targetOnly: dst.slice(i)
+    };
+  }
+  /**
+   * Copy a single message from another branch into the active branch
+   * (appended at the end). Timestamp is reset to now so it's clear when
+   * the cherry-pick happened.
+   *
+   * @returns the cloned message, or null if sourceId / msgIndex is invalid
+   */
+  cherryPickMessage(sourceId, msgIndex) {
+    const src = this.getBranchMessages(sourceId);
+    if (!src) return null;
+    if (msgIndex < 0 || msgIndex >= src.length) return null;
+    const orig = src[msgIndex];
+    const copy = {
+      ...orig,
+      timestamp: /* @__PURE__ */ new Date()
+    };
+    this.messages.push(copy);
+    this.updated = /* @__PURE__ */ new Date();
+    return copy;
+  }
   getMeta() {
     return {
       id: this.id,
@@ -10241,7 +10323,7 @@ Tokens: in=${this.sessionTokenUsage.inputTokens} out=${this.sessionTokenUsage.ou
             "  /diff [--stats]      \u2014 Show file modifications in this session",
             "  /checkpoint [save|restore|delete] <name> \u2014 Session checkpoints",
             "  /fork [checkpoint]   \u2014 Fork session from checkpoint or current",
-            "  /branch [list|new|switch|delete|rename] \u2014 Manage conversation branches",
+            "  /branch [list|new|switch|delete|rename|diff|cherry-pick] \u2014 Manage conversation branches (fork tree, cross-branch picks)",
             "  /index [status|rebuild|clear|semantic-rebuild|semantic-clear] \u2014 Symbol + semantic index (find_symbol / search_code)",
             "  /review [--staged]   \u2014 AI code review from git diff",
             "  /security-review     \u2014 Security vulnerability scan on git diff",
@@ -10571,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}):`, ""];
@@ -10581,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>");
+          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;
         }
@@ -10609,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();
@@ -10622,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();
@@ -10659,7 +10758,74 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           }
           break;
         }
-        this.send({ type: "error", message: `Unknown subcommand: ${sub}. Use list/new/switch/delete/rename.` });
+        if (sub === "diff") {
+          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.` });
+            break;
+          }
+          const preview = (m) => {
+            const text = typeof m.content === "string" ? m.content : "[complex content]";
+            return text.replace(/\s+/g, " ").trim().slice(0, 70);
+          };
+          const lines = [
+            `\u{1F500} diff  ${id} (source) \u2194 ${session.activeBranchId} (active)`,
+            `Common prefix: ${d.commonPrefix} message(s)`
+          ];
+          if (d.sourceOnly.length === 0 && d.targetOnly.length === 0) {
+            lines.push("Branches are identical.");
+          } else {
+            if (d.sourceOnly.length > 0) {
+              lines.push("", `Only in ${id} (${d.sourceOnly.length}):`);
+              d.sourceOnly.forEach(
+                (m, i) => lines.push(`  [${d.commonPrefix + i}] ${m.role}: ${preview(m)}`)
+              );
+            }
+            if (d.targetOnly.length > 0) {
+              lines.push("", `Only in ${session.activeBranchId} (active) (${d.targetOnly.length}):`);
+              d.targetOnly.forEach(
+                (m, i) => lines.push(`  [${d.commonPrefix + i}] ${m.role}: ${preview(m)}`)
+              );
+            }
+            lines.push("", `Use /branch cherry-pick ${id} <index> to copy a message into the active branch.`);
+          }
+          this.send({ type: "info", message: lines.join("\n") });
+          break;
+        }
+        if (sub === "cherry-pick") {
+          const ref = args[1];
+          const idxStr = args[2];
+          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}"` });
+            break;
+          }
+          const picked = session.cherryPickMessage(id, idx);
+          if (!picked) {
+            this.send({ type: "error", message: `Cherry-pick failed \u2014 index ${idx} out of range for branch "${id}".` });
+            break;
+          }
+          await this.sessions.save();
+          const preview = typeof picked.content === "string" ? picked.content.replace(/\s+/g, " ").trim().slice(0, 60) : "[complex content]";
+          this.send({ type: "info", message: `\u2713 Cherry-picked ${picked.role} message from "${id}"[${idx}] \u2192 active branch (${session.messages.length} msgs): ${preview}` });
+          this.sendSessionMessages();
+          this.sendStatus();
+          break;
+        }
+        this.send({ type: "error", message: `Unknown subcommand: ${sub}. Use list/new/switch/delete/rename/diff/cherry-pick.` });
         break;
       }
       // ── /index ──────────────────────────────────────────────────────
@@ -10717,7 +10883,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             message: `Building semantic index for ${idx.symbolCount} symbols\u2026 (first run downloads ~117 MB model)`
           });
           try {
-            const { rebuildSemanticIndex } = await import("./semantic-MD7HYPWZ.js");
+            const { rebuildSemanticIndex } = await import("./semantic-MYAXLDCZ.js");
             const stats = await rebuildSemanticIndex(root);
             const first = stats.modelFirstLoadMs ? ` (model load+first batch ${stats.modelFirstLoadMs}ms)` : "";
             this.send({
@@ -10904,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-O2CYJF3Y.js");
+          const { executeTests } = await import("./run-tests-Q2GGLRK6.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{hub-BDEFIXFF.js → hub-WLBLPBT2.js}

@@ -385,7 +385,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-MWZ7NMES.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-2GGIA6EG.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-EGJAMKAZ.js";
+} from "./chunk-U7ZSIOKV.js";
 import {
   ConfigManager
-} from "./chunk-34OKHMTQ.js";
+} from "./chunk-JWE53S2U.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -49,16 +49,16 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-MOE2D3NR.js";
+} from "./chunk-HFSSDFQN.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
 import "./chunk-NHNWUBXB.js";
-import "./chunk-HPDDAXFY.js";
+import "./chunk-CQQQFNND.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-PFYAAX2S.js";
-import "./chunk-ZT7RZYWE.js";
+import "./chunk-44MKM6OO.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -80,7 +80,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-RRL5572W.js";
+} from "./chunk-BPIKBXGZ.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -978,7 +978,7 @@ function createDefaultCommands() {
           "  /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",
-          "  /branch [list|new|switch|delete|rename] - Manage conversation branches (fork tree)",
+          "  /branch [list|new|switch|delete|rename|diff|cherry-pick] - Manage conversation branches (fork tree, cross-branch picks)",
           "  /index [status|rebuild|clear|semantic-rebuild|semantic-clear] - Symbol + semantic index (find_symbol / search_code)",
           "  /yolo [on|off]           - Toggle session auto-approve (skip confirmations)",
           "  /exit                    - Exit"
@@ -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>]",
+      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,10 +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 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;
         }
@@ -2308,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();
@@ -2322,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();
@@ -2340,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();
@@ -2363,7 +2383,78 @@ ${hint}` : "")
           }
           return;
         }
-        ctx.renderer.renderError(`Unknown subcommand: ${sub}. Use list/new/switch/delete/rename.`);
+        if (sub === "diff") {
+          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.`);
+            return;
+          }
+          const active = session.activeBranchId;
+          console.log(`
+  ${theme.info("diff")}  ${id} (source) \u2194 ${active} (active)`);
+          console.log(theme.dim(`  Common prefix: ${d.commonPrefix} message(s)`));
+          if (d.sourceOnly.length === 0 && d.targetOnly.length === 0) {
+            console.log(theme.success("  Branches are identical.\n"));
+            return;
+          }
+          const preview = (m) => {
+            const text = typeof m.content === "string" ? m.content : "[complex content]";
+            return text.replace(/\s+/g, " ").trim().slice(0, 70);
+          };
+          if (d.sourceOnly.length > 0) {
+            console.log(theme.dim(`
+  Only in ${id}  (${d.sourceOnly.length}):`));
+            d.sourceOnly.forEach((m, i) => {
+              console.log(`    ${theme.dim(`[${d.commonPrefix + i}]`)} ${m.role}: ${preview(m)}`);
+            });
+          }
+          if (d.targetOnly.length > 0) {
+            console.log(theme.dim(`
+  Only in ${active} (active) (${d.targetOnly.length}):`));
+            d.targetOnly.forEach((m, i) => {
+              console.log(`    ${theme.dim(`[${d.commonPrefix + i}]`)} ${m.role}: ${preview(m)}`);
+            });
+          }
+          console.log(theme.dim(`
+  Use /branch cherry-pick ${id} <index> to copy a message into the active branch.
+`));
+          return;
+        }
+        if (sub === "cherry-pick") {
+          const ref = args[1];
+          const idxStr = args[2];
+          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}"`);
+            return;
+          }
+          const picked = session.cherryPickMessage(id, idx);
+          if (!picked) {
+            ctx.renderer.renderError(`Cherry-pick failed \u2014 index ${idx} out of range for branch "${id}".`);
+            return;
+          }
+          await ctx.sessions.save();
+          const preview = typeof picked.content === "string" ? picked.content.replace(/\s+/g, " ").trim().slice(0, 60) : "[complex content]";
+          console.log(theme.success(`
+  \u2713 Cherry-picked ${picked.role} message from "${id}"[${idx}] \u2192 active branch (now ${session.messages.length} msgs)`));
+          console.log(theme.dim(`    ${preview}
+`));
+          return;
+        }
+        ctx.renderer.renderError(`Unknown subcommand: ${sub}. Use list/new/switch/delete/rename/diff/cherry-pick.`);
       }
     },
     // ── /index ────────────────────────────────────────────────────
@@ -2435,7 +2526,7 @@ ${hint}` : "")
           }
           console.log(theme.dim(`  Building semantic index for ${idx.symbolCount} symbols\u2026`));
           console.log(theme.dim("  (First run downloads ~117 MB embedding model to ~/.aicli/models/)"));
-          const { rebuildSemanticIndex } = await import("./semantic-RBWU76MD.js");
+          const { rebuildSemanticIndex } = await import("./semantic-ICJ536BG.js");
           try {
             const stats = await rebuildSemanticIndex(root, {
               onProgress: (done, total) => {
@@ -2501,7 +2592,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-WPSQCOIG.js");
+          const { executeTests } = await import("./run-tests-UX6KNA4R.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -6394,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-MHY4E453.js");
+  const { startWebServer } = await import("./server-LXE5HXOQ.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) => {
@@ -6517,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-SMUURFMA.js");
+    const batch = await import("./batch-JOYUXWBK.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -6677,7 +6768,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-BDEFIXFF.js");
+  const { startHub } = await import("./hub-WLBLPBT2.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-O2CYJF3Y.js → run-tests-Q2GGLRK6.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-FU6WMYXS.js";
+} from "./chunk-VEWRTIMX.js";
 export {
   executeTests,
   runTestsTool

package/dist/{run-tests-WPSQCOIG.js → run-tests-UX6KNA4R.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-ZT7RZYWE.js";
-import "./chunk-RRL5572W.js";
+} from "./chunk-44MKM6OO.js";
+import "./chunk-BPIKBXGZ.js";
 export {
   executeTests,
   runTestsTool

package/dist/{semantic-RBWU76MD.js → semantic-ICJ536BG.js}

@@ -2,14 +2,16 @@
 import {
   buildEmbeddingText,
   hasSemanticIndex,
+  pathTokens,
   rebuildSemanticIndex,
   semanticSearch
-} from "./chunk-HPDDAXFY.js";
+} from "./chunk-CQQQFNND.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-PFYAAX2S.js";
 export {
   buildEmbeddingText,
   hasSemanticIndex,
+  pathTokens,
   rebuildSemanticIndex,
   semanticSearch
 };

package/dist/{semantic-MD7HYPWZ.js → semantic-MYAXLDCZ.js}

@@ -1,14 +1,16 @@
 import {
   buildEmbeddingText,
   hasSemanticIndex,
+  pathTokens,
   rebuildSemanticIndex,
   semanticSearch
-} from "./chunk-UTCC3UMT.js";
+} from "./chunk-GTKJUEBS.js";
 import "./chunk-BJAT4GNC.js";
 import "./chunk-XMA222FQ.js";
 export {
   buildEmbeddingText,
   hasSemanticIndex,
+  pathTokens,
   rebuildSemanticIndex,
   semanticSearch
 };

package/dist/{server-MHY4E453.js → server-LXE5HXOQ.js}

@@ -20,10 +20,10 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-EGJAMKAZ.js";
+} from "./chunk-U7ZSIOKV.js";
 import {
   ConfigManager
-} from "./chunk-34OKHMTQ.js";
+} from "./chunk-JWE53S2U.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -41,14 +41,14 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-MOE2D3NR.js";
+} from "./chunk-HFSSDFQN.js";
 import "./chunk-2ZD3YTVM.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-NHNWUBXB.js";
-import "./chunk-HPDDAXFY.js";
+import "./chunk-CQQQFNND.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-PFYAAX2S.js";
-import "./chunk-ZT7RZYWE.js";
+import "./chunk-44MKM6OO.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -67,7 +67,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-RRL5572W.js";
+} from "./chunk-BPIKBXGZ.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -1482,7 +1482,7 @@ Tokens: in=${this.sessionTokenUsage.inputTokens} out=${this.sessionTokenUsage.ou
             "  /diff [--stats]      \u2014 Show file modifications in this session",
             "  /checkpoint [save|restore|delete] <name> \u2014 Session checkpoints",
             "  /fork [checkpoint]   \u2014 Fork session from checkpoint or current",
-            "  /branch [list|new|switch|delete|rename] \u2014 Manage conversation branches",
+            "  /branch [list|new|switch|delete|rename|diff|cherry-pick] \u2014 Manage conversation branches (fork tree, cross-branch picks)",
             "  /index [status|rebuild|clear|semantic-rebuild|semantic-clear] \u2014 Symbol + semantic index (find_symbol / search_code)",
             "  /review [--staged]   \u2014 AI code review from git diff",
             "  /security-review     \u2014 Security vulnerability scan on git diff",
@@ -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>");
+          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();
@@ -1900,7 +1917,74 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           }
           break;
         }
-        this.send({ type: "error", message: `Unknown subcommand: ${sub}. Use list/new/switch/delete/rename.` });
+        if (sub === "diff") {
+          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.` });
+            break;
+          }
+          const preview = (m) => {
+            const text = typeof m.content === "string" ? m.content : "[complex content]";
+            return text.replace(/\s+/g, " ").trim().slice(0, 70);
+          };
+          const lines = [
+            `\u{1F500} diff  ${id} (source) \u2194 ${session.activeBranchId} (active)`,
+            `Common prefix: ${d.commonPrefix} message(s)`
+          ];
+          if (d.sourceOnly.length === 0 && d.targetOnly.length === 0) {
+            lines.push("Branches are identical.");
+          } else {
+            if (d.sourceOnly.length > 0) {
+              lines.push("", `Only in ${id} (${d.sourceOnly.length}):`);
+              d.sourceOnly.forEach(
+                (m, i) => lines.push(`  [${d.commonPrefix + i}] ${m.role}: ${preview(m)}`)
+              );
+            }
+            if (d.targetOnly.length > 0) {
+              lines.push("", `Only in ${session.activeBranchId} (active) (${d.targetOnly.length}):`);
+              d.targetOnly.forEach(
+                (m, i) => lines.push(`  [${d.commonPrefix + i}] ${m.role}: ${preview(m)}`)
+              );
+            }
+            lines.push("", `Use /branch cherry-pick ${id} <index> to copy a message into the active branch.`);
+          }
+          this.send({ type: "info", message: lines.join("\n") });
+          break;
+        }
+        if (sub === "cherry-pick") {
+          const ref = args[1];
+          const idxStr = args[2];
+          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}"` });
+            break;
+          }
+          const picked = session.cherryPickMessage(id, idx);
+          if (!picked) {
+            this.send({ type: "error", message: `Cherry-pick failed \u2014 index ${idx} out of range for branch "${id}".` });
+            break;
+          }
+          await this.sessions.save();
+          const preview = typeof picked.content === "string" ? picked.content.replace(/\s+/g, " ").trim().slice(0, 60) : "[complex content]";
+          this.send({ type: "info", message: `\u2713 Cherry-picked ${picked.role} message from "${id}"[${idx}] \u2192 active branch (${session.messages.length} msgs): ${preview}` });
+          this.sendSessionMessages();
+          this.sendStatus();
+          break;
+        }
+        this.send({ type: "error", message: `Unknown subcommand: ${sub}. Use list/new/switch/delete/rename/diff/cherry-pick.` });
         break;
       }
       // ── /index ──────────────────────────────────────────────────────
@@ -1958,7 +2042,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             message: `Building semantic index for ${idx.symbolCount} symbols\u2026 (first run downloads ~117 MB model)`
           });
           try {
-            const { rebuildSemanticIndex } = await import("./semantic-RBWU76MD.js");
+            const { rebuildSemanticIndex } = await import("./semantic-ICJ536BG.js");
             const stats = await rebuildSemanticIndex(root);
             const first = stats.modelFirstLoadMs ? ` (model load+first batch ${stats.modelFirstLoadMs}ms)` : "";
             this.send({
@@ -2145,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-WPSQCOIG.js");
+          const { executeTests } = await import("./run-tests-UX6KNA4R.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{task-orchestrator-MWZ7NMES.js → task-orchestrator-2GGIA6EG.js}

@@ -4,17 +4,17 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-MOE2D3NR.js";
+} from "./chunk-HFSSDFQN.js";
 import "./chunk-2ZD3YTVM.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-NHNWUBXB.js";
-import "./chunk-HPDDAXFY.js";
+import "./chunk-CQQQFNND.js";
 import "./chunk-6VRJGH25.js";
 import "./chunk-PFYAAX2S.js";
-import "./chunk-ZT7RZYWE.js";
+import "./chunk-44MKM6OO.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-RRL5572W.js";
+} from "./chunk-BPIKBXGZ.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/package.json

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