chatccc 0.2.187 → 0.2.189

package/src/agent-stop-stuck.ts

@@ -1,129 +1,129 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
-
-import { readUtf8JsonBody } from "./agent-rpc-body.ts";
-import { activePrompts, getChatsForSession } from "./session-chat-binding.ts";
-import { getPlatformForChat } from "./session.ts";
-import { readStreamState, writeStreamState } from "./stream-state.ts";
-import { ts } from "./config.ts";
-
-export const AGENT_STOP_STUCK_PATH = "/api/agent/stop-stuck-loop";
-
-const MAX_REQUEST_BYTES = 8 * 1024;
-
-function jsonReply(res: ServerResponse, status: number, data: unknown): void {
-  res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
-  res.end(JSON.stringify(data));
-}
-
-/**
- * 从原始 body 字节中用正则尽力提取 session_id。
- * 兼容 JSON 编码异常（如 GBK 中文导致 JSON.parse 失败）的场景。
- */
-function extractSessionIdFromRaw(buf: Buffer): string | null {
-  // 匹配 "session_id":"<uuid>" 或 "session_id": "<uuid>"
-  const match = buf.toString("latin1").match(/"session_id"\s*:\s*"([^"]+)"/);
-  return match?.[1] ?? null;
-}
-
-export async function handleAgentStopStuckRequest(
-  req: IncomingMessage,
-  res: ServerResponse,
-): Promise<boolean> {
-  const url = new URL(req.url ?? "/", "http://127.0.0.1");
-  if (url.pathname !== AGENT_STOP_STUCK_PATH) return false;
-
-  if (req.method !== "POST") {
-    jsonReply(res, 405, { error: "Method not allowed, use POST" });
-    return true;
-  }
-
-  let body: { session_id?: string; final_reply?: string };
-  let rawBody: Buffer | null = null;
-  try {
-    body = await readUtf8JsonBody<{ session_id?: string; final_reply?: string }>(req, MAX_REQUEST_BYTES);
-  } catch (err) {
-    // JSON 解析失败时仍尝试从原始字节中提取 session_id 并强行停止
-    // 宁可输出乱码，也不能让 agent 持续循环
-    rawBody = (err as { rawBody?: Buffer }).rawBody as Buffer | undefined ?? null;
-    if (!rawBody) {
-      jsonReply(res, 400, { error: `Invalid request body: ${(err as Error).message}` });
-      return true;
-    }
-    const fallbackId = extractSessionIdFromRaw(rawBody);
-    if (!fallbackId) {
-      jsonReply(res, 400, { error: `Invalid request body: ${(err as Error).message}` });
-      return true;
-    }
-    body = { session_id: fallbackId };
-  }
-
-  const sessionId = typeof body?.session_id === "string" ? body.session_id.trim() : "";
-  if (!sessionId) {
-    jsonReply(res, 400, { error: "session_id is required" });
-    return true;
-  }
-
-  const prompt = activePrompts.get(sessionId);
-  if (!prompt) {
-    jsonReply(res, 404, { error: "Session not found or not running" });
-    return true;
-  }
-
-  // 先发"卡住"提示消息给所有绑定的群聊
-  const chats = getChatsForSession(sessionId);
-  for (const chatId of chats) {
-    const platform = getPlatformForChat(chatId);
-    if (platform) {
-      await platform.sendText(chatId, "⚠️ Agent 检测到自己陷入了循环，正在结束生成…").catch(() => {});
-    }
-  }
-
-  // 不丢弃缓存队列中的消息，让 runAgentSession 的 finally 块正常消费，
-  // 确保 stop-stuck-loop 结束后排队的消息仍能被正常处理。
-
-  const finalReply = typeof body?.final_reply === "string" ? body.final_reply.trim() : "";
-
-  // fire-and-forget：立即把 stream-state 标为 done（而非 stopped），
-  // 让 display loop 以"正常完成"而非"已停止"来渲染卡片和最终回复。
-  // 不设 prompt.stopped = true，这样 runAgentSession 的 finally 也会写 "done"。
-  void (async () => {
-    try {
-      const current = await readStreamState(sessionId);
-      if (!current) return;
-      if (current.status !== "running") return;
-      await writeStreamState({
-        ...current,
-        status: "done",
-        stuckAt: Date.now(),
-        finalReply: finalReply ? current.finalReply + "\n\n" + finalReply : current.finalReply,
-        updatedAt: Date.now(),
-      });
-    } catch (err) {
-      console.warn(
-        `[${ts()}] [STUCK-LOOP] writeStreamState(done) failed for ${sessionId}: ${(err as Error).message}`,
-      );
-    }
-  })();
-
-  // 先关闭底层 SDK session，终止 CLI 子进程，然后再 abort 清理 adapter 层
-  prompt.closeSession?.();
-
-  // 强制杀死 CLI 子进程。controller.abort() 只在 for-await 收到下一条
-  // stream 消息时才被检测到——如果 agent 陷入无输出的计算循环，abort 信号
-  // 永远不会生效；SDK 的 session.close() 也不保证立即终止子进程。
-  if (prompt.processPid !== undefined) {
-    try {
-      process.kill(prompt.processPid);
-    } catch {
-      // 进程可能已退出，忽略错误
-    }
-  }
-
-  // 不设 stopped 标记 → finally block 写 "done" → 卡片正常结束
-  prompt.controller.abort();
-
-  console.log(`[${ts()}] [STUCK-LOOP] Session ${sessionId} aborted as done (agent detected stuck loop, final_reply=${finalReply ? "yes" : "no"})`);
-
-  jsonReply(res, 200, { ok: true });
-  return true;
-}
+import type { IncomingMessage, ServerResponse } from "node:http";
+
+import { readUtf8JsonBody } from "./agent-rpc-body.ts";
+import { activePrompts, getChatsForSession } from "./session-chat-binding.ts";
+import { getPlatformForChat } from "./session.ts";
+import { readStreamState, writeStreamState } from "./stream-state.ts";
+import { ts } from "./config.ts";
+
+export const AGENT_STOP_STUCK_PATH = "/api/agent/stop-stuck-loop";
+
+const MAX_REQUEST_BYTES = 8 * 1024;
+
+function jsonReply(res: ServerResponse, status: number, data: unknown): void {
+  res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
+  res.end(JSON.stringify(data));
+}
+
+/**
+ * 从原始 body 字节中用正则尽力提取 session_id。
+ * 兼容 JSON 编码异常（如 GBK 中文导致 JSON.parse 失败）的场景。
+ */
+function extractSessionIdFromRaw(buf: Buffer): string | null {
+  // 匹配 "session_id":"<uuid>" 或 "session_id": "<uuid>"
+  const match = buf.toString("latin1").match(/"session_id"\s*:\s*"([^"]+)"/);
+  return match?.[1] ?? null;
+}
+
+export async function handleAgentStopStuckRequest(
+  req: IncomingMessage,
+  res: ServerResponse,
+): Promise<boolean> {
+  const url = new URL(req.url ?? "/", "http://127.0.0.1");
+  if (url.pathname !== AGENT_STOP_STUCK_PATH) return false;
+
+  if (req.method !== "POST") {
+    jsonReply(res, 405, { error: "Method not allowed, use POST" });
+    return true;
+  }
+
+  let body: { session_id?: string; final_reply?: string };
+  let rawBody: Buffer | null = null;
+  try {
+    body = await readUtf8JsonBody<{ session_id?: string; final_reply?: string }>(req, MAX_REQUEST_BYTES);
+  } catch (err) {
+    // JSON 解析失败时仍尝试从原始字节中提取 session_id 并强行停止
+    // 宁可输出乱码，也不能让 agent 持续循环
+    rawBody = (err as { rawBody?: Buffer }).rawBody as Buffer | undefined ?? null;
+    if (!rawBody) {
+      jsonReply(res, 400, { error: `Invalid request body: ${(err as Error).message}` });
+      return true;
+    }
+    const fallbackId = extractSessionIdFromRaw(rawBody);
+    if (!fallbackId) {
+      jsonReply(res, 400, { error: `Invalid request body: ${(err as Error).message}` });
+      return true;
+    }
+    body = { session_id: fallbackId };
+  }
+
+  const sessionId = typeof body?.session_id === "string" ? body.session_id.trim() : "";
+  if (!sessionId) {
+    jsonReply(res, 400, { error: "session_id is required" });
+    return true;
+  }
+
+  const prompt = activePrompts.get(sessionId);
+  if (!prompt) {
+    jsonReply(res, 404, { error: "Session not found or not running" });
+    return true;
+  }
+
+  // 先发"卡住"提示消息给所有绑定的群聊
+  const chats = getChatsForSession(sessionId);
+  for (const chatId of chats) {
+    const platform = getPlatformForChat(chatId);
+    if (platform) {
+      await platform.sendText(chatId, "⚠️ Agent 检测到自己陷入了循环，正在结束生成…").catch(() => {});
+    }
+  }
+
+  // 不丢弃缓存队列中的消息，让 runAgentSession 的 finally 块正常消费，
+  // 确保 stop-stuck-loop 结束后排队的消息仍能被正常处理。
+
+  const finalReply = typeof body?.final_reply === "string" ? body.final_reply.trim() : "";
+
+  // fire-and-forget：立即把 stream-state 标为 done（而非 stopped），
+  // 让 display loop 以"正常完成"而非"已停止"来渲染卡片和最终回复。
+  // 不设 prompt.stopped = true，这样 runAgentSession 的 finally 也会写 "done"。
+  void (async () => {
+    try {
+      const current = await readStreamState(sessionId);
+      if (!current) return;
+      if (current.status !== "running") return;
+      await writeStreamState({
+        ...current,
+        status: "done",
+        stuckAt: Date.now(),
+        finalReply: finalReply ? current.finalReply + "\n\n" + finalReply : current.finalReply,
+        updatedAt: Date.now(),
+      });
+    } catch (err) {
+      console.warn(
+        `[${ts()}] [STUCK-LOOP] writeStreamState(done) failed for ${sessionId}: ${(err as Error).message}`,
+      );
+    }
+  })();
+
+  // 先关闭底层 SDK session，终止 CLI 子进程，然后再 abort 清理 adapter 层
+  prompt.closeSession?.();
+
+  // 强制杀死 CLI 子进程。controller.abort() 只在 for-await 收到下一条
+  // stream 消息时才被检测到——如果 agent 陷入无输出的计算循环，abort 信号
+  // 永远不会生效；SDK 的 session.close() 也不保证立即终止子进程。
+  if (prompt.processPid !== undefined) {
+    try {
+      process.kill(prompt.processPid);
+    } catch {
+      // 进程可能已退出，忽略错误
+    }
+  }
+
+  // 不设 stopped 标记 → finally block 写 "done" → 卡片正常结束
+  prompt.controller.abort();
+
+  console.log(`[${ts()}] [STUCK-LOOP] Session ${sessionId} aborted as done (agent detected stuck loop, final_reply=${finalReply ? "yes" : "no"})`);
+
+  jsonReply(res, 200, { ok: true });
+  return true;
+}

