dskcode 0.1.26 → 0.1.28

package/dist/index.js

@@ -771,8 +771,8 @@ async function getAllSkills(cwd) {
 }
 
 // src/cli/index.tsx
-import { readFile as readFile10 } from "fs/promises";
-import { join as join9 } from "path";
+import { readFile as readFile11 } from "fs/promises";
+import { join as join10 } from "path";
 
 // src/ui/RenderScope.tsx
 import { render } from "ink";
@@ -846,7 +846,15 @@ import { Box as Box5, Text as Text6 } from "ink";
 // src/provider/cost-tracker.ts
 import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
 import { join as join3 } from "path";
-var CostTracker = class {
+var CostTracker = class _CostTracker {
+  /** 全局活跃实例表，用于进程退出时统一 flush。 */
+  static #instances = /* @__PURE__ */ new Set();
+  /** 进程退出兜底：统一 flush 所有活跃 CostTracker。 */
+  static async flushAll() {
+    await Promise.allSettled(
+      [..._CostTracker.#instances].map((t) => t.flush())
+    );
+  }
   #costDir;
   #budgetLimit;
   #tokenBudgetLimit;
@@ -872,6 +880,7 @@ var CostTracker = class {
     const today = getTodayStr();
     this.#todayDate = today;
     this.#todaySummary = createEmptyDailySummary(today);
+    _CostTracker.#instances.add(this);
   }
   // -----------------------------------------------------------------------
   // 核心方法
@@ -879,6 +888,7 @@ var CostTracker = class {
   /**
    * 记录一次 API 调用的 Token 使用量和成本。
    * 自动计算费用，累加到会话级和日级统计。
+   * 标记脏数据（dirty），由上层在合适的时机调用 flush() 持久化到磁盘。
    */
   record(usage, model) {
     const cost = calculateCost(usage, model);
@@ -987,8 +997,10 @@ var CostTracker = class {
   /**
    * 从磁盘加载历史成本数据。
    * 启动时调用，用于恢复今日和历史数据。
+   * 副作用：确保成本目录存在（首次运行时创建 ~/.dskcode/costs）。
    */
   async load() {
+    await this.#ensureCostDir();
     const store = await this.#loadStore();
     const today = getTodayStr();
     if (store.daily[today]) {
@@ -998,14 +1010,19 @@ var CostTracker = class {
   }
   /**
    * 将脏数据持久化到磁盘。
-   * 通常在每次 record() 后异步调用，或在会话结束时主动调用。
+   * 会话结束/进程退出时主动调用一次即可。需要每日数据精确时也可在每次
+   * record() 后调用。并发安全：靠 #flushInProgress 互斥。
    */
   async flush() {
     if (!this.#dirty || this.#flushInProgress) return;
     this.#flushInProgress = true;
     this.#dirty = false;
     try {
+      await this.#ensureCostDir();
       await this.#saveStore();
+    } catch (err) {
+      this.#dirty = true;
+      console.error("[CostTracker] flush \u5931\u8D25:", err);
     } finally {
       this.#flushInProgress = false;
     }
@@ -1033,6 +1050,14 @@ var CostTracker = class {
     this.#sessionStartedAt = (/* @__PURE__ */ new Date()).toISOString();
     this.#sessionRecords.length = 0;
   }
+  /**
+   * 销毁实例：从全局实例表移除并 flush。
+   * 一般用不到，仅在测试或显式生命周期管理时使用。
+   */
+  async dispose() {
+    _CostTracker.#instances.delete(this);
+    await this.flush();
+  }
   // -----------------------------------------------------------------------
   // 内部方法
   // -----------------------------------------------------------------------
@@ -1085,6 +1110,10 @@ var CostTracker = class {
       return { version: 1, daily: {} };
     }
   }
+  /** 确保成本目录存在（首次运行时创建 ~/.dskcode/costs） */
+  async #ensureCostDir() {
+    await mkdir3(this.#costDir, { recursive: true });
+  }
   /** 保存成本存储到磁盘 */
   async #saveStore() {
     const store = await this.#loadStore();
@@ -1096,7 +1125,6 @@ var CostTracker = class {
     for (const date of datesToRemove) {
       delete store.daily[date];
     }
-    await mkdir3(this.#costDir, { recursive: true });
     const filePath = join3(this.#costDir, "history.json");
     await writeFile2(filePath, JSON.stringify(store, null, 2), "utf-8");
   }
@@ -2086,17 +2114,183 @@ var ToolRegistry = class {
   }
 };
 
+// src/checkpoint/git-checkpoint.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+var execFileAsync = promisify(execFile);
+var EXEC_OPTIONS = { windowsHide: true };
+async function isGitRepo(cwd) {
+  try {
+    await execFileAsync("git", ["rev-parse", "--is-inside-work-tree"], { cwd, ...EXEC_OPTIONS });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function hasCommits(cwd) {
+  try {
+    await execFileAsync("git", ["rev-parse", "--verify", "HEAD"], { cwd, ...EXEC_OPTIONS });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function hasWorkingChanges(cwd) {
+  const out = await execFileAsync("git", ["status", "--porcelain"], { cwd, ...EXEC_OPTIONS });
+  return out.stdout.trim().length > 0;
+}
+async function git(args, cwd) {
+  try {
+    const { stdout } = await execFileAsync("git", args, { cwd, ...EXEC_OPTIONS });
+    return stdout;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(`git ${args.join(" ")} \u5931\u8D25: ${msg}`);
+  }
+}
+async function listStashShas(cwd) {
+  const out = await git(["stash", "list", "--format=%H"], cwd);
+  return out.split("\n").map((l) => l.trim()).filter(Boolean);
+}
+async function createCheckpoint(cwd) {
+  const timestamp = Date.now();
+  const inRepo = await isGitRepo(cwd);
+  if (!inRepo) return { stashSha: "", timestamp, cwd, isGitRepo: false };
+  if (!await hasCommits(cwd)) return { stashSha: "", timestamp, cwd, isGitRepo: true };
+  if (!await hasWorkingChanges(cwd)) return { stashSha: "", timestamp, cwd, isGitRepo: true };
+  const beforeShas = await listStashShas(cwd);
+  await git(["stash", "push", "-m", `dskcode-cp-${timestamp}`, "-u"], cwd);
+  const newShas = await listStashShas(cwd);
+  if (newShas.length === 0) throw new Error("git stash push \u672A\u80FD\u521B\u5EFA stash entry");
+  const newSha = newShas.find((s) => !beforeShas.includes(s)) ?? newShas[0];
+  await git(["stash", "apply", newSha], cwd);
+  return { stashSha: newSha, timestamp, cwd, isGitRepo: true };
+}
+async function restoreCheckpointForce(checkpoint) {
+  if (!checkpoint.isGitRepo) throw new Error("\u975E git \u4ED3\u5E93\uFF0C\u65E0\u6CD5\u6062\u590D\u6587\u4EF6\u72B6\u6001");
+  if (!checkpoint.stashSha) throw new Error("\u68C0\u67E5\u70B9\u4E3A\u7A7A\uFF08\u5DE5\u4F5C\u533A\u539F\u672C\u5C31\u5E72\u51C0\uFF09\uFF0C\u65E0\u9700\u6062\u590D");
+  const { cwd, stashSha } = checkpoint;
+  const currentShas = await listStashShas(cwd);
+  if (!currentShas.includes(stashSha)) {
+    throw new Error("\u68C0\u67E5\u70B9\u5DF2\u5931\u6548\uFF08stash entry \u5DF2\u88AB\u6D88\u8D39\u6216 GC\uFF09\uFF0C\u65E0\u6CD5\u6062\u590D");
+  }
+  await git(["checkout", "--", "."], cwd);
+  await git(["clean", "-fd"], cwd);
+  await git(["stash", "apply", stashSha], cwd);
+  const refIndex = currentShas.indexOf(stashSha);
+  if (refIndex >= 0) await git(["stash", "drop", `stash@{${refIndex}}`], cwd);
+}
+async function restoreToClean(cwd) {
+  const inRepo = await isGitRepo(cwd);
+  if (!inRepo) throw new Error("\u975E git \u4ED3\u5E93\uFF0C\u65E0\u6CD5\u6062\u590D\u6587\u4EF6\u72B6\u6001");
+  if (!await hasCommits(cwd)) throw new Error("\u4ED3\u5E93\u65E0 commit\uFF0C\u65E0\u6CD5\u6062\u590D");
+  await git(["checkout", "--", "."], cwd);
+  await git(["clean", "-fd"], cwd);
+}
+async function discardCheckpoint(checkpoint) {
+  if (!checkpoint.isGitRepo || !checkpoint.stashSha) return;
+  const { cwd, stashSha } = checkpoint;
+  const shas = await listStashShas(cwd);
+  const idx = shas.indexOf(stashSha);
+  if (idx < 0) return;
+  try {
+    await git(["stash", "drop", `stash@{${idx}}`], cwd);
+  } catch {
+  }
+}
+
+// src/session-store/session-store.ts
+import { mkdir as mkdir4, readFile as readFile4, writeFile as writeFile3, readdir as readdir2, unlink, rename } from "fs/promises";
+import { join as join4 } from "path";
+import { randomUUID } from "crypto";
+function defaultSessionsDir() {
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
+  return join4(home, ".dskcode", "sessions");
+}
+var SessionStore = class {
+  #dir;
+  constructor(dir) {
+    this.#dir = dir ?? defaultSessionsDir();
+  }
+  get dir() {
+    return this.#dir;
+  }
+  async save(session) {
+    await mkdir4(this.#dir, { recursive: true });
+    const finalPath = join4(this.#dir, `${session.id}.json`);
+    const tmpPath = join4(this.#dir, `.${session.id}.json.tmp`);
+    await writeFile3(tmpPath, JSON.stringify(session, null, 2), "utf-8");
+    await rename(tmpPath, finalPath);
+  }
+  async load(id) {
+    const path = join4(this.#dir, `${id}.json`);
+    try {
+      const content = await readFile4(path, "utf-8");
+      return JSON.parse(content);
+    } catch (err) {
+      if (isENOENT(err)) return null;
+      throw err;
+    }
+  }
+  async list() {
+    let files;
+    try {
+      files = await readdir2(this.#dir);
+    } catch (err) {
+      if (isENOENT(err)) return [];
+      throw err;
+    }
+    const results = [];
+    for (const file of files) {
+      if (!file.endsWith(".json") || file.startsWith(".")) continue;
+      try {
+        const content = await readFile4(join4(this.#dir, file), "utf-8");
+        const s = JSON.parse(content);
+        results.push({
+          id: s.id,
+          title: s.title || "\uFF08\u65E0\u6807\u9898\uFF09",
+          updatedAt: s.updatedAt,
+          cwd: s.cwd,
+          messageCount: s.messages?.length ?? 0
+        });
+      } catch {
+      }
+    }
+    return results.sort((a, b) => b.updatedAt - a.updatedAt);
+  }
+  async delete(id) {
+    const path = join4(this.#dir, `${id}.json`);
+    try {
+      await unlink(path);
+    } catch (err) {
+      if (!isENOENT(err)) throw err;
+    }
+  }
+  async exists(id) {
+    return await this.load(id) !== null;
+  }
+  static newId() {
+    return randomUUID();
+  }
+};
+function isENOENT(err) {
+  return typeof err === "object" && err !== null && "code" in err && err.code === "ENOENT";
+}
+
 // src/agent/index.ts
-var Session = class {
+var Session = class _Session {
   #messages = [];
   #provider;
   #toolRegistry;
   #costTracker;
   #options;
   #abortController = new AbortController();
-  // 风暴检测：记录每轮的工具调用错误
+  #sessionId;
+  #store;
+  #createdAt;
+  #persistTimer = null;
+  #checkpoints = /* @__PURE__ */ new Map();
   #stormRecords = [];
-  /** 当前会话模式：code（代码模式）或 plan（计划模式） */
   #mode = "code";
   constructor(provider, tools = [], costTracker, options) {
     this.#provider = provider;
@@ -2114,12 +2308,13 @@ var Session = class {
       preserveRecentRounds: options?.preserveRecentRounds ?? 10,
       projectContext: options?.projectContext,
       gate: options?.gate ?? new AlwaysAllowGate(),
-      writeRoots: options?.writeRoots ?? [options?.cwd ?? process.cwd()]
+      writeRoots: options?.writeRoots ?? [options?.cwd ?? process.cwd()],
+      enableCheckpoint: options?.enableCheckpoint ?? true
     };
+    this.#sessionId = options?.sessionId ?? SessionStore.newId();
+    this.#store = options?.store === false ? null : options?.store ?? new SessionStore();
+    this.#createdAt = Date.now();
   }
-  // -------------------------------------------------------------------------
-  // 公共只读属性
-  // -------------------------------------------------------------------------
   get messages() {
     return this.#messages;
   }
@@ -2132,36 +2327,35 @@ var Session = class {
   get model() {
     return this.#provider.model();
   }
-  /** 获取工具注册表（只读视图） */
   get toolRegistry() {
     return this.#toolRegistry;
   }
-  /** 获取当前会话模式 */
   get mode() {
     return this.#mode;
   }
-  /** 切换会话模式，返回新模式 */
+  get id() {
+    return this.#sessionId;
+  }
+  get store() {
+    return this.#store;
+  }
+  get createdAt() {
+    return this.#createdAt;
+  }
   setMode(mode) {
     this.#mode = mode;
     return this.#mode;
   }
-  // -------------------------------------------------------------------------
-  // 流式对话 — Agent 主循环
-  // -------------------------------------------------------------------------
-  /**
-   * 执行一轮用户对话，以 AsyncGenerator 形式逐步 yield 事件。
-   *
-   * 主循环流程：
-   * 1. 追加用户消息
-   * 2. 进入 Agent 循环（最多 maxToolRounds 轮）
-   *    a. 构建消息 → 裁剪 → 调用 Provider 流式接口
-   *    b. 解析响应：文本增量、工具调用、使用量
-   *    c. 如果有工具调用 → 执行工具 → 追加结果 → 继续循环
-   *    d. 如果没有工具调用 → 退出循环
-   * 3. yield done 事件
-   */
   async *chat(userInput, opts) {
     this.#messages.push({ role: "user", content: userInput });
+    const userMsgIndex = this.#messages.length - 1;
+    if (this.#options.enableCheckpoint) {
+      try {
+        const checkpoint = await createCheckpoint(this.#options.cwd);
+        this.#checkpoints.set(userMsgIndex, checkpoint);
+      } catch {
+      }
+    }
     const startTime = Date.now();
     let toolRounds = 0;
     try {
@@ -2170,7 +2364,6 @@ var Session = class {
         const [trimmed] = trimMessages(
           [...this.#messages],
           {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             model: this.#provider.model(),
             reservedForOutput: this.#options.reservedForOutput,
             systemPrompt,
@@ -2196,28 +2389,17 @@ var Session = class {
             accumulatedText += chunk.content;
             yield { type: "text_delta", content: chunk.content };
           }
-          if (chunk.toolCalls && chunk.toolCalls.length > 0) {
-            lastToolCalls = chunk.toolCalls;
-          }
-          if (chunk.usage) {
-            lastUsage = chunk.usage;
-          }
-          if (chunk.finishReason) {
-            _lastFinishReason = chunk.finishReason;
-          }
+          if (chunk.toolCalls && chunk.toolCalls.length > 0) lastToolCalls = chunk.toolCalls;
+          if (chunk.usage) lastUsage = chunk.usage;
+          if (chunk.finishReason) _lastFinishReason = chunk.finishReason;
         }
         if (lastUsage) {
           const modelId = this.#provider.model();
           this.#costTracker.record(lastUsage, modelId);
           yield { type: "usage", usage: lastUsage, model: modelId };
         }
-        const assistantMsg = {
-          role: "assistant",
-          content: accumulatedText
-        };
-        if (lastToolCalls && lastToolCalls.length > 0) {
-          assistantMsg.toolCalls = lastToolCalls;
-        }
+        const assistantMsg = { role: "assistant", content: accumulatedText };
+        if (lastToolCalls && lastToolCalls.length > 0) assistantMsg.toolCalls = lastToolCalls;
         this.#messages.push(assistantMsg);
         if (lastToolCalls && lastToolCalls.length > 0) {
           yield { type: "tool_calls", calls: lastToolCalls };
@@ -2236,11 +2418,9 @@ var Session = class {
           for (const item of results.items) {
             yield { type: "tool_result", name: item.name, result: item.result };
             let toolContent = item.result.data;
-            if (item.result.diff && item.result.diff.patch) {
-              toolContent += `
+            if (item.result.diff && item.result.diff.patch) toolContent += `
 
 ${item.result.diff.patch}`;
-            }
             this.#messages.push({
               role: "tool",
               content: toolContent,
@@ -2254,31 +2434,17 @@ ${item.result.diff.patch}`;
         break;
       }
     } catch (err) {
-      if (err instanceof DOMException && err.name === "AbortError") {
-        return;
-      }
-      if (err instanceof Error && err.name === "AbortError") {
-        return;
-      }
-      yield {
-        type: "error",
-        error: err instanceof Error ? err : new Error(String(err))
-      };
+      if (err instanceof DOMException && err.name === "AbortError") return;
+      if (err instanceof Error && err.name === "AbortError") return;
+      yield { type: "error", error: err instanceof Error ? err : new Error(String(err)) };
       return;
     }
     const elapsed = Date.now() - startTime;
+    void this.#persist();
+    await this.#costTracker.flush().catch(() => {
+    });
     yield { type: "done", elapsed };
   }
-  // -------------------------------------------------------------------------
-  // 工具执行 — 批量、并行/串行、Gate、风暴检测
-  // -------------------------------------------------------------------------
-  /**
-   * 执行一批工具调用。
-   *
-   * 并行策略：
-   * - 如果这批工具全部是 ReadOnly 的，并行执行（最多 8 并发）
-   * - 否则按顺序串行执行，保证写/读顺序
-   */
   async #executeBatch(calls) {
     const toolCtx = {
       cwd: this.#options.cwd,
@@ -2313,9 +2479,6 @@ ${item.result.diff.patch}`;
     }
     return { items, records };
   }
-  /**
-   * 执行单个工具调用，包含 Gate 检查和预览。
-   */
   async #executeOne(tc, ctx) {
     const toolName = tc.name;
     const timestamp = Date.now();
@@ -2354,12 +2517,7 @@ ${item.result.diff.patch}`;
       const result = await tool.execute(toolArgs, ctx);
       return {
         item: { name: toolName, callId: tc.id, result },
-        record: {
-          name: toolName,
-          success: result.success,
-          error: result.error,
-          timestamp
-        }
+        record: { name: toolName, success: result.success, error: result.error, timestamp }
       };
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
@@ -2370,46 +2528,172 @@ ${item.result.diff.patch}`;
       };
     }
   }
-  // -------------------------------------------------------------------------
-  // 风暴检测 — 同一工具同一错误连续 3 次 → 强制换策略
-  // -------------------------------------------------------------------------
-  /**
-   * 连续 3 次同一工具同一错误 → 触发风暴中断。
-   */
   #checkStormBreak(currentCalls) {
     if (this.#stormRecords.length < 3) return false;
     const recentErrors = this.#stormRecords.slice(-3);
     if (recentErrors.length < 3) return false;
     const first = recentErrors[0];
-    const allSame = recentErrors.every(
-      (r) => r.name === first.name && r.error === first.error && !r.success
-    );
+    const allSame = recentErrors.every((r) => r.name === first.name && r.error === first.error && !r.success);
     if (!allSame) return false;
     return currentCalls.some((tc) => tc.name === first.name);
   }
-  // -------------------------------------------------------------------------
-  // 会话管理
-  // -------------------------------------------------------------------------
-  /** 取消正在进行的流式请求 */
   abort() {
     this.#abortController.abort();
+    if (this.#persistTimer) {
+      clearTimeout(this.#persistTimer);
+      this.#persistTimer = null;
+    }
   }
-  /** 重置会话历史（保留 provider/tools 配置，重置成本追踪） */
   reset() {
     this.#messages.length = 0;
     this.#costTracker.resetSession();
     this.#stormRecords = [];
+    this.#checkpoints.clear();
+  }
+  // -------------------------------------------------------------------------
+  // 持久化与恢复
+  // -------------------------------------------------------------------------
+  async persistNow() {
+    if (this.#persistTimer) {
+      clearTimeout(this.#persistTimer);
+      this.#persistTimer = null;
+    }
+    await this.#doPersist();
+  }
+  #persist() {
+    if (!this.#store) return;
+    if (this.#persistTimer) {
+      this.#persistTimer.refresh();
+      return;
+    }
+    this.#persistTimer = setTimeout(() => {
+      this.#persistTimer = null;
+      void this.#doPersist();
+    }, 500);
+    this.#persistTimer.unref();
+  }
+  async #doPersist() {
+    if (!this.#store) return;
+    const stored = {
+      id: this.#sessionId,
+      title: this.#deriveTitle(),
+      createdAt: this.#createdAt,
+      updatedAt: Date.now(),
+      cwd: this.#options.cwd,
+      model: this.#provider.model(),
+      messages: this.#serializeMessages(),
+      totalCost: this.#costTracker.sessionTotalCost
+    };
+    try {
+      await this.#store.save(stored);
+    } catch (err) {
+      console.error("[Session] \u6301\u4E45\u5316\u5931\u8D25:", err);
+    }
+  }
+  #deriveTitle() {
+    for (const m of this.#messages) {
+      if (m.role === "user" && m.content.trim()) return m.content.trim().slice(0, 40);
+    }
+    return "\u65B0\u4F1A\u8BDD";
+  }
+  #serializeMessages() {
+    return this.#messages.map((msg, idx) => {
+      const checkpoint = this.#checkpoints.get(idx);
+      if (msg.role === "user" && checkpoint) return { ...msg, checkpoint };
+      return { ...msg };
+    });
+  }
+  static async resume(id, provider, tools = [], costTracker, options) {
+    const store = options?.store === false ? null : options?.store ?? new SessionStore();
+    if (!store) throw new Error("resume \u9700\u8981\u542F\u7528\u6301\u4E45\u5316\uFF08options.store \u4E0D\u80FD\u4E3A false\uFF09");
+    const stored = await store.load(id);
+    if (!stored) throw new Error(`\u4F1A\u8BDD ${id} \u4E0D\u5B58\u5728`);
+    const session = new _Session(provider, tools, costTracker, { ...options, sessionId: id, store });
+    for (const m of stored.messages) {
+      session.#messages.push({
+        role: m.role,
+        content: m.content,
+        toolCallId: m.toolCallId,
+        name: m.name,
+        toolCalls: m.toolCalls
+      });
+    }
+    for (let i = 0; i < stored.messages.length; i++) {
+      const cp2 = stored.messages[i]?.checkpoint;
+      if (cp2) session.#checkpoints.set(i, cp2);
+    }
+    session.#createdAt = stored.createdAt;
+    return session;
+  }
+  // -------------------------------------------------------------------------
+  // 检查点与 Rewind
+  // -------------------------------------------------------------------------
+  listCheckpoints() {
+    const result = [];
+    for (const [index, checkpoint] of this.#checkpoints) {
+      const msg = this.#messages[index];
+      if (!msg || msg.role !== "user") continue;
+      result.push({ index, preview: msg.content.slice(0, 80), timestamp: checkpoint.timestamp, isGitRepo: checkpoint.isGitRepo });
+    }
+    return result.sort((a, b) => a.index - b.index);
+  }
+  async rewind(targetIndex) {
+    if (targetIndex < 0 || targetIndex >= this.#messages.length) {
+      return { ok: false, error: `\u65E0\u6548\u7684\u6D88\u606F\u7D22\u5F15 ${targetIndex}` };
+    }
+    const target = this.#messages[targetIndex];
+    if (!target || target.role !== "user") {
+      return { ok: false, error: `\u7D22\u5F15 ${targetIndex} \u4E0D\u662F user \u6D88\u606F` };
+    }
+    const checkpoint = this.#checkpoints.get(targetIndex);
+    if (!checkpoint) return { ok: false, error: "\u8BE5\u6D88\u606F\u6CA1\u6709\u68C0\u67E5\u70B9" };
+    this.#messages.length = targetIndex + 1;
+    const toDiscard = [];
+    for (const [idx, cp2] of this.#checkpoints) {
+      if (idx > targetIndex) {
+        toDiscard.push(cp2);
+        this.#checkpoints.delete(idx);
+      }
+    }
+    let fileRestored = false;
+    if (checkpoint.isGitRepo) {
+      try {
+        if (checkpoint.stashSha) {
+          await restoreCheckpointForce(checkpoint);
+        } else {
+          await restoreToClean(this.#options.cwd);
+        }
+        fileRestored = true;
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        return { ok: false, error: `\u5BF9\u8BDD\u5DF2\u622A\u65AD\u4F46\u6587\u4EF6\u6062\u590D\u5931\u8D25\uFF1A${msg}` };
+      }
+    }
+    this.#checkpoints.delete(targetIndex);
+    for (const cp2 of toDiscard) {
+      void discardCheckpoint(cp2);
+    }
+    this.#persist();
+    return { ok: true, fileRestored };
+  }
+  hasCheckpoints() {
+    return this.listCheckpoints().length > 0;
+  }
+  async delete() {
+    if (this.#store) await this.#store.delete(this.#sessionId);
+    for (const cp2 of this.#checkpoints.values()) {
+      void discardCheckpoint(cp2);
+    }
+    this.#checkpoints.clear();
   }
   // -------------------------------------------------------------------------
   // 内部方法
   // -------------------------------------------------------------------------
-  /** 构建系统提示词 */
   #buildSystemPrompt() {
     const enabledTools = this.#toolRegistry.list();
     const toolDescs = enabledTools.map((t) => ({
       name: t.name,
       description: t.description,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       parameters: t.parameters
     }));
     const opts = {
@@ -2419,25 +2703,14 @@ ${item.result.diff.patch}`;
       projectContext: this.#options.projectContext ?? void 0,
       cwd: this.#options.cwd
     };
-    if (this.#mode === "plan") {
-      return buildPlanSystemPrompt(opts);
-    }
+    if (this.#mode === "plan") return buildPlanSystemPrompt(opts);
     return buildSystemPrompt(opts);
   }
-  /**
-   * 将注册的工具转为 ToolDefinition 格式（预留给 function calling）。
-   * 计划模式下只返回读工具，禁止非读工具暴露给 LLM。
-   */
   #buildToolDefinitions() {
     const tools = this.#mode === "plan" ? this.#toolRegistry.listReadTools() : this.#toolRegistry.list();
     return tools.map((t) => ({
       type: "function",
-      function: {
-        name: t.name,
-        description: t.description,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        parameters: t.parameters
-      }
+      function: { name: t.name, description: t.description, parameters: t.parameters }
     }));
   }
 };
@@ -2831,7 +3104,7 @@ function computeFileDiff(oldContent, newContent, filePath) {
 }
 
 // src/tool/eol.ts
-import { writeFile as writeFile3 } from "fs/promises";
+import { writeFile as writeFile4 } from "fs/promises";
 function detectEol(text) {
   if (text.length === 0) return "\n";
   const crlfIdx = text.indexOf("\r\n");
@@ -2862,11 +3135,11 @@ function normalizeEol(originalContent, newContent) {
 }
 async function writeFileWithEol(filePath, originalContent, newContent) {
   const content = originalContent.length > 0 ? normalizeEol(originalContent, newContent) : newContent;
-  await writeFile3(filePath, content, "utf-8");
+  await writeFile4(filePath, content, "utf-8");
 }
 
 // src/tool/builtins/read-file.ts
-import { readFile as readFile4, stat } from "fs/promises";
+import { readFile as readFile5, stat } from "fs/promises";
 import { open } from "fs/promises";
 import { relative as relative2 } from "path";
 async function checkBinary(filePath) {
@@ -2934,7 +3207,7 @@ var readFileTool = {
           };
         }
       }
-      const content = await readFile4(filePath, "utf-8");
+      const content = await readFile5(filePath, "utf-8");
       const lines = content.split("\n");
       if (lines.length > 0 && lines[lines.length - 1] === "" && content.endsWith("\n")) {
         lines.pop();
@@ -2970,7 +3243,7 @@ var readFileTool = {
 };
 
 // src/tool/builtins/write-file.ts
-import { mkdir as mkdir4, readFile as readFile5 } from "fs/promises";
+import { mkdir as mkdir5, readFile as readFile6 } from "fs/promises";
 import { dirname, relative as relative3, basename } from "path";
 var writeFileTool = {
   name: "write_file",
@@ -3009,11 +3282,11 @@ var writeFileTool = {
       let oldContent = "";
       let existedBefore = false;
       try {
-        oldContent = await readFile5(filePath, "utf-8");
+        oldContent = await readFile6(filePath, "utf-8");
         existedBefore = true;
       } catch {
       }
-      await mkdir4(dirname(filePath), { recursive: true });
+      await mkdir5(dirname(filePath), { recursive: true });
       const content = args.content;
       await writeFileWithEol(filePath, oldContent, content);
       const diff = computeFileDiff(oldContent, content, filePath);
@@ -3042,7 +3315,7 @@ var writeFileTool = {
 };
 
 // src/tool/builtins/edit-file.ts
-import { readFile as readFile6 } from "fs/promises";
+import { readFile as readFile7 } from "fs/promises";
 import { basename as basename2 } from "path";
 var editFileTool = {
   name: "edit_file",
@@ -3085,7 +3358,7 @@ var editFileTool = {
       }
     }
     try {
-      const content = await readFile6(filePath, "utf-8");
+      const content = await readFile7(filePath, "utf-8");
       const firstIndex = content.indexOf(args.old_text);
       if (firstIndex === -1) {
         return {
@@ -3133,7 +3406,7 @@ ${oldLines} \u884C \u2192 ${newLines} \u884C
 };
 
 // src/tool/builtins/multi-edit.ts
-import { readFile as readFile7 } from "fs/promises";
+import { readFile as readFile8 } from "fs/promises";
 import { basename as basename3 } from "path";
 var multiEditTool = {
   name: "multi_edit",
@@ -3179,7 +3452,7 @@ var multiEditTool = {
       }
     }
     try {
-      const originalContent = await readFile7(filePath, "utf-8");
+      const originalContent = await readFile8(filePath, "utf-8");
       let currentContent = originalContent;
       for (let idx = 0; idx < args.edits.length; idx++) {
         const step = args.edits[idx];
@@ -3247,7 +3520,7 @@ var multiEditTool = {
 };
 
 // src/tool/builtins/delete-range.ts
-import { readFile as readFile8 } from "fs/promises";
+import { readFile as readFile9 } from "fs/promises";
 import { basename as basename4 } from "path";
 function findUniqueLine(lines, anchor, label) {
   const matches = [];
@@ -3310,7 +3583,7 @@ var deleteRangeTool = {
       }
     }
     try {
-      const content = await readFile8(filePath, "utf-8");
+      const content = await readFile9(filePath, "utf-8");
       const lines = content.split("\n");
       const startResult = findUniqueLine(lines, args.startAnchor, "start_anchor");
       if ("error" in startResult) {
@@ -3433,8 +3706,8 @@ ${truncateOutput(result.stderr)}`);
 };
 
 // src/tool/builtins/glob.ts
-import { readdir as readdir2, stat as stat2 } from "fs/promises";
-import { join as join4, relative as relative4, isAbsolute as isAbsolute2 } from "path";
+import { readdir as readdir3, stat as stat2 } from "fs/promises";
+import { join as join5, relative as relative4, isAbsolute as isAbsolute2 } from "path";
 function globToRegex(pattern) {
   let regexStr = pattern;
   regexStr = regexStr.replace(/\*\*\//g, "<<GLOBSTAR_SLASH>>");
@@ -3451,7 +3724,7 @@ async function walkDir(dir, baseDir) {
   const results = [];
   let entries;
   try {
-    entries = await readdir2(dir, { withFileTypes: true });
+    entries = await readdir3(dir, { withFileTypes: true });
   } catch {
     return results;
   }
@@ -3459,7 +3732,7 @@ async function walkDir(dir, baseDir) {
     if (entry.isDirectory() && (entry.name === "node_modules" || entry.name === ".git")) {
       continue;
     }
-    const fullPath = join4(dir, entry.name);
+    const fullPath = join5(dir, entry.name);
     const relPath = relative4(baseDir, fullPath);
     if (entry.isDirectory()) {
       results.push(...await walkDir(fullPath, baseDir));
@@ -3492,7 +3765,7 @@ var globTool = {
     if (!args?.pattern || typeof args.pattern !== "string") {
       return { success: false, data: "\u7F3A\u5C11\u5FC5\u8981\u53C2\u6570 pattern", error: "INVALID_ARGS" };
     }
-    const searchDir = args.directory ? isAbsolute2(args.directory) ? args.directory : join4(ctx.cwd, args.directory) : ctx.cwd;
+    const searchDir = args.directory ? isAbsolute2(args.directory) ? args.directory : join5(ctx.cwd, args.directory) : ctx.cwd;
     const regex = globToRegex(args.pattern);
     try {
       const dirStat = await stat2(searchDir);
@@ -3531,13 +3804,13 @@ var globTool = {
 };
 
 // src/tool/builtins/grep.ts
-import { readdir as readdir3, readFile as readFile9, stat as stat3 } from "fs/promises";
-import { join as join5, relative as relative5, isAbsolute as isAbsolute3 } from "path";
+import { readdir as readdir4, readFile as readFile10, stat as stat3 } from "fs/promises";
+import { join as join6, relative as relative5, isAbsolute as isAbsolute3 } from "path";
 async function collectFiles(dir, extension, maxFiles = 200) {
   const results = [];
   let entries;
   try {
-    entries = await readdir3(dir, { withFileTypes: true });
+    entries = await readdir4(dir, { withFileTypes: true });
   } catch {
     return results;
   }
@@ -3546,7 +3819,7 @@ async function collectFiles(dir, extension, maxFiles = 200) {
     if (entry.isDirectory() && (entry.name === "node_modules" || entry.name === ".git" || entry.name === "dist")) {
       continue;
     }
-    const fullPath = join5(dir, entry.name);
+    const fullPath = join6(dir, entry.name);
     if (entry.isDirectory()) {
       results.push(...await collectFiles(fullPath, extension, maxFiles - results.length));
     } else {
@@ -3593,7 +3866,7 @@ var grepTool = {
     if (!args?.pattern || typeof args.pattern !== "string") {
       return { success: false, data: "\u7F3A\u5C11\u5FC5\u8981\u53C2\u6570 pattern", error: "INVALID_ARGS" };
     }
-    const searchDir = args.directory ? isAbsolute3(args.directory) ? args.directory : join5(ctx.cwd, args.directory) : ctx.cwd;
+    const searchDir = args.directory ? isAbsolute3(args.directory) ? args.directory : join6(ctx.cwd, args.directory) : ctx.cwd;
     const maxFiles = args.max_files ?? 200;
     try {
       const flags = args.case_sensitive ? "g" : "gi";
@@ -3606,7 +3879,7 @@ var grepTool = {
       const matches = [];
       for (const filePath of files) {
         try {
-          const content = await readFile9(filePath, "utf-8");
+          const content = await readFile10(filePath, "utf-8");
           const lines = content.split("\n");
           const relPath = relative5(searchDir, filePath);
           for (let i = 0; i < lines.length; i++) {
@@ -3652,8 +3925,8 @@ var grepTool = {
 };
 
 // src/tool/builtins/ls.ts
-import { readdir as readdir4, stat as stat4 } from "fs/promises";
-import { join as join6, relative as relative6 } from "path";
+import { readdir as readdir5, stat as stat4 } from "fs/promises";
+import { join as join7, relative as relative6 } from "path";
 var lsTool = {
   name: "ls",
   kind: "read" /* Read */,
@@ -3677,7 +3950,7 @@ var lsTool = {
     const dirPath = args.path ? resolvePath(args.path, ctx.cwd) : ctx.cwd;
     const showAll = args.all ?? false;
     try {
-      const entries = await readdir4(dirPath, { withFileTypes: true });
+      const entries = await readdir5(dirPath, { withFileTypes: true });
       const lines = [];
       const sorted = [...entries].toSorted((a, b) => {
         if (a.isDirectory() !== b.isDirectory()) {
@@ -3691,7 +3964,7 @@ var lsTool = {
         let sizeStr = "";
         if (typeMark === "FILE") {
           try {
-            const fileStat = await stat4(join6(dirPath, entry.name));
+            const fileStat = await stat4(join7(dirPath, entry.name));
             if (fileStat.size < 1024) {
               sizeStr = `${fileStat.size}B`;
             } else if (fileStat.size < 1024 * 1024) {
@@ -3900,6 +4173,9 @@ var PHASE_CONFIG = {
   calling_tools: { icon: "\u{1F6E0}", label: "\u8C03\u7528\u5DE5\u5177", color: "#f59e0b" },
   executing_tools: { icon: "\u26A1", label: "\u6267\u884C\u5DE5\u5177", color: "#00ffff" }
 };
+function isFileMutatingTool(name) {
+  return name === "edit_file" || name === "write_file" || name === "multi_edit" || name === "delete_range";
+}
 var commandRegistry = /* @__PURE__ */ new Map();
 function registerCommand(name, cmd) {
   commandRegistry.set(name, cmd);
@@ -3929,6 +4205,7 @@ registerCommand("/game", { desc: "\u542F\u52A8\u6E38\u620F", handler: () => ({ k
 registerCommand("/stock", { desc: "\u67E5\u770B\u80A1\u7968\u884C\u60C5", handler: () => ({ kind: "navigate", target: "stock" }) });
 registerCommand("/plan", { desc: "\u5207\u6362\u4E3A\u8BA1\u5212\u6A21\u5F0F\uFF08Shift+Tab\uFF09", handler: () => ({ kind: "text", content: "\u8F93\u5165 /plan \u6216\u6309 Shift+Tab \u5207\u6362\u4E3A\u8BA1\u5212\u6A21\u5F0F" }) });
 registerCommand("/code", { desc: "\u5207\u6362\u56DE\u4EE3\u7801\u6A21\u5F0F\uFF08Shift+Tab\uFF09", handler: () => ({ kind: "text", content: "\u8F93\u5165 /code \u6216\u6309 Shift+Tab \u5207\u6362\u56DE\u4EE3\u7801\u6A21\u5F0F" }) });
+registerCommand("/rewind", { desc: "\u56DE\u9000\u5230\u5386\u53F2\u68C0\u67E5\u70B9\uFF081 = \u6700\u65B0\uFF09", handler: () => ({ kind: "text", content: "\u8BF7\u76F4\u63A5\u8F93\u5165 /rewind \u67E5\u770B\u53EF\u56DE\u9000\u7684\u68C0\u67E5\u70B9\u5217\u8868\uFF0C\u6216 /rewind <\u5E8F\u53F7> \u76F4\u63A5\u56DE\u9000\uFF081 = \u6700\u65B0\uFF0C2 = \u4E0A\u4E00\u6B21\uFF0C\u4F9D\u6B64\u7C7B\u63A8\uFF09" }) });
 var STREAMING_PLACEHOLDERS = [
   "\u8BA9\u5B50\u5F39\u98DE\u4E00\u4F1A\u513F...",
   "\u9A6C\u4E0A\u5C31\u597D...",
@@ -4007,6 +4284,13 @@ function ChatSession({
   const [skillSelectIndex, setSkillSelectIndex] = useState3(0);
   const [fileSelectIndex, setFileSelectIndex] = useState3(0);
   const [inputKey, setInputKey] = useState3(0);
+  const [rewindSelecting, setRewindSelecting] = useState3(false);
+  const [rewindSelectIndex, setRewindSelectIndex] = useState3(0);
+  const [rewindList, setRewindList] = useState3([]);
+  const [rewinding, setRewinding] = useState3(false);
+  const [rewindHintPhase, setRewindHintPhase] = useState3("idle");
+  const currentRoundModifiedRef = useRef2(false);
+  const rewindHintTimerRef = useRef2(null);
   const [selectingModel, setSelectingModel] = useState3(false);
   const [modelSelectIndex, setModelSelectIndex] = useState3(0);
   const modelOptions = ["deepseek-v4-flash", "deepseek-v4-pro"];
@@ -4023,6 +4307,14 @@ function ChatSession({
     setSkillSelectIndex(0);
     setFileSelectIndex(0);
   }, [input]);
+  useEffect3(() => {
+    return () => {
+      if (rewindHintTimerRef.current) {
+        clearTimeout(rewindHintTimerRef.current);
+        rewindHintTimerRef.current = null;
+      }
+    };
+  }, []);
   const getFilteredSkills = useCallback2(
     (value) => {
       const match = value.match(/(?:^|\s)\/([^/]*)$/);
@@ -4053,12 +4345,89 @@ function ChatSession({
     },
     [files]
   );
+  function rebuildDisplayFromSession(sess) {
+    const next = [];
+    for (const m of sess.messages) {
+      if (m.role === "user") {
+        next.push({ role: "user", content: m.content });
+      } else if (m.role === "assistant") {
+        next.push({
+          role: "assistant",
+          content: m.content,
+          assistantDetail: {
+            content: m.content,
+            toolCalls: m.toolCalls
+          }
+        });
+      } else if (m.role === "tool") {
+        next.push({ role: "tool", content: m.content });
+      }
+    }
+    setDisplayMessages(next);
+    setStaticKey((prev) => prev + 1);
+  }
+  const doRewind = useCallback2(async (target, displayNumber) => {
+    const session = sessionRef.current;
+    if (!session) return;
+    setRewinding(true);
+    setIsStreaming(true);
+    setStreamingPhase("thinking");
+    setStreamingPlaceholder("\u23EA \u6B63\u5728\u56DE\u9000\u5230\u68C0\u67E5\u70B9\u2026");
+    setInput("");
+    try {
+      const r = await session.rewind(target.index);
+      if (r.ok) {
+        rebuildDisplayFromSession(session);
+        const tail = r.fileRestored ? "\uFF0C\u5DE5\u4F5C\u533A\u6587\u4EF6\u5DF2\u6062\u590D" : "\uFF08\u4EC5\u5BF9\u8BDD\u56DE\u9000\uFF0C\u672A\u6062\u590D\u6587\u4EF6\uFF09";
+        setDisplayMessages((prev) => [
+          ...prev,
+          { role: "assistant", content: `\u23EA \u5DF2\u56DE\u9000\u5230\u68C0\u67E5\u70B9 #${displayNumber}${tail}\u3002` }
+        ]);
+      } else {
+        setDisplayMessages((prev) => [
+          ...prev,
+          { role: "assistant", content: `\u26A0 \u56DE\u9000\u5931\u8D25\uFF1A${r.error}` }
+        ]);
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      setDisplayMessages((prev) => [
+        ...prev,
+        { role: "assistant", content: `\u26A0 \u56DE\u9000\u5F02\u5E38\uFF1A${msg}` }
+      ]);
+    } finally {
+      setRewinding(false);
+      setIsStreaming(false);
+      setStreamingPhase(null);
+      setStreamingPlaceholder("");
+    }
+  }, []);
   const { doubleCtrlC, handleCtrlC } = useDoubleCtrlC(() => {
     process.exit(0);
   });
   useInput(
     useCallback2(
       (_input, key) => {
+        if (rewindSelecting) {
+          if (key.upArrow) {
+            setRewindSelectIndex((prev) => (prev - 1 + rewindList.length) % rewindList.length);
+          } else if (key.downArrow) {
+            setRewindSelectIndex((prev) => (prev + 1) % rewindList.length);
+          } else if (key.return) {
+            const target = rewindList[rewindSelectIndex];
+            setRewindSelecting(false);
+            if (target) {
+              void doRewind(target, rewindSelectIndex + 1);
+            }
+          } else if (key.escape) {
+            setRewindSelecting(false);
+            setDisplayMessages((prev) => [
+              ...prev,
+              { role: "assistant", content: "\u5DF2\u53D6\u6D88\u56DE\u9000\u3002" }
+            ]);
+          }
+          return;
+        }
         if (selectingModel) {
           if (key.upArrow) {
             setModelSelectIndex((prev) => (prev - 1 + modelOptions.length) % modelOptions.length);
@@ -4165,7 +4534,7 @@ function ChatSession({
           setInput(_input);
         }
       },
-      [selectingModel, modelSelectIndex, modelOptions, activeModel, isStreaming, handleCtrlC, input, skills, skillSelectIndex, fileSelectIndex, getFilteredSkills, getFilteredFiles, sessionMode, setSessionMode]
+      [selectingModel, modelSelectIndex, modelOptions, activeModel, isStreaming, handleCtrlC, input, skills, skillSelectIndex, fileSelectIndex, getFilteredSkills, getFilteredFiles, sessionMode, setSessionMode, rewindSelecting, rewindSelectIndex, rewindList, doRewind]
     )
   );
   useEffect3(() => {
@@ -4289,6 +4658,64 @@ function ChatSession({
     if (!trimmed) return;
     if (trimmed.startsWith("/") && trimmed.length > 1) {
       const cmdLower = trimmed.toLowerCase();
+      if (cmdLower === "/rewind" || cmdLower.startsWith("/rewind ")) {
+        if (isStreaming || rewinding) {
+          const reason = rewinding ? "\u56DE\u9000\u4E2D" : "\u751F\u6210\u4E2D";
+          setDisplayMessages((prev) => [
+            ...prev,
+            { role: "user", content: trimmed },
+            { role: "assistant", content: `\u26A0 \u6B63\u5728${reason}\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5 /rewind\u3002` }
+          ]);
+          setInput("");
+          return;
+        }
+        if (!sessionRef.current) {
+          setDisplayMessages((prev) => [
+            ...prev,
+            { role: "user", content: trimmed },
+            { role: "assistant", content: "\u26A0 Session \u672A\u5C31\u7EEA\uFF0C\u65E0\u6CD5\u56DE\u9000\u3002" }
+          ]);
+          setInput("");
+          return;
+        }
+        const cps = sessionRef.current.listCheckpoints();
+        if (cps.length === 0) {
+          setDisplayMessages((prev) => [
+            ...prev,
+            { role: "user", content: trimmed },
+            { role: "assistant", content: "\u26A0 \u6CA1\u6709\u53EF\u56DE\u9000\u7684\u68C0\u67E5\u70B9\u3002\n\u53EA\u6709\u5728 git \u4ED3\u5E93\u5185\u4E14\u53D1\u751F\u8FC7\u5BF9\u8BDD\u540E\u624D\u4F1A\u751F\u6210\u68C0\u67E5\u70B9\u3002" }
+          ]);
+          setInput("");
+          return;
+        }
+        const parts = trimmed.split(/\s+/);
+        if (parts.length >= 2) {
+          const n = Number(parts[1]);
+          if (!Number.isInteger(n) || n < 1 || n > cps.length) {
+            setDisplayMessages((prev) => [
+              ...prev,
+              { role: "user", content: trimmed },
+              { role: "assistant", content: `\u26A0 \u65E0\u6548\u7684\u5E8F\u53F7\u300C${parts[1]}\u300D\u3002\u53EF\u7528\u8303\u56F4 1~${cps.length}\uFF081 \u8868\u793A\u6700\u65B0\uFF09\u3002` }
+            ]);
+            setInput("");
+            return;
+          }
+          const target = cps[cps.length - n];
+          setInput("");
+          await doRewind(target, n);
+          return;
+        }
+        setRewindList([...cps].reverse());
+        setRewindSelectIndex(0);
+        setRewindSelecting(true);
+        setDisplayMessages((prev) => [
+          ...prev,
+          { role: "user", content: trimmed },
+          { role: "assistant", content: `\u23F7\u2191\u2193 \u9009\u62E9\u68C0\u67E5\u70B9\uFF0CEnter \u786E\u8BA4\uFF0CEsc \u53D6\u6D88\uFF08\u5171 ${cps.length} \u4E2A\u53EF\u56DE\u9000\u4F4D\u7F6E\uFF09` }
+        ]);
+        setInput("");
+        return;
+      }
       if (cmdLower === "/model") {
         const curIdx = modelOptions.indexOf(activeModel);
         setModelSelectIndex(curIdx >= 0 ? curIdx : 0);
@@ -4443,6 +4870,12 @@ function ChatSession({
     currentCostRef.current = void 0;
     currentModelRef.current = void 0;
     streamErrorRef.current = void 0;
+    currentRoundModifiedRef.current = false;
+    setRewindHintPhase("idle");
+    if (rewindHintTimerRef.current) {
+      clearTimeout(rewindHintTimerRef.current);
+      rewindHintTimerRef.current = null;
+    }
     const session = sessionRef.current;
     const abortController = new AbortController();
     abortRef.current = abortController;
@@ -4470,6 +4903,12 @@ function ChatSession({
               currentToolCallsRef.current = next;
               return next;
             });
+            for (const call of event.calls) {
+              if (isFileMutatingTool(call.name)) {
+                currentRoundModifiedRef.current = true;
+                break;
+              }
+            }
             break;
           case "tool_result":
             setStreamingPhase("executing_tools");
@@ -4540,6 +4979,14 @@ function ChatSession({
           }
         ]);
       }
+      if (currentRoundModifiedRef.current && !finStreamError) {
+        setRewindHintPhase("pending");
+        if (rewindHintTimerRef.current) clearTimeout(rewindHintTimerRef.current);
+        rewindHintTimerRef.current = setTimeout(() => {
+          setRewindHintPhase((prev) => prev === "pending" ? "visible" : prev);
+          rewindHintTimerRef.current = null;
+        }, 2e3);
+      }
     }
   }, [onLaunchGame, onLaunchStock, currentContent, currentToolCalls, skills, skillSelectIndex, getFilteredSkills, thinkingEnabled, thinkingEffort, responseFormat, toolChoice, activeModel, sessionMode]);
   useEffect3(() => {
@@ -4685,6 +5132,38 @@ function ChatSession({
         /* @__PURE__ */ jsx9(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text10, { color: "#808080", dimColor: true, children: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u786E\u8BA4 \xB7 Esc \u53D6\u6D88" }) })
       ] }),
       /* @__PURE__ */ jsx9(Text10, { color: "#00ffff", dimColor: true, children: "\u2500".repeat(dividerWidth) })
+    ] }) : rewindSelecting ? /* @__PURE__ */ jsxs9(Box9, { marginTop: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx9(Text10, { color: "#00ffff", dimColor: true, children: "\u2500".repeat(dividerWidth) }),
+      /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsx9(Text10, { bold: true, color: "#ff9800", children: "\u9009\u62E9\u8981\u56DE\u9000\u7684\u68C0\u67E5\u70B9\uFF1A" }),
+        rewindList.map((cp2, i) => {
+          const isSelected = i === rewindSelectIndex;
+          const marker = isSelected ? " > " : "   ";
+          const time = new Date(cp2.timestamp).toLocaleTimeString();
+          const preview = cp2.preview || "(\u7A7A)";
+          const tag = cp2.isGitRepo ? "" : " [\u975E git\uFF0C\u4EC5\u5BF9\u8BDD]";
+          return /* @__PURE__ */ jsx9(Box9, { children: /* @__PURE__ */ jsxs9(
+            Text10,
+            {
+              color: isSelected ? "#ff9800" : void 0,
+              bold: isSelected,
+              children: [
+                marker,
+                "#",
+                i + 1,
+                " ",
+                time,
+                " `",
+                preview,
+                tag,
+                "`"
+              ]
+            }
+          ) }, cp2.index);
+        }),
+        /* @__PURE__ */ jsx9(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text10, { color: "#808080", dimColor: true, children: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u786E\u8BA4 \xB7 Esc \u53D6\u6D88" }) })
+      ] }),
+      /* @__PURE__ */ jsx9(Text10, { color: "#00ffff", dimColor: true, children: "\u2500".repeat(dividerWidth) })
     ] }) : /* @__PURE__ */ jsxs9(Fragment, { children: [
       (hasConversationStarted || sessionMode === "plan") && isStreaming && streamingPhase ? /* @__PURE__ */ jsx9(Box9, { marginTop: 1, justifyContent: "center", children: /* @__PURE__ */ jsxs9(Text10, { bold: true, color: PHASE_CONFIG[streamingPhase].color, children: [
         PHASE_CONFIG[streamingPhase].icon,
@@ -4692,7 +5171,11 @@ function ChatSession({
         PHASE_CONFIG[streamingPhase].label,
         " ",
         /* @__PURE__ */ jsx9(InkSpinner2, { type: "dots" })
-      ] }) }) : null,
+      ] }) }) : rewindHintPhase === "visible" ? (
+        // 本轮修改了文件时，流式结束后 2s 在原位置展示 /rewind 提示
+        // 一直保留到下次对话开始，与 /rewind 1（最新检查点）配套
+        /* @__PURE__ */ jsx9(Box9, { marginTop: 1, justifyContent: "center", children: /* @__PURE__ */ jsx9(Text10, { color: "#808080", children: "\u21A9 /rewind 1 \u53EF\u64A4\u56DE\u672C\u6B21\u4FEE\u6539" }) })
+      ) : null,
       /* @__PURE__ */ jsx9(Box9, { marginTop: 1, children: hasConversationStarted || sessionMode === "plan" ? /* @__PURE__ */ jsxs9(Text10, { color: sessionMode === "plan" ? "#ff69b4" : "#00ffff", dimColor: sessionMode !== "plan", children: [
         /* @__PURE__ */ jsx9(Text10, { children: sessionMode === "plan" ? "\u2500".repeat(Math.max(dividerWidth - 48, 1)) : "\u2500".repeat(Math.max(dividerWidth - 35, 10)) }),
         balance !== null && /* @__PURE__ */ jsxs9(Text10, { color: "yellow", children: [
@@ -5966,9 +6449,9 @@ import { Box as Box13, Text as Text14, useInput as useInput5 } from "ink";
 import { useState as useState7, useCallback as useCallback6, useEffect as useEffect6, useMemo as useMemo2 } from "react";
 import asciichart from "asciichart";
 import os from "os";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
-var SETTINGS_PATH = join7(os.homedir(), ".dskcode", "settings.json");
+var SETTINGS_PATH = join8(os.homedir(), ".dskcode", "settings.json");
 function toFileUrl(p) {
   const norm = p.replace(/\\/g, "/");
   if (process.platform === "win32") {
@@ -6302,8 +6785,8 @@ function renderDetail(stock, _onBack, prices, countdown = 10, currentTime) {
 }
 
 // src/utils/scan-files.ts
-import { readdir as readdir5 } from "fs/promises";
-import { join as join8, relative as relative7 } from "path";
+import { readdir as readdir6 } from "fs/promises";
+import { join as join9, relative as relative7 } from "path";
 var IGNORE_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -6354,7 +6837,7 @@ async function scanProjectFiles(baseDir, dir) {
   const currentDir = dir ?? baseDir;
   let entries;
   try {
-    entries = await readdir5(currentDir, { withFileTypes: true });
+    entries = await readdir6(currentDir, { withFileTypes: true });
   } catch {
     return [];
   }
@@ -6368,12 +6851,12 @@ async function scanProjectFiles(baseDir, dir) {
     } else if (entry.isFile()) {
       const ext = name.slice(name.lastIndexOf(".")).toLowerCase();
       if (SOURCE_EXTS.has(ext)) {
-        files.push(relative7(baseDir, join8(currentDir, name)));
+        files.push(relative7(baseDir, join9(currentDir, name)));
       }
     }
   }
   const nested = await Promise.all(
-    dirs.map((d) => scanProjectFiles(baseDir, join8(currentDir, d)))
+    dirs.map((d) => scanProjectFiles(baseDir, join9(currentDir, d)))
   );
   for (const n of nested) {
     files.push(...n);
@@ -6461,10 +6944,10 @@ compdef _dskcode_completion dskcode`);
   program2.command("stock").description("\u67E5\u770B\u81EA\u9009\u80A1\u5B9E\u65F6\u884C\u60C5").argument("[codes...]", "\u80A1\u7968\u4EE3\u7801\uFF08\u7A7A\u683C\u5206\u9694\uFF09\uFF0C\u5982 513090 600519").action(async function(codes) {
     const _ctx = this.dskcodeCtx;
     const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
-    const globalConfigPath = join9(home, ".dskcode", "settings.json");
+    const globalConfigPath = join10(home, ".dskcode", "settings.json");
     let globalConfigHasStock = false;
     try {
-      const raw = await readFile10(globalConfigPath, "utf-8");
+      const raw = await readFile11(globalConfigPath, "utf-8");
       const parsed = JSON.parse(raw);
       const stock = parsed.stock;
       globalConfigHasStock = Array.isArray(stock?.symbols) && stock.symbols.length > 0;
@@ -6629,10 +7112,18 @@ var ExitCode = {
 // src/index.ts
 var sigintCount = 0;
 var sigintTimer = null;
+async function gracefulExit(code) {
+  try {
+    await CostTracker.flushAll();
+  } catch {
+  }
+  process.exit(code);
+}
 process.on("SIGINT", () => {
   sigintCount++;
   if (sigintCount >= 2) {
-    process.exit(ExitCode.SIGINT);
+    void gracefulExit(ExitCode.SIGINT);
+    return;
   }
   process.stdout.write("\n  \u26A0 \u518D\u6309\u4E00\u6B21 Ctrl+C \u9000\u51FA dskcode\n");
   if (sigintTimer) clearTimeout(sigintTimer);
@@ -6640,18 +7131,25 @@ process.on("SIGINT", () => {
     sigintCount = 0;
   }, 1500);
 });
+process.on("SIGTERM", () => {
+  void gracefulExit(ExitCode.SIGINT);
+});
 var program = createCli();
 try {
   await program.parseAsync(process.argv);
+  await CostTracker.flushAll();
 } catch (err) {
   const error = err;
   if (error.code === "commander.helpDisplayed" || error.code === "commander.version") {
+    await CostTracker.flushAll();
     process.exit(error.exitCode ?? ExitCode.SUCCESS);
   }
   if (typeof error.exitCode === "number") {
+    await CostTracker.flushAll();
     process.exit(error.exitCode);
   }
   console.error(String(err));
+  await CostTracker.flushAll();
   process.exit(ExitCode.GENERAL_ERROR);
 }
 //# sourceMappingURL=index.js.map