chatccc 0.2.244 → 0.2.246

package/src/adapters/adapter-interface.ts

@@ -66,21 +66,21 @@ export interface UnifiedSearchResultBlock {
   query: string;
 }
 
-export interface UnifiedCompactBoundaryBlock {
-  type: "compact_boundary";
-  trigger: "manual" | "auto";
-  pre_tokens: number;
-  post_tokens?: number;
-}
-
-export interface UnifiedAgentStatusBlock {
-  type: "agent_status";
-  status: "compacting" | "responding";
-}
-
-export type UnifiedBlock =
-  | UnifiedAgentStatusBlock
-  | UnifiedThinkingBlock
+export interface UnifiedCompactBoundaryBlock {
+  type: "compact_boundary";
+  trigger: "manual" | "auto";
+  pre_tokens: number;
+  post_tokens?: number;
+}
+
+export interface UnifiedAgentStatusBlock {
+  type: "agent_status";
+  status: "compacting" | "responding";
+}
+
+export type UnifiedBlock =
+  | UnifiedAgentStatusBlock
+  | UnifiedThinkingBlock
   | UnifiedTextBlock
   | UnifiedTextFinalBlock
   | UnifiedToolUseBlock
@@ -93,17 +93,17 @@ export type UnifiedBlock =
 // UnifiedStreamMessage — 一次 SDK/CLI 事件对应的归一化消息
 // ---------------------------------------------------------------------------
 
-export interface UnifiedStreamMessage {
-  type: "assistant" | "user" | "system";
-  blocks: UnifiedBlock[];
-  /**
-   * 适配器确认本事件代表一条完整、权威的最终回复，而不是流式文本片段。
-   *
-   * response-stall 终止与最终事件可能在同一事件循环边界竞态；只有该标记
-   * 为 true 时，上层才允许把已经触发的超时改判为正常完成。
-   */
-  isFinalResponse?: boolean;
-}
+export interface UnifiedStreamMessage {
+  type: "assistant" | "user" | "system";
+  blocks: UnifiedBlock[];
+  /**
+   * 适配器确认本事件代表一条完整、权威的最终回复，而不是流式文本片段。
+   *
+   * response-stall 终止与最终事件可能在同一事件循环边界竞态；只有该标记
+   * 为 true 时，上层才允许把已经触发的超时改判为正常完成。
+   */
+  isFinalResponse?: boolean;
+}
 
 // ---------------------------------------------------------------------------
 // CreateSessionResult
@@ -158,12 +158,18 @@ export interface ToolAdapter {
   /** 群描述中会话 ID 的前缀，如 "Claude Session:" */
   readonly sessionDescPrefix: string;
 
-  /**
-   * 创建新会话，返回会话 ID。
-   * 适配器内部需处理后台流消费（静默消费 stream 中除 init 外的所有事件）。
-   * signal 用于上层在长期收不到 init 事件时终止底层 SDK/CLI。
-   */
-  createSession(cwd: string, signal?: AbortSignal): Promise<CreateSessionResult>;
+  /**
+   * 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。
+   * 适配器内部需处理后台流消费（静默消费 stream 中除 init 外的所有事件）。
+   * signal 用于上层在长期收不到 init 事件时终止底层 SDK/CLI。
+   */
+  createSession(cwd: string, signal?: AbortSignal): Promise<CreateSessionResult>;
 
   /**
    * 向已有会话发送提示文本，返回归一化消息的异步迭代器。
@@ -208,4 +214,4 @@ export function parseUserCommand(userText: string): UserCommand {
   if (original.startsWith("/plan")) return { original, mode: "plan" };
   if (original.startsWith("/ask")) return { original, mode: "ask" };
   return { original, mode: null };
-}
+}

package/src/adapters/ccc-adapter.ts

@@ -1,145 +1,150 @@
-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.provider !== undefined ? { provider: options.provider } : {}),
+    ...(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.
+    },
+  };
+}