chatccc 0.2.231 → 0.2.233

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/file-tools.ts

@@ -11,6 +11,11 @@ import { jsonSchema, tool, type ToolSet } from "ai";
 
 import { isDangerousCommand, type PermissionGate, type PermissionRequest } from "./permissions.js";
 import { killProcessTree } from "./proc-tree-kill.js";
+import {
+  searchBuiltinSessions,
+  type SessionSearchInput,
+  type SessionSearchOutput,
+} from "./session-search.js";
 import {
   webFetchForTool,
   webSearchForTool,
@@ -1199,6 +1204,11 @@ export async function applyPatchForTool(cwd: string, input: ApplyPatchInput): Pr
 export interface BuiltinFileToolsOptions {
   /** 权限门控：副作用工具（run_command/文件写操作）执行前会先经过 gate.check */
   permissionGate?: PermissionGate;
+  /** session_search 工具的会话/原始日志目录（默认 ~/.deepccc/sessions 与 raw-stream-logs；测试可注入） */
+  sessionSearch?: {
+    contextDir?: string;
+    rawLogsDir?: string;
+  };
 }
 
 export function createBuiltinFileTools(
@@ -1455,5 +1465,29 @@ export function createBuiltinFileTools(
       }),
       execute: (input, options) => webFetchForTool(input, { abortSignal: options.abortSignal }),
     }),
+    // 会话历史检索：只读 ~/.deepccc 存档，无需权限询问
+    session_search: tool<SessionSearchInput, SessionSearchOutput>({
+      description:
+        "Search DeepCCC session archives by keyword and return matching snippets. Use when you need to recall old user messages, assistant replies, or tool calls from previous sessions. Multiple terms must all appear in the same message (AND, case-insensitive). Set include_raw_logs to also scan gzipped raw stream logs (slower).",
+      inputSchema: jsonSchema<SessionSearchInput>({
+        type: "object",
+        additionalProperties: false,
+        properties: {
+          query: { type: "string", description: "Keywords to search for (space-separated, all must match)." },
+          session_id: { type: "string", description: "Optional session id to restrict the search to." },
+          include_raw_logs: { type: "boolean", description: "Also scan gzipped raw stream logs under ~/.deepccc/raw-stream-logs. Default false." },
+          max_results: { type: "number", description: "Maximum number of matches, capped at 50." },
+        },
+        required: ["query"],
+      }),
+      execute: (input) =>
+        searchBuiltinSessions(input.query, {
+          contextDir: options.sessionSearch?.contextDir,
+          rawLogsDir: options.sessionSearch?.rawLogsDir,
+          includeRawLogs: input.include_raw_logs ?? false,
+          sessionId: input.session_id,
+          maxResults: input.max_results,
+        }),
+    }),
   };
 }

package/src/builtin/index.ts

@@ -15,8 +15,9 @@ import {
   type RawStreamLogHandle,
 } from "./raw-stream-log.js";
 import {
-  BuiltinContextManager,
+  buildPersistedAssistantMessage,
   buildSummaryPrompt,
+  BuiltinContextManager,
   defaultBuiltinSessionId,
 } from "./context.js";
 import { createBuiltinFileTools } from "./file-tools.js";
@@ -53,8 +54,6 @@ const SUMMARY_SYSTEM_PROMPT = [
 
 export const DEFAULT_COMPACTION_TIMEOUT_MS = 5 * 60 * 1000;
 const MAX_COMPACTION_PASSES = 8;
-const MAX_PERSISTED_ASSISTANT_TEXT_CHARS = 32_000;
-const MAX_PERSISTED_TOOL_TRANSCRIPT_CHARS = 24_000;
 
 // ---------------------------------------------------------------------------
 // 类型定义
@@ -273,6 +272,10 @@ export class ChatSession {
     let safeAccumulated = "";
     let rawLog: RawStreamLogHandle | null = null;
     let completed = false;
+    // 结构化工具调用存档：按 toolCallId 关联入参/出参/错误，落盘到 context.json 的
+    // assistant 消息 toolCalls 字段；[Tool transcript] 文本视图仍按原格式生成。
+    const toolCallsById = new Map<string, { name: string; input?: string; output?: string; is_error?: boolean }>();
+    const toolCallOrder: string[] = [];
 
     try {
       if (this.context.planCompaction()) {
@@ -330,6 +333,8 @@ export class ChatSession {
           yield { type: "text", text: safeText, accumulated: safeAccumulated };
         } else if (part.type === "tool-call") {
           toolContext.push(`tool_call ${part.toolName}: ${safeJson(part.input)}`);
+          toolCallsById.set(part.toolCallId, { name: part.toolName, input: safeJson(part.input) });
+          toolCallOrder.push(part.toolCallId);
           yield {
             type: "tool_use",
             id: part.toolCallId,
@@ -338,6 +343,10 @@ export class ChatSession {
           };
         } else if (part.type === "tool-result") {
           toolContext.push(`tool_result ${part.toolName}: ${truncateToolContext(safeJson(part.output))}`);
+          const call = toolCallsById.get(part.toolCallId);
+          if (call) {
+            call.output = truncateToolContext(safeJson(part.output));
+          }
           yield {
             type: "tool_result",
             tool_use_id: part.toolCallId,
@@ -348,6 +357,11 @@ export class ChatSession {
         } else if (part.type === "tool-error") {
           const message = errorMessage(part.error);
           toolContext.push(`tool_error ${part.toolName}: ${message}`);
+          const call = toolCallsById.get(part.toolCallId);
+          if (call) {
+            call.output = message;
+            call.is_error = true;
+          }
           yield {
             type: "tool_result",
             tool_use_id: part.toolCallId,
@@ -363,19 +377,14 @@ export class ChatSession {
       }
       completed = true;
 
-      const persistedAssistantText = truncateMiddle(
+      const collectedToolCalls = toolCallOrder
+        .map((id) => toolCallsById.get(id))
+        .filter((call): call is { name: string; input?: string; output?: string; is_error?: boolean } => call !== undefined);
+      this.context.appendMessage(buildPersistedAssistantMessage({
         fullText,
-        MAX_PERSISTED_ASSISTANT_TEXT_CHARS,
-        "...[assistant response truncated in context]...",
-      );
-      const persistedText = toolContext.length > 0
-        ? `${persistedAssistantText}\n\n[Tool transcript]\n${truncateMiddle(
-          toolContext.join("\n"),
-          MAX_PERSISTED_TOOL_TRANSCRIPT_CHARS,
-          "...[tool transcript truncated]...",
-        )}`
-        : persistedAssistantText;
-      this.context.appendMessage({ role: "assistant", content: persistedText });
+        transcriptLines: toolContext,
+        toolCalls: collectedToolCalls,
+      }));
       yield { type: "done", text: safeAccumulated };
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
@@ -509,14 +518,6 @@ function truncateToolContext(value: string): string {
   return value.length > 8000 ? `${value.slice(0, 8000)}...[truncated]` : value;
 }
 
-function truncateMiddle(value: string, maxChars: number, marker: string): string {
-  if (value.length <= maxChars) return value;
-  const available = Math.max(0, maxChars - marker.length - 2);
-  const headChars = Math.ceil(available / 2);
-  const tailChars = Math.floor(available / 2);
-  return `${value.slice(0, headChars)}\n${marker}\n${value.slice(-tailChars)}`;
-}
-
 function formatDuration(ms: number): string {
   if (ms % 60_000 === 0) return `${ms / 60_000} minutes`;
   if (ms % 1_000 === 0) return `${ms / 1_000} seconds`;

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("");
+}