chatccc 0.2.226 → 0.2.227

package/src/builtin/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/src/builtin/index.ts

@@ -21,7 +21,13 @@ import {
 } from "./context.js";
 import { createBuiltinFileTools } from "./file-tools.js";
 import { PermissionGate, type PermissionMode, type PermissionResolver } from "./permissions.js";
-import { buildDefaultSkillDirs, buildSkillsIndexPrompt, scanSkillsDirs } from "./skills.js";
+import {
+  buildDefaultSkillDirs,
+  buildSkillsIndexPrompt,
+  scanSkillsDirs,
+  type BuiltinSkill,
+  type SkillDirSpec,
+} from "./skills.js";
 import { applyPrivacy, applyPrivacyToJson } from "./privacy.js";
 
 // ---------------------------------------------------------------------------
@@ -128,8 +134,9 @@ export interface ChatSessionOptions {
   /** Optional tool-step limit. Leave unset for no step limit. */
   maxSteps?: number;
   /**
-   * Codex-style skill directories (<dir>/<name>/SKILL.md).
-   * Defaults to ~/.codex/skills, ~/.agents/skills, <cwd>/.codex/skills.
+   * Custom skill directories (<dir>/<name>/SKILL.md). When set, these are
+   * scanned with the highest priority (deepccc source). Defaults to the
+   * combined Claude/Codex/Cursor/DeepCCC directories (see buildDefaultSkillDirs).
    */
   skillsDirs?: string[];
   /**
@@ -170,12 +177,15 @@ interface ChatMessage {
 
 export class ChatSession {
   private model: any;
-  private systemPrompt: string;
   private cwd: string;
   private context: BuiltinContextManager;
   private maxSteps?: number;
   private effort: string;
   private permissionGate: PermissionGate;
+  private skillDirs: SkillDirSpec[];
+  private customSystemPrompt: string;
+  /** 最近一次 chat() 使用的 system prompt（供 history 等读取） */
+  private systemPrompt = "";
 
   constructor(
     overrides: ChatSessionConfig = {},
@@ -200,25 +210,12 @@ export class ChatSession {
     this.model = provider(modelId);
     this.cwd = options.cwd ?? process.cwd();
     this.maxSteps = normalizeMaxSteps(options.maxSteps);
-
-    // 构建系统提示词
-    const systemContent = [SYSTEM_PROMPT];
-    const projectInstructions = readProjectInstructionFiles(this.cwd);
-    if (projectInstructions) {
-      systemContent.push("", projectInstructions);
-    }
-    // Codex-style skills 索引注入（name + description + 路径，模型按需 read_file 全文）
-    const skills = scanSkillsDirs(options.skillsDirs ?? buildDefaultSkillDirs(this.cwd));
-    const skillsPrompt = buildSkillsIndexPrompt(skills);
-    if (skillsPrompt) {
-      systemContent.push("", skillsPrompt);
-    }
-    if (options.systemPrompt) {
-      systemContent.push("", options.systemPrompt);
-    }
-    systemContent.push("", buildRuntimeWorkspacePrompt(this.cwd));
-
-    this.systemPrompt = systemContent.join("\n");
+    this.customSystemPrompt = options.systemPrompt ?? "";
+    // 技能目录在构造时确定；技能内容在每次 chat() 前重新扫描（mtime 热加载），
+    // 因此创建/修改技能后下一次对话自动生效，无需重启。
+    this.skillDirs =
+      options.skillsDirs?.map((d) => ({ dir: d, source: "deepccc" as const, scope: "project" as const })) ??
+      buildDefaultSkillDirs(this.cwd);
     this.context = new BuiltinContextManager({
       persist: options.persist ?? false,
       contextDir: options.contextDir,
@@ -233,6 +230,24 @@ export class ChatSession {
     );
   }
 
+  /** 组装系统提示词：固定规则 + 项目指令 + 技能索引 + 用户补充 + 运行时上下文 */
+  private buildSystemPrompt(skills: BuiltinSkill[]): string {
+    const systemContent = [SYSTEM_PROMPT];
+    const projectInstructions = readProjectInstructionFiles(this.cwd);
+    if (projectInstructions) {
+      systemContent.push("", projectInstructions);
+    }
+    const skillsPrompt = buildSkillsIndexPrompt(skills);
+    if (skillsPrompt) {
+      systemContent.push("", skillsPrompt);
+    }
+    if (this.customSystemPrompt) {
+      systemContent.push("", this.customSystemPrompt);
+    }
+    systemContent.push("", buildRuntimeWorkspacePrompt(this.cwd));
+    return systemContent.join("\n");
+  }
+
   async *chat(
     userMessage: string,
     signal?: AbortSignal,
@@ -267,9 +282,14 @@ export class ChatSession {
 
       const toolContext: string[] = [];
       const maxSteps = this.maxSteps;
+      // 每次对话前重新扫描技能索引（并行 + mtime 缓存，开销极小）：
+      // 新技能/修改的技能在下一次对话自动生效（热加载）。
+      const skills = await scanSkillsDirs(this.skillDirs);
+      const system = this.buildSystemPrompt(skills);
+      this.systemPrompt = system;
       const result = streamText({
         model: this.model,
-        system: this.systemPrompt,
+        system,
         messages: this.context.buildModelMessages() as any,
         tools: createBuiltinFileTools(this.cwd, { permissionGate: this.permissionGate }),
         stopWhen: maxSteps !== undefined ? stepCountIs(maxSteps) : isLoopFinished(),

package/src/builtin/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/src/builtin/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("");
+}