chatccc 0.2.151 → 0.2.152

package/package.json

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

package/src/adapters/adapter-interface.ts

@@ -128,6 +128,10 @@ export interface ToolPromptOptions {
   onProcessStart?: (info: ToolProcessInfo) => void;
   /** Called when the adapter leaves the prompt process scope normally or by abort. */
   onProcessExit?: (info: ToolProcessInfo) => void;
+  /** Called when the adapter creates an SDK session internally.
+   *  The callback receives a close function that terminates the underlying
+   *  subprocess. Used by stop-stuck-loop to kill the CLI process immediately. */
+  onSessionCreated?: (closeSession: () => void) => void;
 }
 
 // ---------------------------------------------------------------------------

package/src/adapters/claude-adapter.ts

@@ -490,6 +490,8 @@ class ClaudeAdapter implements ToolAdapter {
       })),
     );
 
+    options?.onSessionCreated?.(() => session.close());
+
     try {
       await session.send(buildClaudePromptText(userText, undefined, sessionId));
       for await (const raw of session.stream()) {

package/src/agent-stop-stuck.ts

@@ -116,6 +116,8 @@ export async function handleAgentStopStuckRequest(
     }
   })();
 
+  // 先关闭底层 SDK session，终止 CLI 子进程，然后再 abort 清理 adapter 层
+  prompt.closeSession?.();
   // 不设 stopped 标记 → finally block 写 "done" → 卡片正常结束
   prompt.controller.abort();
 

package/src/session-chat-binding.ts

@@ -73,6 +73,10 @@ export interface ActivePrompt {
   abnormalExitNotified?: boolean;
   /** Set when the resource monitor detects CPU + memory unchanged for 3 minutes. */
   resourceStuck?: boolean;
+  /** Adapter-provided callback to close the underlying SDK session / subprocess.
+   *  Called by stop-stuck-loop before controller.abort() to terminate the CLI
+   *  process immediately, rather than waiting for the async generator to unblock. */
+  closeSession?: () => void;
 }
 
 export const activePrompts = new Map<string, ActivePrompt>();

package/src/session.ts

@@ -1110,6 +1110,10 @@ export async function runAgentSession(
         clearPromptProcessMonitor(sessionId);
         if (exitInfo.pid !== undefined) unregisterProcess(exitInfo.pid);
       },
+      onSessionCreated: (closeSession) => {
+        const prompt = activePrompts.get(sessionId);
+        if (prompt) prompt.closeSession = closeSession;
+      },
     })) {
       for (const block of unifiedMsg.blocks) {
         accumulateBlockContent(block, state, toolCallMap);