chatccc 0.2.56 → 0.2.58

package/src/adapters/claude-adapter.ts

@@ -86,33 +86,33 @@ function buildSdkEnv(
   baseUrl: string | undefined,
   subagentModel: string | undefined,
 ): Record<string, string | undefined> | undefined {
-  const apiKeyTrim = (apiKey ?? "").trim();
-  const baseUrlTrim = (baseUrl ?? "").trim();
-  const subagentModelTrim = (subagentModel ?? "").trim();
-  const hasApiOverride = Boolean(apiKeyTrim || baseUrlTrim);
-  if (!hasApiOverride) return undefined;
-
-  const env: Record<string, string | undefined> = { ...process.env };
-  // ChatCCC's third-party Claude API config is authoritative when present.
-  // Remove Claude Code/user settings env that can silently override gateway/auth/model choice.
-  delete env.ANTHROPIC_AUTH_TOKEN;
-  delete env.CLAUDE_CODE_OAUTH_TOKEN;
-  delete env.ANTHROPIC_MODEL;
-  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
-  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
-  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
-  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
-  delete env.CLAUDE_CODE_EFFORT_LEVEL;
-
-  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
-  if (baseUrlTrim) {
-    env.ANTHROPIC_BASE_URL = baseUrlTrim;
-  } else {
-    delete env.ANTHROPIC_BASE_URL;
-  }
-  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
-  return env;
-}
+  const apiKeyTrim = (apiKey ?? "").trim();
+  const baseUrlTrim = (baseUrl ?? "").trim();
+  const subagentModelTrim = (subagentModel ?? "").trim();
+  const hasApiOverride = Boolean(apiKeyTrim || baseUrlTrim);
+  if (!hasApiOverride) return undefined;
+
+  const env: Record<string, string | undefined> = { ...process.env };
+  // ChatCCC's third-party Claude API config is authoritative when present.
+  // Remove Claude Code/user settings env that can silently override gateway/auth/model choice.
+  delete env.ANTHROPIC_AUTH_TOKEN;
+  delete env.CLAUDE_CODE_OAUTH_TOKEN;
+  delete env.ANTHROPIC_MODEL;
+  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
+  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
+  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
+  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
+  delete env.CLAUDE_CODE_EFFORT_LEVEL;
+
+  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
+  if (baseUrlTrim) {
+    env.ANTHROPIC_BASE_URL = baseUrlTrim;
+  } else {
+    delete env.ANTHROPIC_BASE_URL;
+  }
+  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
+  return env;
+}
 
 function resolveSettingSources(
   _apiKey: string | undefined,
@@ -291,19 +291,19 @@ class ClaudeAdapter implements ToolAdapter {
       this.baseUrl,
       this.subagentModel,
     );
-    const session = unstable_v2_resumeSession(
-      sessionId,
-      sessionOpts as any,
-    );
-
-    if (signal?.aborted) {
-      session.close();
-      return;
-    }
-    const onAbort = () => { session.close(); };
-    signal?.addEventListener("abort", onAbort, { once: true });
-
-    await session.send(userText);
+    const session = unstable_v2_resumeSession(
+      sessionId,
+      sessionOpts as any,
+    );
+
+    if (signal?.aborted) {
+      session.close();
+      return;
+    }
+    const onAbort = () => { session.close(); };
+    signal?.addEventListener("abort", onAbort, { once: true });
+
+    await session.send(userText);
 
     const stream = session.stream();
 

package/src/index.ts

@@ -84,9 +84,9 @@ import {
   updateCardKitCard,
 } from "./cardkit.ts";
 import {
-  MAX_PROCESSED,
-  clearAdapterCache,
-  loadSessionRegistryForBinding,
+  MAX_PROCESSED,
+  clearAdapterCache,
+  loadSessionRegistryForBinding,
   processedMessages,
   rebuildBindingsFromRegistry,
   resetState,
@@ -744,12 +744,12 @@ async function main(): Promise<void> {
   // "保存并启动" 时，web-ui 会调用本回调，把磁盘上刚保存的 config.json
   // 刷进进程内的 export let 常量（live binding 让 CLAUDE_MODEL 等下次创建
   // 会话时自动看到新值）。setup 首次激活走 onActivate 路径，不依赖此 hook。
-  setReloadConfigHook(() => {
-    reloadConfigFromDisk();
-    clearAdapterCache();
-    appendStartupTrace("reload-from-ui: config reloaded", {
-      appIdMask: maskAppId(APP_ID),
-    });
+  setReloadConfigHook(() => {
+    reloadConfigFromDisk();
+    clearAdapterCache();
+    appendStartupTrace("reload-from-ui: config reloaded", {
+      appIdMask: maskAppId(APP_ID),
+    });
   });
   setExtraApiHandler(async (req, res) => {
     return (await handleAgentImageRequest(req, res)) || (await handleAgentFileRequest(req, res));
@@ -769,12 +769,12 @@ async function main(): Promise<void> {
       // 凭证不全：进 setup 向导。注入 onActivate 回调让用户点"保存并启动"
       // 时，原地（同进程）调用 startBotService，复用 setup HTTP server。
       startSetupMode(CHATCCC_PORT, {
-        onActivate: async (httpServer: Server) => {
-          reloadConfigFromDisk();
-          clearAdapterCache();
-          appendStartupTrace("setup-activate: reloaded config from disk", {
-            appIdMaskAfterReload: maskAppId(APP_ID),
-          });
+        onActivate: async (httpServer: Server) => {
+          reloadConfigFromDisk();
+          clearAdapterCache();
+          appendStartupTrace("setup-activate: reloaded config from disk", {
+            appIdMaskAfterReload: maskAppId(APP_ID),
+          });
           try {
             await startBotService({ httpServer, port: CHATCCC_PORT });
             installShutdownHandlers(httpServer);

package/src/orchestrator.ts

@@ -72,13 +72,21 @@ export function cwdDisplayName(cwd: string): string {
   return trimmed.split(/[\\/]/).filter(Boolean).pop() || trimmed || "cwd";
 }
 
-export function sessionChatName(left: string, cwd: string): string {
-  return `${left}-${cwdDisplayName(cwd)}`;
-}
-
-function isUntitledSessionChatName(name: string): boolean {
-  return name === "新会话" || name.startsWith("新会话-");
-}
+export function sessionChatName(left: string, cwd: string): string {
+  return `${left}-${cwdDisplayName(cwd)}`;
+}
+
+function isUntitledSessionChatName(name: string): boolean {
+  return name === "新会话" || name.startsWith("新会话-");
+}
+
+function shouldSendWechatProcessingAck(
+  platform: PlatformAdapter,
+  textLower: string,
+  chatType: string,
+): boolean {
+  return platform.kind === "wechat" && chatType === "p2p" && !textLower.startsWith("/");
+}
 
 // ---------------------------------------------------------------------------
 // handleCommand — 平台无关的命令分发
@@ -971,11 +979,11 @@ export async function handleCommand(
     }
 
     // 并发检查：同一 session 只能有一个活跃 prompt
-    if (isSessionRunning(sessionId)) {
-      logTrace(tid, "BLOCKED", {
-        outcome: "session_busy",
-        sessionId,
-      });
+    if (isSessionRunning(sessionId)) {
+      logTrace(tid, "BLOCKED", {
+        outcome: "session_busy",
+        sessionId,
+      });
       console.log(
         `[${ts()}] [BLOCKED] Session ${sessionId} is already generating, rejecting message from chat ${chatId}`,
       );
@@ -984,13 +992,17 @@ export async function handleCommand(
         "生成中",
         "该会话正在生成回复中，请等待完成后再发送新消息。",
         "yellow",
-      );
-      return;
-    }
-
-    try {
-      logTrace(tid, "RESUME", { sessionId, tool: descriptionTool });
-      await resumeAndPrompt(
+      );
+      return;
+    }
+
+    if (shouldSendWechatProcessingAck(platform, textLower, chatType)) {
+      await platform.sendText(chatId, "生成中...").catch(() => {});
+    }
+
+    try {
+      logTrace(tid, "RESUME", { sessionId, tool: descriptionTool });
+      await resumeAndPrompt(
         sessionId,
         text,
         platform,

package/src/privacy.ts

@@ -1,68 +1,68 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { USER_DATA_DIR } from "./config.ts";
-
-// ---------------------------------------------------------------------------
-// 隐私替换规则
-// ---------------------------------------------------------------------------
-
-interface PrivacyRules {
-  [key: string]: string;
-}
-
-let rules: PrivacyRules | null = null;
-let loaded = false;
-
-function loadRules(): PrivacyRules {
-  const filePath = join(USER_DATA_DIR, "privacy.json");
-  if (!existsSync(filePath)) {
-    return {};
-  }
-  try {
-    const raw = readFileSync(filePath, "utf-8");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      console.error(`[PRIVACY] privacy.json 格式错误：应为对象`);
-      return {};
-    }
-    for (const [k, v] of Object.entries(parsed)) {
-      if (typeof v !== "string") {
-        console.error(`[PRIVACY] privacy.json 值必须为字符串，跳过 "${k}"`);
-        delete (parsed as Record<string, unknown>)[k];
-      }
-    }
-    return parsed as PrivacyRules;
-  } catch (err) {
-    console.error(`[PRIVACY] 读取 privacy.json 失败: ${(err as Error).message}`);
-    return {};
-  }
-}
-
-export function getPrivacyRules(): PrivacyRules {
-  if (!loaded) {
-    rules = loadRules();
-    loaded = true;
-  }
-  return rules!;
-}
-
-/** 重新加载规则（热更新用） */
-export function reloadPrivacyRules(): void {
-  loaded = false;
-  rules = null;
-}
-
-/**
- * 对文本应用隐私替换规则。
- * 若无规则或文本为空，直接返回原文。
- */
-export function applyPrivacy(text: string): string {
-  const r = getPrivacyRules();
-  if (Object.keys(r).length === 0 || !text) return text;
-  let result = text;
-  for (const [from, to] of Object.entries(r)) {
-    // 用 split+join 替代 replaceAll，避免正则特殊字符问题
-    result = result.split(from).join(to);
-  }
-  return result;
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { USER_DATA_DIR } from "./config.ts";
+
+// ---------------------------------------------------------------------------
+// 隐私替换规则
+// ---------------------------------------------------------------------------
+
+interface PrivacyRules {
+  [key: string]: string;
+}
+
+let rules: PrivacyRules | null = null;
+let loaded = false;
+
+function loadRules(): PrivacyRules {
+  const filePath = join(USER_DATA_DIR, "privacy.json");
+  if (!existsSync(filePath)) {
+    return {};
+  }
+  try {
+    const raw = readFileSync(filePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+      console.error(`[PRIVACY] privacy.json 格式错误：应为对象`);
+      return {};
+    }
+    for (const [k, v] of Object.entries(parsed)) {
+      if (typeof v !== "string") {
+        console.error(`[PRIVACY] privacy.json 值必须为字符串，跳过 "${k}"`);
+        delete (parsed as Record<string, unknown>)[k];
+      }
+    }
+    return parsed as PrivacyRules;
+  } catch (err) {
+    console.error(`[PRIVACY] 读取 privacy.json 失败: ${(err as Error).message}`);
+    return {};
+  }
+}
+
+export function getPrivacyRules(): PrivacyRules {
+  if (!loaded) {
+    rules = loadRules();
+    loaded = true;
+  }
+  return rules!;
+}
+
+/** 重新加载规则（热更新用） */
+export function reloadPrivacyRules(): void {
+  loaded = false;
+  rules = null;
+}
+
+/**
+ * 对文本应用隐私替换规则。
+ * 若无规则或文本为空，直接返回原文。
+ */
+export function applyPrivacy(text: string): string {
+  const r = getPrivacyRules();
+  if (Object.keys(r).length === 0 || !text) return text;
+  let result = text;
+  for (const [from, to] of Object.entries(r)) {
+    // 用 split+join 替代 replaceAll，避免正则特殊字符问题
+    result = result.split(from).join(to);
+  }
+  return result;
 }

package/src/session.ts

@@ -393,7 +393,8 @@ export function accumulateBlockContent(
   switch (block.type) {
     case "thinking":
       state.chunkCount++;
-      state.accumulatedContent += block.thinking;
+      // 用引用块标记思考内容（中文无法斜体，引用块有视觉区分）
+      state.accumulatedContent += `\n> ${block.thinking.replace(/\n/g, "\n> ")}\n`;
       break;
     case "tool_use": {
       // 记录 tool_use 信息供后续 tool_result 使用

package/src/simplify.ts

@@ -1,120 +1,120 @@
-import { existsSync, readFileSync } from "node:fs";
-import { resolve as resolvePath } from "node:path";
-import { PROJECT_ROOT } from "./config.ts";
-
-// ---------------------------------------------------------------------------
-// 消息简化规则 —— 数据驱动，在 simplify.json 中配置
-// ---------------------------------------------------------------------------
-
-interface ToolRule {
-  template: string;
-  maxLength: number;
-}
-
-interface SimplifyConfig {
-  tool_use?: Record<string, ToolRule>;
-  tool_result?: Record<string, ToolRule>;
-}
-
-let config: SimplifyConfig | null = null;
-let loaded = false;
-
-function loadConfig(): SimplifyConfig {
-  const filePath = resolvePath(PROJECT_ROOT, "simplify.json");
-  if (!existsSync(filePath)) return {};
-  try {
-    const raw = readFileSync(filePath, "utf-8");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      console.error("[SIMPLIFY] simplify.json 格式错误：应为对象");
-      return {};
-    }
-    return parsed as SimplifyConfig;
-  } catch (err) {
-    console.error(`[SIMPLIFY] 读取 simplify.json 失败: ${(err as Error).message}`);
-    return {};
-  }
-}
-
-function getConfig(): SimplifyConfig {
-  if (!loaded) {
-    config = loadConfig();
-    loaded = true;
-  }
-  return config!;
-}
-
-/** 热重载 */
-export function reloadSimplifyConfig(): void {
-  loaded = false;
-  config = null;
-}
-
-/**
- * 对模板字符串中的 {field} 占位符做替换。
- * fields 为可用字段映射，extra 是额外的上下文（如 tool_use_id 的 id）。
- */
-function resolveTemplate(template: string, fields: Record<string, unknown>, extra?: Record<string, string>): string {
-  let result = template;
-  if (extra) {
-    for (const [k, v] of Object.entries(extra)) {
-      result = result.split(`{${k}}`).join(v);
-    }
-  }
-  for (const [k, v] of Object.entries(fields)) {
-    const strVal = typeof v === "string" ? v : JSON.stringify(v);
-    result = result.split(`{${k}}`).join(strVal);
-  }
-  return result;
-}
-
-/**
- * 简化 tool_use 展示。
- * 返回 null 表示无规则，调用方应回退到默认格式化。
- */
-export function simplifyToolUse(name: string, input: unknown): string | null {
-  const cfg = getConfig();
-  const rules = cfg.tool_use;
-  if (!rules) return null;
-  const rule = rules[name];
-  if (!rule) return null;
-
-  const fields = typeof input === "object" && input !== null
-    ? input as Record<string, unknown>
-    : {};
-  let result = resolveTemplate(rule.template, fields);
-  if (result.length > rule.maxLength) {
-    result = result.slice(0, rule.maxLength) + "...";
-  }
-  return result;
-}
-
-/**
- * 简化 tool_result 展示。
- * 返回 null 表示无规则，调用方应回退到默认格式化。
- * toolCallInput 为对应的 tool_use 输入（可选），用于在 result 模板中引用输入字段。
- */
-export function simplifyToolResult(
-  name: string,
-  toolUseId: string,
-  isError: boolean,
-  toolCallInput?: unknown,
-): string | null {
-  const cfg = getConfig();
-  const rules = cfg.tool_result;
-  if (!rules) return null;
-  const rule = rules[name];
-  if (!rule) return null;
-
-  const id = toolUseId.slice(-6);
-  const extra = { id };
-  const fields = toolCallInput && typeof toolCallInput === "object"
-    ? toolCallInput as Record<string, unknown>
-    : {};
-  let result = resolveTemplate(rule.template, fields, extra);
-  if (isError) result = "❌ " + result;
-  if (result.length > rule.maxLength) {
-    result = result.slice(0, rule.maxLength) + "...";
-  }
-  return result;
+import { existsSync, readFileSync } from "node:fs";
+import { resolve as resolvePath } from "node:path";
+import { PROJECT_ROOT } from "./config.ts";
+
+// ---------------------------------------------------------------------------
+// 消息简化规则 —— 数据驱动，在 simplify.json 中配置
+// ---------------------------------------------------------------------------
+
+interface ToolRule {
+  template: string;
+  maxLength: number;
+}
+
+interface SimplifyConfig {
+  tool_use?: Record<string, ToolRule>;
+  tool_result?: Record<string, ToolRule>;
+}
+
+let config: SimplifyConfig | null = null;
+let loaded = false;
+
+function loadConfig(): SimplifyConfig {
+  const filePath = resolvePath(PROJECT_ROOT, "simplify.json");
+  if (!existsSync(filePath)) return {};
+  try {
+    const raw = readFileSync(filePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+      console.error("[SIMPLIFY] simplify.json 格式错误：应为对象");
+      return {};
+    }
+    return parsed as SimplifyConfig;
+  } catch (err) {
+    console.error(`[SIMPLIFY] 读取 simplify.json 失败: ${(err as Error).message}`);
+    return {};
+  }
+}
+
+function getConfig(): SimplifyConfig {
+  if (!loaded) {
+    config = loadConfig();
+    loaded = true;
+  }
+  return config!;
+}
+
+/** 热重载 */
+export function reloadSimplifyConfig(): void {
+  loaded = false;
+  config = null;
+}
+
+/**
+ * 对模板字符串中的 {field} 占位符做替换。
+ * fields 为可用字段映射，extra 是额外的上下文（如 tool_use_id 的 id）。
+ */
+function resolveTemplate(template: string, fields: Record<string, unknown>, extra?: Record<string, string>): string {
+  let result = template;
+  if (extra) {
+    for (const [k, v] of Object.entries(extra)) {
+      result = result.split(`{${k}}`).join(v);
+    }
+  }
+  for (const [k, v] of Object.entries(fields)) {
+    const strVal = typeof v === "string" ? v : JSON.stringify(v);
+    result = result.split(`{${k}}`).join(strVal);
+  }
+  return result;
+}
+
+/**
+ * 简化 tool_use 展示。
+ * 返回 null 表示无规则，调用方应回退到默认格式化。
+ */
+export function simplifyToolUse(name: string, input: unknown): string | null {
+  const cfg = getConfig();
+  const rules = cfg.tool_use;
+  if (!rules) return null;
+  const rule = rules[name];
+  if (!rule) return null;
+
+  const fields = typeof input === "object" && input !== null
+    ? input as Record<string, unknown>
+    : {};
+  let result = resolveTemplate(rule.template, fields);
+  if (result.length > rule.maxLength) {
+    result = result.slice(0, rule.maxLength) + "...";
+  }
+  return result;
+}
+
+/**
+ * 简化 tool_result 展示。
+ * 返回 null 表示无规则，调用方应回退到默认格式化。
+ * toolCallInput 为对应的 tool_use 输入（可选），用于在 result 模板中引用输入字段。
+ */
+export function simplifyToolResult(
+  name: string,
+  toolUseId: string,
+  isError: boolean,
+  toolCallInput?: unknown,
+): string | null {
+  const cfg = getConfig();
+  const rules = cfg.tool_result;
+  if (!rules) return null;
+  const rule = rules[name];
+  if (!rule) return null;
+
+  const id = toolUseId.slice(-6);
+  const extra = { id };
+  const fields = toolCallInput && typeof toolCallInput === "object"
+    ? toolCallInput as Record<string, unknown>
+    : {};
+  let result = resolveTemplate(rule.template, fields, extra);
+  if (isError) result = "❌ " + result;
+  if (result.length > rule.maxLength) {
+    result = result.slice(0, rule.maxLength) + "...";
+  }
+  return result;
 }

package/src/wechat-platform.ts

@@ -500,21 +500,9 @@ async function handleWechatMessage(
   // 用户回复，重置 claw 连发计数
   consecutiveSendCount.set(chatId, 0);
 
-  // 非指令消息：立即发送"生成中..."，让用户知道消息已收到并正在处理
-  if (text && !text.startsWith("/") && ilinkWire) {
-    const ctxToken = contextTokenMap.get(chatId);
-    if (ctxToken) {
-      ilinkWire.sendText(chatId, "生成中...", ctxToken).catch(() => {});
-    } else {
-      ilinkWire.push(chatId, "生成中...").catch(() => {});
-    }
-    // "生成中..." 计为第1条连发消息
-    consecutiveSendCount.set(chatId, 1);
-  }
-
-  // WeChat 中所有会话都视为 p2p，/new 复用 p2p 路径（等同飞书 /newh 效果）
-  // 不 await：避免长 prompt 阻塞后续消息处理（如 /cd、/stop 等命令）
-  handler(text, chatId, chatId, msgTimestamp, "p2p").catch((err) => {
+  // WeChat 中所有会话都视为 p2p，/new 复用 p2p 路径（等同飞书 /newh 效果）
+  // 不 await：避免长 prompt 阻塞后续消息处理（如 /cd、/stop 等命令）
+  handler(text, chatId, chatId, msgTimestamp, "p2p").catch((err) => {
     platformLog(`消息处理失败: ${(err as Error).stack ?? (err as Error).message}`);
   });
 }