package/src/builtin/cli.ts

@@ -1,197 +1,189 @@
-/**
- * builtin/cli.ts — ChatCCC 内置 Agent 终端 REPL
- *
- * 用法:
- *   npx tsx src/builtin/cli.ts
- *   npx tsx src/builtin/cli.ts --model deepseek-chat
- *   npx tsx src/builtin/cli.ts --cwd /path/to/project
- *
- * 环境变量:
- *   DEEPSEEK_API_KEY — DeepSeek API Key（必需）
- *   DEEPSEEK_BASE_URL — API 地址（可选，默认 https://api.deepseek.com/v1）
- */
-
-import * as readline from "node:readline";
-import * as process from "node:process";
-import { ChatSession, type ChatSessionConfig, type ChatSessionOptions } from "./index.js";
-
-// ---------------------------------------------------------------------------
-// 命令行参数解析
-// ---------------------------------------------------------------------------
-
-function parseArgs(): { config: ChatSessionConfig; options: ChatSessionOptions } {
-  const args = process.argv.slice(2);
-  const config: ChatSessionConfig = {};
-  const options: ChatSessionOptions = {};
-
-  for (let i = 0; i < args.length; i++) {
-    const arg = args[i];
-    const next = args[i + 1];
-    if (arg === "--model" && next) {
-      config.model = next;
-      i++;
-    } else if (arg === "--base-url" && next) {
-      config.baseURL = next;
-      i++;
-    } else if (arg === "--api-key" && next) {
-      config.apiKey = next;
-      i++;
-    } else if (arg === "--cwd" && next) {
-      options.cwd = next;
-      i++;
-    } else if (arg === "--help" || arg === "-h") {
-      printHelp();
-      process.exit(0);
-    }
-  }
-
-  return { config, options };
-}
-
-function printHelp(): void {
-  console.log([
-    "ChatCCC 内置 Agent 终端 REPL",
-    "",
-    "用法: npx tsx src/builtin/cli.ts [选项]",
-    "",
-    "选项:",
-    "  --model <name>   模型名称（默认 deepseek-chat）",
-    "  --base-url <url> API 地址（默认 https://api.deepseek.com/v1）",
-    "  --api-key <key>  API Key（默认读 DEEPSEEK_API_KEY 环境变量）",
-    "  --cwd <path>     工作目录",
-    "  --help, -h       显示帮助",
-    "",
-    "环境变量:",
-    "  DEEPSEEK_API_KEY   DeepSeek API Key",
-    "  DEEPSEEK_BASE_URL  API 地址",
-    "",
-  ].join("\n"));
-}
-
-// ---------------------------------------------------------------------------
-// ANSI 颜色
-// ---------------------------------------------------------------------------
-
-const C = {
-  reset: "\x1b[0m",
-  dim: "\x1b[2m",
-  green: "\x1b[32m",
-  cyan: "\x1b[36m",
-  yellow: "\x1b[33m",
-};
-
-// ---------------------------------------------------------------------------
-// 主程序
-// ---------------------------------------------------------------------------
-
-async function main(): Promise<void> {
-  const { config, options } = parseArgs();
-
-  // 环境变量回退
-  if (!config.baseURL) config.baseURL = process.env.DEEPSEEK_BASE_URL;
-  if (!config.apiKey) config.apiKey = process.env.DEEPSEEK_API_KEY;
-
-  console.log(`${C.dim}ChatCCC 内置 Agent 原型${C.reset}`);
-  console.log(`${C.dim}模型: ${config.model ?? "deepseek-chat"}${C.reset}`);
-  if (options.cwd) {
-    console.log(`${C.dim}目录: ${options.cwd}${C.reset}`);
-  }
-  console.log(`${C.dim}输入消息开始对话，Ctrl+C 中断当前回复，/exit 退出${C.reset}`);
-  console.log("");
-
-  let session: ChatSession;
-  try {
-    session = new ChatSession(config, options);
-  } catch (err) {
-    console.error(`${C.yellow}${(err as Error).message}${C.reset}`);
-    process.exit(1);
-  }
-
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    prompt: `${C.green}>${C.reset} `,
-  });
-
-  // 用于中断当前 LLM 调用的 AbortController
-  let currentAbort: AbortController | null = null;
-
-  rl.prompt();
-
-  rl.on("line", async (line: string) => {
-    const input = line.trim();
-    if (!input) {
-      rl.prompt();
-      return;
-    }
-
-    // 特殊命令
-    if (input === "/exit" || input === "/quit") {
-      console.log(`${C.dim}再见${C.reset}`);
-      rl.close();
-      return;
-    }
-
-    if (input === "/clear") {
-      session.reset();
-      console.log(`${C.dim}会话已重置${C.reset}`);
-      rl.prompt();
-      return;
-    }
-
-    if (input === "/history") {
-      console.log(`${C.dim}共 ${session.turnCount} 轮对话${C.reset}`);
-      rl.prompt();
-      return;
-    }
-
-    // 发送消息
-    currentAbort = new AbortController();
-    const signal = currentAbort.signal;
-
-    try {
-      let lastAccumulated = "";
-      for await (const event of session.chat(input, signal)) {
-        if (event.type === "text") {
-          // 增量输出（仅在首次和行首时不换行）
-          const newText = event.accumulated.slice(lastAccumulated.length);
-          process.stdout.write(newText);
-          lastAccumulated = event.accumulated;
-        } else if (event.type === "done") {
-          if (lastAccumulated) console.log("");
-          console.log(`${C.dim}[完成]${C.reset}`);
-        } else if (event.type === "error") {
-          console.log(`\n${C.yellow}[错误] ${event.message}${C.reset}`);
-        }
-      }
-    } catch (err) {
-      console.log(`\n${C.yellow}[错误] ${(err as Error).message}${C.reset}`);
-    } finally {
-      currentAbort = null;
-    }
-
-    rl.prompt();
-  });
-
-  // Ctrl+C → 中断当前 LLM 调用（不退出程序）
-  rl.on("SIGINT", () => {
-    if (currentAbort) {
-      console.log(`\n${C.yellow}[中断中...]${C.reset}`);
-      currentAbort.abort();
-      currentAbort = null;
-    } else {
-      console.log(`\n${C.dim}输入 /exit 退出${C.reset}`);
-      rl.prompt();
-    }
-  });
-
-  rl.on("close", () => {
-    console.log("");
-    process.exit(0);
-  });
-}
-
-main().catch((err) => {
-  console.error(`${C.yellow}启动失败: ${(err as Error).message}${C.reset}`);
-  process.exit(1);
-});
+/**
+ * builtin/cli.ts — ChatCCC 内置 Agent 终端 REPL
+ *
+ * 用法:
+ *   npx tsx src/builtin/cli.ts
+ *   npx tsx src/builtin/cli.ts --model deepseek-chat
+ *   npx tsx src/builtin/cli.ts --cwd /path/to/project
+ */
+
+import * as readline from "node:readline";
+import * as process from "node:process";
+import { config as appConfig } from "../config.ts";
+import { ChatSession, type ChatSessionConfig, type ChatSessionOptions } from "./index.js";
+
+// ---------------------------------------------------------------------------
+// 命令行参数解析
+// ---------------------------------------------------------------------------
+
+function parseArgs(): { config: ChatSessionConfig; options: ChatSessionOptions } {
+  const args = process.argv.slice(2);
+  const config: ChatSessionConfig = {};
+  const options: ChatSessionOptions = {};
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    const next = args[i + 1];
+    if (arg === "--model" && next) {
+      config.model = next;
+      i++;
+    } else if (arg === "--base-url" && next) {
+      config.baseURL = next;
+      i++;
+    } else if (arg === "--api-key" && next) {
+      config.apiKey = next;
+      i++;
+    } else if (arg === "--cwd" && next) {
+      options.cwd = next;
+      i++;
+    } else if (arg === "--help" || arg === "-h") {
+      printHelp();
+      process.exit(0);
+    }
+  }
+
+  return { config, options };
+}
+
+function printHelp(): void {
+  console.log([
+    "ChatCCC 内置 Agent 终端 REPL",
+    "",
+    "用法: npx tsx src/builtin/cli.ts [选项]",
+    "",
+    "选项:",
+    `  --model <name>   模型名称（覆盖 config.ccc.model，当前默认 ${appConfig.ccc.model}）`,
+    `  --base-url <url> API 地址（覆盖 config.ccc.DEEPSEEK_BASE_URL，当前默认 ${appConfig.ccc.DEEPSEEK_BASE_URL}）`,
+    "  --api-key <key>  API Key（覆盖 config.ccc.DEEPSEEK_API_KEY）",
+    "  --cwd <path>     工作目录",
+    "  --help, -h       显示帮助",
+    "",
+    "默认配置来源:",
+    "  ~/.chatccc/config.json 的 ccc.DEEPSEEK_API_KEY / ccc.DEEPSEEK_BASE_URL / ccc.model",
+    "",
+  ].join("\n"));
+}
+
+// ---------------------------------------------------------------------------
+// ANSI 颜色
+// ---------------------------------------------------------------------------
+
+const C = {
+  reset: "\x1b[0m",
+  dim: "\x1b[2m",
+  green: "\x1b[32m",
+  cyan: "\x1b[36m",
+  yellow: "\x1b[33m",
+};
+
+// ---------------------------------------------------------------------------
+// 主程序
+// ---------------------------------------------------------------------------
+
+async function main(): Promise<void> {
+  const { config, options } = parseArgs();
+
+  console.log(`${C.dim}ChatCCC 内置 Agent 原型${C.reset}`);
+  console.log(`${C.dim}模型: ${config.model ?? appConfig.ccc.model}${C.reset}`);
+  if (options.cwd) {
+    console.log(`${C.dim}目录: ${options.cwd}${C.reset}`);
+  }
+  console.log(`${C.dim}输入消息开始对话，Ctrl+C 中断当前回复，/exit 退出${C.reset}`);
+  console.log("");
+
+  let session: ChatSession;
+  try {
+    session = new ChatSession(config, options);
+  } catch (err) {
+    console.error(`${C.yellow}${(err as Error).message}${C.reset}`);
+    process.exit(1);
+  }
+
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    prompt: `${C.green}>${C.reset} `,
+  });
+
+  // 用于中断当前 LLM 调用的 AbortController
+  let currentAbort: AbortController | null = null;
+
+  rl.prompt();
+
+  rl.on("line", async (line: string) => {
+    const input = line.trim();
+    if (!input) {
+      rl.prompt();
+      return;
+    }
+
+    // 特殊命令
+    if (input === "/exit" || input === "/quit") {
+      console.log(`${C.dim}再见${C.reset}`);
+      rl.close();
+      return;
+    }
+
+    if (input === "/clear") {
+      session.reset();
+      console.log(`${C.dim}会话已重置${C.reset}`);
+      rl.prompt();
+      return;
+    }
+
+    if (input === "/history") {
+      console.log(`${C.dim}共 ${session.turnCount} 轮对话${C.reset}`);
+      rl.prompt();
+      return;
+    }
+
+    // 发送消息
+    currentAbort = new AbortController();
+    const signal = currentAbort.signal;
+
+    try {
+      let lastAccumulated = "";
+      for await (const event of session.chat(input, signal)) {
+        if (event.type === "text") {
+          // 增量输出（仅在首次和行首时不换行）
+          const newText = event.accumulated.slice(lastAccumulated.length);
+          process.stdout.write(newText);
+          lastAccumulated = event.accumulated;
+        } else if (event.type === "done") {
+          if (lastAccumulated) console.log("");
+          console.log(`${C.dim}[完成]${C.reset}`);
+        } else if (event.type === "error") {
+          console.log(`\n${C.yellow}[错误] ${event.message}${C.reset}`);
+        }
+      }
+    } catch (err) {
+      console.log(`\n${C.yellow}[错误] ${(err as Error).message}${C.reset}`);
+    } finally {
+      currentAbort = null;
+    }
+
+    rl.prompt();
+  });
+
+  // Ctrl+C → 中断当前 LLM 调用（不退出程序）
+  rl.on("SIGINT", () => {
+    if (currentAbort) {
+      console.log(`\n${C.yellow}[中断中...]${C.reset}`);
+      currentAbort.abort();
+      currentAbort = null;
+    } else {
+      console.log(`\n${C.dim}输入 /exit 退出${C.reset}`);
+      rl.prompt();
+    }
+  });
+
+  rl.on("close", () => {
+    console.log("");
+    process.exit(0);
+  });
+}
+
+main().catch((err) => {
+  console.error(`${C.yellow}启动失败: ${(err as Error).message}${C.reset}`);
+  process.exit(1);
+});