chatccc 0.2.222 → 0.2.224

package/src/__tests__/terminal-renderer.test.ts

@@ -0,0 +1,143 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import {
+  buildBlockLines,
+  TerminalProgressRenderer,
+} from "../progress/terminal-renderer.ts";
+import { progressView } from "../progress/view.ts";
+
+class FakeOut {
+  chunks: string[] = [];
+  columns = 100;
+  write(s: string): boolean {
+    this.chunks.push(s);
+    return true;
+  }
+  get output(): string {
+    return this.chunks.join("");
+  }
+}
+
+/** 测试桩：仅实现 write 的假输出流，类型上按 WritableStream 对待 */
+function asOut(out: FakeOut): NodeJS.WritableStream & { columns?: number } {
+  return out as unknown as NodeJS.WritableStream & { columns?: number };
+}
+
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+describe("buildBlockLines", () => {
+  it("renders generating status line with header title and stop hint", () => {
+    const lines = buildBlockLines(
+      progressView({ headerTitle: "正在启动 Agent · 0秒", text: "" }),
+      100,
+    );
+    expect(lines[0]).toContain("⏳ 正在启动 Agent · 0秒");
+    expect(lines[0]).toContain("Ctrl+C 停止");
+    expect(lines[1]).toContain("等待 Agent 输出...");
+  });
+
+  it("renders done / stopped / error status lines", () => {
+    const done = buildBlockLines(progressView({ status: "done", text: "ok" }), 100);
+    expect(done[0]).toContain("✅ 完成");
+    const stopped = buildBlockLines(progressView({ status: "stopped", text: "x" }), 100);
+    expect(stopped[0]).toContain("⏹ 已停止");
+    const error = buildBlockLines(progressView({ status: "error", text: "x" }), 100);
+    expect(error[0]).toContain("❌ 异常结束");
+  });
+
+  it("renders tool lines with emoji and status mark", () => {
+    const lines = buildBlockLines(
+      progressView({
+        text: "",
+        tools: [
+          { id: "t1", name: "edit_file", status: "running", detail: "edit a.ts" },
+          { id: "t2", name: "run_command", status: "ok", summary: "npm test passed" },
+          { id: "t3", name: "search_code", status: "error", summary: "regex error" },
+        ],
+      }),
+      100,
+    );
+    expect(lines[1]).toContain("edit_file");
+    expect(lines[1]).toContain("…");
+    expect(lines[1]).toContain("edit a.ts");
+    expect(lines[2]).toContain("✓");
+    expect(lines[2]).toContain("npm test passed");
+    expect(lines[3]).toContain("✗");
+    expect(lines[3]).toContain("regex error");
+  });
+
+  it("truncates long body to maxBodyLines", () => {
+    const text = Array.from({ length: 50 }, (_, i) => `line ${i}`).join("\n");
+    const lines = buildBlockLines(progressView({ text }), 100, 5);
+    expect(lines.filter((l) => l.startsWith("line"))).toHaveLength(5);
+    expect(lines.join("\n")).toContain("...");
+  });
+
+  it("clips lines wider than terminal width to avoid wrapping", () => {
+    const lines = buildBlockLines(
+      progressView({ text: "x".repeat(200) }),
+      30,
+    );
+    for (const line of lines) {
+      expect(line.length).toBeLessThanOrEqual(30);
+    }
+  });
+});
+
+describe("TerminalProgressRenderer", () => {
+  it("begin writes hide-cursor and the first frame", () => {
+    const out = new FakeOut();
+    const r = new TerminalProgressRenderer({ out: asOut(out) });
+    r.begin(progressView({ text: "hello" }));
+    expect(out.output.startsWith("\x1b[?25l")).toBe(true);
+    expect(out.output).toContain("hello");
+  });
+
+  it("end finalizes the block and restores cursor, keeping block on screen", () => {
+    const out = new FakeOut();
+    const r = new TerminalProgressRenderer({ out: asOut(out) });
+    r.begin(progressView({ text: "a" }));
+    const before = out.chunks.length;
+    r.end(progressView({ status: "done", text: "final" }));
+    const delta = out.output.slice(out.chunks.slice(0, before).join("").length);
+    expect(delta).toContain("✅ 完成");
+    expect(delta.endsWith("\x1b[?25h")).toBe(true);
+  });
+
+  it("render is frame-throttled and flush forces immediate redraw", () => {
+    vi.useFakeTimers();
+    const out = new FakeOut();
+    const r = new TerminalProgressRenderer({ out: asOut(out), frameMs: 100 });
+
+    r.begin(progressView({ text: "" }));
+    const outputAfterBegin = out.output;
+
+    r.render(progressView({ text: "one" }));
+    r.render(progressView({ text: "two" }));
+    r.render(progressView({ text: "three" }));
+    // 节流窗口内多次 render 不应产生任何输出
+    expect(out.output).toBe(outputAfterBegin);
+
+    vi.advanceTimersByTime(100);
+    // 合并后只重绘一次，且展示的是最新视图
+    expect(out.output).toContain("three");
+    expect(out.output).not.toContain("two");
+
+    r.flush();
+    // flush 立即重绘当前视图（输出继续增长且仍是三帧内容）
+    expect(out.output.length).toBeGreaterThan(outputAfterBegin.length);
+    expect(out.output).toContain("three");
+    r.dispose();
+  });
+
+  it("clears leftover lines when the block shrinks", () => {
+    const out = new FakeOut();
+    const r = new TerminalProgressRenderer({ out: asOut(out) });
+    r.begin(progressView({ text: "a\nb\nc\nd" }));
+    r.end(progressView({ status: "done", text: "short" }));
+    expect(out.output).toContain("\x1b[2K\n");
+    expect(out.output).toContain("\x1b[J");
+  });
+});

