chatccc 0.2.231 → 0.2.233

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

@@ -464,6 +464,12 @@ async function runRepl(args: ParsedArgs): Promise<void> {
       return;
     }
 
+    if (input === "/sessions") {
+      printSessions();
+      rl.prompt();
+      return;
+    }
+
     currentAbort = new AbortController();
     const signal = currentAbort.signal;
 

package/src/builtin/config.ts

@@ -1,84 +1,84 @@
-import { existsSync, mkdirSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-
-export interface DeepCccConfig {
-  apiKey: string;
-  baseURL: string;
-  model: string;
-  /** Reasoning effort（none/minimal/low/medium/high/xhigh/max），留空不传 reasoning_effort */
-  effort: string;
-  rawStreamLogs: {
-    enabled: boolean;
-    maxBytesPerTurn: number;
-    retentionDays: number;
-    keepCompleted: boolean;
-  };
-}
-
-export const DEEPCCC_HOME = join(homedir(), ".deepccc");
-export const RAW_STREAM_LOGS_DIR = join(DEEPCCC_HOME, "raw-stream-logs");
-const CONFIG_PATH = join(DEEPCCC_HOME, "config.json");
-
-const DEFAULT_CONFIG: DeepCccConfig = {
-  apiKey: "",
-  baseURL: "https://api.deepseek.com/v1",
-  model: "deepseek-v4-pro",
-  effort: "",
-  rawStreamLogs: {
-    enabled: false,
-    maxBytesPerTurn: 1024 * 1024,
-    retentionDays: 7,
-    keepCompleted: false,
-  },
-};
-
-function readConfigFile(): Partial<DeepCccConfig> {
-  if (!existsSync(CONFIG_PATH)) return {};
-  const raw = JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Partial<DeepCccConfig>;
-  return raw && typeof raw === "object" ? raw : {};
-}
-
-function env(name: string): string | undefined {
-  const value = process.env[name]?.trim();
-  return value ? value : undefined;
-}
-
-function boolEnv(name: string): boolean | undefined {
-  const value = env(name)?.toLowerCase();
-  if (value === undefined) return undefined;
-  if (["1", "true", "yes", "on"].includes(value)) return true;
-  if (["0", "false", "no", "off"].includes(value)) return false;
-  return undefined;
-}
-
-function numberEnv(name: string): number | undefined {
-  const value = Number(env(name));
-  return Number.isFinite(value) && value >= 0 ? value : undefined;
-}
-
-function loadConfig(): DeepCccConfig {
-  const file = readConfigFile();
-  const rawLogs: Partial<DeepCccConfig["rawStreamLogs"]> = file.rawStreamLogs && typeof file.rawStreamLogs === "object"
-    ? file.rawStreamLogs
-    : {};
-
-  return {
-    apiKey: env("DEEPCCC_API_KEY") ?? env("DEEPSEEK_API_KEY") ?? file.apiKey ?? DEFAULT_CONFIG.apiKey,
-    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,
-    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,
-      retentionDays: numberEnv("DEEPCCC_RAW_STREAM_RETENTION_DAYS") ?? rawLogs.retentionDays ?? DEFAULT_CONFIG.rawStreamLogs.retentionDays,
-      keepCompleted: boolEnv("DEEPCCC_RAW_STREAM_KEEP_COMPLETED") ?? rawLogs.keepCompleted ?? DEFAULT_CONFIG.rawStreamLogs.keepCompleted,
-    },
-  };
-}
-
-export function ensureConfigDir(): void {
-  mkdirSync(dirname(CONFIG_PATH), { recursive: true });
-}
-
-export const config = loadConfig();
+import { existsSync, mkdirSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
+export interface DeepCccConfig {
+  apiKey: string;
+  baseURL: string;
+  model: string;
+  /** Reasoning effort（none/minimal/low/medium/high/xhigh/max），留空不传 reasoning_effort */
+  effort: string;
+  rawStreamLogs: {
+    enabled: boolean;
+    maxBytesPerTurn: number;
+    retentionDays: number;
+    keepCompleted: boolean;
+  };
+}
+
+export const DEEPCCC_HOME = join(homedir(), ".deepccc");
+export const RAW_STREAM_LOGS_DIR = join(DEEPCCC_HOME, "raw-stream-logs");
+const CONFIG_PATH = join(DEEPCCC_HOME, "config.json");
+
+const DEFAULT_CONFIG: DeepCccConfig = {
+  apiKey: "",
+  baseURL: "https://api.deepseek.com/v1",
+  model: "deepseek-v4-pro",
+  effort: "",
+  rawStreamLogs: {
+    enabled: false,
+    maxBytesPerTurn: 1024 * 1024,
+    retentionDays: 7,
+    keepCompleted: false,
+  },
+};
+
+function readConfigFile(): Partial<DeepCccConfig> {
+  if (!existsSync(CONFIG_PATH)) return {};
+  const raw = JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Partial<DeepCccConfig>;
+  return raw && typeof raw === "object" ? raw : {};
+}
+
+function env(name: string): string | undefined {
+  const value = process.env[name]?.trim();
+  return value ? value : undefined;
+}
+
+function boolEnv(name: string): boolean | undefined {
+  const value = env(name)?.toLowerCase();
+  if (value === undefined) return undefined;
+  if (["1", "true", "yes", "on"].includes(value)) return true;
+  if (["0", "false", "no", "off"].includes(value)) return false;
+  return undefined;
+}
+
+function numberEnv(name: string): number | undefined {
+  const value = Number(env(name));
+  return Number.isFinite(value) && value >= 0 ? value : undefined;
+}
+
+function loadConfig(): DeepCccConfig {
+  const file = readConfigFile();
+  const rawLogs: Partial<DeepCccConfig["rawStreamLogs"]> = file.rawStreamLogs && typeof file.rawStreamLogs === "object"
+    ? file.rawStreamLogs
+    : {};
+
+  return {
+    apiKey: env("DEEPCCC_API_KEY") ?? env("DEEPSEEK_API_KEY") ?? file.apiKey ?? DEFAULT_CONFIG.apiKey,
+    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,
+    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,
+      retentionDays: numberEnv("DEEPCCC_RAW_STREAM_RETENTION_DAYS") ?? rawLogs.retentionDays ?? DEFAULT_CONFIG.rawStreamLogs.retentionDays,
+      keepCompleted: boolEnv("DEEPCCC_RAW_STREAM_KEEP_COMPLETED") ?? rawLogs.keepCompleted ?? DEFAULT_CONFIG.rawStreamLogs.keepCompleted,
+    },
+  };
+}
+
+export function ensureConfigDir(): void {
+  mkdirSync(dirname(CONFIG_PATH), { recursive: true });
+}
+
+export const config = loadConfig();