chatccc 0.2.114 → 0.2.116

package/README.md

@@ -305,7 +305,7 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `/newh` | 重置当前会话，保留工作目录 |
 | `/model` | 查看或切换当前会话的模型 |
 | `/stop` | 停止当前回复 |
-| `/status` | 查看当前会话状态 |
+| `/state` | 查看当前会话状态 |
 | `/cd` | 查看或设置当前会话工作目录 |
 | `/sessions` | 查看所有会话状态 |
 | `/git <子命令>` | 在当前会话工作目录执行 `git ...` 并回传输出 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.114",
+  "version": "0.2.116",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/__tests__/card-plain-text.test.ts

@@ -32,7 +32,7 @@ describe("cardJsonToPlainText", () => {
 
     expect(text).toContain("# 生成中...");
     expect(text).toContain("stream body");
-    expect(text).toContain("/status");
+    expect(text).toContain("/state");
     expect(text).toContain("/stop");
   });
 

package/src/__tests__/cards.test.ts

@@ -107,7 +107,7 @@ describe("buildProgressCard", () => {
     const parsed = JSON.parse(card);
     const buttons = parsed.body.elements.filter((e: any) => e.tag === "button");
     expect(buttons).toHaveLength(2);
-    expect(buttons[0].text.content).toBe("查看状态（/status）");
+    expect(buttons[0].text.content).toBe("查看状态（/state）");
     expect(buttons[1].text.content).toBe("停止生成（/stop）");
   });
 

package/src/__tests__/claude-adapter.test.ts

