chatccc 0.2.200 → 0.2.202

package/src/agent-delegate-task.ts

@@ -1,81 +1,81 @@
-import { resolve } from "node:path";
-
-import { sessionPrefixForTool, toolDisplayName, ts } from "./config.ts";
-import { setDefaultCwd } from "./config.ts";
-import type { PlatformAdapter } from "./platform-adapter.ts";
-import { initClaudeSession, recordSessionRegistry, resumeAndPrompt, saveSessionTool } from "./session.ts";
-import { bindChatToSession } from "./session-chat-binding.ts";
-import { sessionChatName } from "./session-name.ts";
-
-export interface DelegateAgentTaskInput {
-  platform: PlatformAdapter;
-  tool: string;
-  cwd: string;
-  promptText: string;
-  openIds: string[];
-  chatNamePrefix?: string;
-  msgTimestamp?: number;
-  traceId?: string;
-}
-
-export interface DelegateAgentTaskResult {
-  chatId: string;
-  sessionId: string;
-  tool: string;
-  cwd: string;
-}
-
-export async function delegateAgentTask(input: DelegateAgentTaskInput): Promise<DelegateAgentTaskResult> {
-  const cwd = resolve(input.cwd);
-  const toolLabel = toolDisplayName(input.tool);
-  const init = await initClaudeSession(input.tool, cwd);
-  const sessionId = init.sessionId;
-  const chatNamePrefix = input.chatNamePrefix?.trim() || input.promptText.slice(0, 10) || "新会话";
-  const chatName = sessionChatName(chatNamePrefix, cwd);
-
-  let chatId: string;
-  try {
-    chatId = await input.platform.createGroup(chatName, input.openIds);
-    await input.platform.updateChatInfo(chatId, chatName, `${sessionPrefixForTool(input.tool)} ${sessionId}`);
-    await setDefaultCwd(cwd, chatId);
-    bindChatToSession(sessionId, chatId);
-    await recordSessionRegistry({
-      chatId,
-      sessionId,
-      tool: input.tool,
-      chatName,
-      turnCount: 0,
-      startTime: Date.now(),
-      running: false,
-    });
-    await saveSessionTool(sessionId, input.tool, chatName);
-  } catch (err) {
-    console.error(`[${ts()}] [AGENT-DELEGATE-TASK] create group failed: ${(err as Error).message}`);
-    throw err;
-  }
-
-  await input.platform.sendCard(
-    chatId,
-    `${toolLabel} Session Ready`,
-    `已创建 **${toolLabel}** 会话群。\n\n` +
-      `**Session ID:** ${sessionId}\n` +
-      `**工作目录:** \`${cwd}\`\n\n` +
-      `下面会自动把任务作为第一句话发送给 ${toolLabel}。`,
-    "green",
-  ).catch(() => {});
-  input.platform.setChatAvatar(chatId, input.tool, "new").catch(() => {});
-
-  await resumeAndPrompt(
-    sessionId,
-    input.promptText,
-    input.platform,
-    chatId,
-    input.msgTimestamp ?? Date.now(),
-    input.tool,
-    input.traceId,
-  );
-
-  console.log(`[${ts()}] [AGENT-DELEGATE-TASK] created ${toolLabel} session=${sessionId} chat=${chatId} cwd=${cwd}`);
-  return { chatId, sessionId, tool: input.tool, cwd };
-}
-
+import { resolve } from "node:path";
+
+import { sessionPrefixForTool, toolDisplayName, ts } from "./config.ts";
+import { setDefaultCwd } from "./config.ts";
+import type { PlatformAdapter } from "./platform-adapter.ts";
+import { initClaudeSession, recordSessionRegistry, resumeAndPrompt, saveSessionTool } from "./session.ts";
+import { bindChatToSession } from "./session-chat-binding.ts";
+import { sessionChatName } from "./session-name.ts";
+
+export interface DelegateAgentTaskInput {
+  platform: PlatformAdapter;
+  tool: string;
+  cwd: string;
+  promptText: string;
+  openIds: string[];
+  chatNamePrefix?: string;
+  msgTimestamp?: number;
+  traceId?: string;
+}
+
+export interface DelegateAgentTaskResult {
+  chatId: string;
+  sessionId: string;
+  tool: string;
+  cwd: string;
+}
+
+export async function delegateAgentTask(input: DelegateAgentTaskInput): Promise<DelegateAgentTaskResult> {
+  const cwd = resolve(input.cwd);
+  const toolLabel = toolDisplayName(input.tool);
+  const init = await initClaudeSession(input.tool, cwd);
+  const sessionId = init.sessionId;
+  const chatNamePrefix = input.chatNamePrefix?.trim() || input.promptText.slice(0, 10) || "新会话";
+  const chatName = sessionChatName(chatNamePrefix, cwd);
+
+  let chatId: string;
+  try {
+    chatId = await input.platform.createGroup(chatName, input.openIds);
+    await input.platform.updateChatInfo(chatId, chatName, `${sessionPrefixForTool(input.tool)} ${sessionId}`);
+    await setDefaultCwd(cwd, chatId);
+    bindChatToSession(sessionId, chatId);
+    await recordSessionRegistry({
+      chatId,
+      sessionId,
+      tool: input.tool,
+      chatType: "group",
+      chatName,
+      turnCount: 0,
+      startTime: Date.now(),
+      running: false,
+    });
+    await saveSessionTool(sessionId, input.tool, chatName);
+  } catch (err) {
+    console.error(`[${ts()}] [AGENT-DELEGATE-TASK] create group failed: ${(err as Error).message}`);
+    throw err;
+  }
+
+  await input.platform.sendCard(
+    chatId,
+    `${toolLabel} Session Ready`,
+    `已创建 **${toolLabel}** 会话群。\n\n` +
+      `**Session ID:** ${sessionId}\n` +
+      `**工作目录:** \`${cwd}\`\n\n` +
+      `下面会自动把任务作为第一句话发送给 ${toolLabel}。`,
+    "green",
+  ).catch(() => {});
+  input.platform.setChatAvatar(chatId, input.tool, "new").catch(() => {});
+
+  await resumeAndPrompt(
+    sessionId,
+    input.promptText,
+    input.platform,
+    chatId,
+    input.msgTimestamp ?? Date.now(),
+    input.tool,
+    input.traceId,
+  );
+
+  console.log(`[${ts()}] [AGENT-DELEGATE-TASK] created ${toolLabel} session=${sessionId} chat=${chatId} cwd=${cwd}`);
+  return { chatId, sessionId, tool: input.tool, cwd };
+}

