dskcode 0.1.27 → 0.1.28

package/dist/index.js

@@ -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");
   }
@@ -2413,6 +2441,8 @@ ${item.result.diff.patch}`;
     }
     const elapsed = Date.now() - startTime;
     void this.#persist();
+    await this.#costTracker.flush().catch(() => {
+    });
     yield { type: "done", elapsed };
   }
   async #executeBatch(calls) {
@@ -4630,10 +4660,11 @@ function ChatSession({
       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\u751F\u6210\u6216\u56DE\u9000\u4E2D\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5 /rewind\u3002" }
+            { role: "assistant", content: `\u26A0 \u6B63\u5728${reason}\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5 /rewind\u3002` }
           ]);
           setInput("");
           return;
@@ -7081,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);
@@ -7092,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