@testchimp/cli 0.1.60 → 0.1.61

package/dist/chimphands/run.js

@@ -1081,6 +1081,34 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
         const textByPartId = new Map();
         const partTypeById = new Map();
         let sawStdout = false;
+        let cancelEscalationTimer = null;
+        let cancelWatcher = null;
+        const clearCancelWatcher = () => {
+            if (cancelWatcher) {
+                clearInterval(cancelWatcher);
+                cancelWatcher = null;
+            }
+            if (cancelEscalationTimer) {
+                clearTimeout(cancelEscalationTimer);
+                cancelEscalationTimer = null;
+            }
+        };
+        const killActiveChild = (signal) => {
+            try {
+                if (!child.killed)
+                    child.kill(signal);
+            }
+            catch {
+                /* ignore */
+            }
+        };
+        cancelWatcher = setInterval(() => {
+            if (!callbacks.getCancelRequested?.())
+                return;
+            clearCancelWatcher();
+            killActiveChild("SIGTERM");
+            cancelEscalationTimer = setTimeout(() => killActiveChild("SIGKILL"), 2000);
+        }, 500);
         let progressTicker = setInterval(() => {
             if (sawStdout) {
                 if (progressTicker) {
@@ -1236,6 +1264,7 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
         });
         child.on("close", (code) => {
             callbacks.onActiveChild?.(null);
+            clearCancelWatcher();
             if (progressTicker) {
                 clearInterval(progressTicker);
                 progressTicker = null;
@@ -1674,29 +1703,40 @@ export async function runChimphands(opts) {
     };
     if (userId)
         childEnv.TESTCHIMP_USER_ID = userId;
+    const handleCancelTurn = () => {
+        cancelTurnRequested = true;
+        const ch = activeOpencodeChild;
+        if (ch && !ch.killed) {
+            try {
+                ch.kill("SIGTERM");
+                setTimeout(() => {
+                    try {
+                        if (!ch.killed)
+                            ch.kill("SIGKILL");
+                    }
+                    catch {
+                        /* ignore */
+                    }
+                }, 2000);
+            }
+            catch {
+                /* ignore */
+            }
+        }
+    };
     const stopInbound = connectInboundStream(backend, apiKey, sessionId, {
         onUserMessage: enqueueUserMessage,
         onIdle: () => {
             idle = true;
         },
-        onCancelTurn: () => {
-            cancelTurnRequested = true;
-            const ch = activeOpencodeChild;
-            if (ch && !ch.killed) {
-                try {
-                    ch.kill("SIGTERM");
-                }
-                catch {
-                    /* ignore */
-                }
-            }
-        },
+        onCancelTurn: handleCancelTurn,
         onUserFileEdit: handleUserFileEdit,
         shouldRun: () => sessionActive,
     });
     if (runtimeId && attachUrl) {
         stopTunnel = startTunnelWorker(backend, apiKey, runtimeId, attachUrl, sessionId, {
             onUserFileEdit: handleUserFileEdit,
+            onCancelTurn: handleCancelTurn,
         });
     }
     const shutdownRuntime = async () => {
@@ -2109,6 +2149,14 @@ function startTunnelWorker(backend, apiKey, runtimeId, attachUrl, sessionId, han
                     socket.send(JSON.stringify({ type: "pong" }));
                     return;
                 }
+                if (frame.type === "inbound_event" && frame.event === "cancel_turn") {
+                    const payload = frame.data;
+                    if (payload?.sessionId && payload.sessionId !== sessionId) {
+                        return;
+                    }
+                    handlers?.onCancelTurn?.();
+                    return;
+                }
                 if (frame.type === "inbound_event" && frame.event === "user_file_edit" && frame.data) {
                     const edit = frame.data;
                     if (edit.sessionId && edit.sessionId !== sessionId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testchimp/cli",
-  "version": "0.1.60",
+  "version": "0.1.61",
   "description": "TestChimp CLI and MCP server — coverage, plans, EaaS, TrueCoverage, API operations (calls /api/mcp/*)",
   "type": "module",
   "main": "dist/bin/testchimp.js",