package/src/agent-reload-config-rpc.ts

@@ -1,34 +1,34 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
-
-import { reloadRuntimeConfig, type RuntimeReloadResult } from "./runtime-reload.ts";
-
-export const AGENT_RELOAD_CONFIG_PATH = "/api/agent/reload-config";
-
-type ReloadRuntimeConfig = (source: string) => RuntimeReloadResult | Promise<RuntimeReloadResult>;
-
-function jsonReply(res: ServerResponse, status: number, data: unknown): void {
-  res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
-  res.end(JSON.stringify(data));
-}
-
-export async function handleAgentReloadConfigRequest(
-  req: IncomingMessage,
-  res: ServerResponse,
-  reload: ReloadRuntimeConfig = reloadRuntimeConfig,
-): Promise<boolean> {
-  const url = new URL(req.url ?? "/", "http://127.0.0.1");
-  if (url.pathname !== AGENT_RELOAD_CONFIG_PATH) return false;
-
-  if (req.method !== "POST") {
-    jsonReply(res, 405, { ok: false, error: "Method not allowed" });
-    return true;
-  }
-
-  try {
-    const result = await reload("agent-reload-api");
-    jsonReply(res, 200, { ok: true, ...result });
-  } catch (err) {
-    jsonReply(res, 500, { ok: false, error: (err as Error).message });
-  }
-  return true;
-}
+import type { IncomingMessage, ServerResponse } from "node:http";
+
+import { reloadRuntimeConfig, type RuntimeReloadResult } from "./runtime-reload.ts";
+
+export const AGENT_RELOAD_CONFIG_PATH = "/api/agent/reload-config";
+
+type ReloadRuntimeConfig = (source: string) => RuntimeReloadResult | Promise<RuntimeReloadResult>;
+
+function jsonReply(res: ServerResponse, status: number, data: unknown): void {
+  res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
+  res.end(JSON.stringify(data));
+}
+
+export async function handleAgentReloadConfigRequest(
+  req: IncomingMessage,
+  res: ServerResponse,
+  reload: ReloadRuntimeConfig = reloadRuntimeConfig,
+): Promise<boolean> {
+  const url = new URL(req.url ?? "/", "http://127.0.0.1");
+  if (url.pathname !== AGENT_RELOAD_CONFIG_PATH) return false;
+
+  if (req.method !== "POST") {
+    jsonReply(res, 405, { ok: false, error: "Method not allowed" });
+    return true;
+  }
+
+  try {
+    const result = await reload("agent-reload-api");
+    jsonReply(res, 200, { ok: true, ...result });
+  } catch (err) {
+    jsonReply(res, 500, { ok: false, error: (err as Error).message });
+  }
+  return true;
+}

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;
+}