chatccc 0.2.223 → 0.2.225

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

@@ -2,6 +2,8 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 
 import {
   buildBlockLines,
+  charWidth,
+  clipToWidth,
   TerminalProgressRenderer,
 } from "../progress/terminal-renderer.ts";
 import { progressView } from "../progress/view.ts";
@@ -41,6 +43,7 @@ describe("buildBlockLines", () => {
   it("renders done / stopped / error status lines", () => {
     const done = buildBlockLines(progressView({ status: "done", text: "ok" }), 100);
     expect(done[0]).toContain("✅ 完成");
+    expect(done[0]).toContain("\x1b[1m"); // 完成状态行加粗，不用浅色
     const stopped = buildBlockLines(progressView({ status: "stopped", text: "x" }), 100);
     expect(stopped[0]).toContain("⏹ 已停止");
     const error = buildBlockLines(progressView({ status: "error", text: "x" }), 100);
@@ -66,6 +69,10 @@ describe("buildBlockLines", () => {
     expect(lines[2]).toContain("npm test passed");
     expect(lines[3]).toContain("✗");
     expect(lines[3]).toContain("regex error");
+    // 工具行摘要不用浅色字体（回复内容可读性优先）
+    for (const line of [lines[1], lines[2], lines[3]]) {
+      expect(line).not.toContain("\x1b[2m");
+    }
   });
 
   it("truncates long body to maxBodyLines", () => {
@@ -84,6 +91,46 @@ describe("buildBlockLines", () => {
       expect(line.length).toBeLessThanOrEqual(30);
     }
   });
+
+  it("charWidth counts CJK/emoji as 2 columns and control/ZWJ as 0", () => {
+    expect(charWidth("a")).toBe(1);
+    expect(charWidth("中")).toBe(2);
+    expect(charWidth("📂")).toBe(2);
+    expect(charWidth("\u200d")).toBe(0); // ZWJ
+  });
+
+  it("clipToWidth truncates by display width, not string length", () => {
+    expect(clipToWidth("中文abc", 4)).toBe("中文");
+    expect(clipToWidth("中文abc", 5)).toBe("中文a");
+    expect(clipToWidth("📂 x", 2)).toBe("📂");
+    expect(clipToWidth("📂 x", 3)).toBe("📂 ");
+  });
+
+  it("clipToWidth keeps ANSI tokens whole and closes colors at the cut", () => {
+    const ansi = "\x1b[32m📂\x1b[0m abc";
+    expect(clipToWidth(ansi, 6)).toBe("\x1b[32m📂\x1b[0m abc");
+    expect(clipToWidth(ansi, 5)).toBe("\x1b[32m📂\x1b[0m ab");
+    // 截断发生在未闭合颜色内时自动补 reset，避免颜色泄漏
+    expect(clipToWidth("\x1b[1m\x1b[32m✅ 完成\x1b[0m", 6)).toBe("\x1b[1m\x1b[32m✅ 完\x1b[0m");
+  });
+
+  it("emoji tool lines are clipped by display width so the block never wraps", () => {
+    // 模拟用户示例：emoji + 超长 JSON 工具行，宽 40 的终端必须整行不折行
+    const lines = buildBlockLines(
+      progressView({
+        text: "",
+        tools: [
+          { id: "t1", name: "list_dir", status: "ok", summary: `{"path":"C:\\Users\\weizhangjian\\.chatccc","entries":[{"name":"builtin","path":"C:\\Users${'x'.repeat(300)}"}]}` },
+        ],
+      }),
+      40,
+    );
+    const toolLine = lines.find((l) => l.includes("list_dir"))!;
+    // 显示宽度（剥离 ANSI 后按 charWidth 计算）不超过终端列宽，永不折行
+    const visible = [...toolLine.replace(/\x1b\[[0-9;]*m/g, "")].reduce((w, ch) => w + charWidth(ch), 0);
+    expect(visible).toBeLessThanOrEqual(40);
+    expect(toolLine).toContain("\x1b[0m"); // ANSI 完整闭合
+  });
 });
 
 describe("TerminalProgressRenderer", () => {
@@ -93,6 +140,7 @@ describe("TerminalProgressRenderer", () => {
     r.begin(progressView({ text: "hello" }));
     expect(out.output.startsWith("\x1b[?25l")).toBe(true);
     expect(out.output).toContain("hello");
+    r.dispose();
   });
 
   it("end finalizes the block and restores cursor, keeping block on screen", () => {
@@ -140,4 +188,60 @@ describe("TerminalProgressRenderer", () => {
     expect(out.output).toContain("\x1b[2K\n");
     expect(out.output).toContain("\x1b[J");
   });
+
+  it("heartbeat animates generating dots so the block never freezes", () => {
+    vi.useFakeTimers();
+    const out = new FakeOut();
+    const r = new TerminalProgressRenderer({ out: asOut(out), animMs: 100 });
+    r.begin(progressView({ headerTitle: "生成中...", text: "" }));
+    const frame0 = out.output;
+    expect(frame0).toContain("·"); // 首帧即带动画点
+    vi.advanceTimersByTime(100);
+    const frame1 = out.output;
+    expect(frame1).not.toBe(frame0); // 无新事件也持续重绘
+    expect(frame1).toContain("··"); // 第二帧点号增长
+    r.dispose();
+  });
+
+  it("stops the heartbeat after end so the final block stays static", () => {
+    vi.useFakeTimers();
+    const out = new FakeOut();
+    const r = new TerminalProgressRenderer({ out: asOut(out), animMs: 100 });
+    r.begin(progressView({ text: "" }));
+    r.end(progressView({ status: "done", text: "final" }));
+    const afterEnd = out.output.length;
+    vi.advanceTimersByTime(500);
+    expect(out.output.length).toBe(afterEnd);
+  });
+
+  it("redraw moves up exactly blockLines-1 rows, never eating history above", () => {
+    // 回归测试：光标在区块最后一行时，回到第一行只需上移 N-1 行。
+    // 上移 N 行会每帧多上移 1 行，把上方历史内容逐行吃掉。
+    const out = new FakeOut();
+    const r = new TerminalProgressRenderer({ out: asOut(out), animMs: 0 });
+    // 状态行 1 行 + 正文 4 行 = 5 行区块
+    r.begin(progressView({ text: "a\nb\nc\nd" }));
+    const afterBegin = out.output;
+    r.flush(); // 第二帧强制重绘
+    const delta = out.output.slice(afterBegin.length);
+    expect(delta).toContain("\x1b[4A"); // 上移 5-1=4 行
+    expect(delta).not.toContain("\x1b[5A"); // 绝不出现上移 N 行
+    r.dispose();
+  });
+
+  it("multi-frame redraws keep moving up N-1 rows each time (no drift)", () => {
+    const out = new FakeOut();
+    const r = new TerminalProgressRenderer({ out: asOut(out), animMs: 0 });
+    r.begin(progressView({ text: "a\nb\nc\nd" }));
+    for (let i = 0; i < 3; i++) {
+      r.flush();
+    }
+    // 连续多帧重绘，每帧上移都是 4 行（5 行区块），不是 5/6/7... 逐帧递增
+    const moves = out.output.match(/\x1b\[(\d+)A/g) ?? [];
+    expect(moves.length).toBe(3);
+    for (const move of moves) {
+      expect(move).toBe("\x1b[4A");
+    }
+    r.dispose();
+  });
 });

package/src/__tests__/web-ui.test.ts

@@ -95,6 +95,7 @@ describe("unflattenConfig", () => {
         CHATCCC_CCC_BASE_URL: "https://api.deepseek.com/v1",
         CHATCCC_CCC_MODEL: "deepseek-v4-flash",
         CHATCCC_CCC_ALTERNATIVE_MODEL: "deepseek-v4-pro",
+        CHATCCC_CCC_EFFORT: "max",
       }),
     ).toEqual({
       ccc: {
@@ -104,6 +105,7 @@ describe("unflattenConfig", () => {
         DEEPSEEK_BASE_URL: "https://api.deepseek.com/v1",
         model: "deepseek-v4-flash",
         alternativeModel: "deepseek-v4-pro",
+        effort: "max",
       },
     });
   });
@@ -251,6 +253,7 @@ describe("dashboard edit modal", () => {
     expect(PAGE_HTML).toContain('id="agent-default-ccc"');
     expect(PAGE_HTML).toContain('id="field-CHATCCC_CCC_MODEL"');
     expect(PAGE_HTML).toContain('id="field-CHATCCC_CCC_ALTERNATIVE_MODEL"');
+    expect(PAGE_HTML).toContain('id="field-CHATCCC_CCC_EFFORT"');
     expect(PAGE_HTML).toContain('id="dash-ccc"');
     expect(PAGE_HTML).toContain("editSection('ccc')");
   });

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

@@ -13,6 +13,7 @@
 
 import * as readline from "node:readline";
 import * as process from "node:process";
+import { appendFileSync } from "node:fs";
 import { resolve as resolvePath } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -32,11 +33,14 @@ interface ParsedArgs {
   help: boolean;
   streamJson: boolean;
   prompt: string | null;
+  /** 强制纯文本流式输出（不用过程区块渲染器），渲染异常时的兜底通道 */
+  plain: boolean;
 }
 
 interface RuntimeDeps {
   ChatSession: typeof import("./index.js").ChatSession;
   appConfig: typeof import("../config.ts").config;
+  fileLog: typeof import("../config.ts").fileLog;
 }
 
 interface JsonLine {
@@ -60,6 +64,7 @@ function parseArgs(argv = process.argv.slice(2)): ParsedArgs {
   let help = false;
   let streamJson = false;
   let prompt: string | null = null;
+  let plain = false;
 
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
@@ -67,6 +72,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++;
@@ -93,20 +101,22 @@ function parseArgs(argv = process.argv.slice(2)): ParsedArgs {
     } else if (arg === "--prompt" && next !== undefined) {
       prompt = next;
       i++;
+    } else if (arg === "--plain") {
+      plain = true;
     } else if (arg === "--help" || arg === "-h") {
       help = true;
     }
   }
 
-  return { config, options, listSessions, resume, help, streamJson, prompt };
+  return { config, options, listSessions, resume, help, streamJson, prompt, plain };
 }
 
 async function loadRuntime(): Promise<RuntimeDeps> {
-  const [{ ChatSession }, { config: appConfig }] = await Promise.all([
+  const [{ ChatSession }, { config: appConfig, fileLog }] = await Promise.all([
     import("./index.js"),
     import("../config.ts"),
   ]);
-  return { ChatSession, appConfig };
+  return { ChatSession, appConfig, fileLog };
 }
 
 function printHelp(appConfig: RuntimeDeps["appConfig"]): void {
@@ -117,6 +127,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",
@@ -125,6 +136,7 @@ function printHelp(appConfig: RuntimeDeps["appConfig"]): void {
     "  --list-sessions      List saved ccc sessions and exit",
     "  --stream-json        One-shot mode: write JSONL events to stdout",
     "  --prompt <text>      Prompt text for --stream-json",
+    "  --plain              Force plain streaming output (no progress block renderer)",
     "  --help, -h           Show help",
     "",
     "Default config source:",
@@ -307,8 +319,32 @@ const C = {
   yellow: "\x1b[33m",
 };
 
+/**
+ * 交互模式下渲染器独占终端 stdout：普通日志只写日志文件、不回显到终端，
+ * 避免生成过程中任何 console 输出混入过程区块、破坏行数计数（导致重绘
+ * 上移不足、把上方历史内容"吃掉"）。错误提示（console.error）保留回显。
+ */
+function muteConsoleLogToFile(logPath: string): void {
+  const writeFile = (level: string, args: unknown[]): void => {
+    try {
+      const text = args
+        .map((a) =>
+          typeof a === "string" ? a
+            : a instanceof Error ? (a.stack ?? a.message)
+            : JSON.stringify(a))
+        .join(" ");
+      appendFileSync(logPath, `[${new Date().toISOString()}] [${level}] ${text}\n`, "utf8");
+    } catch {
+      // 日志系统自身失败不影响主流程
+    }
+  };
+  console.log = (...args: unknown[]) => writeFile("LOG", args);
+  console.info = (...args: unknown[]) => writeFile("INFO", args);
+  console.warn = (...args: unknown[]) => writeFile("WARN", args);
+}
+
 async function runRepl(args: ParsedArgs): Promise<void> {
-  const { ChatSession, appConfig } = await loadRuntime();
+  const { ChatSession, appConfig, fileLog } = await loadRuntime();
 
   const cwd = resolvePath(args.options.cwd ?? process.cwd());
   let resolvedSession;
@@ -326,6 +362,12 @@ async function runRepl(args: ParsedArgs): Promise<void> {
   console.log(`${C.dim}Type a message to chat. Double Ctrl+C interrupts generation or exits. Type exit to quit.${C.reset}`);
   console.log("");
 
+  // 交互渲染模式下 console 输出只写日志文件、不回显到终端（渲染器独占 stdout，
+  // 避免生成中日志混入区块破坏行数）。--plain 无渲染器，不需要静音。
+  if (process.stdout.isTTY === true && !args.plain) {
+    muteConsoleLogToFile(fileLog.logPath);
+  }
+
   let session: InstanceType<typeof ChatSession>;
   try {
     session = new ChatSession(args.config, {
@@ -359,20 +401,20 @@ async function runRepl(args: ParsedArgs): Promise<void> {
     }
 
     if (input === "exit") {
-      console.log(`${C.dim}bye${C.reset}`);
+      process.stdout.write(`${C.dim}bye${C.reset}\n`);
       rl.close();
       return;
     }
 
     if (input === "/clear") {
       session.reset();
-      console.log(`${C.dim}session cleared${C.reset}`);
+      process.stdout.write(`${C.dim}session cleared${C.reset}\n`);
       rl.prompt();
       return;
     }
 
     if (input === "/history") {
-      console.log(`${C.dim}${session.turnCount} conversation turns${C.reset}`);
+      process.stdout.write(`${C.dim}${session.turnCount} conversation turns${C.reset}\n`);
       rl.prompt();
       return;
     }
@@ -381,12 +423,16 @@ async function runRepl(args: ParsedArgs): Promise<void> {
     const signal = currentAbort.signal;
 
     // TTY 下用"过程区块"（飞书过程卡片的终端形态）：固定区域原地更新、
-    // 工具调用折叠为单行；非 TTY（管道/CI）回退为纯文本流式输出。
-    const useTerminalBlock = process.stdout.isTTY === true;
+    // 工具调用折叠为单行；非 TTY（管道/CI）或 --plain 回退为纯文本流式输出。
+    const useTerminalBlock = process.stdout.isTTY === true && !args.plain;
     const renderer = useTerminalBlock ? new TerminalProgressRenderer() : null;
     let view: ProgressView | null = null;
     if (renderer) {
       view = progressView({ headerTitle: "生成中..." });
+      // 先回行首换行再 begin：让过程区块从输入行下方开始，避免首帧 \r\x1b[2K
+      // 清掉用户刚输入的问题行（历史文本不被刷掉）。\r\n 兼容 readline
+      // 行提交后光标仍停在输入行行尾的情况。
+      process.stdout.write("\r\n");
       renderer.begin(view);
     }
     let rendererEnded = false;
@@ -425,14 +471,14 @@ async function runRepl(args: ParsedArgs): Promise<void> {
         view = progressView({ ...view, status: aborted ? "stopped" : "error", showStop: false });
         renderer.end(view);
         rendererEnded = true;
-        console.log("");
+        process.stdout.write("\n");
       }
-      console.log(`\n${C.yellow}[error] ${(err as Error).message}${C.reset}`);
+      console.error(`\n${C.yellow}[error] ${(err as Error).message}${C.reset}`);
     } finally {
       if (renderer && view && !rendererEnded) {
         // 定型终态区块（完成/已停止/异常结束）留在屏幕上，恢复光标
         renderer.end(view);
-        console.log("");
+        process.stdout.write("\n");
       }
       currentAbort = null;
       ctrlCState.reset();
@@ -445,31 +491,31 @@ async function runRepl(args: ParsedArgs): Promise<void> {
     const action = ctrlCState.press(currentAbort !== null);
 
     if (action === "exit") {
-      console.log(`\n${C.dim}bye${C.reset}`);
+      console.error(`\n${C.dim}bye${C.reset}`);
       rl.close();
       return;
     }
 
     if (action === "interrupt") {
-      console.log(`\n${C.yellow}[interrupting...]${C.reset}`);
+      console.error(`\n${C.yellow}[interrupting...]${C.reset}`);
       currentAbort?.abort();
       currentAbort = null;
       return;
     }
 
     if (action === "arm-interrupt") {
-      console.log(`\n${C.dim}Press Ctrl+C again to interrupt current response${C.reset}`);
+      console.error(`\n${C.dim}Press Ctrl+C again to interrupt current response${C.reset}`);
       return;
     }
 
     if (action === "arm-exit") {
-      console.log(`\n${C.dim}Press Ctrl+C again to exit, or type exit${C.reset}`);
+      console.error(`\n${C.dim}Press Ctrl+C again to exit, or type exit${C.reset}`);
       rl.prompt();
     }
   });
 
   rl.on("close", () => {
-    console.log("");
+    process.stdout.write("\n");
     process.exit(0);
   });
 }

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);