@testchimp/cli 0.1.65 → 0.1.66

package/dist/chimphands/run.js

@@ -1773,6 +1773,8 @@ export async function runChimphands(opts) {
     let lastUserActivity = Date.now();
     let exitCode;
     let cancelTurnRequested = false;
+    /** True when cancel was triggered by a mid-turn user message (steer), not Stop. */
+    let steerAbortRequested = false;
     let activeOpencodeChild = null;
     let agentTurnInProgress = false;
     /** Wakes waitForNextPrompt when idle is signaled (SSE) or a user message arrives. */
@@ -1788,6 +1790,35 @@ export async function runChimphands(opts) {
             activeOpencodeChild = child;
         },
     };
+    /** Abort in-flight OpenCode turn (session HTTP abort + kill `opencode run` child). */
+    const abortActiveTurn = (reason) => {
+        cancelTurnRequested = true;
+        if (reason === "steer") {
+            steerAbortRequested = true;
+        }
+        const sessionToAbort = opencodeSessionId?.trim();
+        if (attachUrl && sessionToAbort) {
+            void abortOpencodeSession(attachUrl, sessionToAbort);
+        }
+        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 enqueueUserMessage = (msg) => {
         const id = msg.id?.trim();
         if (id) {
@@ -1801,9 +1832,15 @@ export async function runChimphands(opts) {
         queue.push(content);
         lastUserActivity = Date.now();
         idle = false;
-        wakePromptWaiter();
         const preview = content.length > 120 ? `${content.slice(0, 117)}...` : content;
         console.error(`ChimpHands queued user message (turnActive=${agentTurnInProgress}, depth=${queue.length}): ${JSON.stringify(preview)}`);
+        // OpenCode has no mid-turn inject: abort the active turn so the queued
+        // message is consumed immediately as the next prompt (course-correct).
+        if (agentTurnInProgress && !cancelTurnRequested) {
+            console.error(`ChimpHands steering: aborting active turn so queued user message reaches OpenCode`);
+            abortActiveTurn("steer");
+        }
+        wakePromptWaiter();
     };
     const pollPendingUserMessages = async () => {
         try {
@@ -1869,29 +1906,8 @@ export async function runChimphands(opts) {
         childEnv.TESTCHIMP_USER_ID = userId;
     const handleCancelTurn = () => {
         console.error(`ChimpHands cancel_turn received for session ${sessionId}`);
-        cancelTurnRequested = true;
-        const sessionToAbort = opencodeSessionId?.trim();
-        if (attachUrl && sessionToAbort) {
-            void abortOpencodeSession(attachUrl, sessionToAbort);
-        }
-        const ch = activeOpencodeChild;
-        if (ch && !ch.killed) {
-            try {
-                ch.kill("SIGTERM");
-                setTimeout(() => {
-                    try {
-                        if (!ch.killed)
-                            ch.kill("SIGKILL");
-                    }
-                    catch {
-                        /* ignore */
-                    }
-                }, 2000);
-            }
-            catch {
-                /* ignore */
-            }
-        }
+        steerAbortRequested = false;
+        abortActiveTurn("cancel");
     };
     const stopInbound = connectInboundStream(backend, apiKey, sessionId, {
         onUserMessage: enqueueUserMessage,
@@ -2006,11 +2022,21 @@ export async function runChimphands(opts) {
         });
         while (prompt) {
             cancelTurnRequested = false;
+            const wasSteered = steerAbortRequested;
+            steerAbortRequested = false;
             agentTurnInProgress = true;
             let useOpencodeSessionId = opencodeSessionId;
             let isNewOpencodeSession = !useOpencodeSessionId;
-            let effectivePrompt = wrapPromptWithContext(conversationSummary, prompt, isNewOpencodeSession, workingBranch, pullRequestUrl);
-            const turnPostEvent = (role, content, opts) => postEventForTurn(prompt, effectivePrompt, role, content, opts);
+            const promptForOpencode = wasSteered
+                ? [
+                    "The previous agent turn was interrupted because the user sent a new message.",
+                    "Stop any long-running watch/poll that no longer applies. Course-correct using this guidance:",
+                    "",
+                    prompt,
+                ].join("\n")
+                : prompt;
+            let effectivePrompt = wrapPromptWithContext(conversationSummary, promptForOpencode, isNewOpencodeSession, workingBranch, pullRequestUrl);
+            const turnPostEvent = (role, content, opts) => postEventForTurn(promptForOpencode, effectivePrompt, role, content, opts);
             // Visible in chat (not filtered as routine). OpenCode may not emit text until a
             // part completes — without this the UI looks empty while the turn is running.
             postEvent(ROLE_STATUS, "Agent is working…", { status: STATUS_RUNNING });
@@ -2098,7 +2124,11 @@ export async function runChimphands(opts) {
                 exitCode = result.code || 1;
                 break;
             }
-            if (result.cancelled) {
+            if (result.cancelled && (steerAbortRequested || queue.length > 0)) {
+                // Mid-turn user message aborted this turn — run the queued prompt next.
+                postEvent(ROLE_STATUS, "Incorporating your message…", { status: STATUS_RUNNING });
+            }
+            else if (result.cancelled) {
                 postEvent(ROLE_STATUS, "Turn stopped", { status: STATUS_WAITING_USER });
             }
             else {

package/package.json

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