chatccc 0.2.221 → 0.2.223

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/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 {
@@ -373,10 +380,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 +420,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

@@ -20,6 +20,7 @@ import {
   defaultBuiltinSessionId,
 } from "./context.ts";
 import { createBuiltinFileTools } from "./file-tools.ts";
+import { buildDefaultSkillDirs, buildSkillsIndexPrompt, scanSkillsDirs } from "./skills.ts";
 
 // ---------------------------------------------------------------------------
 // 系统提示词 — 编译期冻结常量
@@ -118,6 +119,11 @@ export interface ChatSessionOptions {
   keepRecentMessages?: number;
   /** Optional tool-step limit. Leave unset for no step limit. */
   maxSteps?: number;
+  /**
+   * Codex-style skill 扫描目录（<dir>/<name>/SKILL.md）。
+   * 缺省扫描 ~/.codex/skills、~/.agents/skills、<cwd>/.codex/skills。
+   */
+  skillsDirs?: string[];
 }
 
 /**
@@ -180,6 +186,12 @@ export class ChatSession {
     if (projectInstructions) {
       systemContent.push("", projectInstructions);
     }
+    // Codex-style skills 索引注入（name + description + 路径，模型按需 read_file 全文）
+    const skills = scanSkillsDirs(options.skillsDirs ?? buildDefaultSkillDirs(this.cwd));
+    const skillsPrompt = buildSkillsIndexPrompt(skills);
+    if (skillsPrompt) {
+      systemContent.push("", skillsPrompt);
+    }
     if (options.systemPrompt) {
       systemContent.push("", options.systemPrompt);
     }

package/src/builtin/skills.ts

@@ -0,0 +1,108 @@
+/**
+ * builtin/skills.ts — Codex-style skills 支持
+ *
+ * 从用户级（~/.codex/skills、~/.agents/skills）和项目级（<cwd>/.codex/skills）
+ * 扫描 Codex 目录式 skill（<name>/SKILL.md），解析 frontmatter 中的
+ * name + description，生成索引注入 system prompt。模型按需用 read_file
+ * 读取 SKILL.md 全文并执行（索引注入省 token，触发靠 description + 指令）。
+ */
+
+import { readFileSync, readdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+export interface BuiltinSkill {
+  name: string;
+  description: string;
+  /** SKILL.md 的绝对路径 */
+  skillPath: string;
+}
+
+/** 解析 SKILL.md frontmatter（兼容 CRLF），返回 name + description；无 frontmatter 返回 null */
+export function parseSkillFrontmatter(
+  content: string,
+): { name: string; description: string } | null {
+  const match = /^---\r?\n([\s\S]*?)\r?\n---\s*(?:\r?\n|$)/.exec(content);
+  if (!match) return null;
+  const fm = match[1];
+  const nameMatch = /^name:\s*(.+?)\s*$/m.exec(fm);
+  if (!nameMatch) return null;
+  const descMatch = /^description:\s*(.+?)\s*$/m.exec(fm);
+  return {
+    name: nameMatch[1].trim(),
+    description: descMatch?.[1].trim() ?? "",
+  };
+}
+
+/**
+ * 扫描多个 skill 目录，返回去重后的 skill 列表。
+ * 同名 skill 后面的目录覆盖前面的（调用方应把项目级目录放最后）。
+ * 隐藏目录（.system 等）和无 SKILL.md 的目录会被跳过。
+ */
+export function scanSkillsDirs(dirs: string[]): BuiltinSkill[] {
+  const byName = new Map<string, BuiltinSkill>();
+
+  for (const dir of dirs) {
+    let entries;
+    try {
+      entries = readdirSync(dir, { withFileTypes: true });
+    } catch {
+      continue; // 目录不存在或不可读：跳过
+    }
+
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      if (entry.name.startsWith(".")) continue; // 排除 .system 等隐藏/内置目录
+
+      const skillPath = join(dir, entry.name, "SKILL.md");
+      let content: string;
+      try {
+        content = readFileSync(skillPath, "utf-8");
+      } catch {
+        continue; // 没有 SKILL.md 的目录不是 skill
+      }
+
+      const parsed = parseSkillFrontmatter(content);
+      if (!parsed) continue;
+
+      byName.set(parsed.name, {
+        name: parsed.name,
+        description: parsed.description,
+        skillPath,
+      });
+    }
+  }
+
+  return [...byName.values()];
+}
+
+/**
+ * 默认 skill 扫描目录：
+ * 1. ~/.codex/skills（Codex CLI 旧路径，用户实际在用的地方）
+ * 2. ~/.agents/skills（Codex 标准全局目录）
+ * 3. <cwd>/.codex/skills（项目级，优先级最高，放最后）
+ */
+export function buildDefaultSkillDirs(cwd: string): string[] {
+  return [
+    join(homedir(), ".codex", "skills"),
+    join(homedir(), ".agents", "skills"),
+    join(cwd, ".codex", "skills"),
+  ];
+}
+
+/**
+ * 生成 skill 索引提示词（注入 system prompt）。
+ * 索引只含 name + description + 路径，并指示模型在任务匹配时
+ * 先用 read_file 读取 SKILL.md 全文再执行——这是触发率的关键。
+ */
+export function buildSkillsIndexPrompt(skills: BuiltinSkill[]): string {
+  if (skills.length === 0) return "";
+
+  const lines = [
+    "## Available Skills (Codex-style)",
+    "The following Codex-style skills are available on this machine. When a user request matches a skill's description, first read its full SKILL.md with read_file, then follow the instructions in it exactly.",
+    "",
+    ...skills.map((s) => `- **${s.name}** (\`${s.skillPath}\`): ${s.description || "(no description)"}`),
+  ];
+  return lines.join("\n");
+}