jinzd-ai-cli 0.4.73 → 0.4.75

package/README.md

@@ -7,7 +7,7 @@
 [![npm version](https://img.shields.io/npm/v/jinzd-ai-cli)](https://www.npmjs.com/package/jinzd-ai-cli)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 [![Node.js](https://img.shields.io/badge/node-%3E%3D20-brightgreen)](https://nodejs.org)
-[![Tests](https://img.shields.io/badge/tests-396%20passing-brightgreen)]()
+[![Tests](https://img.shields.io/badge/tests-529%20passing-brightgreen)]()
 [![GitHub Release](https://img.shields.io/github/v/release/jinzhengdong/ai-cli)](https://github.com/jinzhengdong/ai-cli/releases)
 [![CI](https://github.com/jinzhengdong/ai-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/jinzhengdong/ai-cli/actions/workflows/ci.yml)
 
@@ -24,6 +24,11 @@
 - **8 Built-in Providers** — Claude, Gemini, DeepSeek, OpenAI, Zhipu GLM, Kimi, OpenRouter (300+ models), **Ollama** (local models, no API key needed)
 - **3 Interfaces** — Terminal CLI, browser Web UI (`aicli web`), Electron desktop app
 - **Agentic Tool Calling** — AI autonomously runs shell commands, reads/writes files, searches code, fetches web, runs tests (default 200 rounds, configurable up to 10000 via `config.maxToolRounds` or `--max-tool-rounds`)
+- **Prompt Caching** *(v0.4.70+)* — System prompt split into stable/volatile halves so Claude caches the stable part with `cache_control: ephemeral`; cached tokens bill at ~10% of the input price
+- **Unified-Diff Patch Edits** *(v0.4.72+)* — `edit_file` accepts standard `@@ -a,b +c,d @@` hunks for the most compact way to apply many scattered small changes to a large file (±200-line drift tolerance + whitespace fallback)
+- **Anthropic Batches API** *(v0.4.73+)* — `aicli batch submit/list/status/results/cancel` for 50%-off, 24-hour async processing — ideal for offline analysis and bulk evals
+- **Web UI Session Replay** *(v0.4.71+)* — 🎬 button on every saved session opens a timeline replay: every message, tool call, reasoning, and cache-aware token usage at a glance
+- **Conversation Branching** *(v0.4.74+)* — `/branch list/new/switch/delete/rename` inside the REPL, plus a 🌿 "fork here" button on every replay step — explore alternate directions without losing the original thread
 - **Streaming Tool Use** — Real-time streaming of AI reasoning and tool calls as they happen
 - **Sub-Agents** — Delegate complex subtasks to isolated child agents with independent tool loops
 - **Extended Thinking** — Claude deep reasoning mode with `/think` toggle
@@ -34,7 +39,7 @@
 - **PWA Support** — Install Web UI as a desktop/mobile app, accessible over LAN
 - **Hierarchical Context** — 3-layer context files (global / project / subdirectory) auto-injected
 - **Headless Mode** — `ai-cli -p "prompt"` for CI/CD pipelines and scripting
-- **40 REPL Commands** — Session management, checkpointing, code review, security review, rewind, scaffolding, and more
+- **40 REPL Commands** — Session management, checkpointing, code review, security review, rewind, scaffolding, cross-session history search, and more
 - **GitHub Actions CI/CD** — Automated testing on Node 20/22 + npm publish on release tags
 - **Cross-Platform** — Windows, macOS, Linux
 
@@ -188,7 +193,8 @@ AI autonomously invokes these 24 tools during conversations:
 | `/compact` | Compress conversation history |
 | `/session` | Session management (new / list / load) |
 | `/checkpoint` | Save/restore conversation checkpoints |
-| `/fork` | Branch conversation from current point |
+| `/fork` | Fork the current session into a new session file |
+| `/branch` | Create/switch/delete branches *within* the current session (B2) |
 | `/search <keyword>` | Full-text search across all sessions |
 | `/skill` | Manage agent skill packs |
 | `/mcp` | View MCP server status and tools |
@@ -227,8 +233,27 @@ Subcommands:
   aicli providers          List all providers and status
   aicli sessions           List recent sessions
   aicli user <action>      Manage Web UI users
+  aicli batch <action>     Anthropic Batches API (submit | list | status | results | cancel)
 ```
 
+### Batch Mode (Anthropic Message Batches)
+
+For offline analysis, bulk evals, or any workload where latency is flexible, use the Batches API for **50% off** tokens with a 24-hour processing window.
+
+```bash
+# 1. Prepare a JSONL file (one request per line):
+#    {"customId":"req-1","messages":[{"role":"user","content":"..."}],"maxTokens":1024}
+aicli batch submit prompts.jsonl         # validate + submit + track locally
+aicli batch submit --dry-run prompts.jsonl  # parse only, no network
+
+aicli batch list                          # live status of recent batches
+aicli batch status <id>                   # detailed status + request counts
+aicli batch results <id> out.jsonl        # download results (stdout if no path)
+aicli batch cancel <id>                   # cancel an in-progress batch
+```
+
+Local tracking file: `~/.aicli/batches.json` (last 200 submissions). Requires `AICLI_API_KEY_CLAUDE` or a Claude API key configured via `aicli config`.
+
 ### Headless Mode
 
 ```bash

package/README.zh-CN.md

@@ -7,7 +7,7 @@
 [![npm version](https://img.shields.io/npm/v/jinzd-ai-cli)](https://www.npmjs.com/package/jinzd-ai-cli)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 [![Node.js](https://img.shields.io/badge/node-%3E%3D20-brightgreen)](https://nodejs.org)
-[![Tests](https://img.shields.io/badge/tests-396%20passing-brightgreen)]()
+[![Tests](https://img.shields.io/badge/tests-529%20passing-brightgreen)]()
 [![GitHub Release](https://img.shields.io/github/v/release/jinzhengdong/ai-cli)](https://github.com/jinzhengdong/ai-cli/releases)
 [![CI](https://github.com/jinzhengdong/ai-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/jinzhengdong/ai-cli/actions/workflows/ci.yml)
 
@@ -16,6 +16,11 @@
 - **8 大内置 Provider** — Claude、Gemini、DeepSeek、OpenAI、智谱 GLM、Kimi、OpenRouter（300+ 模型）、**Ollama**（本地模型，无需 API Key）
 - **三种使用方式** — 终端 CLI、浏览器 Web UI（`aicli web`）、Electron 桌面应用
 - **Agentic 工具调用** — AI 自主执行 bash 命令、读写文件、搜索代码、抓取网页、运行测试（默认 200 轮，可通过 `config.maxToolRounds` 或 `--max-tool-rounds` 调整，上限 10000）
+- **Prompt Caching**（v0.4.70+）— system prompt 拆分稳定/易变两段，Claude 对稳定段启用 `cache_control: ephemeral`，命中时按 10% 计费
+- **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" 按钮，任意位置开辟新分支探索不同方向，原对话保持不变
 - **流式工具调用** — 实时流式展示 AI 推理过程和工具调用
 - **子代理系统** — 将复杂子任务委派给独立子代理执行
 - **深度推理** — Claude Extended Thinking，`/think` 一键切换
@@ -180,7 +185,8 @@ AI 在对话中可自主调用 24 个工具：
 | `/compact` | 压缩对话历史 |
 | `/session` | 会话管理（new / list / load） |
 | `/checkpoint` | 保存/恢复会话检查点 |
-| `/fork` | 从当前位置或检查点分叉对话 |
+| `/fork` | 复制整个会话为新的 session 文件 |
+| `/branch` | 在当前 session **内部**创建/切换/删除分支（B2）|
 | `/search <关键词>` | 跨会话全文搜索 |
 | `/skill` | 管理 Agent 技能包 |
 | `/mcp` | 查看 MCP 服务器状态 |
@@ -219,8 +225,27 @@ aicli [选项]
   aicli providers          列出所有 Provider
   aicli sessions           列出最近会话
   aicli user <操作>        管理 Web UI 用户
+  aicli batch <操作>       Anthropic Batches API（submit | list | status | results | cancel）
 ```
 
+### 批处理模式（Anthropic Message Batches）
+
+离线分析、批量 eval 等对延迟不敏感的场景，使用 Batches API 可享 **50% 折扣** + 24 小时处理窗口。
+
+```bash
+# 1. 准备 JSONL 输入（每行一个请求）：
+#    {"customId":"req-1","messages":[{"role":"user","content":"..."}],"maxTokens":1024}
+aicli batch submit prompts.jsonl         # 校验 + 提交 + 本地追踪
+aicli batch submit --dry-run prompts.jsonl  # 只解析不提交
+
+aicli batch list                          # 实时查看已追踪批次状态
+aicli batch status <id>                   # 单批详情 + 请求计数分解
+aicli batch results <id> out.jsonl        # 下载结果（省略文件名则输出到 stdout）
+aicli batch cancel <id>                   # 取消进行中的批次
+```
+
+本地追踪文件：`~/.aicli/batches.json`（保留最近 200 次提交）。需配置 `AICLI_API_KEY_CLAUDE` 或通过 `aicli config` 设置 Claude API Key。
+
 ### 无头模式
 
 ```bash
@@ -391,7 +416,7 @@ Web UI（`aicli web`）提供功能完备的浏览器界面：
 ## 测试
 
 ```bash
-npm test              # 运行全部 396 个测试
+npm test              # 运行全部 515 个测试（30 suites）
 npm run test:watch    # 监听模式
 ```
 

package/dist/{chunk-HAOCJWW2.js → chunk-3BHGEPIT.js}

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

package/dist/{chunk-T2OUKQOX.js → chunk-5P4QTZBI.js}

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

package/dist/{chunk-LR7IV4SK.js → chunk-ASNDBI5R.js}

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

package/dist/{chunk-TIGB5ADX.js → chunk-C4MGON2N.js}

@@ -2,7 +2,7 @@
 import {
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-H65WPFDO.js";
+} from "./chunk-MPIUYP6Q.js";
 import {
   AuthError,
   ProviderError,
@@ -18,7 +18,7 @@ import {
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
   VERSION
-} from "./chunk-T2OUKQOX.js";
+} from "./chunk-5P4QTZBI.js";
 
 // src/providers/claude.ts
 import Anthropic from "@anthropic-ai/sdk";
@@ -2132,6 +2132,9 @@ function getContentText(content) {
 }
 
 // src/session/session.ts
+function makeBranchId() {
+  return Math.random().toString(16).slice(2, 8);
+}
 var Session = class _Session {
   id;
   provider;
@@ -2147,12 +2150,32 @@ var Session = class _Session {
     cacheReadTokens: 0
   };
   checkpoints = [];
+  // ── B2 Branches (v0.4.74+) ──────────────────────────────────────
+  /**
+   * All branches in this session. The 'main' branch is auto-created and
+   * represents the linear conversation for pre-B2 sessions.
+   */
+  branches = [];
+  /** Currently active branch — its messages live in `this.messages`. */
+  activeBranchId = "main";
+  /**
+   * Stashed message arrays for INACTIVE branches. The active branch's
+   * messages are always in `this.messages`, never duplicated here.
+   */
+  _inactiveBranchMessages = /* @__PURE__ */ new Map();
   constructor(id, provider, model) {
     this.id = id;
     this.provider = provider;
     this.model = model;
     this.created = /* @__PURE__ */ new Date();
     this.updated = /* @__PURE__ */ new Date();
+    this.branches.push({
+      id: "main",
+      title: "main",
+      parentBranchId: null,
+      parentMessageIndex: 0,
+      created: this.created
+    });
   }
   /**
    * 更新 session 关联的 provider 和 model（在 /provider 或 /model 切换时调用）。
@@ -2239,6 +2262,120 @@ var Session = class _Session {
     this.checkpoints = this.checkpoints.filter((c) => c.name !== name);
     return this.checkpoints.length < len;
   }
+  // ── B2 Branch operations ────────────────────────────────────────
+  /** Deep-clone a messages array (matches `Session.fork` semantics). */
+  static cloneMessages(msgs) {
+    return msgs.map((m) => {
+      const cloned = { ...m };
+      if (Array.isArray(cloned.content)) {
+        cloned.content = cloned.content.map(
+          (part) => typeof part === "object" && part !== null ? { ...part } : part
+        );
+      }
+      if (cloned.toolCalls) {
+        cloned.toolCalls = cloned.toolCalls.map((tc) => ({ ...tc }));
+      }
+      return cloned;
+    });
+  }
+  /** List all branches (metadata only). */
+  listBranches() {
+    return this.branches.map((b) => ({ ...b }));
+  }
+  /** Current active branch metadata. */
+  getActiveBranch() {
+    const b = this.branches.find((b2) => b2.id === this.activeBranchId);
+    if (!b) {
+      this.activeBranchId = this.branches[0]?.id ?? "main";
+      return this.branches[0] ?? { id: "main", title: "main", parentBranchId: null, parentMessageIndex: 0, created: /* @__PURE__ */ new Date() };
+    }
+    return b;
+  }
+  /**
+   * Create a new branch by forking the active branch at message index
+   * `fromIndex`. Copies `messages[0..fromIndex]` into the new branch
+   * and switches to it. The original active branch is preserved intact
+   * in the stash.
+   *
+   * @returns new branch id
+   * @throws if fromIndex is out of range
+   */
+  createBranch(fromIndex, title) {
+    if (fromIndex < 0 || fromIndex > this.messages.length) {
+      throw new Error(
+        `createBranch: fromIndex ${fromIndex} out of range [0, ${this.messages.length}]`
+      );
+    }
+    this._inactiveBranchMessages.set(this.activeBranchId, this.messages);
+    const id = makeBranchId();
+    const meta = {
+      id,
+      title: title || `branch-${this.branches.length + 1}`,
+      parentBranchId: this.activeBranchId,
+      parentMessageIndex: fromIndex,
+      created: /* @__PURE__ */ new Date()
+    };
+    this.branches.push(meta);
+    this.messages = _Session.cloneMessages(this.messages.slice(0, fromIndex));
+    this.activeBranchId = id;
+    this.updated = /* @__PURE__ */ new Date();
+    return id;
+  }
+  /**
+   * Switch the active branch. Stashes current messages under the old
+   * active id and loads the target branch's messages into `this.messages`.
+   *
+   * @returns true if switched, false if id not found or already active
+   */
+  switchBranch(id) {
+    if (id === this.activeBranchId) return false;
+    if (!this.branches.some((b) => b.id === id)) return false;
+    this._inactiveBranchMessages.set(this.activeBranchId, this.messages);
+    const target = this._inactiveBranchMessages.get(id) ?? [];
+    this._inactiveBranchMessages.delete(id);
+    this.messages = target;
+    this.activeBranchId = id;
+    this.updated = /* @__PURE__ */ new Date();
+    return true;
+  }
+  /**
+   * Delete a branch by id. Cannot delete the active branch or the last
+   * remaining branch. If other branches list this one as parent, their
+   * parent pointer is retargeted to this branch's parent (transparent
+   * to callers — branches still form a valid forest).
+   *
+   * @returns true if deleted
+   */
+  deleteBranch(id) {
+    if (id === this.activeBranchId) return false;
+    if (this.branches.length <= 1) return false;
+    const idx = this.branches.findIndex((b) => b.id === id);
+    if (idx === -1) return false;
+    const deleted = this.branches[idx];
+    for (const b of this.branches) {
+      if (b.parentBranchId === id) {
+        b.parentBranchId = deleted.parentBranchId;
+      }
+    }
+    this.branches.splice(idx, 1);
+    this._inactiveBranchMessages.delete(id);
+    this.updated = /* @__PURE__ */ new Date();
+    return true;
+  }
+  /** Rename a branch (affects only display title). */
+  renameBranch(id, newTitle) {
+    const b = this.branches.find((b2) => b2.id === id);
+    if (!b) return false;
+    b.title = newTitle;
+    this.updated = /* @__PURE__ */ new Date();
+    return true;
+  }
+  /** 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;
+  }
   getMeta() {
     return {
       id: this.id,
@@ -2251,6 +2388,23 @@ var Session = class _Session {
     };
   }
   toJSON() {
+    const serializeMessages = (msgs) => msgs.map((m) => {
+      const out = {
+        role: m.role,
+        content: m.content,
+        timestamp: m.timestamp.toISOString()
+      };
+      if (m.toolCalls) out.toolCalls = m.toolCalls;
+      if (m.reasoningContent !== void 0) out.reasoningContent = m.reasoningContent;
+      if (m.toolCallId) out.toolCallId = m.toolCallId;
+      if (m.toolName) out.toolName = m.toolName;
+      if (m.isError !== void 0) out.isError = m.isError;
+      return out;
+    });
+    const branchMessages = {};
+    for (const [id, msgs] of this._inactiveBranchMessages.entries()) {
+      branchMessages[id] = serializeMessages(msgs);
+    }
     return {
       id: this.id,
       provider: this.provider,
@@ -2264,19 +2418,21 @@ var Session = class _Session {
         messageIndex: c.messageIndex,
         timestamp: c.timestamp.toISOString()
       })),
-      messages: this.messages.map((m) => {
-        const out = {
-          role: m.role,
-          content: m.content,
-          timestamp: m.timestamp.toISOString()
-        };
-        if (m.toolCalls) out.toolCalls = m.toolCalls;
-        if (m.reasoningContent !== void 0) out.reasoningContent = m.reasoningContent;
-        if (m.toolCallId) out.toolCallId = m.toolCallId;
-        if (m.toolName) out.toolName = m.toolName;
-        if (m.isError !== void 0) out.isError = m.isError;
-        return out;
-      })
+      // B2 Branches (v0.4.74+). Omitted for sessions with only the default
+      // 'main' branch and no stashed messages (keeps file size identical
+      // to pre-B2 for the common case).
+      ...this.branches.length > 1 || this._inactiveBranchMessages.size > 0 ? {
+        activeBranchId: this.activeBranchId,
+        branches: this.branches.map((b) => ({
+          id: b.id,
+          title: b.title,
+          parentBranchId: b.parentBranchId,
+          parentMessageIndex: b.parentMessageIndex,
+          created: b.created.toISOString()
+        })),
+        branchMessages
+      } : {},
+      messages: serializeMessages(this.messages)
     };
   }
   /**
@@ -2344,7 +2500,7 @@ var Session = class _Session {
         timestamp: new Date(c.timestamp)
       }));
     }
-    session.messages = d.messages.map((m) => {
+    const deserializeMessages = (arr) => arr.map((m) => {
       const ts = new Date(m.timestamp);
       const msg = {
         role: m.role ?? "user",
@@ -2358,6 +2514,31 @@ var Session = class _Session {
       if (typeof m.isError === "boolean") msg.isError = m.isError;
       return msg;
     });
+    session.messages = deserializeMessages(d.messages);
+    if (Array.isArray(d.branches) && d.branches.length > 0) {
+      session.branches = d.branches.map((b) => {
+        const ts = new Date(b.created);
+        return {
+          id: String(b.id ?? "main"),
+          title: String(b.title ?? b.id ?? "main"),
+          parentBranchId: typeof b.parentBranchId === "string" ? b.parentBranchId : null,
+          parentMessageIndex: typeof b.parentMessageIndex === "number" ? b.parentMessageIndex : 0,
+          created: isNaN(ts.getTime()) ? /* @__PURE__ */ new Date() : ts
+        };
+      });
+      session.activeBranchId = typeof d.activeBranchId === "string" ? d.activeBranchId : session.branches[0]?.id ?? "main";
+      const bm = d.branchMessages;
+      if (bm && typeof bm === "object") {
+        for (const [id, arr] of Object.entries(bm)) {
+          if (id === session.activeBranchId) continue;
+          if (!Array.isArray(arr)) continue;
+          session._inactiveBranchMessages.set(
+            id,
+            deserializeMessages(arr)
+          );
+        }
+      }
+    }
     return session;
   }
 };

package/dist/{chunk-76KBSQHA.js → chunk-E6RP5DBU.js}

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

package/dist/{chunk-H65WPFDO.js → chunk-MPIUYP6Q.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-4BKXL7SM.js";
 import {
   runTestsTool
-} from "./chunk-HAOCJWW2.js";
+} from "./chunk-3BHGEPIT.js";
 import {
   EnvLoader,
   NetworkError,
@@ -17,7 +17,7 @@ import {
   SUBAGENT_ALLOWED_TOOLS,
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT
-} from "./chunk-T2OUKQOX.js";
+} from "./chunk-5P4QTZBI.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";

package/dist/{hub-AFXKRJ5D.js → hub-W3BF22UV.js}

@@ -385,7 +385,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-M7Y32LNH.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-277NWVSE.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-TIGB5ADX.js";
+} from "./chunk-C4MGON2N.js";
 import {
   ConfigManager
-} from "./chunk-LR7IV4SK.js";
+} from "./chunk-ASNDBI5R.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -49,11 +49,11 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-H65WPFDO.js";
+} from "./chunk-MPIUYP6Q.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
-import "./chunk-HAOCJWW2.js";
+import "./chunk-3BHGEPIT.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -76,7 +76,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-T2OUKQOX.js";
+} from "./chunk-5P4QTZBI.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -316,6 +316,11 @@ var Renderer = class {
     console.log(feat("Session size control: auto-trim old tool output when session exceeds 2MB, keep recent rounds intact"));
     console.log(feat("Crash recovery: detect incomplete agentic loops on /resume, warn and offer continuation"));
     console.log(feat("Cost dashboard: /cost history shows cross-session daily/weekly/monthly spend with budget progress bar"));
+    console.log(feat("Prompt caching (A1, v0.4.70+): system prompt split into stable/volatile \u2014 Claude caches stable half, 10% cost on hits"));
+    console.log(feat("edit_file patch mode (A2, v0.4.72+): accepts unified diff (@@ hunks) \u2014 most compact for scattered small changes in large files"));
+    console.log(feat("Anthropic Batches API (A3, v0.4.73+): aicli batch submit/list/status/results/cancel \u2014 50% off, 24h window"));
+    console.log(feat("Session Replay (B1, v0.4.71+): Web UI \u{1F3AC} button \u2014 timeline view of every message, tool call, reasoning, and cache-aware token usage"));
+    console.log(feat("Conversation Branching (B2, v0.4.74+): /branch list/new/switch/delete/rename \u2014 fork the conversation at any message; Web UI replay \u{1F33F} fork-here button"));
     console.log();
   }
   printPrompt(provider, _model) {
@@ -2235,6 +2240,122 @@ ${hint}` : "")
         console.log();
       }
     },
+    // ── /branch ───────────────────────────────────────────────────
+    {
+      name: "branch",
+      description: "Manage conversation branches (fork/switch/list/delete/rename)",
+      usage: "/branch [list | new <msgIndex> [title] | switch <id> | delete <id> | rename <id> <title>]",
+      async 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 branches = session.listBranches();
+          console.log(theme.heading(`
+  Branches (${branches.length}):
+`));
+          for (const b of branches) {
+            const active = b.id === session.activeBranchId ? theme.success("\u25CF ") : "  ";
+            const parent = b.parentBranchId ? theme.dim(` \u2190 ${b.parentBranchId}@${b.parentMessageIndex}`) : "";
+            const count = b.id === session.activeBranchId ? session.messages.length : session.getBranchMessages(b.id)?.length ?? 0;
+            console.log(
+              `  ${active}${theme.accent(b.id.padEnd(10))} ${b.title.padEnd(20)} ` + theme.dim(`(${count} msgs)`) + parent
+            );
+          }
+          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();
+          return;
+        }
+        if (sub === "new") {
+          const idxArg = args[1];
+          if (!idxArg) {
+            ctx.renderer.renderError("Usage: /branch new <msgIndex> [title]");
+            return;
+          }
+          const fromIndex = parseInt(idxArg, 10);
+          if (isNaN(fromIndex) || fromIndex < 0 || fromIndex > session.messages.length) {
+            ctx.renderer.renderError(`Invalid msgIndex: ${idxArg}. Range: 0-${session.messages.length}`);
+            return;
+          }
+          const title = args.slice(2).join(" ").trim() || void 0;
+          try {
+            const newId = session.createBranch(fromIndex, title);
+            await ctx.sessions.save();
+            console.log(theme.success(`
+  \u2713 Created branch "${newId}" from message #${fromIndex}`));
+            console.log(theme.dim(`    Now on branch "${newId}" (${session.messages.length} messages)
+`));
+          } catch (err) {
+            ctx.renderer.renderError(err.message);
+          }
+          return;
+        }
+        if (sub === "switch") {
+          const id = args[1];
+          if (!id) {
+            ctx.renderer.renderError("Usage: /branch switch <id>");
+            return;
+          }
+          const ok = session.switchBranch(id);
+          if (ok) {
+            await ctx.sessions.save();
+            const b = session.getActiveBranch();
+            console.log(theme.success(`
+  \u2713 Switched to branch "${b.id}" \u2014 ${b.title}`));
+            console.log(theme.dim(`    ${session.messages.length} messages on this branch
+`));
+          } else {
+            ctx.renderer.renderError(`Cannot switch to "${id}" (not found or already active).`);
+          }
+          return;
+        }
+        if (sub === "delete") {
+          const id = args[1];
+          if (!id) {
+            ctx.renderer.renderError("Usage: /branch delete <id>");
+            return;
+          }
+          const ok = session.deleteBranch(id);
+          if (ok) {
+            await ctx.sessions.save();
+            console.log(theme.success(`
+  \u2713 Deleted branch "${id}"
+`));
+          } else {
+            ctx.renderer.renderError(
+              `Cannot delete "${id}" (not found, active, or last remaining branch).`
+            );
+          }
+          return;
+        }
+        if (sub === "rename") {
+          const id = args[1];
+          const title = args.slice(2).join(" ").trim();
+          if (!id || !title) {
+            ctx.renderer.renderError("Usage: /branch rename <id> <new title>");
+            return;
+          }
+          const ok = session.renameBranch(id, title);
+          if (ok) {
+            await ctx.sessions.save();
+            console.log(theme.success(`
+  \u2713 Renamed branch "${id}" \u2192 "${title}"
+`));
+          } else {
+            ctx.renderer.renderError(`Branch "${id}" not found.`);
+          }
+          return;
+        }
+        ctx.renderer.renderError(`Unknown subcommand: ${sub}. Use list/new/switch/delete/rename.`);
+      }
+    },
     // ── /commands ─────────────────────────────────────────────────
     {
       name: "commands",
@@ -2271,7 +2392,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-6JUSVL4W.js");
+          const { executeTests } = await import("./run-tests-V2JJADIU.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -6143,7 +6264,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-QQGBLS42.js");
+  const { startWebServer } = await import("./server-2XO72FRP.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) => {
@@ -6266,7 +6387,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-QSOGQ46F.js");
+    const batch = await import("./batch-2RTTAHBL.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -6353,6 +6474,7 @@ program.command("help").description("Show a comprehensive guide to all aicli fea
     `${B}${C}  \u25A0 WEB UI OPTIONS${R}`,
     `    ${Y}aicli web --port 8080${R}          Custom port (default: 3000)`,
     `    ${Y}aicli web --host 0.0.0.0${R}       LAN access (mobile/tablet)`,
+    `    ${D}  Features: \u{1F3AC} Session Replay + \u{1F33F} Conversation Branching (fork from any message)${R}`,
     "",
     `${B}${C}  \u25A0 MULTI-AGENT HUB${R}`,
     `    ${Y}--preset <name>${R}                Role preset (tech-review/brainstorm/code-review/debate)`,
@@ -6375,6 +6497,7 @@ program.command("help").description("Show a comprehensive guide to all aicli fea
     `    ${M}/search${R}                        Search across all session histories`,
     `    ${M}/compact${R}                       Compress conversation to save context`,
     `    ${M}/checkpoint${R} ${M}/fork${R}               Save/restore/fork session state`,
+    `    ${M}/branch${R}                        List/create/switch/delete conversation branches (B2)`,
     `    ${M}/undo${R}                          Undo file operations`,
     `    ${M}/yolo${R}                          Skip all tool confirmations`,
     `    ${M}/mcp${R}                           Manage MCP server connections`,
@@ -6386,6 +6509,7 @@ program.command("help").description("Show a comprehensive guide to all aicli fea
     `    ${D}bash  read_file  write_file  edit_file  list_dir  grep_files  glob_files${R}`,
     `    ${D}web_fetch  google_search  run_interactive  run_tests  spawn_agent${R}`,
     `    ${D}ask_user  write_todos  save_memory  save_last_response  + MCP tools${R}`,
+    `    ${D}edit_file has 5 modes: string replace, line insert/delete, batch edits, unified-diff patch${R}`,
     "",
     `${B}${C}  \u25A0 CONFIGURATION${R}`,
     `    ${D}Config:     ~/.aicli/config.json${R}`,
@@ -6403,6 +6527,8 @@ program.command("help").description("Show a comprehensive guide to all aicli fea
     `    ${G}aicli hub --preset brainstorm "idea"${R}            ${D}# multi-agent brainstorm${R}`,
     `    ${G}aicli hub --task --roles team.json "build app"${R}  ${D}# task mode: agents write code${R}`,
     `    ${G}aicli hub -c spec.md -c api.md "build it"${R}       ${D}# hub + docs context${R}`,
+    `    ${G}aicli batch submit prompts.jsonl${R}                ${D}# Anthropic batch: 50% off, 24h window${R}`,
+    `    ${G}aicli batch status <id>${R} ${G}/ results <id> out.jsonl${R}  ${D}# poll / download${R}`,
     "",
     `${D}  Docs: https://github.com/jinzhengdong/ai-cli${R}`,
     `${D}  Issues: https://github.com/jinzhengdong/ai-cli/issues${R}`,
@@ -6421,7 +6547,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-AFXKRJ5D.js");
+  const { startHub } = await import("./hub-W3BF22UV.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-5BUD2CL4.js → run-tests-LEYTZHPU.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-76KBSQHA.js";
+} from "./chunk-E6RP5DBU.js";
 export {
   executeTests,
   runTestsTool

package/dist/{run-tests-6JUSVL4W.js → run-tests-V2JJADIU.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-HAOCJWW2.js";
-import "./chunk-T2OUKQOX.js";
+} from "./chunk-3BHGEPIT.js";
+import "./chunk-5P4QTZBI.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-QQGBLS42.js → server-2XO72FRP.js}

@@ -20,13 +20,13 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-TIGB5ADX.js";
+} from "./chunk-C4MGON2N.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
 import {
   ConfigManager
-} from "./chunk-LR7IV4SK.js";
+} from "./chunk-ASNDBI5R.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -44,9 +44,9 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-H65WPFDO.js";
+} from "./chunk-MPIUYP6Q.js";
 import "./chunk-4BKXL7SM.js";
-import "./chunk-HAOCJWW2.js";
+import "./chunk-3BHGEPIT.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -66,7 +66,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-T2OUKQOX.js";
+} from "./chunk-5P4QTZBI.js";
 
 // src/web/server.ts
 import express from "express";
@@ -563,6 +563,15 @@ var SessionHandler = class _SessionHandler {
       models: p.info.models.map((m) => ({ id: m.id, name: m.displayName ?? m.id }))
     }));
     const costUsd = computeCost(this.currentProvider, this.currentModel, this.sessionTokenUsage);
+    const sess = this.sessions.current;
+    const branches = sess ? sess.listBranches().map((b) => ({
+      id: b.id,
+      title: b.title,
+      parentBranchId: b.parentBranchId,
+      parentMessageIndex: b.parentMessageIndex,
+      created: b.created.toISOString(),
+      messageCount: b.id === sess.activeBranchId ? sess.messages.length : sess.getBranchMessages(b.id)?.length ?? 0
+    })) : [];
     this.send({
       type: "status",
       provider: this.currentProvider,
@@ -574,7 +583,9 @@ var SessionHandler = class _SessionHandler {
       thinkingMode: this.runtimeThinking ?? false,
       tokenUsage: { ...this.sessionTokenUsage },
       costUsd,
-      providers: providerList
+      providers: providerList,
+      branches,
+      activeBranchId: sess?.activeBranchId ?? "main"
     });
   }
   async handleMessage(raw) {
@@ -1787,6 +1798,105 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
         }
         break;
       }
+      // ── /branch ─────────────────────────────────────────────────────
+      case "branch": {
+        const session = this.sessions.current;
+        if (!session) {
+          this.send({ type: "error", message: "No active session." });
+          break;
+        }
+        const sub = args[0]?.toLowerCase();
+        if (!sub || sub === "list") {
+          const branches = session.listBranches();
+          const lines = [`\u{1F33F} Branches (${branches.length}):`, ""];
+          for (const b of branches) {
+            const marker = b.id === session.activeBranchId ? "\u25CF " : "  ";
+            const count = b.id === session.activeBranchId ? session.messages.length : session.getBranchMessages(b.id)?.length ?? 0;
+            const parent = b.parentBranchId ? ` \u2190 ${b.parentBranchId}@${b.parentMessageIndex}` : "";
+            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>");
+          this.send({ type: "info", message: lines.join("\n") });
+          break;
+        }
+        if (sub === "new") {
+          const idxArg = args[1];
+          if (!idxArg) {
+            this.send({ type: "error", message: "Usage: /branch new <msgIndex> [title]" });
+            break;
+          }
+          const fromIndex = parseInt(idxArg, 10);
+          if (isNaN(fromIndex) || fromIndex < 0 || fromIndex > session.messages.length) {
+            this.send({ type: "error", message: `Invalid msgIndex: ${idxArg}. Range: 0-${session.messages.length}` });
+            break;
+          }
+          const title = args.slice(2).join(" ").trim() || void 0;
+          try {
+            const newId = session.createBranch(fromIndex, title);
+            await this.sessions.save();
+            this.send({ type: "info", message: `\u2713 Created branch "${newId}" from message #${fromIndex}. Now active (${session.messages.length} messages).` });
+            this.sendSessionMessages();
+            this.sendStatus();
+          } catch (err) {
+            this.send({ type: "error", message: err.message });
+          }
+          break;
+        }
+        if (sub === "switch") {
+          const id = args[1];
+          if (!id) {
+            this.send({ type: "error", message: "Usage: /branch switch <id>" });
+            break;
+          }
+          const ok = session.switchBranch(id);
+          if (ok) {
+            await this.sessions.save();
+            const b = session.getActiveBranch();
+            this.send({ type: "info", message: `\u2713 Switched to branch "${b.id}" \u2014 ${b.title} (${session.messages.length} messages)` });
+            this.sendSessionMessages();
+            this.sendStatus();
+          } else {
+            this.send({ type: "error", message: `Cannot switch to "${id}" (not found or already active).` });
+          }
+          break;
+        }
+        if (sub === "delete") {
+          const id = args[1];
+          if (!id) {
+            this.send({ type: "error", message: "Usage: /branch delete <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).` });
+          }
+          break;
+        }
+        if (sub === "rename") {
+          const id = args[1];
+          const title = args.slice(2).join(" ").trim();
+          if (!id || !title) {
+            this.send({ type: "error", message: "Usage: /branch rename <id> <new title>" });
+            break;
+          }
+          const ok = session.renameBranch(id, title);
+          if (ok) {
+            await this.sessions.save();
+            this.send({ type: "info", message: `\u2713 Renamed branch "${id}" \u2192 "${title}"` });
+            this.sendStatus();
+          } else {
+            this.send({ type: "error", message: `Branch "${id}" not found.` });
+          }
+          break;
+        }
+        this.send({ type: "error", message: `Unknown subcommand: ${sub}. Use list/new/switch/delete/rename.` });
+        break;
+      }
       // ── /fork ───────────────────────────────────────────────────────
       case "fork": {
         const session = this.sessions.current;
@@ -1952,7 +2062,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-6JUSVL4W.js");
+          const { executeTests } = await import("./run-tests-V2JJADIU.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{task-orchestrator-M7Y32LNH.js → task-orchestrator-277NWVSE.js}

@@ -4,13 +4,13 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-H65WPFDO.js";
+} from "./chunk-MPIUYP6Q.js";
 import "./chunk-4BKXL7SM.js";
-import "./chunk-HAOCJWW2.js";
+import "./chunk-3BHGEPIT.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-T2OUKQOX.js";
+} from "./chunk-5P4QTZBI.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/dist/web/client/app.js

@@ -519,6 +519,17 @@ function handleStatus(msg) {
   }
   if (msg.tokenUsage) targetTab.tokenUsage = msg.tokenUsage;
 
+  // B2: stash branch data on the tab so tab-switch keeps the picker in sync.
+  if (Array.isArray(msg.branches)) {
+    targetTab.branches = msg.branches;
+    targetTab.activeBranchId = msg.activeBranchId || 'main';
+  }
+
+  if (isActiveTarget) {
+    // Re-render the branches panel whenever the active tab gets a status.
+    renderBranchPanel(msg.branches || [], msg.activeBranchId || 'main', msg.sessionId || '');
+  }
+
   if (isActiveTarget) {
     // Active tab: full UI reflection
     btnThink.classList.toggle('btn-active-toggle', msg.thinkingMode);
@@ -1044,7 +1055,10 @@ function renderFilteredSessions(filter) {
 }
 
 // ── Session Replay (B1) ─────────────────────────────────
+let _replaySessionId = null; // session shown in the replay modal
+
 async function openReplay(sessionId) {
+  _replaySessionId = sessionId;
   const modal = document.getElementById('replay-modal');
   const metaEl = document.getElementById('replay-meta');
   const usageEl = document.getElementById('replay-usage');
@@ -1092,6 +1106,34 @@ function renderReplay(session, metaEl, usageEl, timelineEl) {
 
   const messages = Array.isArray(session.messages) ? session.messages : [];
   timelineEl.innerHTML = messages.map((m, i) => renderReplayStep(m, i)).join('');
+
+  // Wire 🌿 fork-from-here buttons.
+  timelineEl.querySelectorAll('.replay-fork-btn').forEach((btn) => {
+    btn.addEventListener('click', (e) => {
+      e.stopPropagation();
+      const idx = parseInt(btn.dataset.msgIndex || '0', 10);
+      forkFromReplay(idx);
+    });
+  });
+}
+
+function forkFromReplay(msgIndex) {
+  if (!_replaySessionId) return;
+  const activeSid = sessionTabs[activeTabIdx]?.sessionId;
+  const title = prompt(`New branch title (forking at message #${msgIndex}):`, '');
+  if (title === null) return; // cancelled
+  const args = ['new', String(msgIndex), ...(title.trim() ? [title.trim()] : [])];
+  if (activeSid && activeSid === _replaySessionId) {
+    // Replayed session is already active — just branch.
+    send({ type: 'command', name: 'branch', args });
+  } else {
+    // Load the replayed session first, then branch.
+    send({ type: 'command', name: 'session', args: ['load', _replaySessionId] });
+    // Small delay to let the load settle before branching.
+    setTimeout(() => send({ type: 'command', name: 'branch', args }), 400);
+  }
+  const modal = document.getElementById('replay-modal');
+  if (modal && typeof modal.close === 'function') modal.close();
 }
 
 function renderReplayStep(m, idx) {
@@ -1142,11 +1184,143 @@ function renderReplayStep(m, idx) {
       <span class="role-tag">${escapeHtml(roleTag)}</span>
       <span class="opacity-50">${ts}</span>
       ${m.toolCallId ? `<span class="opacity-40">↳ ${escapeHtml(m.toolCallId)}</span>` : ''}
+      <button class="replay-fork-btn opacity-60 hover:opacity-100 text-xs ml-auto" data-msg-index="${idx + 1}" title="Fork a new branch from this point">🌿 fork here</button>
     </div>
     ${body || '<div class="opacity-40 text-xs">(empty)</div>'}
   </div>`;
 }
 
+// ── B2: Branch sidebar panel ─────────────────────────────
+let _cachedBranches = [];
+let _cachedActiveBranchId = 'main';
+
+function renderBranchPanel(branches, activeId, sessionId) {
+  _cachedBranches = branches;
+  _cachedActiveBranchId = activeId;
+  const listEl = document.getElementById('branch-list');
+  const headerEl = document.getElementById('branches-header');
+  if (!listEl) return;
+
+  if (!sessionId) {
+    if (headerEl) headerEl.textContent = 'No session';
+    listEl.innerHTML = '<div class="text-xs opacity-40 text-center py-4">Load a session to see branches</div>';
+    return;
+  }
+  if (headerEl) {
+    headerEl.textContent = `Session ${sessionId.slice(0, 8)} · ${branches.length} branch${branches.length === 1 ? '' : 'es'}`;
+  }
+  if (branches.length === 0) {
+    listEl.innerHTML = '<div class="text-xs opacity-40 text-center py-4">No branches</div>';
+    return;
+  }
+
+  // Build tree: compute depth by walking parent chain.
+  const byId = Object.fromEntries(branches.map(b => [b.id, b]));
+  function depthOf(b) {
+    let d = 0, cur = b;
+    while (cur && cur.parentBranchId && byId[cur.parentBranchId]) {
+      d++;
+      cur = byId[cur.parentBranchId];
+      if (d > 100) break; // safety
+    }
+    return d;
+  }
+  // Depth-first order: roots first, then children in order.
+  const ordered = [];
+  const visited = new Set();
+  function visit(b) {
+    if (visited.has(b.id)) return;
+    visited.add(b.id);
+    ordered.push(b);
+    for (const c of branches) {
+      if (c.parentBranchId === b.id) visit(c);
+    }
+  }
+  for (const b of branches) {
+    if (!b.parentBranchId || !byId[b.parentBranchId]) visit(b);
+  }
+  // Any remaining (orphaned) — append at end.
+  for (const b of branches) if (!visited.has(b.id)) visit(b);
+
+  listEl.innerHTML = ordered.map(b => {
+    const depth = depthOf(b);
+    const indent = depth === 0 ? '' : '│  '.repeat(depth - 1) + '└─ ';
+    const isActive = b.id === activeId;
+    const marker = isActive ? '●' : '○';
+    const parentTag = b.parentBranchId
+      ? `<span class="branch-count">← ${escapeHtml(b.parentBranchId)}@${b.parentMessageIndex}</span>`
+      : '';
+    return `
+      <div class="branch-item${isActive ? ' active' : ''}" data-branch-id="${escapeHtml(b.id)}" data-branch-active="${isActive ? '1' : '0'}">
+        <span class="branch-indent">${indent}</span>
+        <span class="branch-marker">${marker}</span>
+        <span class="branch-title" title="${escapeHtml(b.title)}">${escapeHtml(b.title)}</span>
+        <span class="branch-id">${escapeHtml(b.id)}</span>
+        <span class="branch-count">${b.messageCount}m</span>
+        ${parentTag}
+        <span class="branch-actions">
+          <button data-branch-action="rename" title="Rename">✎</button>
+          <button data-branch-action="delete" title="Delete">×</button>
+        </span>
+      </div>`;
+  }).join('');
+
+  // Wire click handlers.
+  listEl.querySelectorAll('.branch-item').forEach(el => {
+    el.addEventListener('click', (e) => {
+      const actionBtn = e.target.closest('button[data-branch-action]');
+      const id = el.dataset.branchId;
+      if (!id) return;
+      if (actionBtn) {
+        e.stopPropagation();
+        const action = actionBtn.dataset.branchAction;
+        if (action === 'rename') {
+          const cur = byId[id];
+          const title = prompt('New branch title:', cur?.title || '');
+          if (title && title.trim() && title.trim() !== cur?.title) {
+            send({ type: 'command', name: 'branch', args: ['rename', id, title.trim()] });
+          }
+        } else if (action === 'delete') {
+          if (id === activeId) {
+            alert('Cannot delete the active branch. Switch to another branch first.');
+            return;
+          }
+          if (confirm(`Delete branch "${id}"? Its messages will be lost.`)) {
+            send({ type: 'command', name: 'branch', args: ['delete', id] });
+          }
+        }
+        return;
+      }
+      // Plain click → switch branch.
+      if (el.dataset.branchActive !== '1') {
+        send({ type: 'command', name: 'branch', args: ['switch', id] });
+      }
+    });
+  });
+}
+
+// "+ Fork" button — fork the active branch at its current tip.
+document.getElementById('btn-branch-new')?.addEventListener('click', () => {
+  const activeTab = sessionTabs[activeTabIdx];
+  if (!activeTab || !activeTab.sessionId) {
+    alert('Load a session first.');
+    return;
+  }
+  const activeBranch = _cachedBranches.find(b => b.id === _cachedActiveBranchId);
+  const tip = activeBranch?.messageCount ?? 0;
+  const raw = prompt(`Fork from message # (0–${tip}, default ${tip}):`, String(tip));
+  if (raw === null) return;
+  const idx = parseInt(raw.trim() || String(tip), 10);
+  if (isNaN(idx) || idx < 0 || idx > tip) {
+    alert(`Invalid index. Range: 0–${tip}`);
+    return;
+  }
+  const title = prompt('New branch title (optional):', '');
+  if (title === null) return;
+  const args = ['new', String(idx), ...(title.trim() ? [title.trim()] : [])];
+  send({ type: 'command', name: 'branch', args });
+});
+
 function startSessionRename(itemEl, titleEl) {
   const sessionId = itemEl.dataset.sessionId;
   const currentTitle = titleEl.textContent.trim();

package/dist/web/client/index.html

@@ -105,6 +105,7 @@
         <!-- Sidebar tabs -->
         <div class="flex border-b border-base-content/10 flex-shrink-0">
           <button class="sidebar-tab active flex-1 text-xs font-semibold py-2 px-1 text-center" data-tab="sessions">📋 Sessions</button>
+          <button class="sidebar-tab flex-1 text-xs font-semibold py-2 px-1 text-center" data-tab="branches" title="Conversation branches (B2)">🌿 Branches</button>
           <button class="sidebar-tab flex-1 text-xs font-semibold py-2 px-1 text-center" data-tab="tools">🔧 Tools</button>
           <button class="sidebar-tab flex-1 text-xs font-semibold py-2 px-1 text-center" data-tab="files">📁 Files</button>
         </div>
@@ -127,6 +128,17 @@
             <div class="text-xs opacity-40 text-center py-4">No sessions yet</div>
           </div>
         </div>
+        <!-- Branches tab (B2) -->
+        <div id="tab-branches" class="sidebar-tab-content flex flex-col flex-1 overflow-hidden hidden">
+          <div class="p-2 border-b border-base-content/10 flex items-center gap-1">
+            <span class="text-xs opacity-60 flex-1 truncate" id="branches-header">No session</span>
+            <button id="btn-branch-new" class="btn btn-xs btn-primary btn-outline flex-shrink-0 whitespace-nowrap" title="Fork at current tip">+ Fork</button>
+          </div>
+          <div id="branch-list" class="flex-1 overflow-y-auto p-2 flex flex-col gap-1 text-sm">
+            <div class="text-xs opacity-40 text-center py-4">Load a session to see branches</div>
+          </div>
+        </div>
+
         <!-- Tools tab -->
         <div id="tab-tools" class="sidebar-tab-content flex flex-col flex-1 overflow-hidden hidden">
           <div class="p-2 border-b border-base-content/10">

package/dist/web/client/style.css

@@ -903,3 +903,74 @@ button, a, .session-item, .file-tree-row, .template-item, .tool-item, .mcp-serve
   max-height: 12rem;
   overflow-y: auto;
 }
+
+/* ── B2 Branch picker (sidebar) ─────────────────────────── */
+.branch-item {
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+  padding: 0.35rem 0.5rem;
+  border-radius: 0.35rem;
+  cursor: pointer;
+  border: 1px solid transparent;
+  transition: background 0.1s, border-color 0.1s;
+  font-size: 0.78rem;
+  line-height: 1.25;
+  position: relative;
+}
+.branch-item:hover {
+  background: rgba(128, 128, 128, 0.12);
+}
+.branch-item.active {
+  background: rgba(34, 197, 94, 0.12);
+  border-color: rgba(34, 197, 94, 0.45);
+}
+.branch-item .branch-marker {
+  flex-shrink: 0;
+  width: 0.8rem;
+  color: rgb(34, 197, 94);
+}
+.branch-item .branch-title {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.branch-item .branch-id {
+  flex-shrink: 0;
+  opacity: 0.5;
+  font-family: ui-monospace, SFMono-Regular, monospace;
+  font-size: 0.7rem;
+}
+.branch-item .branch-count {
+  flex-shrink: 0;
+  opacity: 0.55;
+  font-size: 0.7rem;
+}
+.branch-item .branch-actions {
+  display: none;
+  gap: 0.15rem;
+  flex-shrink: 0;
+}
+.branch-item:hover .branch-actions {
+  display: flex;
+}
+.branch-item .branch-actions button {
+  background: transparent;
+  border: none;
+  padding: 0 0.2rem;
+  font-size: 0.72rem;
+  cursor: pointer;
+  opacity: 0.7;
+}
+.branch-item .branch-actions button:hover {
+  opacity: 1;
+}
+.branch-item .branch-indent {
+  flex-shrink: 0;
+  color: rgba(128, 128, 128, 0.5);
+  font-family: ui-monospace, SFMono-Regular, monospace;
+  font-size: 0.72rem;
+  white-space: pre;
+}

package/package.json

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