jinzd-ai-cli 0.4.72 → 0.4.74

package/dist/{chunk-57HHY5ZX.js → chunk-PLJUAA3J.js}

@@ -1,330 +1,24 @@
 #!/usr/bin/env node
+import {
+  schemaToJsonSchema,
+  truncateForPersist
+} from "./chunk-D5ZDVEJJ.js";
 import {
   AuthError,
-  ConfigError,
-  EnvLoader,
   ProviderError,
   ProviderNotFoundError,
-  RateLimitError,
-  schemaToJsonSchema,
-  truncateForPersist
-} from "./chunk-XH65H3BT.js";
+  RateLimitError
+} from "./chunk-2ZD3YTVM.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
-  CONFIG_FILE_NAME,
   DEV_STATE_FILE_NAME,
-  HISTORY_DIR_NAME,
   MCP_CALL_TIMEOUT,
   MCP_CONNECT_TIMEOUT,
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
-  PLUGINS_DIR_NAME,
   VERSION
-} from "./chunk-73UI5AH7.js";
-
-// src/config/config-manager.ts
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
-
-// src/config/schema.ts
-import { z } from "zod";
-var CustomModelSchema = z.object({
-  id: z.string(),
-  displayName: z.string().optional(),
-  contextWindow: z.number().optional()
-});
-var CustomProviderConfigSchema = z.object({
-  id: z.string(),
-  // 唯一 ID，不能与内置 provider 重名
-  displayName: z.string(),
-  // 显示名称
-  apiKey: z.string().optional(),
-  // 可选：直接在此写 key（也可通过 apiKeys 字段或环境变量提供）
-  baseUrl: z.string(),
-  // OpenAI 兼容 API 的 base URL（必填）
-  defaultModel: z.string(),
-  // 默认使用的模型 ID
-  models: z.array(CustomModelSchema).default([]),
-  timeout: z.number().optional()
-  // 请求超时（ms），覆盖全局默认值
-});
-var ModelParamsSchema = z.object({
-  temperature: z.number().min(0).max(2).optional(),
-  maxTokens: z.number().int().positive().optional(),
-  timeout: z.number().int().positive().optional(),
-  /** 是否启用深度思考（thinking）模式，Claude Sonnet/Opus、GLM-5 等 */
-  thinking: z.boolean().optional(),
-  /** thinking 模式的 token 预算（最小 1024，仅 Claude Extended Thinking 使用） */
-  thinkingBudget: z.number().int().min(1024).optional()
-});
-var UserProfileSchema = z.object({
-  /** 真实姓名（如 "Jin Zhengdong"） */
-  name: z.string().optional(),
-  /** 昵称/称呼偏好（如 "东叔"），AI 会以此称呼你 */
-  nickname: z.string().optional(),
-  /** 职业角色（如 "Full-stack developer"、"Data scientist"） */
-  role: z.string().optional(),
-  /** 个人简介 / 专长描述（1-3 句话） */
-  bio: z.string().optional(),
-  /** 兴趣领域或技术栈（如 ["TypeScript", "Rust", "AI/ML"]） */
-  interests: z.array(z.string()).default([]),
-  /** 语言偏好（如 "zh-CN"、"en"），AI 将据此选择交流语言 */
-  locale: z.string().optional(),
-  /** 自定义人设补充（自由格式，直接注入 system prompt） */
-  extra: z.string().optional()
-}).default({});
-var ConfigSchema = z.object({
-  version: z.string().default("1.0.0"),
-  // 用户身份档案 — 跨 Provider 的 "灵魂"
-  userProfile: UserProfileSchema,
-  defaultProvider: z.string().default("claude"),
-  // 每个 provider 的默认模型（key 为 provider ID）
-  defaultModels: z.record(z.string()).default({}),
-  // API Keys：放宽为任意 record，支持自定义 provider ID
-  apiKeys: z.record(z.string()).default({}),
-  customBaseUrls: z.record(z.string()).default({}),
-  // Per-provider timeout in ms (e.g. { deepseek: 60000 })
-  // ⚠️  Timeout 优先级说明（L5）：
-  //   1. modelParams[modelId].timeout  — 最高优先级，精确到具体模型（如 deepseek-reasoner 需要更长超时）
-  //   2. timeouts[providerId]          — Provider 级默认，覆盖内置默认值
-  //   3. 内置 Provider 的硬编码默认值  — 最低兜底（如 OpenAI 兼容系列默认 60000ms）
-  //   实现位置：src/providers/registry.ts initialize()，将 timeouts[id] 注入 provider
-  timeouts: z.record(z.number()).default({}),
-  // HTTP/HTTPS 代理地址（Node.js 不自动使用系统代理，需显式配置）
-  // 例：http://127.0.0.1:10809
-  // 也可通过环境变量 HTTPS_PROXY / HTTP_PROXY 覆盖
-  proxy: z.string().optional(),
-  // 自定义 Provider 列表（OpenAI 兼容接口，无需改代码）
-  customProviders: z.array(CustomProviderConfigSchema).default([]),
-  // 按模型 ID 存储的推理参数（key 为模型 ID，如 "deepseek-chat"）
-  modelParams: z.record(ModelParamsSchema).default({}),
-  ui: z.object({
-    streaming: z.boolean().default(true),
-    markdownRendering: z.boolean().default(true),
-    showTokenCount: z.boolean().default(true),
-    /** 桌面通知阈值（毫秒）：AI 任务耗时超过此值时发送系统通知。0 = 禁用。默认 10000 (10s) */
-    notificationThreshold: z.number().default(1e4),
-    /** 终端输出折行宽度。0 = 自动（使用终端宽度），>0 = 固定列宽。默认 0 */
-    wordWrap: z.number().int().min(0).default(0),
-    /** 颜色主题：'dark'（默认）| 'light' | 'custom' */
-    theme: z.enum(["dark", "light", "custom"]).default("dark"),
-    /** 自定义颜色覆盖（仅在 theme='custom' 时生效）。值为 chalk 颜色名或 '#hex'，支持 'bold.cyan' 组合 */
-    colors: z.object({
-      prompt: z.string().optional(),
-      info: z.string().optional(),
-      warning: z.string().optional(),
-      error: z.string().optional(),
-      success: z.string().optional(),
-      dim: z.string().optional(),
-      accent: z.string().optional(),
-      toolCall: z.string().optional(),
-      toolResult: z.string().optional(),
-      heading: z.string().optional()
-    }).optional()
-  }).default({}),
-  session: z.object({
-    autoSave: z.boolean().default(true),
-    maxHistoryDays: z.number().default(30),
-    systemPrompt: z.string().optional()
-  }).default({}),
-  // 项目上下文文件配置
-  // 启动时自动读取并注入 system prompt，类似 Claude Code 的 CLAUDE.md 机制
-  // 默认按顺序查找：AICLI.md → CLAUDE.md → .aicli/context.md
-  // 设为 false 可禁用此功能
-  contextFile: z.union([z.string(), z.literal(false)]).default("auto"),
-  // Google Custom Search API 的 Search Engine ID (cx 参数)
-  // API Key 通过 apiKeys['google-search'] 或 AICLI_API_KEY_GOOGLESEARCH 环境变量配置
-  // CX 也可通过 AICLI_GOOGLE_CX 环境变量覆盖
-  googleSearchEngineId: z.string().optional(),
-  // MCP (Model Context Protocol) 服务器配置
-  // 声明外部 MCP 服务器，启动时自动连接、发现工具并注册
-  // 配置格式兼容 Claude Desktop（command + args + env）
-  // 示例：{ "filesystem": { "command": "npx", "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path"] } }
-  mcpServers: z.record(z.object({
-    command: z.string(),
-    args: z.array(z.string()).default([]),
-    env: z.record(z.string()).optional(),
-    timeout: z.number().default(3e4)
-  })).default({}),
-  // 工具执行钩子（shell 命令，模板变量：{tool} {dangerLevel} {args} {status}）
-  hooks: z.object({
-    preToolExecution: z.string().optional(),
-    postToolExecution: z.string().optional()
-  }).optional(),
-  // 工具权限规则（按顺序匹配第一个生效）
-  permissionRules: z.array(z.object({
-    tool: z.string(),
-    action: z.enum(["auto-approve", "deny", "confirm"]),
-    when: z.object({
-      dangerLevel: z.enum(["safe", "write", "destructive"]).optional(),
-      pathPattern: z.string().optional()
-    }).optional()
-  })).default([]),
-  // 无规则匹配时的默认权限动作
-  defaultPermission: z.enum(["auto-approve", "deny", "confirm"]).default("confirm"),
-  // 自动上下文压缩开关
-  // 当对话估算 token 数超过模型 contextWindow 的 80% 时，自动触发 compact 压缩旧消息
-  // 默认开启。设为 false 则仅在手动 /compact 时压缩
-  autoCompact: z.boolean().default(true),
-  // Agentic 工具调用循环单次对话最大轮次（默认 200）。
-  // 超过此值后 AI 被强制停止调用工具并生成总结。
-  // 建议范围：25（保守）~ 1000（宽松，接近 Claude Code）。
-  // CLI `--max-tool-rounds <n>` 可覆盖此值。
-  maxToolRounds: z.number().int().min(1).max(1e4).default(200),
-  // Auto-pause checkpoint：Agentic 循环每隔多少轮暂停一次，让用户确认方向或中途介入。
-  // 默认 50；设为 0 禁用（完全自动执行到完成或 maxToolRounds 用尽）。
-  // CLI 与 Web UI 行为一致：CLI 用 readline question 提示，Web UI 弹出对话框。
-  autoPauseInterval: z.number().int().min(0).max(1e4).default(50),
-  // 单次工具输出（如 read_file、bash、grep_files）返回给 AI 的最大字符数上限。
-  // 默认 500_000 (~500K chars ≈ 6000-8000 行代码)。
-  // 实际上限还会受模型 contextWindow 动态约束（取 contextWindow/4 作为下限）。
-  // 设置为 0 或未配置时使用默认值；不建议设为小于 12_000 或大于模型 contextWindow/2。
-  maxToolOutputChars: z.number().int().min(0).default(5e5),
-  // 月度成本预算（USD）。
-  // 设置后，每次 AI 回复后会跟踪成本，接近或超过预算时在 /status 和 /cost 中显示警告。
-  // 默认 0 = 不限制。例：50 表示每月最多花 $50。
-  monthlyBudget: z.number().min(0).default(0),
-  // 插件加载开关（安全控制）
-  // 默认 false：不自动加载 ~/.aicli/plugins/ 中的插件文件。
-  // 插件以完整 Node.js 权限在主进程中执行（可读写文件、访问网络、执行命令），
-  // 必须确认插件来源可信后，再设为 true 启用。
-  // 可通过 /config 命令或直接编辑 ~/.aicli/config.json 开启。
-  allowPlugins: z.boolean().default(false),
-  // 智能模型路由（v0.4.68+）
-  // 按用户每轮输入的内容/标签/长度动态选择模型，在同一 provider 内切换，
-  // 例：短问题走 haiku（省钱），planning 走 opus（质量）。
-  // enabled=false 时永远返回当前模型。rules 按顺序匹配，首个命中的规则生效。
-  // 每个 rule 的 match 必须至少有一个条件（tag/contains/maxLength/minLength）。
-  // 详见 src/core/model-router.ts。
-  routing: z.object({
-    enabled: z.boolean().default(false),
-    rules: z.array(z.object({
-      match: z.object({
-        contains: z.array(z.string()).optional(),
-        maxLength: z.number().int().positive().optional(),
-        minLength: z.number().int().positive().optional(),
-        tag: z.string().optional()
-      }),
-      model: z.string(),
-      name: z.string().optional()
-    })).default([]),
-    fallback: z.string().optional()
-  }).default({ enabled: false, rules: [] })
-});
-
-// src/config/config-manager.ts
-var ConfigManager = class {
-  configDir;
-  configPath;
-  config;
-  constructor(configDir) {
-    this.configDir = configDir ?? join(homedir(), CONFIG_DIR_NAME);
-    this.configPath = join(this.configDir, CONFIG_FILE_NAME);
-    this.config = this.load();
-  }
-  load() {
-    if (!existsSync(this.configPath)) {
-      return ConfigSchema.parse({});
-    }
-    try {
-      const raw = JSON.parse(readFileSync(this.configPath, "utf-8"));
-      return ConfigSchema.parse(raw);
-    } catch (err) {
-      throw new ConfigError(
-        `Config file at ${this.configPath} is invalid. Delete it and run 'ai-cli config' to recreate.
-${err}`
-      );
-    }
-  }
-  save() {
-    mkdirSync(this.configDir, { recursive: true });
-    writeFileSync(this.configPath, JSON.stringify(this.config, null, 2), "utf-8");
-  }
-  getApiKey(providerId) {
-    const envKey = EnvLoader.getApiKey(providerId);
-    if (envKey) return envKey;
-    return this.config.apiKeys[providerId];
-  }
-  setApiKey(providerId, key) {
-    this.config.apiKeys[providerId] = key;
-    this.save();
-  }
-  get(key) {
-    return this.config[key];
-  }
-  set(key, value) {
-    this.config[key] = value;
-    this.save();
-  }
-  /**
-   * 仅修改内存中的配置值，不持久化到磁盘。
-   * 用于 CLI 命令行参数覆盖（-p, -m, --no-stream），使其只对当前进程生效。
-   */
-  setTransient(key, value) {
-    this.config[key] = value;
-  }
-  isFirstRun() {
-    return !existsSync(this.configPath);
-  }
-  getConfigDir() {
-    return this.configDir;
-  }
-  getHistoryDir() {
-    return join(this.configDir, HISTORY_DIR_NAME);
-  }
-  getPluginsDir() {
-    return join(this.configDir, PLUGINS_DIR_NAME);
-  }
-  getDefaultProvider() {
-    return EnvLoader.getDefaultProvider() ?? this.config.defaultProvider;
-  }
-  /** 点分路径读取配置值，如 `ui.theme` → config.ui.theme */
-  getByPath(path) {
-    const keys = path.split(".");
-    let current = this.config;
-    for (const key of keys) {
-      if (current == null || typeof current !== "object") return void 0;
-      current = current[key];
-    }
-    return current;
-  }
-  /** 点分路径写入配置值，自动类型转换（boolean/number/string）并持久化 */
-  setByPath(path, rawValue) {
-    const keys = path.split(".");
-    if (keys.length === 0) return;
-    let value = rawValue;
-    if (rawValue === "true") value = true;
-    else if (rawValue === "false") value = false;
-    else if (rawValue !== "" && !isNaN(Number(rawValue))) value = Number(rawValue);
-    const draft = JSON.parse(JSON.stringify(this.config));
-    let current = draft;
-    for (let i = 0; i < keys.length - 1; i++) {
-      const key = keys[i];
-      if (current[key] == null || typeof current[key] !== "object") {
-        current[key] = {};
-      }
-      current = current[key];
-    }
-    current[keys[keys.length - 1]] = value;
-    const result = ConfigSchema.safeParse(draft);
-    if (!result.success) {
-      const firstErr = result.error.errors[0];
-      throw new ConfigError(`Invalid config value for "${path}": ${firstErr?.message ?? "validation failed"}`);
-    }
-    this.config = result.data;
-    this.save();
-  }
-  /** 获取完整配置对象的格式化 JSON 字符串（用于 /config show 等展示） */
-  toFormattedJSON() {
-    return JSON.stringify(this.config, null, 2);
-  }
-  /** 获取完整配置对象（JSON 兼容的原始对象） */
-  toJSON() {
-    return structuredClone(this.config);
-  }
-};
+} from "./chunk-BT2TCINO.js";
 
 // src/providers/claude.ts
 import Anthropic from "@anthropic-ai/sdk";
