@testchimp/cli 0.1.59 → 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;
@@ -1546,9 +1575,7 @@ export async function runChimphands(opts) {
             syncLiveSse(attached);
         })
         : () => { };
-    const stopTunnel = runtimeId && attachUrl
-        ? startTunnelWorker(backend, apiKey, runtimeId, attachUrl)
-        : () => { };
+    let stopTunnel = () => { };
     const userId = bootStr(boot, "chimphands_service_account_user_id", "chimphandsServiceAccountUserId");
     if (userId) {
         process.env.TESTCHIMP_USER_ID = userId;
@@ -1634,6 +1661,13 @@ export async function runChimphands(opts) {
             // Polling is best-effort when inbound SSE misses an event.
         }
     };
+    const seenWorktreeWriteRequestIds = new Set();
+    const handleUserFileEdit = (edit) => {
+        if (seenWorktreeWriteRequestIds.has(edit.requestId))
+            return;
+        seenWorktreeWriteRequestIds.add(edit.requestId);
+        void applyUserFileEdit(backend, apiKey, sessionId, edit, () => agentTurnInProgress);
+    };
     const postEvent = (role, content, opts) => {
         const bodyOpts = { ...opts };
         if (opencodeSessionId && !bodyOpts.opencodeSessionId) {
@@ -1669,28 +1703,42 @@ 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 */
-                }
-            }
-        },
-        onUserFileEdit: (edit) => {
-            void applyUserFileEdit(backend, apiKey, sessionId, edit, () => agentTurnInProgress);
-        },
+        onCancelTurn: handleCancelTurn,
+        onUserFileEdit: handleUserFileEdit,
         shouldRun: () => sessionActive,
     });
+    if (runtimeId && attachUrl) {
+        stopTunnel = startTunnelWorker(backend, apiKey, runtimeId, attachUrl, sessionId, {
+            onUserFileEdit: handleUserFileEdit,
+            onCancelTurn: handleCancelTurn,
+        });
+    }
     const shutdownRuntime = async () => {
         sessionActive = false;
         stopInbound();
@@ -1970,7 +2018,7 @@ async function commitAndPushDirtyWorktree(message) {
         console.error(`ChimpHands commit-before-idle failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
-function startTunnelWorker(backend, apiKey, runtimeId, attachUrl) {
+function startTunnelWorker(backend, apiKey, runtimeId, attachUrl, sessionId, handlers) {
     let stopped = false;
     const base = attachUrl.replace(/\/$/, "");
     let ws = null;
@@ -2101,6 +2149,29 @@ function startTunnelWorker(backend, apiKey, runtimeId, attachUrl) {
                     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) {
+                        return;
+                    }
+                    const requestId = edit.requestId || edit.request_id;
+                    if (requestId && edit.path) {
+                        handlers?.onUserFileEdit?.({
+                            requestId,
+                            path: edit.path,
+                            content: edit.content ?? "",
+                        });
+                    }
+                    return;
+                }
                 if (frame.type === "http_request" || frame.requestId) {
                     void handleHttpRequest(socket, frame);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testchimp/cli",
-  "version": "0.1.59",
+  "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",