package/src/adapters/ccc-adapter.ts

@@ -41,6 +41,7 @@ export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
     ...(options.apiKey !== undefined ? { apiKey: options.apiKey } : {}),
     ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
     ...(options.model !== undefined ? { model: options.model } : {}),
+    ...(options.effort !== undefined ? { effort: options.effort } : {}),
   };
 
   return {

package/src/builtin/cli.ts

@@ -5,6 +5,10 @@
  *   npx tsx src/builtin/cli.ts
  *   npx tsx src/builtin/cli.ts --model deepseek-v4-pro
  *   npx tsx src/builtin/cli.ts --stream-json --prompt "hello"
+ *
+ * 交互模式（TTY）下，单轮回复渲染为固定"过程区块"（飞书过程卡片的终端形态）：
+ * 状态行 + 折叠工具行 + 原地更新正文，不再滚屏刷 JSON；完成/停止/异常后定型
+ * 留在屏幕上。非 TTY（管道/CI）回退为纯文本流式输出；--stream-json 机器接口不变。
  */
 
 import * as readline from "node:readline";
@@ -15,6 +19,9 @@ import { fileURLToPath } from "node:url";
 import { listBuiltinContextSessions } from "./context.js";
 import { resolveBuiltinSession, type BuiltinResumeRequest } from "./session-select.js";
 import { createCtrlCState } from "./sigint.js";
+import { reduceProgress } from "../progress/reducer.ts";
+import { TerminalProgressRenderer } from "../progress/terminal-renderer.ts";
+import { progressView, type ProgressView } from "../progress/view.ts";
 import type { ChatEvent, ChatSessionConfig, ChatSessionOptions } from "./index.js";
 
 interface ParsedArgs {
@@ -60,6 +67,9 @@ function parseArgs(argv = process.argv.slice(2)): ParsedArgs {
     if (arg === "--model" && next !== undefined) {
       config.model = next;
       i++;
+    } else if (arg === "--effort" && next !== undefined) {
+      config.effort = next;
+      i++;
     } else if (arg === "--base-url" && next !== undefined) {
       config.baseURL = next;
       i++;
@@ -110,6 +120,7 @@ function printHelp(appConfig: RuntimeDeps["appConfig"]): void {
     "",
     "Options:",
     `  --model <name>       Model name (overrides config.ccc.model, current default ${appConfig.ccc.model})`,
+    `  --effort <level>     Reasoning effort: none/minimal/low/medium/high/xhigh/max (overrides config.ccc.effort)`,
     `  --base-url <url>     API base URL (current default ${appConfig.ccc.DEEPSEEK_BASE_URL})`,
     "  --api-key <key>      API key (overrides config.ccc.DEEPSEEK_API_KEY)",
     "  --cwd <path>         Working directory",
@@ -373,10 +384,28 @@ async function runRepl(args: ParsedArgs): Promise<void> {
     currentAbort = new AbortController();
     const signal = currentAbort.signal;
 
+    // TTY 下用"过程区块"（飞书过程卡片的终端形态）：固定区域原地更新、
+    // 工具调用折叠为单行；非 TTY（管道/CI）回退为纯文本流式输出。
+    const useTerminalBlock = process.stdout.isTTY === true;
+    const renderer = useTerminalBlock ? new TerminalProgressRenderer() : null;
+    let view: ProgressView | null = null;
+    if (renderer) {
+      view = progressView({ headerTitle: "生成中..." });
+      renderer.begin(view);
+    }
+    let rendererEnded = false;
+
     try {
       let lastAccumulated = "";
       for await (const event of session.chat(input, signal)) {
-        if (event.type === "text") {
+        if (renderer && view) {
+          view = reduceProgress(view, event);
+          if (event.type === "text" || event.type === "compact") {
+            renderer.render(view);
+          } else {
+            renderer.flush();
+          }
+        } else if (event.type === "text") {
           const newText = event.accumulated.slice(lastAccumulated.length);
           process.stdout.write(newText);
           lastAccumulated = event.accumulated;
@@ -395,8 +424,20 @@ async function runRepl(args: ParsedArgs): Promise<void> {
         }
       }
     } catch (err) {
+      if (renderer && view) {
+        const aborted = err instanceof Error && err.name === "AbortError";
+        view = progressView({ ...view, status: aborted ? "stopped" : "error", showStop: false });
+        renderer.end(view);
+        rendererEnded = true;
+        console.log("");
+      }
       console.log(`\n${C.yellow}[error] ${(err as Error).message}${C.reset}`);
     } finally {
+      if (renderer && view && !rendererEnded) {
+        // 定型终态区块（完成/已停止/异常结束）留在屏幕上，恢复光标
+        renderer.end(view);
+        console.log("");
+      }
       currentAbort = null;
       ctrlCState.reset();
     }

package/src/builtin/index.ts

@@ -100,6 +100,11 @@ export interface ChatSessionConfig {
   apiKey?: string;
   /** 模型名称；传入时覆盖 config.ccc.model */
   model?: string;
+  /**
+   * Reasoning effort（none/minimal/low/medium/high/xhigh/max）；
+   * 传入时覆盖 config.ccc.effort，留空不传 reasoning_effort 请求字段。
+   */
+  effort?: string;
 }
 
 export interface ChatSessionOptions {
@@ -156,6 +161,7 @@ export class ChatSession {
   private cwd: string;
   private context: BuiltinContextManager;
   private maxSteps?: number;
+  private effort: string;
 
   constructor(
     overrides: ChatSessionConfig = {},
@@ -170,6 +176,7 @@ export class ChatSession {
 
     const baseURL = overrides.baseURL ?? appConfig.ccc.DEEPSEEK_BASE_URL;
     const modelId = overrides.model ?? appConfig.ccc.model;
+    this.effort = (overrides.effort ?? appConfig.ccc.effort ?? "").trim();
 
     const provider = createOpenAICompatible({
       name: "deepseek",
@@ -260,6 +267,9 @@ export class ChatSession {
         tools: createBuiltinFileTools(this.cwd),
         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);