chatccc 0.2.229 → 0.2.231

package/src/orchestrator.ts

@@ -2246,7 +2246,7 @@ export async function handleCommand(
 
     try {
       logTrace(tid, "RESUME", { sessionId, tool: descriptionTool });
-      await resumeAndPrompt(
+      const resumeOutcome = await resumeAndPrompt(
         sessionId,
         promptText,
         platform,
@@ -2255,8 +2255,13 @@ export async function handleCommand(
         descriptionTool,
         tid,
       );
-      logTrace(tid, "DONE", { outcome: "resume_done", sessionId });
-      console.log(`[${ts()}] [RESUME] Session ${sessionId} done`);
+      if (resumeOutcome === "error") {
+        logTrace(tid, "DONE", { outcome: "resume_error", sessionId });
+        console.error(`[${ts()}] [RESUME] Session ${sessionId} ended with an Agent error`);
+      } else {
+        logTrace(tid, "DONE", { outcome: "resume_done", sessionId, sessionOutcome: resumeOutcome });
+        console.log(`[${ts()}] [RESUME] Session ${sessionId} done (${resumeOutcome})`);
+      }
     } catch (err) {
       logTrace(tid, "DONE", {
         outcome: "resume_fail",

package/src/platform-adapter.ts

@@ -8,11 +8,11 @@
 import type { CursorUsageSummary } from "./cursor-usage.ts";
 import type { CodexUsageSummary } from "./feishu-api.ts";
 
-export interface ChatAvatarUsageHints {
-  codexUsage?: CodexUsageSummary | null;
-  cursorUsage?: CursorUsageSummary | null;
-  fastMode?: boolean;
-}
+export interface ChatAvatarUsageHints {
+  codexUsage?: CodexUsageSummary | null;
+  cursorUsage?: CursorUsageSummary | null;
+  fastMode?: boolean;
+}
 
 export interface PlatformAdapter {
   /** 平台标识，用于区分不同平台的行为（如 wechat、feishu 等） */
@@ -67,4 +67,4 @@ export interface PlatformAdapter {
 
   /** 更新已发送的进度展示，sequence 保证有序 */
   cardUpdate(cardId: string, cardJson: string, sequence: number): Promise<void>;
-}
+}

package/src/privacy.ts

@@ -1,118 +1,118 @@
-import { existsSync, readFileSync, statSync } from "node:fs";
-import { join } from "node:path";
-import { USER_DATA_DIR } from "./config.ts";
-
-interface PrivacyRules {
-  [key: string]: string;
-}
-
-interface PrivacyConfig {
-  enabled: boolean;
-  rules: PrivacyRules;
-}
-
-let config: PrivacyConfig | null = null;
-let loadedStamp: string | null | undefined;
-
-function privacyFilePath(): string {
-  return join(USER_DATA_DIR, "privacy.json");
-}
-
-function privacyFileStamp(): string | null {
-  const filePath = privacyFilePath();
-  if (!existsSync(filePath)) return null;
-  try {
-    const s = statSync(filePath);
-    return `${s.mtimeMs}:${s.size}`;
-  } catch {
-    return null;
-  }
-}
-
-function sanitizeRules(raw: Record<string, unknown>): PrivacyRules {
-  const result: PrivacyRules = {};
-  for (const [from, to] of Object.entries(raw)) {
-    if (!from) {
-      console.error("[PRIVACY] privacy.json rule key cannot be empty, skipped");
-      continue;
-    }
-    if (typeof to !== "string") {
-      console.error(`[PRIVACY] privacy.json value must be a string, skipped "${from}"`);
-      continue;
-    }
-    result[from] = to;
-  }
-  return result;
-}
-
-function normalizeConfig(parsed: Record<string, unknown>): PrivacyConfig {
-  const hasNewSchema = Object.prototype.hasOwnProperty.call(parsed, "enabled") ||
-    Object.prototype.hasOwnProperty.call(parsed, "rules");
-
-  if (!hasNewSchema) {
-    return { enabled: true, rules: sanitizeRules(parsed) };
-  }
-
-  const enabledRaw = parsed.enabled;
-  const enabled = enabledRaw === undefined ? true : enabledRaw !== false;
-  if (enabledRaw !== undefined && typeof enabledRaw !== "boolean") {
-    console.error("[PRIVACY] privacy.json enabled must be a boolean, using true");
-  }
-
-  const rulesRaw = parsed.rules;
-  if (rulesRaw === undefined) return { enabled, rules: {} };
-  if (typeof rulesRaw !== "object" || rulesRaw === null || Array.isArray(rulesRaw)) {
-    console.error("[PRIVACY] privacy.json rules must be an object");
-    return { enabled, rules: {} };
-  }
-  return { enabled, rules: sanitizeRules(rulesRaw as Record<string, unknown>) };
-}
-
-function loadConfig(): PrivacyConfig {
-  const filePath = privacyFilePath();
-  if (!existsSync(filePath)) {
-    return { enabled: true, rules: {} };
-  }
-  try {
-    const raw = readFileSync(filePath, "utf-8").replace(/^\uFEFF/, "");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      console.error("[PRIVACY] privacy.json must be an object");
-      return { enabled: true, rules: {} };
-    }
-    return normalizeConfig(parsed as Record<string, unknown>);
-  } catch (err) {
-    console.error(`[PRIVACY] failed to read privacy.json: ${(err as Error).message}`);
-    return { enabled: true, rules: {} };
-  }
-}
-
-export function getPrivacyConfig(): PrivacyConfig {
-  const stamp = privacyFileStamp();
-  if (!config || stamp !== loadedStamp) {
-    config = loadConfig();
-    loadedStamp = stamp;
-  }
-  return config;
-}
-
-export function getPrivacyRules(): PrivacyRules {
-  return getPrivacyConfig().rules;
-}
-
-export function reloadPrivacyRules(): void {
-  config = null;
-  loadedStamp = undefined;
-}
-
-export function applyPrivacy(text: string): string {
-  const { enabled, rules } = getPrivacyConfig();
-  if (!enabled || Object.keys(rules).length === 0 || !text) return text;
-
-  let result = text;
-  for (const [from, to] of Object.entries(rules)) {
-    // Use split+join instead of regex replacement so rule keys stay literal.
-    result = result.split(from).join(to);
-  }
-  return result;
-}
+import { existsSync, readFileSync, statSync } from "node:fs";
+import { join } from "node:path";
+import { USER_DATA_DIR } from "./config.ts";
+
+interface PrivacyRules {
+  [key: string]: string;
+}
+
+interface PrivacyConfig {
+  enabled: boolean;
+  rules: PrivacyRules;
+}
+
+let config: PrivacyConfig | null = null;
+let loadedStamp: string | null | undefined;
+
+function privacyFilePath(): string {
+  return join(USER_DATA_DIR, "privacy.json");
+}
+
+function privacyFileStamp(): string | null {
+  const filePath = privacyFilePath();
+  if (!existsSync(filePath)) return null;
+  try {
+    const s = statSync(filePath);
+    return `${s.mtimeMs}:${s.size}`;
+  } catch {
+    return null;
+  }
+}
+
+function sanitizeRules(raw: Record<string, unknown>): PrivacyRules {
+  const result: PrivacyRules = {};
+  for (const [from, to] of Object.entries(raw)) {
+    if (!from) {
+      console.error("[PRIVACY] privacy.json rule key cannot be empty, skipped");
+      continue;
+    }
+    if (typeof to !== "string") {
+      console.error(`[PRIVACY] privacy.json value must be a string, skipped "${from}"`);
+      continue;
+    }
+    result[from] = to;
+  }
+  return result;
+}
+
+function normalizeConfig(parsed: Record<string, unknown>): PrivacyConfig {
+  const hasNewSchema = Object.prototype.hasOwnProperty.call(parsed, "enabled") ||
+    Object.prototype.hasOwnProperty.call(parsed, "rules");
+
+  if (!hasNewSchema) {
+    return { enabled: true, rules: sanitizeRules(parsed) };
+  }
+
+  const enabledRaw = parsed.enabled;
+  const enabled = enabledRaw === undefined ? true : enabledRaw !== false;
+  if (enabledRaw !== undefined && typeof enabledRaw !== "boolean") {
+    console.error("[PRIVACY] privacy.json enabled must be a boolean, using true");
+  }
+
+  const rulesRaw = parsed.rules;
+  if (rulesRaw === undefined) return { enabled, rules: {} };
+  if (typeof rulesRaw !== "object" || rulesRaw === null || Array.isArray(rulesRaw)) {
+    console.error("[PRIVACY] privacy.json rules must be an object");
+    return { enabled, rules: {} };
+  }
+  return { enabled, rules: sanitizeRules(rulesRaw as Record<string, unknown>) };
+}
+
+function loadConfig(): PrivacyConfig {
+  const filePath = privacyFilePath();
+  if (!existsSync(filePath)) {
+    return { enabled: true, rules: {} };
+  }
+  try {
+    const raw = readFileSync(filePath, "utf-8").replace(/^\uFEFF/, "");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+      console.error("[PRIVACY] privacy.json must be an object");
+      return { enabled: true, rules: {} };
+    }
+    return normalizeConfig(parsed as Record<string, unknown>);
+  } catch (err) {
+    console.error(`[PRIVACY] failed to read privacy.json: ${(err as Error).message}`);
+    return { enabled: true, rules: {} };
+  }
+}
+
+export function getPrivacyConfig(): PrivacyConfig {
+  const stamp = privacyFileStamp();
+  if (!config || stamp !== loadedStamp) {
+    config = loadConfig();
+    loadedStamp = stamp;
+  }
+  return config;
+}
+
+export function getPrivacyRules(): PrivacyRules {
+  return getPrivacyConfig().rules;
+}
+
+export function reloadPrivacyRules(): void {
+  config = null;
+  loadedStamp = undefined;
+}
+
+export function applyPrivacy(text: string): string {
+  const { enabled, rules } = getPrivacyConfig();
+  if (!enabled || Object.keys(rules).length === 0 || !text) return text;
+
+  let result = text;
+  for (const [from, to] of Object.entries(rules)) {
+    // Use split+join instead of regex replacement so rule keys stay literal.
+    result = result.split(from).join(to);
+  }
+  return result;
+}

package/src/progress/reducer.ts

@@ -1,108 +1,113 @@
-/**
- * progress/reducer.ts — ChatEvent 事件流 → ProgressView 的增量合并
- *
- * 这是飞书与终端共享的唯一一份"事件 → 过程视图"公共逻辑：
- * 终端 REPL 直接消费 ChatSession.chat() 的事件流，逐条 reduce；
- * 飞书侧 display loop 若未来接入事件流，同样使用本 reducer，保证两端
- * 看到的过程状态（正文累积、工具调用、终态判定）完全一致。
- */
-
-import type { ChatEvent } from "../builtin/index.ts";
-import {
-  withProgressView,
-  type ProgressToolCall,
-  type ProgressView,
-} from "./view.ts";
-
-/** 工具调用 input 单行摘要（终端折叠行展示用） */
-export function summarizeToolInput(input: unknown, maxChars = 120): string {
-  let raw: string;
-  if (typeof input === "string") {
-    raw = input;
-  } else {
-    try {
-      raw = JSON.stringify(input);
-    } catch {
-      raw = String(input);
-    }
-  }
-  const oneLine = raw.replace(/\s+/g, " ").trim();
-  return oneLine.length > maxChars ? oneLine.slice(0, maxChars) + "…" : oneLine;
-}
-
-/** 工具结果单行摘要（成功/失败各取首行） */
-export function summarizeToolResult(content: unknown, maxChars = 120): string {
-  let raw: string;
-  if (typeof content === "string") {
-    raw = content;
-  } else if (content instanceof Error) {
-    raw = content.message;
-  } else {
-    try {
-      raw = JSON.stringify(content);
-    } catch {
-      raw = String(content);
-    }
-  }
-  const firstLine = raw.split("\n")[0] ?? "";
-  return firstLine.length > maxChars ? firstLine.slice(0, maxChars) + "…" : firstLine;
-}
-
-/**
- * 把一条 ChatEvent 合并进 ProgressView，返回新视图（不可变更新）。
- * 未识别的/不影响展示的事件（如 compact）返回原视图。
- */
-export function reduceProgress(prev: ProgressView, event: ChatEvent): ProgressView {
-  switch (event.type) {
-    case "text":
-      // accumulated 是全文累积，直接全量替换，天然幂等
-      return withProgressView(prev, { text: event.accumulated });
-
-    case "tool_use": {
-      const tool: ProgressToolCall = {
-        id: event.id ?? `tool-${prev.tools.length + 1}`,
-        name: event.name,
-        status: "running",
-        detail: summarizeToolInput(event.input),
-      };
-      return withProgressView(prev, { tools: [...prev.tools, tool] });
-    }
-
-    case "tool_result": {
-      const nextStatus = event.is_error ? ("error" as const) : ("ok" as const);
-      const summary = summarizeToolResult(event.content);
-      let matched = false;
-      const tools = prev.tools.map((t) => {
-        if (matched || t.id !== event.tool_use_id) return t;
-        matched = true;
-        return { ...t, status: nextStatus, summary };
-      });
-      if (!matched) {
-        // id 缺失或失配：兜底更新最后一个 running 工具，避免状态悬挂
-        const lastRunning = [...prev.tools].reverse().findIndex((t) => t.status === "running");
-        if (lastRunning >= 0) {
-          const idx = prev.tools.length - 1 - lastRunning;
-          const updated = prev.tools.map((t, i) =>
-            i === idx ? { ...t, status: nextStatus, summary } : t,
-          );
-          return withProgressView(prev, { tools: updated });
-        }
-      }
-      return withProgressView(prev, { tools });
-    }
-
-    case "done":
-      return withProgressView(prev, {
-        status: "done",
-        showStop: false,
-        text: event.text,
-      });
-
-    case "error":
-      return withProgressView(prev, { status: "error", showStop: false });
-
-    case "compact":
-      // 旧上下文压缩不影响当前过程展示
-      return prev;
-  }
-}
+/**
+ * progress/reducer.ts — ChatEvent 事件流 → ProgressView 的增量合并
+ *
+ * 这是飞书与终端共享的唯一一份"事件 → 过程视图"公共逻辑：
+ * 终端 REPL 直接消费 ChatSession.chat() 的事件流，逐条 reduce；
+ * 飞书侧 display loop 若未来接入事件流，同样使用本 reducer，保证两端
+ * 看到的过程状态（正文累积、工具调用、终态判定）完全一致。
+ */
+
+import type { ChatEvent } from "../builtin/index.ts";
+import {
+  withProgressView,
+  type ProgressToolCall,
+  type ProgressView,
+} from "./view.ts";
+
+/** 工具调用 input 单行摘要（终端折叠行展示用） */
+export function summarizeToolInput(input: unknown, maxChars = 120): string {
+  let raw: string;
+  if (typeof input === "string") {
+    raw = input;
+  } else {
+    try {
+      raw = JSON.stringify(input);
+    } catch {
+      raw = String(input);
+    }
+  }
+  const oneLine = raw.replace(/\s+/g, " ").trim();
+  return oneLine.length > maxChars ? oneLine.slice(0, maxChars) + "…" : oneLine;
+}
+
+/** 工具结果单行摘要（成功/失败各取首行） */
+export function summarizeToolResult(content: unknown, maxChars = 120): string {
+  let raw: string;
+  if (typeof content === "string") {
+    raw = content;
+  } else if (content instanceof Error) {
+    raw = content.message;
+  } else {
+    try {
+      raw = JSON.stringify(content);
+    } catch {
+      raw = String(content);
+    }
+  }
+  const firstLine = raw.split("\n")[0] ?? "";
+  return firstLine.length > maxChars ? firstLine.slice(0, maxChars) + "…" : firstLine;
+}
+
+/**
+ * 把一条 ChatEvent 合并进 ProgressView，返回新视图（不可变更新）。
+ * 未识别的/不影响展示的事件（如 compact）返回原视图。
+ */
+export function reduceProgress(prev: ProgressView, event: ChatEvent): ProgressView {
+  switch (event.type) {
+    case "status":
+      return withProgressView(prev, {
+        headerTitle: event.phase === "compacting" ? "压缩上下文中..." : "生成回复中...",
+      });
+
+    case "text":
+      // accumulated 是全文累积，直接全量替换，天然幂等
+      return withProgressView(prev, { text: event.accumulated });
+
+    case "tool_use": {
+      const tool: ProgressToolCall = {
+        id: event.id ?? `tool-${prev.tools.length + 1}`,
+        name: event.name,
+        status: "running",
+        detail: summarizeToolInput(event.input),
+      };
+      return withProgressView(prev, { tools: [...prev.tools, tool] });
+    }
+
+    case "tool_result": {
+      const nextStatus = event.is_error ? ("error" as const) : ("ok" as const);
+      const summary = summarizeToolResult(event.content);
+      let matched = false;
+      const tools = prev.tools.map((t) => {
+        if (matched || t.id !== event.tool_use_id) return t;
+        matched = true;
+        return { ...t, status: nextStatus, summary };
+      });
+      if (!matched) {
+        // id 缺失或失配：兜底更新最后一个 running 工具，避免状态悬挂
+        const lastRunning = [...prev.tools].reverse().findIndex((t) => t.status === "running");
+        if (lastRunning >= 0) {
+          const idx = prev.tools.length - 1 - lastRunning;
+          const updated = prev.tools.map((t, i) =>
+            i === idx ? { ...t, status: nextStatus, summary } : t,
+          );
+          return withProgressView(prev, { tools: updated });
+        }
+      }
+      return withProgressView(prev, { tools });
+    }
+
+    case "done":
+      return withProgressView(prev, {
+        status: "done",
+        showStop: false,
+        text: event.text,
+      });
+
+    case "error":
+      return withProgressView(prev, { status: "error", showStop: false });
+
+    case "compact":
+      // 旧上下文压缩不影响当前过程展示
+      return prev;
+  }
+}