chatccc 0.2.244 → 0.2.245

package/deepccc-agent/src/__tests__/privacy.test.ts

@@ -55,7 +55,8 @@ import { ChatSession } from "../index.js";
 const streamTextMock = aiMocks.streamText;
 const generateTextMock = aiMocks.generateText;
 
-const originalRawStreamLogs = structuredClone(config.rawStreamLogs);
+const originalRawStreamLogs = structuredClone(config.rawStreamLogs);
+const originalStreaming = config.streaming;
 const PRIVACY_FILE = join(privacyState.dir, "privacy.json");
 
 function writePrivacy(content: string): void {
@@ -78,16 +79,18 @@ beforeEach(() => {
   } catch {}
   reloadPrivacyRules();
   streamTextMock.mockReset();
-  generateTextMock.mockReset();
-  config.rawStreamLogs = structuredClone(originalRawStreamLogs);
+  generateTextMock.mockReset();
+  config.rawStreamLogs = structuredClone(originalRawStreamLogs);
+  config.streaming = true;
 });
 
 afterEach(() => {
   try {
     rmSync(PRIVACY_FILE, { force: true });
   } catch {}
-  reloadPrivacyRules();
-});
+  reloadPrivacyRules();
+  config.streaming = originalStreaming;
+});
 
 afterAll(() => {
   try {

package/deepccc-agent/src/cli.ts

@@ -11,8 +11,8 @@
  * 非 TTY（管道/CI）或 --plain 回退为纯文本流式输出；--stream-json 机器接口不变。
  */
 
-import * as readline from "node:readline";
-import * as process from "node:process";
+import * as readline from "node:readline";
+import process from "node:process";
 import { appendFileSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve as resolvePath } from "node:path";
@@ -637,10 +637,11 @@ async function main(): Promise<void> {
 
   const args = parseArgs();
 
-  if (args.streamJson) {
-    const code = await runStreamJson(args);
-    process.exit(code);
-  }
+  if (args.streamJson) {
+    const code = await runStreamJson(args);
+    process.exitCode = code;
+    return;
+  }
 
   if (args.help) {
     const { appConfig } = await loadRuntime();

package/deepccc-agent/src/config.ts

@@ -8,6 +8,8 @@ export interface DeepCccConfig {
   model: string;
   /** Reasoning effort（none/minimal/low/medium/high/xhigh/max），留空不传 reasoning_effort */
   effort: string;
+  /** 主对话是否使用流式请求；默认开启 */
+  streaming: boolean;
   rawStreamLogs: {
     enabled: boolean;
     maxBytesPerTurn: number;
@@ -25,6 +27,7 @@ const DEFAULT_CONFIG: DeepCccConfig = {
   baseURL: "https://api.deepseek.com/v1",
   model: "deepseek-v4-pro",
   effort: "",
+  streaming: true,
   rawStreamLogs: {
     enabled: false,
     maxBytesPerTurn: 1024 * 1024,
@@ -68,6 +71,7 @@ function loadConfig(): DeepCccConfig {
     baseURL: env("DEEPCCC_BASE_URL") ?? env("DEEPSEEK_BASE_URL") ?? file.baseURL ?? DEFAULT_CONFIG.baseURL,
     model: env("DEEPCCC_MODEL") ?? env("DEEPSEEK_MODEL") ?? file.model ?? DEFAULT_CONFIG.model,
     effort: env("DEEPCCC_EFFORT") ?? env("DEEPSEEK_EFFORT") ?? file.effort ?? DEFAULT_CONFIG.effort,
+    streaming: boolEnv("DEEPCCC_STREAMING") ?? file.streaming ?? DEFAULT_CONFIG.streaming,
     rawStreamLogs: {
       enabled: boolEnv("DEEPCCC_RAW_STREAM_LOGS") ?? rawLogs.enabled ?? DEFAULT_CONFIG.rawStreamLogs.enabled,
       maxBytesPerTurn: numberEnv("DEEPCCC_RAW_STREAM_MAX_BYTES") ?? rawLogs.maxBytesPerTurn ?? DEFAULT_CONFIG.rawStreamLogs.maxBytesPerTurn,

package/deepccc-agent/src/index.ts

@@ -280,10 +280,11 @@ export class ChatSession {
     const modelId = overrides.model ?? appConfig.model;
     this.effort = (overrides.effort ?? appConfig.effort ?? "").trim();
 
-    const provider = createOpenAICompatible({
-      name: "deepccc",
-      baseURL,
-      apiKey,
+    const provider = createOpenAICompatible({
+      name: "deepccc",
+      baseURL,
+      apiKey,
+      includeUsage: true,
     });
     this.model = provider(modelId);
     this.cwd = options.cwd ?? process.cwd();
@@ -383,20 +384,27 @@ export class ChatSession {
       const skills = await scanSkillsDirs(this.skillDirs);
       const system = this.buildSystemPrompt(skills);
       this.systemPrompt = system;
-      const result = streamText({
-        model: this.model,
-        system,
-        messages: this.context.buildModelMessages() as any,
+      const generationOptions = {
+        model: this.model,
+        system,
+        messages: this.context.buildModelMessages() as any,
         tools: createBuiltinFileTools(this.cwd, { permissionGate: this.permissionGate }),
         stopWhen: maxSteps !== undefined ? stepCountIs(maxSteps) : isLoopFinished(),
         abortSignal: signal,
-        // DeepSeek OpenAI 兼容接口：providerOptions.deepseek.reasoningEffort
-        // 由 @ai-sdk/openai-compatible 自动映射为请求体 reasoning_effort 字段
-        ...(this.effort ? { providerOptions: { deepseek: { reasoningEffort: this.effort } } } : {}),
-      });
-
-      const stream = result.fullStream ?? textStreamToFullStream(result.textStream);
-      for await (const part of stream as AsyncIterable<TextStreamPart<any>>) {
+        // DeepSeek OpenAI 兼容接口：providerOptions.deepseek.reasoningEffort
+        // 由 @ai-sdk/openai-compatible 自动映射为请求体 reasoning_effort 字段
+        ...(this.effort ? { providerOptions: { deepseek: { reasoningEffort: this.effort } } } : {}),
+      };
+      let stream: AsyncIterable<TextStreamPart<any>>;
+      if (appConfig.streaming) {
+        const result = streamText(generationOptions);
+        stream = result.fullStream ?? textStreamToFullStream(result.textStream);
+      } else {
+        const result = await generateText(generationOptions);
+        stream = generateResultToFullStream(result);
+      }
+
+      for await (const part of stream as AsyncIterable<TextStreamPart<any>>) {
         rawLog?.writeLine(safeRawStreamJson(part));
         if (part.type === "text-delta") {
           fullText += part.text;
@@ -554,11 +562,40 @@ export class ChatSession {
   }
 }
 
-async function* textStreamToFullStream(stream: AsyncIterable<string>): AsyncIterable<{ type: "text-delta"; text: string }> {
-  for await (const text of stream) {
-    yield { type: "text-delta", text };
-  }
-}
+async function* textStreamToFullStream(stream: AsyncIterable<string>): AsyncIterable<{ type: "text-delta"; text: string }> {
+  for await (const text of stream) {
+    yield { type: "text-delta", text };
+  }
+}
+
+async function* generateResultToFullStream(result: any): AsyncIterable<TextStreamPart<any>> {
+  let emittedText = false;
+  for (const step of result.steps ?? []) {
+    for (const call of step.toolCalls ?? []) {
+      yield {
+        type: "tool-call",
+        toolCallId: call.toolCallId,
+        toolName: call.toolName,
+        input: call.input,
+      } as TextStreamPart<any>;
+    }
+    for (const toolResult of step.toolResults ?? []) {
+      yield {
+        type: "tool-result",
+        toolCallId: toolResult.toolCallId,
+        toolName: toolResult.toolName,
+        output: toolResult.output,
+      } as TextStreamPart<any>;
+    }
+    if (step.text) {
+      emittedText = true;
+      yield { type: "text-delta", text: step.text } as TextStreamPart<any>;
+    }
+  }
+  if (!emittedText && result.text) {
+    yield { type: "text-delta", text: result.text } as TextStreamPart<any>;
+  }
+}
 
 function safeJson(value: unknown): string {
   try {

package/package.json

@@ -1,73 +1,73 @@
-{
-  "name": "chatccc",
-  "version": "0.2.244",
-  "description": "Feishu bot bridge for Claude Code",
-  "license": "Apache-2.0",
-  "type": "module",
-  "main": "./src/index.ts",
-  "bin": {
-    "chatccc": "bin/chatccc.mjs",
-    "cccagent": "bin/cccagent.mjs"
-  },
-  "files": [
-    "src/",
-    "deepccc-agent/",
-    "bin/",
-    "scripts/postinstall-sharp-check.mjs",
-    "demo/ilink_echo_probe.ts",
-    "agent-prompts/",
-    "im-skills/",
-    ".agents/skills/create-chatccc-feishu-app/",
-    ".claude/skills/create-chatccc-feishu-app/",
-    ".cursor/skills/create-chatccc-feishu-app/",
-    "images/img_readme_*.jpg",
-    "images/img_readme_*.png",
-    "images/avatars/status_*.png",
-    "images/avatars/badges/",
-    "images/avatars/combinations/",
-    "package.json",
-    "README.md",
-    "config.sample.json"
-  ],
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "chatccc": "tsx src/index.ts",
-    "start": "tsx src/index.ts",
-    "demo:bot-test": "tsx demo/bot_test.ts",
-    "demo:bot-test:local": "tsx demo/bot_test.ts --local",
-    "demo:create-group": "tsx src/index.ts",
-    "demo:create-group:local": "tsx src/index.ts --local",
-    "demo:permission-check": "tsx demo/permission_check.ts",
-    "demo:claude-hi": "tsx demo/claude_say_hi.ts",
-    "demo:codex-hi": "tsx demo/codex_say_hi.ts",
-    "demo:codex-app-server-approval": "tsx demo/codex-app-server-approval/approval_demo.ts",
-    "demo:ilink-echo": "tsx demo/ilink_echo_probe.ts",
-    "claude-proxy": "tsx src/litellm-proxy.ts",
-    "test": "vitest run",
-    "test:deepccc": "vitest run --root deepccc-agent",
-    "test:watch": "vitest",
-    "postinstall": "node scripts/postinstall-sharp-check.mjs"
-  },
-  "dependencies": {
-    "@ai-sdk/openai-compatible": "^2.0.47",
-    "@larksuiteoapi/node-sdk": "^1.59.0",
-    "@openilink/openilink-sdk-node": "^0.6.0",
-    "@vscode/ripgrep": "^1.18.0",
-    "ai": "^6.0.184",
-    "nodemailer": "^8.0.7",
-    "qrcode-terminal": "^0.12.0",
-    "sharp": "^0.34.5",
-    "tsx": "^4.0.0",
-    "ws": "^8.18.0"
-  },
-  "devDependencies": {
-    "@types/node": "^20.0.0",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/ws": "^8.18.1",
-    "typescript": "^5.0.0",
-    "vitest": "^3.2.4"
-  },
-  "engines": {
-    "node": ">=20"
-  }
-}
+{
+  "name": "chatccc",
+  "version": "0.2.245",
+  "description": "Feishu bot bridge for Claude Code",
+  "license": "Apache-2.0",
+  "type": "module",
+  "main": "./src/index.ts",
+  "bin": {
+    "chatccc": "bin/chatccc.mjs",
+    "cccagent": "bin/cccagent.mjs"
+  },
+  "files": [
+    "src/",
+    "deepccc-agent/",
+    "bin/",
+    "scripts/postinstall-sharp-check.mjs",
+    "demo/ilink_echo_probe.ts",
+    "agent-prompts/",
+    "im-skills/",
+    ".agents/skills/create-chatccc-feishu-app/",
+    ".claude/skills/create-chatccc-feishu-app/",
+    ".cursor/skills/create-chatccc-feishu-app/",
+    "images/img_readme_*.jpg",
+    "images/img_readme_*.png",
+    "images/avatars/status_*.png",
+    "images/avatars/badges/",
+    "images/avatars/combinations/",
+    "package.json",
+    "README.md",
+    "config.sample.json"
+  ],
+  "scripts": {
+    "dev": "tsx src/index.ts",
+    "chatccc": "tsx src/index.ts",
+    "start": "tsx src/index.ts",
+    "demo:bot-test": "tsx demo/bot_test.ts",
+    "demo:bot-test:local": "tsx demo/bot_test.ts --local",
+    "demo:create-group": "tsx src/index.ts",
+    "demo:create-group:local": "tsx src/index.ts --local",
+    "demo:permission-check": "tsx demo/permission_check.ts",
+    "demo:claude-hi": "tsx demo/claude_say_hi.ts",
+    "demo:codex-hi": "tsx demo/codex_say_hi.ts",
+    "demo:codex-app-server-approval": "tsx demo/codex-app-server-approval/approval_demo.ts",
+    "demo:ilink-echo": "tsx demo/ilink_echo_probe.ts",
+    "claude-proxy": "tsx src/litellm-proxy.ts",
+    "test": "vitest run",
+    "test:deepccc": "vitest run --root deepccc-agent",
+    "test:watch": "vitest",
+    "postinstall": "node scripts/postinstall-sharp-check.mjs"
+  },
+  "dependencies": {
+    "@ai-sdk/openai-compatible": "^2.0.47",
+    "@larksuiteoapi/node-sdk": "^1.59.0",
+    "@openilink/openilink-sdk-node": "^0.6.0",
+    "@vscode/ripgrep": "^1.18.0",
+    "ai": "^6.0.184",
+    "nodemailer": "^8.0.7",
+    "qrcode-terminal": "^0.12.0",
+    "sharp": "^0.34.5",
+    "tsx": "^4.0.0",
+    "ws": "^8.18.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.18.1",
+    "typescript": "^5.0.0",
+    "vitest": "^3.2.4"
+  },
+  "engines": {
+    "node": ">=20"
+  }
+}

package/src/__tests__/ccc-adapter.test.ts

@@ -34,6 +34,21 @@ afterEach(() => {
 });
 
 describe("createCccAdapter", () => {
+  it("disables response-stall detection when DeepCCC streaming is disabled", async () => {
+    const { config: deepCccConfig } = await import("../../deepccc-agent/src/config.ts");
+    const previousStreaming = deepCccConfig.streaming;
+    deepCccConfig.streaming = false;
+
+    try {
+      const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+      const adapter = createCccAdapter({ apiKey: "sk-test" });
+
+      expect(adapter.responseStallDetectionEnabled).toBe(false);
+    } finally {
+      deepCccConfig.streaming = previousStreaming;
+    }
+  });
+
   it("creates a persisted ccc session and exposes model/cwd metadata", async () => {
     const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
     const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-meta-"));

package/src/__tests__/session.test.ts

@@ -928,7 +928,7 @@ describe("runAgentSession response stall watchdog", () => {
     if (tempDir) await rm(tempDir, { recursive: true, force: true });
   });
 
-  it("auto-ends every Agent after three minutes of unchanged reply characters, including zero", async () => {
+  it("auto-ends adapters with stall detection after three minutes of unchanged reply characters, including zero", async () => {
     vi.setSystemTime(0);
     _setResponseStallTimeoutForTest(180_000);
     _setResponseStallCheckIntervalForTest(1_000);
@@ -994,13 +994,76 @@ describe("runAgentSession response stall watchdog", () => {
     expect(closeSession).toHaveBeenCalledTimes(1);
     expect(killProcessTreeMock).toHaveBeenCalledWith(4242);
     expect(activePrompts.has("sid-response-stall")).toBe(false);
-    expect(mockStreamStates.get("sid-response-stall")).toMatchObject({
-      status: "auto_ended",
-      finalReply: "",
-      autoEndedAt: expect.any(Number),
-    });
-  });
-
+    expect(mockStreamStates.get("sid-response-stall")).toMatchObject({
+      status: "auto_ended",
+      finalReply: "",
+      autoEndedAt: expect.any(Number),
+    });
+  });
+
+  it("does not detect response stalls when the adapter disables streamed-output monitoring", async () => {
+    vi.setSystemTime(0);
+    _setResponseStallTimeoutForTest(180_000);
+    _setResponseStallCheckIntervalForTest(1_000);
+    _setProcessAliveForTest(() => true);
+
+    const platform = mockPlatform("feishu");
+    setSessionPlatform(platform);
+    bindChatToSession("sid-non-streaming", "chat-non-streaming");
+    recordLastActiveChat("sid-non-streaming", "chat-non-streaming");
+
+    let finishPrompt: (() => void) | undefined;
+    const closeSession = vi.fn();
+    const adapter: ToolAdapter = {
+      displayName: "Non-streaming DeepCCC",
+      sessionDescPrefix: "CCC Session:",
+      responseStallDetectionEnabled: false,
+      createSession: async () => ({ sessionId: "sid-non-streaming" }),
+      getSessionInfo: async (sid) => ({ sessionId: sid, cwd: "F:\\repo" }),
+      closeSession: async () => {},
+      prompt: async function* (
+        _sid: string,
+        _text: string,
+        _cwd: string,
+        _signal?: AbortSignal,
+        options?: ToolPromptOptions,
+      ) {
+        options?.onSessionCreated?.(closeSession);
+        options?.onProcessStart?.({ pid: 4545 });
+        yield { type: "assistant", blocks: [{ type: "agent_status", status: "responding" }] };
+        await new Promise<void>((resolve) => {
+          finishPrompt = resolve;
+        });
+      },
+    };
+    _setAdapterForToolForTest("ccc", adapter);
+
+    const runPromise = runAgentSession(
+      "sid-non-streaming",
+      "prompt",
+      platform,
+      "chat-non-streaming",
+      Date.now(),
+      "ccc",
+    );
+
+    await vi.waitFor(() => {
+      expect(activePrompts.get("sid-non-streaming")?.processPid).toBe(4545);
+      expect(finishPrompt).toBeTypeOf("function");
+    });
+    expect(activePrompts.get("sid-non-streaming")?.responseStallMonitor).toBeUndefined();
+
+    await vi.advanceTimersByTimeAsync(181_001);
+
+    expect(activePrompts.has("sid-non-streaming")).toBe(true);
+    expect(closeSession).not.toHaveBeenCalled();
+    expect(killProcessTreeMock).not.toHaveBeenCalledWith(4545);
+    expect(mockStreamStates.get("sid-non-streaming")?.status).toBe("running");
+
+    finishPrompt?.();
+    await runPromise;
+  });
+
   it("does not apply the reply-stall timeout while an Agent is compacting context", async () => {
     vi.setSystemTime(0);
     _setResponseStallTimeoutForTest(180_000);

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,4 +1,5 @@
 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,
@@ -56,6 +57,9 @@ export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
   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();

package/src/session.ts

@@ -1521,7 +1521,8 @@ export async function runAgentSession(
   let streamErrored = false;
   let streamTerminalError: TerminalErrorInfo | undefined;
   let runOutcome: SessionRunOutcome = "error";
-
+  const responseStallDetectionEnabled = adapter.responseStallDetectionEnabled !== false;
+
   const runningPrompt = activePrompts.get(sessionId);
   if (runningPrompt) {
     startPromptAvatarRefresh(sessionId, tool, platform, runningPrompt);
@@ -1607,14 +1608,16 @@ export async function runAgentSession(
       );
     };
 
-    const responseStallMonitor = setInterval(() => {
-      void checkResponseStall().catch((err) => {
-        console.warn(`[${ts()}] [RESPONSE-STALL] check failed for ${sessionId}: ${(err as Error).message}`);
-      });
-    }, responseStallCheckIntervalMs);
-    responseStallMonitor.unref?.();
-    runningPrompt.responseStallMonitor = responseStallMonitor;
-  }
+    if (responseStallDetectionEnabled) {
+      const responseStallMonitor = setInterval(() => {
+        void checkResponseStall().catch((err) => {
+          console.warn(`[${ts()}] [RESPONSE-STALL] check failed for ${sessionId}: ${(err as Error).message}`);
+        });
+      }, responseStallCheckIntervalMs);
+      responseStallMonitor.unref?.();
+      runningPrompt.responseStallMonitor = responseStallMonitor;
+    }
+  }
 
   try {
     for await (const unifiedMsg of adapter.prompt(sessionId, userTextWithCapabilities, cwd, controller.signal, {
@@ -1664,7 +1667,7 @@ export async function runAgentSession(
       }
 
       const prompt = activePrompts.get(sessionId);
-      if (prompt && !prompt.autoEnded) {
+      if (prompt && !prompt.autoEnded) {
         const totalChars = state.accumulatedContent.length + pickFinalReply(state).length;
         prompt.responseProgress = observeResponseProgress(
           // starting → responding 本身是一次有效进展，即便首个文本块仍为空也应