chatccc 0.2.85 → 0.2.87

package/package.json

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

package/src/adapters/cursor-adapter.ts

@@ -268,11 +268,13 @@ function spawnAgent(
     shell: true,
   });
 
+  console.log(`[Cursor debug] spawn: cmd=${CURSOR_AGENT_COMMAND}, args=[${allArgs.join(", ")}], cwd=${cwd ?? "(none)"}, stdinLen=${stdinText?.length ?? 0}, pid=${proc.pid}`);
+
   // 收集 stderr，子进程异常退出时输出到日志，方便排查静默失败
   let stderr = "";
   proc.stderr!.on("data", (chunk: Buffer) => { stderr += chunk.toString(); });
   proc.on("close", (code) => {
-    if (code !== 0 && stderr.trim()) {
+    if (stderr.trim()) {
       console.error(`[Cursor stderr] exit=${code}: ${stderr.trim().slice(0, 2000)}`);
     }
   });
@@ -287,14 +289,18 @@ function spawnAgent(
 async function* readJsonLines(
   proc: ChildProcess,
   signal?: AbortSignal,
+  debugTag?: string,
 ): AsyncGenerator<CursorMessageLine> {
+  const tag = debugTag ?? "cursor";
   const rl = createInterface({ input: proc.stdout!, crlfDelay: Infinity });
   // abort 时主动 close readline，避免等待 Windows 管道自然关闭（可能延迟数分钟）
   const onAbort = () => { rl.close(); };
   signal?.addEventListener("abort", onAbort, { once: true });
+  let lineCount = 0;
   try {
     for await (const line of rl) {
       if (signal?.aborted) break;
+      lineCount++;
       const trimmed = line.trim();
       if (!trimmed) continue;
       try {
@@ -304,6 +310,7 @@ async function* readJsonLines(
   } finally {
     signal?.removeEventListener("abort", onAbort);
     rl.close();
+    console.log(`[Cursor debug] ${tag} readJsonLines done: ${lineCount} raw lines, signalAborted=${signal?.aborted ?? false}`);
   }
 }
 
@@ -325,7 +332,7 @@ class CursorAdapter implements ToolAdapter {
     const proc = spawnAgent(["ok"], cwd);
     this.activeProcs.add(proc);
 
-    for await (const msg of readJsonLines(proc)) {
+    for await (const msg of readJsonLines(proc, undefined, "createSession")) {
       if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
         const sessionId = msg.session_id;
         await this.metaStore
@@ -348,6 +355,7 @@ class CursorAdapter implements ToolAdapter {
     cwd: string,
     signal?: AbortSignal,
   ): AsyncIterable<UnifiedStreamMessage> {
+    console.log(`[Cursor debug] prompt start: sessionId=${sessionId}, cwd=${cwd}, userTextLen=${userText.length}`);
     const proc = spawnAgent(["--resume", sessionId], cwd, userText);
     this.activeProcs.add(proc);
 
@@ -357,7 +365,7 @@ class CursorAdapter implements ToolAdapter {
     signal?.addEventListener("abort", onAbort, { once: true });
 
     try {
-      for await (const raw of readJsonLines(proc, signal)) {
+      for await (const raw of readJsonLines(proc, signal, sessionId)) {
         if (signal?.aborted) break;
         if (
           raw.type === "system" &&
@@ -376,6 +384,7 @@ class CursorAdapter implements ToolAdapter {
       signal?.removeEventListener("abort", onAbort);
       await killProcessTree(proc.pid);
       this.activeProcs.delete(proc);
+      console.log(`[Cursor debug] prompt end: sessionId=${sessionId}, signalAborted=${signal?.aborted ?? false}`);
     }
   }
 

package/src/session.ts

@@ -955,7 +955,16 @@ export async function runAgentSession(
 const CARD_ROTATE_MS = 9 * 60 * 1000;
 
 export function ensureDisplayLoop(sessionId: string): void {
-  if (displayLoops.has(sessionId)) return;
+  // 杀掉旧 loop（如果存在），避免竞态：旧 loop 正在处理 terminal 分支
+  // （发送完成卡片、清理 display）尚未 delete 自己，新 turn 的
+  // runAgentSession 调用 ensureDisplayLoop 时因 guard 直接返回，
+  // 导致新 turn 没有 display loop → 卡片永久不更新。
+  const oldStop = displayLoops.get(sessionId);
+  if (oldStop) {
+    console.log(`[${ts()}] [DISPLAY] ensureDisplayLoop restarting loop for ${sessionId} (old loop existed)`);
+    oldStop();
+    displayLoops.delete(sessionId);
+  }
 
   let dotCount = 0;
 
@@ -1243,6 +1252,7 @@ export function ensureDisplayLoop(sessionId: string): void {
       }
 
       if (isTerminal) {
+        console.log(`[${ts()}] [DISPLAY] loop stopping for ${sessionId} (terminal state: ${state.status})`);
         clearInterval(interval);
         displayLoops.delete(sessionId);
       }