dskcode 0.1.28 → 0.1.29

package/dist/index.js

@@ -772,7 +772,7 @@ async function getAllSkills(cwd) {
 
 // src/cli/index.tsx
 import { readFile as readFile11 } from "fs/promises";
-import { join as join10 } from "path";
+import { join as join12 } from "path";
 
 // src/ui/RenderScope.tsx
 import { render } from "ink";
@@ -2277,6 +2277,153 @@ function isENOENT(err) {
   return typeof err === "object" && err !== null && "code" in err && err.code === "ENOENT";
 }
 
+// src/logger/logger.ts
+import { mkdir as mkdir5, appendFile } from "fs/promises";
+import { join as join5, basename } from "path";
+var MAX_DATA_LEN = 2e3;
+var MAX_QUEUE = 500;
+function defaultLogsDir() {
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
+  return join5(home, ".dskcode", "logs");
+}
+function projectNameFromCwd(cwd) {
+  const name = basename(cwd);
+  return name || "_root";
+}
+var ConversationLogger = class _ConversationLogger {
+  /** 所有活跃的 logger 实例（用于退出时统一 flush） */
+  static #instances = /* @__PURE__ */ new Set();
+  /**
+   * 刷新所有活跃 logger 实例的缓冲，确保事件落盘。
+   * 进程退出前调用。
+   */
+  static async flushAll() {
+    const promises = [];
+    for (const logger of _ConversationLogger.#instances) {
+      promises.push(logger.flush());
+    }
+    await Promise.allSettled(promises);
+  }
+  #logPath;
+  #enabled;
+  #queue = Promise.resolve();
+  #queueLen = 0;
+  #closed = false;
+  constructor(sessionId, cwd, options) {
+    this.#enabled = options?.enabled ?? true;
+    if (!this.#enabled) {
+      this.#logPath = "";
+      return;
+    }
+    const baseDir = options?.logsDir ?? defaultLogsDir();
+    const projectName = projectNameFromCwd(cwd);
+    this.#logPath = join5(baseDir, projectName, `${sessionId}.jsonl`);
+    _ConversationLogger.#instances.add(this);
+  }
+  /** 日志文件完整路径（禁用时返回空字符串） */
+  get logPath() {
+    return this.#logPath;
+  }
+  /** 是否启用日志记录 */
+  get enabled() {
+    return this.#enabled;
+  }
+  /**
+   * 记录一个事件。
+   *
+   * 内部将事件序列化为 JSON 并追加到日志文件。
+   * 写入操作串行排队，保证事件顺序。调用方无需 await。
+   */
+  log(event) {
+    if (!this.#enabled || this.#closed) return;
+    if (this.#queueLen >= MAX_QUEUE) return;
+    this.#queueLen++;
+    this.#queue = this.#queue.then(() => this.#writeLine(event)).catch(() => {
+    }).finally(() => this.#queueLen--);
+  }
+  /**
+   * 关闭日志记录器。
+   *
+   * 标记关闭，不再接受新事件，但会等待队列中已有事件写入完成。
+   * 返回的 Promise resolve 后保证所有已 log 的事件都已落盘。
+   */
+  async flush() {
+    this.#closed = true;
+    await this.#queue.catch(() => {
+    });
+    _ConversationLogger.#instances.delete(this);
+  }
+  /** 将一行 JSON 写入日志文件 */
+  async #writeLine(event) {
+    const dir = join5(this.#logPath, "..");
+    await mkdir5(dir, { recursive: true });
+    const line = JSON.stringify(event) + "\n";
+    await appendFile(this.#logPath, line, "utf-8");
+  }
+  // -----------------------------------------------------------------------
+  // 便捷方法 — 封装常见事件类型，减少调用方样板代码
+  // -----------------------------------------------------------------------
+  /** 记录会话开始 */
+  logSessionStart(sessionId, cwd, model, mode) {
+    this.log({ ts: Date.now(), type: "session_start", sessionId, cwd, model, mode });
+  }
+  /** 记录用户消息 */
+  logUserMessage(content) {
+    this.log({ ts: Date.now(), type: "user_message", content });
+  }
+  /** 记录助手文本（一轮中模型输出的完整文本） */
+  logAssistantText(content, round) {
+    this.log({ ts: Date.now(), type: "assistant_text", content, round });
+  }
+  /** 记录工具调用 */
+  logToolCall(name, callId, args, round) {
+    this.log({ ts: Date.now(), type: "tool_call", name, callId, arguments: args, round });
+  }
+  /** 记录工具结果 */
+  logToolResult(name, callId, success, data, error, elapsed, round) {
+    this.log({
+      ts: Date.now(),
+      type: "tool_result",
+      name,
+      callId,
+      success,
+      data: truncate(data),
+      ...error ? { error } : {},
+      ...elapsed !== void 0 ? { elapsed } : {},
+      round
+    });
+  }
+  /** 记录 Token 用量与费用 */
+  logUsage(model, promptTokens, completionTokens, cachedPromptTokens, cost, round) {
+    this.log({
+      ts: Date.now(),
+      type: "usage",
+      model,
+      promptTokens,
+      completionTokens,
+      ...cachedPromptTokens !== void 0 ? { cachedPromptTokens } : {},
+      cost,
+      round
+    });
+  }
+  /** 记录错误 */
+  logError(message, stack) {
+    this.log({ ts: Date.now(), type: "error", message, ...stack ? { stack } : {} });
+  }
+  /** 记录一轮对话完成 */
+  logTurnDone(elapsed, toolRounds) {
+    this.log({ ts: Date.now(), type: "turn_done", elapsed, toolRounds });
+  }
+  /** 记录会话结束 */
+  logSessionEnd(elapsed) {
+    this.log({ ts: Date.now(), type: "session_end", elapsed });
+  }
+};
+function truncate(text) {
+  if (text.length <= MAX_DATA_LEN) return text;
+  return text.slice(0, MAX_DATA_LEN) + `...[\u5DF2\u622A\u65AD\uFF0C\u539F\u59CB\u957F\u5EA6 ${text.length}]`;
+}
+
 // src/agent/index.ts
 var Session = class _Session {
   #messages = [];
@@ -2292,6 +2439,7 @@ var Session = class _Session {
   #checkpoints = /* @__PURE__ */ new Map();
   #stormRecords = [];
   #mode = "code";
+  #logger;
   constructor(provider, tools = [], costTracker, options) {
     this.#provider = provider;
     if (tools instanceof ToolRegistry) {
@@ -2309,11 +2457,16 @@ var Session = class _Session {
       projectContext: options?.projectContext,
       gate: options?.gate ?? new AlwaysAllowGate(),
       writeRoots: options?.writeRoots ?? [options?.cwd ?? process.cwd()],
-      enableCheckpoint: options?.enableCheckpoint ?? true
+      enableCheckpoint: options?.enableCheckpoint ?? true,
+      enableLog: options?.enableLog ?? true
     };
     this.#sessionId = options?.sessionId ?? SessionStore.newId();
     this.#store = options?.store === false ? null : options?.store ?? new SessionStore();
     this.#createdAt = Date.now();
+    this.#logger = new ConversationLogger(this.#sessionId, this.#options.cwd, {
+      enabled: this.#options.enableLog
+    });
+    this.#logger.logSessionStart(this.#sessionId, this.#options.cwd, this.#provider.model(), this.#mode);
   }
   get messages() {
     return this.#messages;
@@ -2348,6 +2501,7 @@ var Session = class _Session {
   }
   async *chat(userInput, opts) {
     this.#messages.push({ role: "user", content: userInput });
+    this.#logger.logUserMessage(userInput);
     const userMsgIndex = this.#messages.length - 1;
     if (this.#options.enableCheckpoint) {
       try {
@@ -2396,13 +2550,26 @@ var Session = class _Session {
         if (lastUsage) {
           const modelId = this.#provider.model();
           this.#costTracker.record(lastUsage, modelId);
+          const cost = calculateCost(lastUsage, modelId);
+          this.#logger.logUsage(
+            modelId,
+            lastUsage.promptTokens,
+            lastUsage.completionTokens,
+            lastUsage.cachedPromptTokens,
+            cost.totalCost,
+            toolRounds
+          );
           yield { type: "usage", usage: lastUsage, model: modelId };
         }
         const assistantMsg = { role: "assistant", content: accumulatedText };
         if (lastToolCalls && lastToolCalls.length > 0) assistantMsg.toolCalls = lastToolCalls;
         this.#messages.push(assistantMsg);
+        this.#logger.logAssistantText(accumulatedText, toolRounds);
         if (lastToolCalls && lastToolCalls.length > 0) {
           yield { type: "tool_calls", calls: lastToolCalls };
+          for (const tc of lastToolCalls) {
+            this.#logger.logToolCall(tc.name, tc.id, tc.arguments, toolRounds);
+          }
           const stormBroken = this.#checkStormBreak(lastToolCalls);
           if (stormBroken) {
             const stormMsg = "\n\u26A0\uFE0F \u540C\u4E00\u5DE5\u5177\u91CD\u590D\u51FA\u9519\uFF0C\u5DF2\u5F3A\u5236\u5207\u6362\u7B56\u7565\n";
@@ -2417,6 +2584,15 @@ var Session = class _Session {
           this.#stormRecords = results.records;
           for (const item of results.items) {
             yield { type: "tool_result", name: item.name, result: item.result };
+            this.#logger.logToolResult(
+              item.name,
+              item.callId,
+              item.result.success,
+              item.result.data,
+              item.result.error,
+              void 0,
+              toolRounds
+            );
             let toolContent = item.result.data;
             if (item.result.diff && item.result.diff.patch) toolContent += `
 
@@ -2436,10 +2612,15 @@ ${item.result.diff.patch}`;
     } catch (err) {
       if (err instanceof DOMException && err.name === "AbortError") return;
       if (err instanceof Error && err.name === "AbortError") return;
+      this.#logger.logError(
+        err instanceof Error ? err.message : String(err),
+        err instanceof Error ? err.stack : void 0
+      );
       yield { type: "error", error: err instanceof Error ? err : new Error(String(err)) };
       return;
     }
     const elapsed = Date.now() - startTime;
+    this.#logger.logTurnDone(elapsed, toolRounds);
     void this.#persist();
     await this.#costTracker.flush().catch(() => {
     });
@@ -2544,6 +2725,10 @@ ${item.result.diff.patch}`;
       this.#persistTimer = null;
     }
   }
+  /** 刷新日志缓冲，确保所有已记录的事件落盘 */
+  async flushLog() {
+    await this.#logger.flush();
+  }
   reset() {
     this.#messages.length = 0;
     this.#costTracker.resetSession();
@@ -2685,6 +2870,8 @@ ${item.result.diff.patch}`;
       void discardCheckpoint(cp2);
     }
     this.#checkpoints.clear();
+    this.#logger.logSessionEnd(Date.now() - this.#createdAt);
+    await this.#logger.flush();
   }
   // -------------------------------------------------------------------------
   // 内部方法
@@ -2780,6 +2967,10 @@ async function execCommand(command, args, cwd, timeoutMs = DEFAULT_TIMEOUT_MS, s
       spawnCmd = command;
       spawnArgs = args;
       useShell = false;
+      if (isWindows && spawnCmd === "cmd" && spawnArgs[0] === "/c") {
+        const prefixed = `chcp 65001 >nul && ${spawnArgs[1] ?? ""}`;
+        spawnArgs = ["/c", prefixed];
+      }
     } else {
       useShell = !isWindows;
       spawnCmd = isWindows ? "cmd" : command;
@@ -2794,10 +2985,10 @@ async function execCommand(command, args, cwd, timeoutMs = DEFAULT_TIMEOUT_MS, s
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (data) => {
-      stdout += data.toString();
+      stdout += data.toString("utf8");
     });
     child.stderr.on("data", (data) => {
-      stderr += data.toString();
+      stderr += data.toString("utf8");
     });
     const timeout = setTimeout(() => {
       child.kill("SIGTERM");
@@ -3243,8 +3434,8 @@ var readFileTool = {
 };
 
 // src/tool/builtins/write-file.ts
-import { mkdir as mkdir5, readFile as readFile6 } from "fs/promises";
-import { dirname, relative as relative3, basename } from "path";
+import { mkdir as mkdir6, readFile as readFile6 } from "fs/promises";
+import { dirname, relative as relative3, basename as basename2 } from "path";
 var writeFileTool = {
   name: "write_file",
   kind: "edit" /* Edit */,
@@ -3286,7 +3477,7 @@ var writeFileTool = {
         existedBefore = true;
       } catch {
       }
-      await mkdir5(dirname(filePath), { recursive: true });
+      await mkdir6(dirname(filePath), { recursive: true });
       const content = args.content;
       await writeFileWithEol(filePath, oldContent, content);
       const diff = computeFileDiff(oldContent, content, filePath);
@@ -3295,7 +3486,7 @@ var writeFileTool = {
       const byteSize = Buffer.byteLength(content, "utf-8");
       const action = existedBefore ? "\u5DF2\u4FEE\u6539" : "\u5DF2\u521B\u5EFA";
       const diffSummary = existedBefore ? `\uFF0C+${diff.additions} -${diff.deletions}` : `\uFF0C+${diff.additions} \u884C\uFF08\u65B0\u5EFA\uFF09`;
-      const fileName = basename(filePath);
+      const fileName = basename2(filePath);
       const summary = existedBefore ? `\u{1F4DD} \u4FEE\u6539: ${fileName} (+${diff.additions} -${diff.deletions})` : `\u{1F4DD} \u65B0\u5EFA: ${fileName} (+${diff.additions} \u884C)`;
       return {
         success: true,
@@ -3316,7 +3507,7 @@ var writeFileTool = {
 
 // src/tool/builtins/edit-file.ts
 import { readFile as readFile7 } from "fs/promises";
-import { basename as basename2 } from "path";
+import { basename as basename3 } from "path";
 var editFileTool = {
   name: "edit_file",
   kind: "edit" /* Edit */,
@@ -3384,7 +3575,7 @@ var editFileTool = {
       const oldLines = args.old_text.split("\n").length;
       const newLines = args.new_text.split("\n").length;
       const diffSummary = `+${diff.additions} -${diff.deletions}`;
-      const summary = `\u{1F4DD} \u4FEE\u6539: ${basename2(filePath)} (+${diff.additions} -${diff.deletions})`;
+      const summary = `\u{1F4DD} \u4FEE\u6539: ${basename3(filePath)} (+${diff.additions} -${diff.deletions})`;
       return {
         success: true,
         data: `\u6587\u4EF6\u5DF2\u7F16\u8F91\uFF1A${filePath}
@@ -3407,7 +3598,7 @@ ${oldLines} \u884C \u2192 ${newLines} \u884C
 
 // src/tool/builtins/multi-edit.ts
 import { readFile as readFile8 } from "fs/promises";
-import { basename as basename3 } from "path";
+import { basename as basename4 } from "path";
 var multiEditTool = {
   name: "multi_edit",
   kind: "edit" /* Edit */,
@@ -3505,7 +3696,7 @@ var multiEditTool = {
         data: `\u6587\u4EF6\u5DF2\u7F16\u8F91\uFF1A${filePath}
 \u5171\u6267\u884C ${args.edits.length} \u6B65\u66FF\u6362
 \u53D8\u66F4\uFF1A+${diff.additions} -${diff.deletions}`,
-        summary: `\u{1F4DD} \u4FEE\u6539: ${basename3(filePath)} (${args.edits.length} \u6B65, +${diff.additions} -${diff.deletions})`,
+        summary: `\u{1F4DD} \u4FEE\u6539: ${basename4(filePath)} (${args.edits.length} \u6B65, +${diff.additions} -${diff.deletions})`,
         diff
       };
     } catch (err) {
@@ -3521,7 +3712,7 @@ var multiEditTool = {
 
 // src/tool/builtins/delete-range.ts
 import { readFile as readFile9 } from "fs/promises";
-import { basename as basename4 } from "path";
+import { basename as basename5 } from "path";
 function findUniqueLine(lines, anchor, label) {
   const matches = [];
   for (let i = 0; i < lines.length; i++) {
@@ -3617,7 +3808,7 @@ var deleteRangeTool = {
       const diff = computeFileDiff(content, newContent, filePath);
       diff.existedBefore = true;
       const deletedLines = rangeEnd - rangeStart + 1;
-      const summary = `\u{1F4DD} \u4FEE\u6539: ${basename4(filePath)} (\u5220 ${deletedLines} \u884C, +${diff.additions} -${diff.deletions})`;
+      const summary = `\u{1F4DD} \u4FEE\u6539: ${basename5(filePath)} (\u5220 ${deletedLines} \u884C, +${diff.additions} -${diff.deletions})`;
       return {
         success: true,
         data: `\u6587\u4EF6\u5DF2\u7F16\u8F91\uFF1A${filePath}
@@ -3639,17 +3830,62 @@ var deleteRangeTool = {
 
 // src/tool/builtins/bash.ts
 import process3 from "process";
+import { existsSync as existsSync3 } from "fs";
+import { join as join6 } from "path";
 var isWindows2 = process3.platform === "win32";
+function detectShell() {
+  if (!isWindows2) {
+    return {
+      bin: "sh",
+      args: ["-c"],
+      label: "sh",
+      hint: "\u5F53\u524D shell \u662F bash \u517C\u5BB9\u8BED\u6CD5\uFF0C\u652F\u6301 pwd/ls/&&/\u7BA1\u9053\u7B49\u6807\u51C6 Unix \u5DE5\u5177\u3002"
+    };
+  }
+  const envBash = process3.env.DSKCODE_BASH;
+  if (envBash && existsSync3(envBash)) {
+    return { bin: envBash, args: ["-c"], label: "Git Bash", hint: SHELL_HINT_BASH };
+  }
+  const roots = [
+    process3.env.ProgramFiles,
+    process3.env["ProgramFiles(x86)"],
+    process3.env.LOCALAPPDATA ? join6(process3.env.LOCALAPPDATA, "Programs") : null,
+    // 非 C 盘安装（你机器就是 D 盘），枚举几个常见盘符根
+    "D:\\Program Files",
+    "E:\\Program Files"
+  ].filter((v) => Boolean(v));
+  for (const root of roots) {
+    for (const sub of ["Git\\bin\\bash.exe", "Git\\usr\\bin\\bash.exe"]) {
+      const candidate = join6(root, sub);
+      if (existsSync3(candidate)) {
+        return { bin: candidate, args: ["-c"], label: "Git Bash", hint: SHELL_HINT_BASH };
+      }
+    }
+  }
+  return {
+    bin: "cmd",
+    args: ["/c"],
+    label: "cmd.exe",
+    hint: "\u5F53\u524D shell \u662F Windows cmd.exe\u3002\u8BF7\u4F7F\u7528 cmd \u8BED\u6CD5\uFF1A\u8DEF\u5F84\u7528\u53CD\u659C\u6760\u6216\u6B63\u659C\u6760\u5747\u53EF\u3001\u547D\u4EE4\u94FE\u7528 & \u6216\u6362\u884C\uFF0C\u907F\u514D\u4F7F\u7528 pwd/ls/&& \u7B49 Unix \u547D\u4EE4\u3002"
+  };
+}
+var SHELL_HINT_BASH = "\u5F53\u524D shell \u662F bash \u517C\u5BB9\u8BED\u6CD5\uFF0C\u652F\u6301 pwd/ls/&&/\u7BA1\u9053\u7B49\u6807\u51C6 Unix \u5DE5\u5177\u3002";
+var SHELL_INFO = detectShell();
 var bashTool = {
   name: "bash",
   kind: "other" /* Other */,
-  description: "\u5728 shell \u4E2D\u6267\u884C\u547D\u4EE4\u3002\u8FD4\u56DE\u6807\u51C6\u8F93\u51FA\u3001\u6807\u51C6\u9519\u8BEF\u548C\u9000\u51FA\u7801\u3002\u652F\u6301\u8D85\u65F6\u63A7\u5236\u548C\u4FE1\u53F7\u4E2D\u6B62\u3002\u9002\u7528\u4E8E\u8FD0\u884C\u6784\u5EFA\u3001\u6D4B\u8BD5\u3001Git \u64CD\u4F5C\u7B49\u547D\u4EE4\u3002",
+  description: [
+    "\u5728 shell \u4E2D\u6267\u884C\u547D\u4EE4\uFF0C\u8FD4\u56DE stdout / stderr / \u9000\u51FA\u7801\u3002\u652F\u6301\u8D85\u65F6\u63A7\u5236\u548C\u4FE1\u53F7\u4E2D\u6B62\u3002",
+    `\u5F53\u524D shell\uFF1A${SHELL_INFO.label}\u3002${SHELL_INFO.hint}`,
+    "\u8BFB\u53D6\u6587\u4EF6\u8BF7\u4F18\u5148\u4F7F\u7528 read_file \u5DE5\u5177\uFF0C\u4E0D\u8981\u7528 cat/type/Get-Content\uFF1B",
+    "\u641C\u7D22\u4EE3\u7801\u7528 grep / glob\uFF0C\u5217\u76EE\u5F55\u7528 ls\u2014\u2014\u8FD9\u4E9B\u4E13\u7528\u5DE5\u5177\u5728\u6240\u6709\u5E73\u53F0\u90FD\u53EF\u7528\u4E14\u65E0\u9700\u5173\u5FC3 shell \u8BED\u6CD5\u3002"
+  ].join(""),
   parameters: {
     type: "object",
     properties: {
       command: {
         type: "string",
-        description: "\u8981\u6267\u884C\u7684 shell \u547D\u4EE4"
+        description: `\u8981\u6267\u884C\u7684 shell \u547D\u4EE4\uFF08\u5F53\u524D shell\uFF1A${SHELL_INFO.label}\uFF09`
       },
       timeout: {
         type: "number",
@@ -3665,8 +3901,8 @@ var bashTool = {
     }
     const timeout = args.timeout ?? ctx.timeout ?? getDefaultTimeout();
     try {
-      const shellCommand = isWindows2 ? "cmd" : "sh";
-      const shellArgs = isWindows2 ? ["/c", args.command] : ["-c", args.command];
+      const shellCommand = SHELL_INFO.bin ?? "cmd";
+      const shellArgs = [...SHELL_INFO.args, args.command];
       const result = await execCommand(
         shellCommand,
         shellArgs,
@@ -3707,7 +3943,7 @@ ${truncateOutput(result.stderr)}`);
 
 // src/tool/builtins/glob.ts
 import { readdir as readdir3, stat as stat2 } from "fs/promises";
-import { join as join5, relative as relative4, isAbsolute as isAbsolute2 } from "path";
+import { join as join7, relative as relative4, isAbsolute as isAbsolute2 } from "path";
 function globToRegex(pattern) {
   let regexStr = pattern;
   regexStr = regexStr.replace(/\*\*\//g, "<<GLOBSTAR_SLASH>>");
@@ -3732,7 +3968,7 @@ async function walkDir(dir, baseDir) {
     if (entry.isDirectory() && (entry.name === "node_modules" || entry.name === ".git")) {
       continue;
     }
-    const fullPath = join5(dir, entry.name);
+    const fullPath = join7(dir, entry.name);
     const relPath = relative4(baseDir, fullPath);
     if (entry.isDirectory()) {
       results.push(...await walkDir(fullPath, baseDir));
@@ -3765,7 +4001,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 : join5(ctx.cwd, args.directory) : ctx.cwd;
+    const searchDir = args.directory ? isAbsolute2(args.directory) ? args.directory : join7(ctx.cwd, args.directory) : ctx.cwd;
     const regex = globToRegex(args.pattern);
     try {
       const dirStat = await stat2(searchDir);
@@ -3805,7 +4041,7 @@ var globTool = {
 
 // src/tool/builtins/grep.ts
 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";
+import { join as join8, relative as relative5, isAbsolute as isAbsolute3 } from "path";
 async function collectFiles(dir, extension, maxFiles = 200) {
   const results = [];
   let entries;
@@ -3819,7 +4055,7 @@ async function collectFiles(dir, extension, maxFiles = 200) {
     if (entry.isDirectory() && (entry.name === "node_modules" || entry.name === ".git" || entry.name === "dist")) {
       continue;
     }
-    const fullPath = join6(dir, entry.name);
+    const fullPath = join8(dir, entry.name);
     if (entry.isDirectory()) {
       results.push(...await collectFiles(fullPath, extension, maxFiles - results.length));
     } else {
@@ -3866,7 +4102,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 : join6(ctx.cwd, args.directory) : ctx.cwd;
+    const searchDir = args.directory ? isAbsolute3(args.directory) ? args.directory : join8(ctx.cwd, args.directory) : ctx.cwd;
     const maxFiles = args.max_files ?? 200;
     try {
       const flags = args.case_sensitive ? "g" : "gi";
@@ -3926,7 +4162,7 @@ var grepTool = {
 
 // src/tool/builtins/ls.ts
 import { readdir as readdir5, stat as stat4 } from "fs/promises";
-import { join as join7, relative as relative6 } from "path";
+import { join as join9, relative as relative6 } from "path";
 var lsTool = {
   name: "ls",
   kind: "read" /* Read */,
@@ -3964,7 +4200,7 @@ var lsTool = {
         let sizeStr = "";
         if (typeMark === "FILE") {
           try {
-            const fileStat = await stat4(join7(dirPath, entry.name));
+            const fileStat = await stat4(join9(dirPath, entry.name));
             if (fileStat.size < 1024) {
               sizeStr = `${fileStat.size}B`;
             } else if (fileStat.size < 1024 * 1024) {
@@ -4403,7 +4639,12 @@ function ChatSession({
     }
   }, []);
   const { doubleCtrlC, handleCtrlC } = useDoubleCtrlC(() => {
-    process.exit(0);
+    const s = sessionRef.current;
+    if (s) {
+      void s.flushLog().finally(() => process.exit(0));
+    } else {
+      process.exit(0);
+    }
   });
   useInput(
     useCallback2(
@@ -4803,6 +5044,7 @@ function ChatSession({
         const result = cmd.handler();
         switch (result.kind) {
           case "exit":
+            await sessionRef.current?.flushLog();
             process.exit(0);
             return;
           case "clear":
@@ -4988,7 +5230,7 @@ function ChatSession({
         }, 2e3);
       }
     }
-  }, [onLaunchGame, onLaunchStock, currentContent, currentToolCalls, skills, skillSelectIndex, getFilteredSkills, thinkingEnabled, thinkingEffort, responseFormat, toolChoice, activeModel, sessionMode]);
+  }, [onLaunchGame, onLaunchStock, currentContent, currentToolCalls, skills, skillSelectIndex, getFilteredSkills, thinkingEnabled, thinkingEffort, responseFormat, toolChoice, activeModel, sessionMode, isStreaming, rewinding]);
   useEffect3(() => {
     if (!isStreaming && externalCostTracker) {
       setTodayCost(externalCostTracker.todayTotalCost);
@@ -6449,9 +6691,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 join8 } from "path";
+import { join as join10 } from "path";
 import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
-var SETTINGS_PATH = join8(os.homedir(), ".dskcode", "settings.json");
+var SETTINGS_PATH = join10(os.homedir(), ".dskcode", "settings.json");
 function toFileUrl(p) {
   const norm = p.replace(/\\/g, "/");
   if (process.platform === "win32") {
@@ -6786,7 +7028,7 @@ function renderDetail(stock, _onBack, prices, countdown = 10, currentTime) {
 
 // src/utils/scan-files.ts
 import { readdir as readdir6 } from "fs/promises";
-import { join as join9, relative as relative7 } from "path";
+import { join as join11, relative as relative7 } from "path";
 var IGNORE_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -6851,12 +7093,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, join9(currentDir, name)));
+        files.push(relative7(baseDir, join11(currentDir, name)));
       }
     }
   }
   const nested = await Promise.all(
-    dirs.map((d) => scanProjectFiles(baseDir, join9(currentDir, d)))
+    dirs.map((d) => scanProjectFiles(baseDir, join11(currentDir, d)))
   );
   for (const n of nested) {
     files.push(...n);
@@ -6944,7 +7186,7 @@ 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 = join10(home, ".dskcode", "settings.json");
+    const globalConfigPath = join12(home, ".dskcode", "settings.json");
     let globalConfigHasStock = false;
     try {
       const raw = await readFile11(globalConfigPath, "utf-8");
@@ -7114,7 +7356,10 @@ var sigintCount = 0;
 var sigintTimer = null;
 async function gracefulExit(code) {
   try {
-    await CostTracker.flushAll();
+    await Promise.all([
+      CostTracker.flushAll(),
+      ConversationLogger.flushAll()
+    ]);
   } catch {
   }
   process.exit(code);
@@ -7137,19 +7382,19 @@ process.on("SIGTERM", () => {
 var program = createCli();
 try {
   await program.parseAsync(process.argv);
-  await CostTracker.flushAll();
+  await Promise.all([CostTracker.flushAll(), ConversationLogger.flushAll()]);
 } catch (err) {
   const error = err;
   if (error.code === "commander.helpDisplayed" || error.code === "commander.version") {
-    await CostTracker.flushAll();
+    await Promise.all([CostTracker.flushAll(), ConversationLogger.flushAll()]);
     process.exit(error.exitCode ?? ExitCode.SUCCESS);
   }
   if (typeof error.exitCode === "number") {
-    await CostTracker.flushAll();
+    await Promise.all([CostTracker.flushAll(), ConversationLogger.flushAll()]);
     process.exit(error.exitCode);
   }
   console.error(String(err));
-  await CostTracker.flushAll();
+  await Promise.all([CostTracker.flushAll(), ConversationLogger.flushAll()]);
   process.exit(ExitCode.GENERAL_ERROR);
 }
 //# sourceMappingURL=index.js.map