@@ -369,7 +369,7 @@ describe("createClaudeAdapter", () => {
   // -------------------------------------------------------------------------
   // getSessionInfo 行为契约
   //   - cwd 决定 /git 是否可用
-  //   - model 用于 /status、/sessions 显示
+  //   - model 用于 /state、/sessions 显示
   // -------------------------------------------------------------------------
 
   it("getSessionInfo: store 中无该 sessionId 时只返回 sessionId", async () => {

package/src/__tests__/cursor-adapter.test.ts

@@ -296,7 +296,7 @@ describe("createCursorAdapter", () => {
   // -------------------------------------------------------------------------
   // getSessionInfo 行为契约
   //   - cwd 决定 /git 是否可用
-  //   - model 决定 /status、/sessions 显示的是否是 Cursor 真实模型
+  //   - model 决定 /state、/sessions 显示的是否是 Cursor 真实模型
   // -------------------------------------------------------------------------
 
   it("getSessionInfo: store 中无该 sessionId 时只返回 sessionId（cwd / model 都 undefined，让上层走错误分支）", async () => {
@@ -316,7 +316,7 @@ describe("createCursorAdapter", () => {
     expect(info?.model).toBeUndefined();
   });
 
-  it("getSessionInfo: store 同时有 cwd + model 时一并返回（这是 /status 显示真实模型的关键）", async () => {
+  it("getSessionInfo: store 同时有 cwd + model 时一并返回（这是 /state 显示真实模型的关键）", async () => {
     const store = createInMemoryMetaStore({
       "sid-known": { cwd: "F:/proj/Foo", model: "Composer 2 Fast" },
     });

package/src/__tests__/cursor-session-meta-store.test.ts

@@ -1,7 +1,7 @@
 // =============================================================================
 // cursor-session-meta-store.test.ts — sessionId→{cwd,model} 持久化的护栏单测
 // =============================================================================
-// 行为契约（与 cursor-adapter.getSessionInfo 配合，决定 /git、/status、/sessions
+// 行为契约（与 cursor-adapter.getSessionInfo 配合，决定 /git、/state、/sessions
 // 在 Cursor 会话上是否显示正确）：
 //   - 文件不存在 / 损坏 / 非法 schema 时 get 返回 undefined，不抛异常
 //   - set 部分合并：只覆盖非空字段，已有字段保持不变

package/src/__tests__/session.test.ts

@@ -160,7 +160,7 @@ function mockSessionInfo(chatId: string, overrides: Partial<{
 
 /**
  * 简易 mock adapter：getSessionInfo 返回固定 SessionInfo，其他方法不实现
- * （仅 /status、/sessions 路径会触发 getSessionInfo，无需完整接口）。
+ * （仅 /state、/sessions 路径会触发 getSessionInfo，无需完整接口）。
  */
 function mockAdapter(getInfo: (sid: string) => SessionInfo | undefined): ToolAdapter {
   return {
@@ -597,7 +597,7 @@ describe("getSessionStatus", () => {
   });
 
   // -------------------------------------------------------------------------
-  // model/effort 来源：按 tool 分支（核心契约——决定 /status 显示是否真实）
+  // model/effort 来源：按 tool 分支（核心契约——决定 /state 显示是否真实）
   // -------------------------------------------------------------------------
 
   it("Claude 会话：effort 非 null（始终显示该行）；model 来自全局配置", async () => {
@@ -643,7 +643,7 @@ describe("getSessionStatus", () => {
     expect(status!.model).toBe(UNKNOWN_MODEL_PLACEHOLDER);
   });
 
-  it("Cursor 会话：adapter.getSessionInfo 抛错时降级为占位符（不阻塞 /status）", async () => {
+  it("Cursor 会话：adapter.getSessionInfo 抛错时降级为占位符（不阻塞 /state）", async () => {
     mockSessionInfo("chat-cursor", { sessionId: "sid-cur", tool: "cursor" });
     _setAdapterForToolForTest(
       "cursor",

package/src/adapters/adapter-interface.ts

@@ -101,7 +101,7 @@ export interface CreateSessionResult {
 }
 
 // ---------------------------------------------------------------------------
-// SessionInfo — 会话元数据（/status、/cd 等命令使用）
+// SessionInfo — 会话元数据（/state、/cd 等命令使用）
 // ---------------------------------------------------------------------------
 
 export interface SessionInfo {
@@ -113,7 +113,7 @@ export interface SessionInfo {
    * 会话实际使用的模型展示名（如 Cursor 的 `Composer 2 Fast`）。
    * - Cursor adapter：从 cursor-agent system/init 事件学习并持久化到 store
    * - Claude adapter：留空（model 由 ChatCCC 配置 `CLAUDE_MODEL` 决定，不从 SDK 取）
-   * 上层 /status、/sessions 渲染时按 tool 决定显示哪一来源。
+   * 上层 /state、/sessions 渲染时按 tool 决定显示哪一来源。
    */
   model?: string;
 }

package/src/adapters/claude-adapter.ts

@@ -458,6 +458,12 @@ class ClaudeAdapter implements ToolAdapter {
 
         const normalized = normalizeSdkMessage(raw);
         if (normalized) yield normalized;
+
+        // result 是流末事件，收到后立即结束进程，防止 CLI 僵死导致 readline 挂起。
+        if (raw.type === "result") {
+          void killProcessTree(proc.pid);
+          break;
+        }
       }
     } finally {
       signal?.removeEventListener("abort", onAbort);

package/src/adapters/cursor-adapter.ts

@@ -394,6 +394,12 @@ class CursorAdapter implements ToolAdapter {
         }
         const normalized = normalizeCursorMessage(raw);
         if (normalized) yield normalized;
+
+        // result 是流末事件，收到后立即结束进程，防止 CLI 僵死导致 readline 挂起。
+        if (raw.type === "result") {
+          void killProcessTree(proc.pid);
+          break;
+        }
       }
     } finally {
       signal?.removeEventListener("abort", onAbort);

package/src/adapters/cursor-session-meta-store.ts

@@ -5,7 +5,7 @@
 // 内部已持久化）。Cursor CLI 没有等价机制，因此 ChatCCC 必须自己维护一份
 // sessionId → { cwd, model } 映射，否则：
 //   1. /git、/cd 等需要"会话真实工作目录"的命令将在 Cursor 会话上 100% 失败
-//   2. /status、/sessions 显示的"模型"只能硬塞 ChatCCC 的 ANTHROPIC 环境变量，
+//   2. /state、/sessions 显示的"模型"只能硬塞 ChatCCC 的 ANTHROPIC 环境变量，
 //      与 Cursor 实际跑的 Composer 2 Fast 等真实模型无关
 //
 // 存储：

package/src/adapters/resource-monitor.ts

@@ -0,0 +1,141 @@
+// =============================================================================
+// resource-monitor.ts — CLI 进程资源监控（CPU + 内存）
+// =============================================================================
+// 对所有 chatccc 启动的 CLI 进程持续监控 CPU 和内存占用。
+// 若连续 3 分钟两项指标均无变化，判定为僵死，发出 "stuck" 事件。
+// =============================================================================
+
+import { exec } from "node:child_process";
+import { EventEmitter } from "node:events";
+
+const CHECK_INTERVAL_MS = 30_000; // 30 秒检查一次
+const STUCK_THRESHOLD = 6; // 连续 6 次无变化 = 3 分钟
+
+interface ProcessSnapshot {
+  cpu: number;
+  memory: number;
+  unchangedCount: number;
+}
+
+interface TrackedProcess {
+  pid: number;
+  sessionId: string;
+  snapshot: ProcessSnapshot;
+}
+
+export const resourceMonitor = new EventEmitter();
+
+const tracked = new Map<number, TrackedProcess>();
+
+let timer: ReturnType<typeof setInterval> | null = null;
+
+function startIfNeeded(): void {
+  if (timer) return;
+  timer = setInterval(checkAll, CHECK_INTERVAL_MS);
+  timer.unref?.();
+}
+
+function stopIfIdle(): void {
+  if (tracked.size > 0) return;
+  if (timer) { clearInterval(timer); timer = null; }
+}
+
+export function registerProcess(pid: number, sessionId: string): void {
+  tracked.set(pid, { pid, sessionId, snapshot: { cpu: -1, memory: -1, unchangedCount: 0 } });
+  startIfNeeded();
+}
+
+export function unregisterProcess(pid: number): void {
+  tracked.delete(pid);
+  stopIfIdle();
+}
+
+// ---------------------------------------------------------------------------
+// 批量查询进程指标（Windows PowerShell）
+// ---------------------------------------------------------------------------
+
+function execPowerShell(script: string, timeoutMs: number): Promise<string> {
+  return new Promise((resolve, reject) => {
+    exec(
+      `powershell -NoProfile -Command "${script}"`,
+      { timeout: timeoutMs, windowsHide: true },
+      (err, stdout) => {
+        if (err) reject(err);
+        else resolve(stdout);
+      },
+    );
+  });
+}
+
+async function getProcessMetrics(pids: number[]): Promise<Map<number, { cpu: number; memory: number }>> {
+  const result = new Map<number, { cpu: number; memory: number }>();
+  if (pids.length === 0) return result;
+
+  const psScript = `Get-Process -Id ${pids.join(",")} -ErrorAction SilentlyContinue | ForEach-Object { "$($_.Id)|$($_.CPU)|$($_.WorkingSet64)" }`;
+
+  try {
+    const stdout = await execPowerShell(psScript, 10_000);
+    for (const line of stdout.trim().split(/\r?\n/)) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      const [idStr, cpuStr, memStr] = trimmed.split("|");
+      const id = parseInt(idStr, 10);
+      const cpu = parseFloat(cpuStr);
+      const memory = parseInt(memStr, 10);
+      if (!isNaN(id) && !isNaN(cpu) && !isNaN(memory)) {
+        result.set(id, { cpu, memory });
+      }
+    }
+  } catch {
+    // PowerShell 查询失败时跳过本轮，下次重试
+  }
+
+  return result;
+}
+
+// ---------------------------------------------------------------------------
+// 定时检查
+// ---------------------------------------------------------------------------
+
+async function checkAll(): Promise<void> {
+  if (tracked.size === 0) return;
+
+  const pids = [...tracked.keys()];
+  const metrics = await getProcessMetrics(pids);
+
+  for (const [pid, tp] of tracked) {
+    const m = metrics.get(pid);
+    if (!m) {
+      // 进程已不存在，停止追踪
+      tracked.delete(pid);
+      continue;
+    }
+
+    const prev = tp.snapshot;
+    const cpuChanged = m.cpu !== prev.cpu;
+    // 内存允许 ±1% 波动，避免正常抖动触发误判
+    const memTolerance = prev.memory > 0 ? Math.max(prev.memory * 0.01, 1024 * 1024) : 1024 * 1024;
+    const memChanged = Math.abs(m.memory - prev.memory) > memTolerance;
+
+    if (!cpuChanged && !memChanged) {
+      tp.snapshot.unchangedCount++;
+      if (tp.snapshot.unchangedCount >= STUCK_THRESHOLD) {
+        const idleMinutes = Math.round(
+          (tp.snapshot.unchangedCount * CHECK_INTERVAL_MS) / 60_000,
+        );
+        resourceMonitor.emit("stuck", {
+          pid: tp.pid,
+          sessionId: tp.sessionId,
+          idleMinutes,
+        });
+        tracked.delete(pid);
+      }
+    } else {
+      tp.snapshot.unchangedCount = 0;
+    }
+    tp.snapshot.cpu = m.cpu;
+    tp.snapshot.memory = m.memory;
+  }
+
+  stopIfIdle();
+}

package/src/cards.ts

@@ -89,7 +89,7 @@ export function buildProgressCard(
     elements.push({ tag: "hr" });
     elements.push({
       tag: "button",
-      text: { tag: "plain_text", content: "查看状态（/status）" },
+      text: { tag: "plain_text", content: "查看状态（/state）" },
       type: "default",
       value: { action: "status" },
       element_id: "action_status",

package/src/index.ts

@@ -287,7 +287,7 @@ function parseCardAction(data: unknown): CardActionResult | null {
   }
   if (!cmd) return null;
 
-  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", status: "/status", cd: "/cd", sessions: "/sessions", newh: "/newh" };
+  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", status: "/state", cd: "/cd", sessions: "/sessions", newh: "/newh" };
   let text = CMD_MAP[cmd] ?? "";
   if (cmd === "cd" && typeof action.value === "object" && action.value !== null) {
     const path = (action.value as Record<string, string>).path;

package/src/orchestrator.ts

@@ -739,8 +739,8 @@ export async function handleCommand(
       return;
     }
 
-    if (textLower === "/status") {
-      logTrace(tid, "BRANCH", { cmd: "/status" });
+    if (textLower === "/state") {
+      logTrace(tid, "BRANCH", { cmd: "/state" });
       const status = await getSessionStatus(chatId);
       const isActive = isSessionRunning(sessionId);
       const statusText = [

package/src/session-chat-binding.ts

@@ -71,6 +71,8 @@ export interface ActivePrompt {
   /** Set when the watchdog detects that the CLI process disappeared before stream finalization. */
   abnormalExit?: boolean;
   abnormalExitNotified?: boolean;
+  /** Set when the resource monitor detects CPU + memory unchanged for 3 minutes. */
+  resourceStuck?: boolean;
 }
 
 export const activePrompts = new Map<string, ActivePrompt>();

package/src/session.ts

@@ -29,6 +29,7 @@ import type { ToolProcessInfo } from "./adapters/adapter-interface.ts";
 import { createClaudeAdapter } from "./adapters/claude-adapter.ts";
 import { createCursorAdapter } from "./adapters/cursor-adapter.ts";
 import { createCodexAdapter } from "./adapters/codex-adapter.ts";
+import { resourceMonitor, registerProcess, unregisterProcess } from "./adapters/resource-monitor.ts";
 import { buildImSkillsPromptCached, exportSkillSubDocs, clearImSkillsPromptCache } from "./im-skills.ts";
 import type { PlatformAdapter } from "./platform-adapter.ts";
 
@@ -181,7 +182,7 @@ function startPromptProcessMonitor(sessionId: string, info: ToolProcessInfo): vo
       clearPromptProcessMonitor(sessionId);
       return;
     }
-    if (current.stopped || current.abnormalExit) return;
+    if (current.stopped || current.abnormalExit || current.resourceStuck) return;
     if (isProcessAliveImpl(info.pid)) return;
 
     current.abnormalExit = true;
@@ -877,6 +878,26 @@ export async function runAgentSession(
     startTime: now,
   });
 
+  // 资源监控僵死检测：CPU + 内存连续 3 分钟无变化 → 强制停止
+  const onResourceStuck = (data: { pid: number; sessionId: string; idleMinutes: number }) => {
+    if (data.sessionId !== sessionId) return;
+    const prompt = activePrompts.get(sessionId);
+    if (!prompt || prompt.stopped || prompt.abnormalExit || prompt.resourceStuck) return;
+    prompt.resourceStuck = true;
+
+    const chatId = pickDisplayChat(sessionId) ?? getLastActiveChat(sessionId) ?? getChatsForSession(sessionId)[0];
+    const p = chatId ? platformForChat(chatId) : null;
+    if (chatId && p) {
+      p.sendText(
+        chatId,
+        `⚠️ 会话僵死：session ${sessionId.slice(0, 8)} 对应的 CLI 进程 PID ${data.pid} CPU 和内存连续 ${data.idleMinutes} 分钟无变化，已强制停止。若回复不完整，请重新发送上一条指令。`,
+      ).catch(() => {});
+    }
+
+    controller.abort();
+  };
+  resourceMonitor.on("stuck", onResourceStuck);
+
   // 异步准备工作（session info、IM skills prompt 等）
   let adapter: ToolAdapter;
   let info: Awaited<ReturnType<ToolAdapter["getSessionInfo"]>>;
@@ -1079,9 +1100,11 @@ export async function runAgentSession(
     for await (const unifiedMsg of adapter.prompt(sessionId, userTextWithCapabilities, cwd, controller.signal, {
       onProcessStart: (processInfo) => {
         startPromptProcessMonitor(sessionId, processInfo);
+        if (processInfo.pid !== undefined) registerProcess(processInfo.pid, sessionId);
       },
-      onProcessExit: () => {
+      onProcessExit: (exitInfo) => {
         clearPromptProcessMonitor(sessionId);
+        if (exitInfo.pid !== undefined) unregisterProcess(exitInfo.pid);
       },
     })) {
       for (const block of unifiedMsg.blocks) {
@@ -1124,9 +1147,11 @@ export async function runAgentSession(
     console.error(`[${ts()}] [STREAM] Error in stream loop for ${sessionId}: ${(streamErr as Error).message}`);
   } finally {
     // 标记 prompt 结束
+    resourceMonitor.off("stuck", onResourceStuck);
     const prompt = activePrompts.get(sessionId);
     const wasStopped = prompt?.stopped ?? false;
     const wasAbnormalExit = prompt?.abnormalExit ?? false;
+    const wasResourceStuck = prompt?.resourceStuck ?? false;
     clearPromptProcessMonitor(sessionId);
     activePrompts.delete(sessionId);
 
@@ -1134,7 +1159,7 @@ export async function runAgentSession(
     // 读到新状态并终结旧卡片。否则 setImmediate 在 CHECK 阶段先于
     // writeFile I/O（POLL 阶段）执行，display loop 会误以为旧轮仍在
     // 运行中并更新旧卡片，而不是新建卡片。
-    const finalStatus = wasAbnormalExit ? "error" : wasStopped ? "stopped" : "done";
+    const finalStatus = (wasAbnormalExit || wasResourceStuck) ? "error" : wasStopped ? "stopped" : "done";
     const finalReply = pickFinalReply(state).trim();
     await writeStreamState({
       sessionId,
@@ -1549,7 +1574,7 @@ export function stopSession(sessionId: string): boolean {
 }
 
 // ---------------------------------------------------------------------------
-// Session status query (供 /status、/sessions 命令使用)
+// Session status query (供 /state、/sessions 命令使用)
 // ---------------------------------------------------------------------------
 //
 // model / effort 的来源策略（按 tool 区分，避免硬塞 ChatCCC 全局配置导致显示
@@ -1590,7 +1615,7 @@ async function resolveModelEffort(
       const info = await adapter.getSessionInfo(sessionId);
       if (info?.model) model = info.model;
     } catch {
-      // adapter 异常时降级为占位符（不阻塞 /status 卡片）
+      // adapter 异常时降级为占位符（不阻塞 /state 卡片）
     }
     return { model, effort: null };
   }