@@ -2427,8 +2121,8 @@ var ProviderRegistry = class {
 };
 
 // src/session/session-manager.ts
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, unlinkSync, renameSync, openSync, readSync, closeSync } from "fs";
-import { join as join2 } from "path";
+import { readFileSync, writeFileSync, existsSync, mkdirSync, readdirSync, unlinkSync, renameSync, openSync, readSync, closeSync } from "fs";
+import { join } from "path";
 import { v4 as uuidv4 } from "uuid";
 
 // src/core/types.ts
@@ -2438,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;
@@ -2453,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 切换时调用）。
@@ -2545,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,
@@ -2557,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,
@@ -2570,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)
     };
   }
   /**
@@ -2650,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",
@@ -2664,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;
   }
 };
@@ -2707,20 +2582,20 @@ var SessionManager = class {
   }
   async save() {
     if (!this._current) return;
-    mkdirSync2(this.historyDir, { recursive: true });
-    const filePath = join2(this.historyDir, `${this._current.id}.json`);
+    mkdirSync(this.historyDir, { recursive: true });
+    const filePath = join(this.historyDir, `${this._current.id}.json`);
     const tmpPath = filePath + ".tmp";
-    writeFileSync2(tmpPath, JSON.stringify(this._current.toJSON(), null, 2), "utf-8");
+    writeFileSync(tmpPath, JSON.stringify(this._current.toJSON(), null, 2), "utf-8");
     renameSync(tmpPath, filePath);
   }
   loadSession(id) {
-    const filePath = join2(this.historyDir, `${id}.json`);
-    if (!existsSync2(filePath)) {
+    const filePath = join(this.historyDir, `${id}.json`);
+    if (!existsSync(filePath)) {
       throw new Error(`Session ${id} not found`);
     }
     let data;
     try {
-      data = JSON.parse(readFileSync2(filePath, "utf-8"));
+      data = JSON.parse(readFileSync(filePath, "utf-8"));
     } catch (err) {
       throw new Error(`Session ${id} is corrupted: ${err instanceof Error ? err.message : String(err)}`);
     }
@@ -2729,12 +2604,12 @@ var SessionManager = class {
     return session;
   }
   listSessions() {
-    if (!existsSync2(this.historyDir)) return [];
+    if (!existsSync(this.historyDir)) return [];
     const files = readdirSync(this.historyDir).filter((f) => f.endsWith(".json"));
     const metas = [];
     for (const file of files) {
       try {
-        const meta = this.readSessionMeta(join2(this.historyDir, file));
+        const meta = this.readSessionMeta(join(this.historyDir, file));
         if (meta) metas.push(meta);
       } catch (err) {
         process.stderr.write(
@@ -2772,7 +2647,7 @@ var SessionManager = class {
     if (id && provider && model) {
       let messageCount = 0;
       try {
-        const full = readFileSync2(filePath, "utf-8");
+        const full = readFileSync(filePath, "utf-8");
         const matches = full.match(/"role"\s*:/g);
         messageCount = matches ? matches.length : 0;
       } catch {
@@ -2787,7 +2662,7 @@ var SessionManager = class {
         title: title || void 0
       };
     }
-    const data = JSON.parse(readFileSync2(filePath, "utf-8"));
+    const data = JSON.parse(readFileSync(filePath, "utf-8"));
     return {
       id: data.id,
       provider: data.provider,
@@ -2799,8 +2674,8 @@ var SessionManager = class {
     };
   }
   deleteSession(id) {
-    const filePath = join2(this.historyDir, `${id}.json`);
-    if (!existsSync2(filePath)) return false;
+    const filePath = join(this.historyDir, `${id}.json`);
+    if (!existsSync(filePath)) return false;
     try {
       unlinkSync(filePath);
       if (this._current && this._current.id === id) {
@@ -2837,14 +2712,14 @@ var SessionManager = class {
    * 每个 session 最多返回 3 条匹配片段，全局最多 maxResults 个 session。
    */
   searchMessages(query, maxResults = 20) {
-    if (!existsSync2(this.historyDir)) return [];
+    if (!existsSync(this.historyDir)) return [];
     const q = query.toLowerCase();
-    const files = readdirSync(this.historyDir).filter((f) => f.endsWith(".json")).map((f) => join2(this.historyDir, f));
+    const files = readdirSync(this.historyDir).filter((f) => f.endsWith(".json")).map((f) => join(this.historyDir, f));
     const results = [];
     for (const filePath of files) {
       if (results.length >= maxResults) break;
       try {
-        const data = JSON.parse(readFileSync2(filePath, "utf-8"));
+        const data = JSON.parse(readFileSync(filePath, "utf-8"));
         const messages = data.messages ?? [];
         const matches = [];
         for (const msg of messages) {
@@ -2891,8 +2766,8 @@ var SessionManager = class {
 
 // src/tools/git-context.ts
 import { execSync } from "child_process";
-import { existsSync as existsSync3 } from "fs";
-import { join as join3 } from "path";
+import { existsSync as existsSync2 } from "fs";
+import { join as join2 } from "path";
 function runGit(cmd, cwd) {
   try {
     return execSync(`git ${cmd}`, {
@@ -2909,7 +2784,7 @@ function getGitRoot(cwd = process.cwd()) {
   return runGit("rev-parse --show-toplevel", cwd);
 }
 function getGitContext(cwd = process.cwd()) {
-  if (!existsSync3(join3(cwd, ".git"))) {
+  if (!existsSync2(join2(cwd, ".git"))) {
     const result = runGit("rev-parse --git-dir", cwd);
     if (!result) return null;
   }
@@ -3489,11 +3364,11 @@ var McpManager = class {
 };
 
 // src/skills/manager.ts
-import { existsSync as existsSync4, readdirSync as readdirSync2, mkdirSync as mkdirSync3, statSync } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync3, readdirSync as readdirSync2, mkdirSync as mkdirSync2, statSync } from "fs";
+import { join as join3 } from "path";
 
 // src/skills/types.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync2 } from "fs";
 import { basename } from "path";
 function parseSimpleYaml(yaml) {
   const result = {};
@@ -3515,7 +3390,7 @@ function parseYamlArray(value) {
 function parseSkillFile(filePath) {
   let raw;
   try {
-    raw = readFileSync3(filePath, "utf-8");
+    raw = readFileSync2(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -3555,9 +3430,9 @@ var SkillManager = class {
   /** 发现并加载 skillsDir 下所有 .md 文件，返回加载数量 */
   loadSkills() {
     this.skills.clear();
-    if (!existsSync4(this.skillsDir)) {
+    if (!existsSync3(this.skillsDir)) {
       try {
-        mkdirSync3(this.skillsDir, { recursive: true });
+        mkdirSync2(this.skillsDir, { recursive: true });
       } catch {
       }
       return 0;
@@ -3570,14 +3445,14 @@ var SkillManager = class {
     }
     for (const entry of entries) {
       let filePath;
-      const fullPath = join4(this.skillsDir, entry);
+      const fullPath = join3(this.skillsDir, entry);
       if (entry.endsWith(".md")) {
         filePath = fullPath;
       } else {
         try {
           if (statSync(fullPath).isDirectory()) {
-            const skillMd = join4(fullPath, "SKILL.md");
-            if (existsSync4(skillMd)) {
+            const skillMd = join3(fullPath, "SKILL.md");
+            if (existsSync3(skillMd)) {
               filePath = skillMd;
             } else {
               continue;
@@ -3880,9 +3755,9 @@ function autoTrimSessionIfNeeded(session, sizeLimit = SESSION_SIZE_LIMIT) {
 }
 
 // src/repl/dev-state.ts
-import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2, mkdirSync as mkdirSync4 } from "fs";
-import { join as join5 } from "path";
-import { homedir as homedir2 } from "os";
+import { existsSync as existsSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2, mkdirSync as mkdirSync3 } from "fs";
+import { join as join4 } from "path";
+import { homedir } from "os";
 var DEV_STATE_MAX_CHARS = 6e3;
 var SNAPSHOT_PROMPT = `You are about to be replaced by a different AI model. Please generate a structured development state snapshot so the next model can continue seamlessly.
 
@@ -3935,12 +3810,12 @@ function sessionHasMeaningfulContent(messages) {
   return hasUser && hasAssistant;
 }
 function getDevStatePath() {
-  return join5(homedir2(), CONFIG_DIR_NAME, DEV_STATE_FILE_NAME);
+  return join4(homedir(), CONFIG_DIR_NAME, DEV_STATE_FILE_NAME);
 }
 function saveDevState(content) {
-  const configDir = join5(homedir2(), CONFIG_DIR_NAME);
-  if (!existsSync5(configDir)) {
-    mkdirSync4(configDir, { recursive: true });
+  const configDir = join4(homedir(), CONFIG_DIR_NAME);
+  if (!existsSync4(configDir)) {
+    mkdirSync3(configDir, { recursive: true });
   }
   let trimmed = content.trim();
   if (trimmed.length > DEV_STATE_MAX_CHARS) {
@@ -3951,17 +3826,17 @@ function saveDevState(content) {
     }
     trimmed += "\n\n[...truncated]";
   }
-  writeFileSync3(getDevStatePath(), trimmed, "utf-8");
+  writeFileSync2(getDevStatePath(), trimmed, "utf-8");
 }
 function loadDevState() {
   const path = getDevStatePath();
-  if (!existsSync5(path)) return null;
-  const content = readFileSync4(path, "utf-8").trim();
+  if (!existsSync4(path)) return null;
+  const content = readFileSync3(path, "utf-8").trim();
   return content || null;
 }
 function clearDevState() {
   const path = getDevStatePath();
-  if (existsSync5(path)) {
+  if (existsSync4(path)) {
     try {
       unlinkSync2(path);
     } catch {
@@ -3970,7 +3845,6 @@ function clearDevState() {
 }
 
 export {
-  ConfigManager,
   detectsHallucinatedFileOp,
   hadPreviousWriteToolCalls,
   TOOL_CALL_REMINDER,