chatccc 0.2.243 → 0.2.245

package/src/adapters/adapter-interface.ts

@@ -151,12 +151,18 @@ export interface ToolPromptOptions {
 // ToolAdapter — 统一的 AI 工具适配器接口
 // ---------------------------------------------------------------------------
 
-export interface ToolAdapter {
+export interface ToolAdapter {
   /** 日志/展示用名称，如 "Claude" */
   readonly displayName: string;
 
   /** 群描述中会话 ID 的前缀，如 "Claude Session:" */
-  readonly sessionDescPrefix: string;
+  readonly sessionDescPrefix: string;
+
+  /**
+   * Whether ChatCCC may infer a stalled response from unchanged streamed output.
+   * Defaults to true. Adapters that only emit output after a request completes must disable it.
+   */
+  readonly responseStallDetectionEnabled?: boolean;
 
   /**
    * 创建新会话，返回会话 ID。

package/src/adapters/ccc-adapter.ts

@@ -1,145 +1,149 @@
-import { ChatSession, type ChatSessionConfig, type ChatSessionOptions } from "../../deepccc-agent/src/index.ts";
-import {
-  getBuiltinContextSession,
-  newBuiltinSessionId,
-  normalizeBuiltinSessionId,
-} from "../../deepccc-agent/src/context.ts";
-import { config, CCC_SESSION_PREFIX } from "../config.ts";
-import type {
-  CreateSessionResult,
-  SessionInfo,
-  ToolAdapter,
-  ToolPromptOptions,
-  UnifiedStreamMessage,
-} from "./adapter-interface.ts";
-
-export interface CccAdapterOptions extends ChatSessionConfig {
-  contextDir?: string;
-  compactAtTokens?: number;
-  keepRecentMessages?: number;
-  compactionTimeoutMs?: number;
-  maxSteps?: number;
-}
-
-function toChatSessionOptions(
-  sessionId: string,
-  cwd: string,
-  options: CccAdapterOptions,
-): ChatSessionOptions {
-  return {
-    cwd,
-    persist: true,
-    sessionId,
-    contextDir: options.contextDir,
-    compactAtTokens: options.compactAtTokens,
-    keepRecentMessages: options.keepRecentMessages,
-    compactionTimeoutMs: options.compactionTimeoutMs,
-    maxSteps: options.maxSteps,
-    // chatccc 无终端可交互，且对齐 claude/codex 适配器的 bypass 模式：
-    // 高危命令不询问，全部放行（与独立 deepccc CLI 的 ask 模式不同）
-    permissionMode: "bypass",
-  };
-}
-
-export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
-  if (!options.apiKey?.trim()) {
-    throw new Error("ChatCCC 未配置 CCC Agent API Key。请先填写 ccc.DEEPSEEK_API_KEY 后再启用 CCC Agent。");
-  }
-
-  const chatConfig: ChatSessionConfig = {
-    apiKey: options.apiKey,
-    ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
-    ...(options.model !== undefined ? { model: options.model } : {}),
-    ...(options.effort !== undefined ? { effort: options.effort } : {}),
-  };
-
-  return {
-    displayName: "CCC Agent",
-    sessionDescPrefix: CCC_SESSION_PREFIX,
-
-    async createSession(cwd: string): Promise<CreateSessionResult> {
-      const sessionId = newBuiltinSessionId();
-      const session = new ChatSession(
-        chatConfig,
-        toChatSessionOptions(sessionId, cwd, options),
-      );
-      session.reset();
-      return { sessionId };
-    },
-
-    async *prompt(
-      sessionId: string,
-      userText: string,
-      cwd: string,
-      signal?: AbortSignal,
-      _promptOptions?: ToolPromptOptions,
-    ): AsyncIterable<UnifiedStreamMessage> {
-      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
-      const session = new ChatSession(
-        chatConfig,
-        toChatSessionOptions(normalizedSessionId, cwd, options),
-      );
-
-      for await (const event of session.chat(userText, signal)) {
-        if (event.type === "status") {
-          yield {
-            type: "assistant",
-            blocks: [{
-              type: "agent_status",
-              status: event.phase === "compacting" ? "compacting" : "responding",
-            }],
-          };
-        } else if (event.type === "text") {
-          yield {
-            type: "assistant",
-            blocks: [{ type: "text", text: event.text }],
-          };
-        } else if (event.type === "tool_use") {
-          yield {
-            type: "assistant",
-            blocks: [{
-              type: "tool_use",
-              id: event.id,
-              name: event.name,
-              input: event.input,
-            }],
-          };
-        } else if (event.type === "tool_result") {
-          yield {
-            type: "assistant",
-            blocks: [{
-              type: "tool_result",
-              tool_use_id: event.tool_use_id,
-              content: event.content,
-              is_error: event.is_error,
-            }],
-          };
-        } else if (event.type === "done" && !signal?.aborted) {
-          yield {
-            type: "assistant",
-            blocks: [],
-            isFinalResponse: true,
-          };
-        } else if (event.type === "error") {
-          throw new Error(event.message);
-        }
-      }
-    },
-
-    async getSessionInfo(sessionId: string): Promise<SessionInfo | undefined> {
-      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
-      const info = getBuiltinContextSession(normalizedSessionId, options.contextDir);
-      if (!info) return undefined;
-      return {
-        sessionId: info.sessionId,
-        cwd: info.cwd,
-        lastModified: info.updatedAt,
-        model: options.model ?? config.ccc.model,
-      };
-    },
-
-    async closeSession(_sessionId: string): Promise<void> {
-      // ChatSession uses one request-scoped stream per prompt. AbortSignal handles cancellation.
-    },
-  };
-}
+import { ChatSession, type ChatSessionConfig, type ChatSessionOptions } from "../../deepccc-agent/src/index.ts";
+import { config as deepCccConfig } from "../../deepccc-agent/src/config.ts";
+import {
+  getBuiltinContextSession,
+  newBuiltinSessionId,
+  normalizeBuiltinSessionId,
+} from "../../deepccc-agent/src/context.ts";
+import { config, CCC_SESSION_PREFIX } from "../config.ts";
+import type {
+  CreateSessionResult,
+  SessionInfo,
+  ToolAdapter,
+  ToolPromptOptions,
+  UnifiedStreamMessage,
+} from "./adapter-interface.ts";
+
+export interface CccAdapterOptions extends ChatSessionConfig {
+  contextDir?: string;
+  compactAtTokens?: number;
+  keepRecentMessages?: number;
+  compactionTimeoutMs?: number;
+  maxSteps?: number;
+}
+
+function toChatSessionOptions(
+  sessionId: string,
+  cwd: string,
+  options: CccAdapterOptions,
+): ChatSessionOptions {
+  return {
+    cwd,
+    persist: true,
+    sessionId,
+    contextDir: options.contextDir,
+    compactAtTokens: options.compactAtTokens,
+    keepRecentMessages: options.keepRecentMessages,
+    compactionTimeoutMs: options.compactionTimeoutMs,
+    maxSteps: options.maxSteps,
+    // chatccc 无终端可交互，且对齐 claude/codex 适配器的 bypass 模式：
+    // 高危命令不询问，全部放行（与独立 deepccc CLI 的 ask 模式不同）
+    permissionMode: "bypass",
+  };
+}
+
+export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
+  if (!options.apiKey?.trim()) {
+    throw new Error("ChatCCC 未配置 CCC Agent API Key。请先填写 ccc.DEEPSEEK_API_KEY 后再启用 CCC Agent。");
+  }
+
+  const chatConfig: ChatSessionConfig = {
+    apiKey: options.apiKey,
+    ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
+    ...(options.model !== undefined ? { model: options.model } : {}),
+    ...(options.effort !== undefined ? { effort: options.effort } : {}),
+  };
+
+  return {
+    displayName: "CCC Agent",
+    sessionDescPrefix: CCC_SESSION_PREFIX,
+    // Non-streaming DeepCCC emits its reply only after the provider request finishes,
+    // so unchanged output cannot distinguish a slow request from a stalled response.
+    responseStallDetectionEnabled: deepCccConfig.streaming,
+
+    async createSession(cwd: string): Promise<CreateSessionResult> {
+      const sessionId = newBuiltinSessionId();
+      const session = new ChatSession(
+        chatConfig,
+        toChatSessionOptions(sessionId, cwd, options),
+      );
+      session.reset();
+      return { sessionId };
+    },
+
+    async *prompt(
+      sessionId: string,
+      userText: string,
+      cwd: string,
+      signal?: AbortSignal,
+      _promptOptions?: ToolPromptOptions,
+    ): AsyncIterable<UnifiedStreamMessage> {
+      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
+      const session = new ChatSession(
+        chatConfig,
+        toChatSessionOptions(normalizedSessionId, cwd, options),
+      );
+
+      for await (const event of session.chat(userText, signal)) {
+        if (event.type === "status") {
+          yield {
+            type: "assistant",
+            blocks: [{
+              type: "agent_status",
+              status: event.phase === "compacting" ? "compacting" : "responding",
+            }],
+          };
+        } else if (event.type === "text") {
+          yield {
+            type: "assistant",
+            blocks: [{ type: "text", text: event.text }],
+          };
+        } else if (event.type === "tool_use") {
+          yield {
+            type: "assistant",
+            blocks: [{
+              type: "tool_use",
+              id: event.id,
+              name: event.name,
+              input: event.input,
+            }],
+          };
+        } else if (event.type === "tool_result") {
+          yield {
+            type: "assistant",
+            blocks: [{
+              type: "tool_result",
+              tool_use_id: event.tool_use_id,
+              content: event.content,
+              is_error: event.is_error,
+            }],
+          };
+        } else if (event.type === "done" && !signal?.aborted) {
+          yield {
+            type: "assistant",
+            blocks: [],
+            isFinalResponse: true,
+          };
+        } else if (event.type === "error") {
+          throw new Error(event.message);
+        }
+      }
+    },
+
+    async getSessionInfo(sessionId: string): Promise<SessionInfo | undefined> {
+      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
+      const info = getBuiltinContextSession(normalizedSessionId, options.contextDir);
+      if (!info) return undefined;
+      return {
+        sessionId: info.sessionId,
+        cwd: info.cwd,
+        lastModified: info.updatedAt,
+        model: options.model ?? config.ccc.model,
+      };
+    },
+
+    async closeSession(_sessionId: string): Promise<void> {
+      // ChatSession uses one request-scoped stream per prompt. AbortSignal handles cancellation.
+    },
+  };
+}

package/src/config-utils.ts

@@ -20,7 +20,7 @@ import { join } from "node:path";
  * - `value` 去除空白后等于 `"default"`（不区分大小写）→ 视作 `""` 并 warn。
  * - 其余情况原样返回（不裁剪两端空白，留给具体调用方决定）。
  */
-export function normalizeOptionalConfigField(
+export function normalizeOptionalConfigField(
   value: unknown,
   options: { label: string; fallback?: string },
 ): string {
@@ -33,18 +33,18 @@ export function normalizeOptionalConfigField(
     );
     return "";
   }
-  return value;
-}
-
-/**
- * CCC Agent requires credentials owned by ChatCCC. An explicit enabled=true
- * must not make the agent selectable when that credential is absent.
- */
-export function resolveCccEnabled(rawEnabled: unknown, apiKey: unknown): boolean {
-  const hasApiKey = typeof apiKey === "string" && apiKey.trim().length > 0;
-  if (!hasApiKey) return false;
-  return typeof rawEnabled === "boolean" ? rawEnabled : true;
-}
+  return value;
+}
+
+/**
+ * CCC Agent requires credentials owned by ChatCCC. An explicit enabled=true
+ * must not make the agent selectable when that credential is absent.
+ */
+export function resolveCccEnabled(rawEnabled: unknown, apiKey: unknown): boolean {
+  const hasApiKey = typeof apiKey === "string" && apiKey.trim().length > 0;
+  if (!hasApiKey) return false;
+  return typeof rawEnabled === "boolean" ? rawEnabled : true;
+}
 
 // ---------------------------------------------------------------------------
 // /git 超时配置相关

package/src/config.ts

@@ -11,10 +11,10 @@ import {
   anthropicConfigDisplay,
   autoDetectCodexPath,
   autoDetectCursorPath,
-  normalizeOptionalConfigField,
-  readToolCliPath,
-  resolveCccEnabled,
-} from "./config-utils.ts";
+  normalizeOptionalConfigField,
+  readToolCliPath,
+  resolveCccEnabled,
+} from "./config-utils.ts";
 
 // 重新导出 config-utils 中的纯函数/常量，保持对外 API 不变
 // （历史上这些符号都从 ./config.ts 导入；新代码可直接从 ./config-utils.ts 导入以避免触发本文件的副作用）
@@ -23,11 +23,11 @@ export {
   MIN_GIT_TIMEOUT_SECONDS,
   MAX_GIT_TIMEOUT_SECONDS,
   parseGitTimeoutSeconds,
-  normalizeOptionalConfigField,
-  isAnthropicConfigEmpty,
-  anthropicConfigDisplay,
-  resolveCccEnabled,
-} from "./config-utils.ts";
+  normalizeOptionalConfigField,
+  isAnthropicConfigEmpty,
+  anthropicConfigDisplay,
+  resolveCccEnabled,
+} from "./config-utils.ts";
 export type { ParsedGitTimeout } from "./config-utils.ts";
 
 // ---------------------------------------------------------------------------
