chatccc 0.2.243 → 0.2.245

package/deepccc-agent/src/file-log.ts

@@ -1,38 +1,38 @@
-/**
- * file-log.ts — DeepCCC 文件日志（写入 ~/.deepccc/logs/）
- *
- * 交互渲染模式下渲染器独占终端 stdout：普通 console 日志只写文件、不回显
- * 到终端，避免生成过程中任何 console 输出混入过程区块、破坏行数计数
- * （导致重绘上移不足、把上方历史内容"吃掉"）。
- */
-
-import { appendFileSync, mkdirSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-
-export function setupFileLogging(logDir: string, prefix: string): { logPath: string } {
-  mkdirSync(logDir, { recursive: true });
-  const ts = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
-  const logPath = join(logDir, `${prefix}-${ts}.log`);
-  appendFileSync(logPath, "", { flag: "a", encoding: "utf8" });
-  return { logPath };
-}
-
-/** 默认日志目录：~/.deepccc/logs */
-export function defaultLogDir(): string {
-  return join(homedir(), ".deepccc", "logs");
-}
-
-export function writeLogLine(logPath: string, level: string, args: unknown[]): void {
-  try {
-    const text = args
-      .map((a) =>
-        typeof a === "string" ? a
-          : a instanceof Error ? (a.stack ?? a.message)
-          : JSON.stringify(a))
-      .join(" ");
-    appendFileSync(logPath, `[${new Date().toISOString()}] [${level}] ${text}\n`, "utf8");
-  } catch {
-    // 日志系统自身失败不影响主流程
-  }
-}
+/**
+ * file-log.ts — DeepCCC 文件日志（写入 ~/.deepccc/logs/）
+ *
+ * 交互渲染模式下渲染器独占终端 stdout：普通 console 日志只写文件、不回显
+ * 到终端，避免生成过程中任何 console 输出混入过程区块、破坏行数计数
+ * （导致重绘上移不足、把上方历史内容"吃掉"）。
+ */
+
+import { appendFileSync, mkdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+export function setupFileLogging(logDir: string, prefix: string): { logPath: string } {
+  mkdirSync(logDir, { recursive: true });
+  const ts = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
+  const logPath = join(logDir, `${prefix}-${ts}.log`);
+  appendFileSync(logPath, "", { flag: "a", encoding: "utf8" });
+  return { logPath };
+}
+
+/** 默认日志目录：~/.deepccc/logs */
+export function defaultLogDir(): string {
+  return join(homedir(), ".deepccc", "logs");
+}
+
+export function writeLogLine(logPath: string, level: string, args: unknown[]): void {
+  try {
+    const text = args
+      .map((a) =>
+        typeof a === "string" ? a
+          : a instanceof Error ? (a.stack ?? a.message)
+          : JSON.stringify(a))
+      .join(" ");
+    appendFileSync(logPath, `[${new Date().toISOString()}] [${level}] ${text}\n`, "utf8");
+  } catch {
+    // 日志系统自身失败不影响主流程
+  }
+}

package/deepccc-agent/src/index.ts

@@ -6,8 +6,10 @@
 
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { generateText, isLoopFinished, stepCountIs, streamText, type TextStreamPart } from "ai";
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
 import { join } from "node:path";
+import { fileURLToPath } from "node:url";
 
 import { config as appConfig, RAW_STREAM_LOGS_DIR } from "./config.js";
 import {
@@ -121,21 +123,49 @@ function buildRuntimeWorkspacePrompt(cwd: string): string {
 }
 
 /**
- * Windows 专属命令行指引（仅 win32 注入）：cmd.exe 的引号语义与 bash 不同，
- * 模型按 bash 习惯写命令时会被 cmd 拆坏（引号保留为字面量、单引号不生效、
- * 多行/嵌套引号脚本崩坏）。这段提示放在固定规则区（项目指令之前）。
+ * 各操作系统特有的命令行指引（文本资产，维护在 os-prompts/ 目录，而非硬编码）：
+ *
+ * - 内置文件：包内 os-prompts/<platform>.md（win32/darwin/linux），随 npm 包分发；
+ * - 用户覆盖：~/.deepccc/prompts/<platform>.md 存在时完全替代内置内容（可自定义）。
+ *
+ * 文件内容自带标题（如 "## Windows Command-Line Notes"），读取后 trim 直接作为
+ * 一个段落注入固定规则区（项目指令之前）。未知平台或文件缺失时返回空字符串。
  */
-function buildPlatformCommandPrompt(): string {
-  if (process.platform !== "win32") return "";
-  return [
-    "## Windows Command-Line Notes",
-    "You are running on Windows. run_command executes through cmd.exe, not bash. cmd quoting differs from bash and breaks common habits:",
-    "- Double quotes are NOT stripped: `echo \"hello world\"` prints `\"hello world\"` (quotes included), and `\"a b\" \"c\"` passes the literal arguments `\"a b\"` and `\"c\"` (quotes included) to the program.",
-    "- Single quotes are NOT quoting characters in cmd.exe: `'a b'` is parsed as two arguments (`'a` and `b'`).",
-    "- Multi-line or quote-heavy inline scripts (python -c \"...\\n...\", ssh host \"bash -c '...'\") frequently break under cmd quoting; write the script to a temporary file and execute that file instead.",
-    "- PowerShell-only syntax (Get-Item, 2>$null, Select-Object) is unavailable; the shell is cmd.exe unless you explicitly invoke powershell.",
-    "- To pass an argument containing spaces, use double quotes and expect the quotes to reach the program literally; when the target accepts file input, prefer writing the value to a file.",
-  ].join("\n");
+export function loadPlatformCommandPrompt(
+  platform: string = process.platform,
+  dirs: { builtinDir?: string; userDir?: string } = {},
+): string {
+  const filename =
+    platform === "win32" ? "win32.md" :
+    platform === "darwin" ? "darwin.md" :
+    platform === "linux" ? "linux.md" :
+    null;
+  if (!filename) return "";
+
+  // import.meta.url 定位包根：chatccc 源码运行时指向 deepccc-agent/os-prompts/，
+  // deepccc dist 运行时指向包根 os-prompts/（dist/index.js 的 ../os-prompts/）。
+  const builtinDir =
+    dirs.builtinDir ?? fileURLToPath(new URL("../os-prompts/", import.meta.url));
+  const userDir = dirs.userDir ?? join(homedir(), ".deepccc", "prompts");
+
+  // 用户覆盖优先；读取失败时静默回退内置，内置也失败则返回空。
+  const userFile = join(userDir, filename);
+  if (existsSync(userFile)) {
+    try {
+      return readFileSync(userFile, "utf-8").trim();
+    } catch {
+      // fall through to builtin
+    }
+  }
+  const builtinFile = join(builtinDir, filename);
+  if (existsSync(builtinFile)) {
+    try {
+      return readFileSync(builtinFile, "utf-8").trim();
+    } catch {
+      return "";
+    }
+  }
+  return "";
 }
 
 function normalizeMaxSteps(value: number | undefined): number | undefined {
@@ -250,10 +280,11 @@ export class ChatSession {
     const modelId = overrides.model ?? appConfig.model;
     this.effort = (overrides.effort ?? appConfig.effort ?? "").trim();
 
-    const provider = createOpenAICompatible({
-      name: "deepccc",
-      baseURL,
-      apiKey,
+    const provider = createOpenAICompatible({
+      name: "deepccc",
+      baseURL,
+      apiKey,
+      includeUsage: true,
     });
     this.model = provider(modelId);
     this.cwd = options.cwd ?? process.cwd();
@@ -287,7 +318,7 @@ export class ChatSession {
    */
   private buildSystemPrompt(skills: BuiltinSkill[]): string {
     const systemContent = [SYSTEM_PROMPT];
-    const platformPrompt = buildPlatformCommandPrompt();
+    const platformPrompt = loadPlatformCommandPrompt();
     if (platformPrompt) {
       systemContent.push("", platformPrompt);
     }
@@ -353,20 +384,27 @@ export class ChatSession {
       const skills = await scanSkillsDirs(this.skillDirs);
       const system = this.buildSystemPrompt(skills);
       this.systemPrompt = system;
-      const result = streamText({
-        model: this.model,
-        system,
-        messages: this.context.buildModelMessages() as any,
+      const generationOptions = {
+        model: this.model,
+        system,
+        messages: this.context.buildModelMessages() as any,
         tools: createBuiltinFileTools(this.cwd, { permissionGate: this.permissionGate }),
         stopWhen: maxSteps !== undefined ? stepCountIs(maxSteps) : isLoopFinished(),
         abortSignal: signal,
-        // DeepSeek OpenAI 兼容接口：providerOptions.deepseek.reasoningEffort
-        // 由 @ai-sdk/openai-compatible 自动映射为请求体 reasoning_effort 字段
-        ...(this.effort ? { providerOptions: { deepseek: { reasoningEffort: this.effort } } } : {}),
-      });
-
-      const stream = result.fullStream ?? textStreamToFullStream(result.textStream);
-      for await (const part of stream as AsyncIterable<TextStreamPart<any>>) {
+        // DeepSeek OpenAI 兼容接口：providerOptions.deepseek.reasoningEffort
+        // 由 @ai-sdk/openai-compatible 自动映射为请求体 reasoning_effort 字段
+        ...(this.effort ? { providerOptions: { deepseek: { reasoningEffort: this.effort } } } : {}),
+      };
+      let stream: AsyncIterable<TextStreamPart<any>>;
+      if (appConfig.streaming) {
+        const result = streamText(generationOptions);
+        stream = result.fullStream ?? textStreamToFullStream(result.textStream);
+      } else {
+        const result = await generateText(generationOptions);
+        stream = generateResultToFullStream(result);
+      }
+
+      for await (const part of stream as AsyncIterable<TextStreamPart<any>>) {
         rawLog?.writeLine(safeRawStreamJson(part));
         if (part.type === "text-delta") {
           fullText += part.text;
@@ -524,11 +562,40 @@ export class ChatSession {
   }
 }
 
-async function* textStreamToFullStream(stream: AsyncIterable<string>): AsyncIterable<{ type: "text-delta"; text: string }> {
-  for await (const text of stream) {
-    yield { type: "text-delta", text };
-  }
-}
+async function* textStreamToFullStream(stream: AsyncIterable<string>): AsyncIterable<{ type: "text-delta"; text: string }> {
+  for await (const text of stream) {
+    yield { type: "text-delta", text };
+  }
+}
+
+async function* generateResultToFullStream(result: any): AsyncIterable<TextStreamPart<any>> {
+  let emittedText = false;
+  for (const step of result.steps ?? []) {
+    for (const call of step.toolCalls ?? []) {
+      yield {
+        type: "tool-call",
+        toolCallId: call.toolCallId,
+        toolName: call.toolName,
+        input: call.input,
+      } as TextStreamPart<any>;
+    }
+    for (const toolResult of step.toolResults ?? []) {
+      yield {
+        type: "tool-result",
+        toolCallId: toolResult.toolCallId,
+        toolName: toolResult.toolName,
+        output: toolResult.output,
+      } as TextStreamPart<any>;
+    }
+    if (step.text) {
+      emittedText = true;
+      yield { type: "text-delta", text: step.text } as TextStreamPart<any>;
+    }
+  }
+  if (!emittedText && result.text) {
+    yield { type: "text-delta", text: result.text } as TextStreamPart<any>;
+  }
+}
 
 function safeJson(value: unknown): string {
   try {

package/deepccc-agent/src/proc-tree-kill.ts

@@ -1,61 +1,61 @@
-import { spawn } from "node:child_process";
-
-/**
- * Best-effort process-tree termination.
- *
- * Commands are spawned through a platform shell, so the pid we get is often
- * the outer shell process. Killing only that process can leave the real child
- * command running. This helper targets the whole process tree on Windows and
- * the process group on POSIX when possible.
- */
-export async function killProcessTree(pid: number | undefined): Promise<void> {
-  if (pid == null || !Number.isFinite(pid) || pid <= 0) return;
-  if (process.platform === "win32") {
-    await killWindowsTree(pid);
-    return;
-  }
-  await killPosixTree(pid);
-}
-
-function killWindowsTree(pid: number): Promise<void> {
-  return new Promise<void>((resolve) => {
-    let resolved = false;
-    const done = () => {
-      if (resolved) return;
-      resolved = true;
-      resolve();
-    };
-
-    try {
-      const proc = spawn("taskkill", ["/pid", String(pid), "/T", "/F"], {
-        stdio: "ignore",
-        windowsHide: true,
-      });
-      proc.once("error", (err) => {
-        console.warn(`[killProcessTree] taskkill spawn error for pid=${pid}: ${(err as Error).message}`);
-        done();
-      });
-      proc.once("close", () => { done(); });
-      setTimeout(done, 3000).unref();
-    } catch (err) {
-      console.warn(`[killProcessTree] taskkill failed for pid=${pid}: ${(err as Error).message}`);
-      done();
-    }
-  });
-}
-
-async function killPosixTree(pid: number): Promise<void> {
-  trySignal(-pid, "SIGTERM");
-  trySignal(pid, "SIGTERM");
-  await new Promise((resolve) => setTimeout(resolve, 1000));
-  trySignal(-pid, "SIGKILL");
-  trySignal(pid, "SIGKILL");
-}
-
-function trySignal(target: number, signal: NodeJS.Signals): void {
-  try {
-    process.kill(target, signal);
-  } catch {
-    // Process is already gone or cannot be signaled.
-  }
-}
+import { spawn } from "node:child_process";
+
+/**
+ * Best-effort process-tree termination.
+ *
+ * Commands are spawned through a platform shell, so the pid we get is often
+ * the outer shell process. Killing only that process can leave the real child
+ * command running. This helper targets the whole process tree on Windows and
+ * the process group on POSIX when possible.
+ */
+export async function killProcessTree(pid: number | undefined): Promise<void> {
+  if (pid == null || !Number.isFinite(pid) || pid <= 0) return;
+  if (process.platform === "win32") {
+    await killWindowsTree(pid);
+    return;
+  }
+  await killPosixTree(pid);
+}
+
+function killWindowsTree(pid: number): Promise<void> {
+  return new Promise<void>((resolve) => {
+    let resolved = false;
+    const done = () => {
+      if (resolved) return;
+      resolved = true;
+      resolve();
+    };
+
+    try {
+      const proc = spawn("taskkill", ["/pid", String(pid), "/T", "/F"], {
+        stdio: "ignore",
+        windowsHide: true,
+      });
+      proc.once("error", (err) => {
+        console.warn(`[killProcessTree] taskkill spawn error for pid=${pid}: ${(err as Error).message}`);
+        done();
+      });
+      proc.once("close", () => { done(); });
+      setTimeout(done, 3000).unref();
+    } catch (err) {
+      console.warn(`[killProcessTree] taskkill failed for pid=${pid}: ${(err as Error).message}`);
+      done();
+    }
+  });
+}
+
+async function killPosixTree(pid: number): Promise<void> {
+  trySignal(-pid, "SIGTERM");
+  trySignal(pid, "SIGTERM");
+  await new Promise((resolve) => setTimeout(resolve, 1000));
+  trySignal(-pid, "SIGKILL");
+  trySignal(pid, "SIGKILL");
+}
+
+function trySignal(target: number, signal: NodeJS.Signals): void {
+  try {
+    process.kill(target, signal);
+  } catch {
+    // Process is already gone or cannot be signaled.
+  }
+}

package/deepccc-agent/src/progress/cards-helpers.ts

@@ -1,76 +1,76 @@
-/**
- * progress/cards-helpers.ts — 从 ChatCCC cards.ts 提取的纯函数（DeepCCC 独立版）
- *
- * terminal-renderer 需要 getToolEmoji（工具 emoji 映射）和 truncateContent
- * （正文按行/字符截断）。DeepCCC 没有飞书卡片模块，这两个函数在此独立存放，
- * 与 ChatCCC 保持一致实现，避免引入整张卡片模块。
- */
-
-// 检测 markdown 代码块是否未闭合（``` 出现奇数次）
-export function isCodeBlockOpen(text: string): boolean {
-  const matches = text.match(/```/g);
-  return matches ? matches.length % 2 !== 0 : false;
-}
-
-export function truncateContent(text: string, maxLines = 20, maxChars = 8000): string {
-  const lines = text.split("\n");
-  // 跳过开头空行
-  let startIdx = 0;
-  while (startIdx < lines.length && lines[startIdx].trim() === "") {
-    startIdx++;
-  }
-  const effectiveLines = lines.slice(startIdx);
-  let displayText: string;
-  if (effectiveLines.length > maxLines) {
-    const firstLine = effectiveLines[0];
-    const lastLines = effectiveLines.slice(-(maxLines - 1)).join("\n");
-    displayText = firstLine + "\n...\n" + lastLines;
-  } else {
-    displayText = text;
-  }
-
-  // 截断后如果代码块未闭合，补上闭合标记，避免后续追加内容时误入代码块
-  if (isCodeBlockOpen(displayText)) {
-    displayText += "\n```";
-  }
-
-  return displayText;
-}
-
-const TOOL_EMOJI_MAP: Record<string, string> = {
-  Read: "\u{1F4D6}",          // 📖
-  Write: "\u{270D}\u{FE0F}",  // ✍️
-  Edit: "\u{270F}\u{FE0F}",   // ✏️
-  Grep: "\u{1F50E}",          // 🔎
-  Glob: "\u{1F4C2}",          // 📂
-  Bash: "\u{1F5A5}\u{FE0F}",  // 🖥️
-  WebSearch: "\u{1F310}",     // 🌐
-  WebFetch: "\u{1F4E5}",      // 📥
-  TodoWrite: "\u{2705}",      // ✅
-  Agent: "\u{1F916}",         // 🤖
-  NotebookEdit: "\u{1F4D3}",  // 📓
-  AskUserQuestion: "\u{2753}",// ❓
-  // CCC 内置 Agent 下划线命名（getToolEmoji 会先把下划线转驼峰再查表，这里保留蛇形条目以便直接命中）
-  read_file: "\u{1F4D6}",          // 📖
-  list_dir: "\u{1F4C2}",          // 📂
-  search_code: "\u{1F50E}",       // 🔎
-  run_command: "\u{1F5A5}\u{FE0F}", // 🖥️
-  edit_file: "\u{270F}\u{FE0F}",  // ✏️
-  create_file: "\u{270D}\u{FE0F}", // ✍️
-  delete_file: "\u{1F5D1}\u{FE0F}", // 🗑️
-  move_file: "\u{1F4E6}",         // 📦
-  apply_patch: "\u{1F4CB}",       // 📋
-};
-
-export function getToolEmoji(name: string): string {
-  return TOOL_EMOJI_MAP[name] ?? TOOL_EMOJI_MAP[normalizeToolName(name)] ?? "\u{1F527}"; // 🔧
-}
-
-/** 把下划线命名转成驼峰（read_file → ReadFile），用于兼容两种命名风格 */
-export function normalizeToolName(name: string): string {
-  return name
-    .split("_")
-    .filter((part) => part.length > 0)
-    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-    .join("");
-}
+/**
+ * progress/cards-helpers.ts — 从 ChatCCC cards.ts 提取的纯函数（DeepCCC 独立版）
+ *
+ * terminal-renderer 需要 getToolEmoji（工具 emoji 映射）和 truncateContent
+ * （正文按行/字符截断）。DeepCCC 没有飞书卡片模块，这两个函数在此独立存放，
+ * 与 ChatCCC 保持一致实现，避免引入整张卡片模块。
+ */
+
+// 检测 markdown 代码块是否未闭合（``` 出现奇数次）
+export function isCodeBlockOpen(text: string): boolean {
+  const matches = text.match(/```/g);
+  return matches ? matches.length % 2 !== 0 : false;
+}
+
+export function truncateContent(text: string, maxLines = 20, maxChars = 8000): string {
+  const lines = text.split("\n");
+  // 跳过开头空行
+  let startIdx = 0;
+  while (startIdx < lines.length && lines[startIdx].trim() === "") {
+    startIdx++;
+  }
+  const effectiveLines = lines.slice(startIdx);
+  let displayText: string;
+  if (effectiveLines.length > maxLines) {
+    const firstLine = effectiveLines[0];
+    const lastLines = effectiveLines.slice(-(maxLines - 1)).join("\n");
+    displayText = firstLine + "\n...\n" + lastLines;
+  } else {
+    displayText = text;
+  }
+
+  // 截断后如果代码块未闭合，补上闭合标记，避免后续追加内容时误入代码块
+  if (isCodeBlockOpen(displayText)) {
+    displayText += "\n```";
+  }
+
+  return displayText;
+}
+
+const TOOL_EMOJI_MAP: Record<string, string> = {
+  Read: "\u{1F4D6}",          // 📖
+  Write: "\u{270D}\u{FE0F}",  // ✍️
+  Edit: "\u{270F}\u{FE0F}",   // ✏️
+  Grep: "\u{1F50E}",          // 🔎
+  Glob: "\u{1F4C2}",          // 📂
+  Bash: "\u{1F5A5}\u{FE0F}",  // 🖥️
+  WebSearch: "\u{1F310}",     // 🌐
+  WebFetch: "\u{1F4E5}",      // 📥
+  TodoWrite: "\u{2705}",      // ✅
+  Agent: "\u{1F916}",         // 🤖
+  NotebookEdit: "\u{1F4D3}",  // 📓
+  AskUserQuestion: "\u{2753}",// ❓
+  // CCC 内置 Agent 下划线命名（getToolEmoji 会先把下划线转驼峰再查表，这里保留蛇形条目以便直接命中）
+  read_file: "\u{1F4D6}",          // 📖
+  list_dir: "\u{1F4C2}",          // 📂
+  search_code: "\u{1F50E}",       // 🔎
+  run_command: "\u{1F5A5}\u{FE0F}", // 🖥️
+  edit_file: "\u{270F}\u{FE0F}",  // ✏️
+  create_file: "\u{270D}\u{FE0F}", // ✍️
+  delete_file: "\u{1F5D1}\u{FE0F}", // 🗑️
+  move_file: "\u{1F4E6}",         // 📦
+  apply_patch: "\u{1F4CB}",       // 📋
+};
+
+export function getToolEmoji(name: string): string {
+  return TOOL_EMOJI_MAP[name] ?? TOOL_EMOJI_MAP[normalizeToolName(name)] ?? "\u{1F527}"; // 🔧
+}
+
+/** 把下划线命名转成驼峰（read_file → ReadFile），用于兼容两种命名风格 */
+export function normalizeToolName(name: string): string {
+  return name
+    .split("_")
+    .filter((part) => part.length > 0)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join("");
+}