@@ -597,10 +597,10 @@ function loadConfig(): AppConfig {
     );
   // 旧版 ccc 配置没有 enabled。只用 API Key 推断启用，避免 sample 中自带的
   // 默认 Base URL / model 让升级用户在未配置凭证时意外启用 CCC Agent。
-  const claudeEnabled = resolveEnabled(claude.enabled, claudeNonEmpty);
-  const cursorEnabled = resolveEnabled(cursorRaw.enabled, cursorNonEmpty);
-  const codexEnabled = resolveEnabled(codexRaw.enabled, codexNonEmpty);
-  const cccEnabled = resolveCccEnabled(cccRaw.enabled, cccRaw.DEEPSEEK_API_KEY);
+  const claudeEnabled = resolveEnabled(claude.enabled, claudeNonEmpty);
+  const cursorEnabled = resolveEnabled(cursorRaw.enabled, cursorNonEmpty);
+  const codexEnabled = resolveEnabled(codexRaw.enabled, codexNonEmpty);
+  const cccEnabled = resolveCccEnabled(cccRaw.enabled, cccRaw.DEEPSEEK_API_KEY);
   const chromeDevtoolsPort = Number(chromeDevtoolsRaw.port);
   const explicitDefaultTool: AgentTool | null =
     typeof claude.defaultAgent === "boolean" && claude.defaultAgent && claudeEnabled ? "claude" :

package/src/progress/reducer.ts

@@ -1,113 +1,113 @@
-/**
- * progress/reducer.ts — ChatEvent 事件流 → ProgressView 的增量合并
- *
- * 这是飞书与终端共享的唯一一份"事件 → 过程视图"公共逻辑：
- * 终端 REPL 直接消费 ChatSession.chat() 的事件流，逐条 reduce；
- * 飞书侧 display loop 若未来接入事件流，同样使用本 reducer，保证两端
- * 看到的过程状态（正文累积、工具调用、终态判定）完全一致。
- */
-
-import type { ChatEvent } from "../../deepccc-agent/src/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;
-  }
-}
+/**
+ * progress/reducer.ts — ChatEvent 事件流 → ProgressView 的增量合并
+ *
+ * 这是飞书与终端共享的唯一一份"事件 → 过程视图"公共逻辑：
+ * 终端 REPL 直接消费 ChatSession.chat() 的事件流，逐条 reduce；
+ * 飞书侧 display loop 若未来接入事件流，同样使用本 reducer，保证两端
+ * 看到的过程状态（正文累积、工具调用、终态判定）完全一致。
+ */
+
+import type { ChatEvent } from "../../deepccc-agent/src/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;
+  }
+}