@testchimp/cli 0.1.58 → 0.1.60

package/dist/chimphands/run.js

@@ -5,6 +5,8 @@
  */
 import { execSync, spawn } from "node:child_process";
 import { mkdirSync, openSync, writeFileSync } from "node:fs";
+import fs from "node:fs/promises";
+import path from "node:path";
 import http from "node:http";
 import https from "node:https";
 import { URL } from "node:url";
@@ -1059,6 +1061,7 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
         stdio: ["pipe", "pipe", "pipe"],
         env: childEnv,
     });
+    callbacks.onActiveChild?.(child);
     try {
         child.stdin?.end();
     }
@@ -1232,6 +1235,7 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
             }
         });
         child.on("close", (code) => {
+            callbacks.onActiveChild?.(null);
             if (progressTicker) {
                 clearInterval(progressTicker);
                 progressTicker = null;
@@ -1242,6 +1246,10 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
             const stderrFatal = extractOpencodeFatalError(err);
             if (stderrFatal)
                 fatalError = stderrFatal;
+            if (callbacks.getCancelRequested?.()) {
+                resolve({ code: 0, err: "", opencodeSessionId: activeSessionId, cancelled: true });
+                return;
+            }
             if (fatalError) {
                 resolve({ code: 1, err: fatalError, opencodeSessionId: activeSessionId });
                 return;
@@ -1258,6 +1266,63 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
         });
     });
 }
+function normalizeWorktreeRelativePath(filePath) {
+    let p = String(filePath || "").trim().replace(/\\/g, "/");
+    while (p.startsWith("/"))
+        p = p.slice(1);
+    if (!p || p.includes("\0")) {
+        throw new Error("invalid path");
+    }
+    const segments = [];
+    for (const part of p.split("/")) {
+        if (!part || part === ".")
+            continue;
+        if (part === "..") {
+            if (!segments.length)
+                throw new Error("invalid path");
+            segments.pop();
+            continue;
+        }
+        segments.push(part);
+    }
+    if (!segments.length)
+        throw new Error("invalid path");
+    return segments.join("/");
+}
+async function ackWorktreeFileWrite(backend, apiKey, sessionId, requestId, ok, errorMessage) {
+    const body = {
+        sessionId,
+        requestId,
+        ok,
+    };
+    if (errorMessage)
+        body.errorMessage = errorMessage.slice(0, 2000);
+    await postJson(backend, apiKey, "/api/chimphands/ack_worktree_file_write", body).catch((err) => {
+        console.error(`ChimpHands ack_worktree_file_write failed: ${err instanceof Error ? err.message : String(err)}`);
+    });
+}
+async function applyUserFileEdit(backend, apiKey, sessionId, edit, turnActive) {
+    if (turnActive()) {
+        await ackWorktreeFileWrite(backend, apiKey, sessionId, edit.requestId, false, "agent turn in progress");
+        return;
+    }
+    try {
+        const relative = normalizeWorktreeRelativePath(edit.path);
+        const root = process.cwd();
+        const full = path.resolve(root, relative);
+        const rootResolved = path.resolve(root);
+        if (full !== rootResolved && !full.startsWith(rootResolved + path.sep)) {
+            throw new Error("path outside worktree");
+        }
+        await fs.mkdir(path.dirname(full), { recursive: true });
+        await fs.writeFile(full, edit.content, "utf8");
+        await ackWorktreeFileWrite(backend, apiKey, sessionId, edit.requestId, true);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        await ackWorktreeFileWrite(backend, apiKey, sessionId, edit.requestId, false, msg);
+    }
+}
 function connectInboundStream(backend, apiKey, sessionId, handlers) {
     const url = new URL(`${backend}/api/chimphands/sessions/${encodeURIComponent(sessionId)}/inbound`);
     const lib = url.protocol === "https:" ? https : http;
@@ -1305,6 +1370,37 @@ function connectInboundStream(backend, apiKey, sessionId, handlers) {
                         if (eventName === "idle") {
                             handlers.onIdle();
                         }
+                        else if (eventName === "cancel_turn") {
+                            try {
+                                const payload = JSON.parse(data);
+                                if (payload.sessionId && payload.sessionId !== sessionId) {
+                                    continue;
+                                }
+                            }
+                            catch {
+                                /* ignore malformed payload */
+                            }
+                            handlers.onCancelTurn?.();
+                        }
+                        else if (eventName === "user_file_edit") {
+                            try {
+                                const edit = JSON.parse(data);
+                                if (edit.sessionId && edit.sessionId !== sessionId) {
+                                    continue;
+                                }
+                                const requestId = edit.requestId || edit.request_id;
+                                if (requestId && edit.path) {
+                                    handlers.onUserFileEdit?.({
+                                        requestId,
+                                        path: edit.path,
+                                        content: edit.content ?? "",
+                                    });
+                                }
+                            }
+                            catch {
+                                /* ignore */
+                            }
+                        }
                         else if (eventName === "user_message" || eventName === "message") {
                             try {
                                 const msg = JSON.parse(data);
@@ -1450,9 +1546,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;
@@ -1498,6 +1592,15 @@ export async function runChimphands(opts) {
     let sessionActive = true;
     let lastUserActivity = Date.now();
     let exitCode;
+    let cancelTurnRequested = false;
+    let activeOpencodeChild = null;
+    let agentTurnInProgress = false;
+    const turnControl = {
+        getCancelRequested: () => cancelTurnRequested,
+        onActiveChild: (child) => {
+            activeOpencodeChild = child;
+        },
+    };
     const enqueueUserMessage = (msg) => {
         const id = msg.id?.trim();
         if (id) {
@@ -1529,6 +1632,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) {
@@ -1569,8 +1679,26 @@ export async function runChimphands(opts) {
         onIdle: () => {
             idle = true;
         },
+        onCancelTurn: () => {
+            cancelTurnRequested = true;
+            const ch = activeOpencodeChild;
+            if (ch && !ch.killed) {
+                try {
+                    ch.kill("SIGTERM");
+                }
+                catch {
+                    /* ignore */
+                }
+            }
+        },
+        onUserFileEdit: handleUserFileEdit,
         shouldRun: () => sessionActive,
     });
+    if (runtimeId && attachUrl) {
+        stopTunnel = startTunnelWorker(backend, apiKey, runtimeId, attachUrl, sessionId, {
+            onUserFileEdit: handleUserFileEdit,
+        });
+    }
     const shutdownRuntime = async () => {
         sessionActive = false;
         stopInbound();
@@ -1641,6 +1769,8 @@ export async function runChimphands(opts) {
             tick();
         });
         while (prompt) {
+            cancelTurnRequested = false;
+            agentTurnInProgress = true;
             let useOpencodeSessionId = opencodeSessionId;
             let isNewOpencodeSession = !useOpencodeSessionId;
             let effectivePrompt = wrapPromptWithContext(conversationSummary, prompt, isNewOpencodeSession, workingBranch, pullRequestUrl);
@@ -1658,6 +1788,7 @@ export async function runChimphands(opts) {
                 },
                 onWorkingBranch: noteWorkingBranch,
                 postEvent: turnPostEvent,
+                ...turnControl,
             }, attachUrl);
             if (result.code !== 0 &&
                 useOpencodeSessionId &&
@@ -1676,8 +1807,10 @@ export async function runChimphands(opts) {
                     },
                     onWorkingBranch: noteWorkingBranch,
                     postEvent: turnPostEvent,
+                    ...turnControl,
                 }, attachUrl);
             }
+            agentTurnInProgress = false;
             await poster.flush();
             if (result.opencodeSessionId) {
                 opencodeSessionId = result.opencodeSessionId;
@@ -1700,7 +1833,7 @@ export async function runChimphands(opts) {
                     console.error(`ChimpHands turn-end reconcile failed: ${err instanceof Error ? err.message : String(err)}`);
                 }
             }
-            if (result.code !== 0) {
+            if (result.code !== 0 && !result.cancelled) {
                 const errMsg = (result.err || "opencode failed").trim() || "opencode failed";
                 console.error(`ChimpHands OpenCode failed: ${errMsg}`);
                 try {
@@ -1724,7 +1857,12 @@ export async function runChimphands(opts) {
                 exitCode = result.code || 1;
                 break;
             }
-            postEvent(ROLE_STATUS, "Waiting for user input", { status: STATUS_WAITING_USER });
+            if (result.cancelled) {
+                postEvent(ROLE_STATUS, "Turn stopped", { status: STATUS_WAITING_USER });
+            }
+            else {
+                postEvent(ROLE_STATUS, "Waiting for user input", { status: STATUS_WAITING_USER });
+            }
             lastUserActivity = Date.now();
             idle = false;
             prompt = (await waitForNextPrompt()) || "";
@@ -1840,7 +1978,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;
@@ -1971,6 +2109,21 @@ function startTunnelWorker(backend, apiKey, runtimeId, attachUrl) {
                     socket.send(JSON.stringify({ type: "pong" }));
                     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.58",
+  "version": "0.1.60",
   "description": "TestChimp CLI and MCP server — coverage, plans, EaaS, TrueCoverage, API operations (calls /api/mcp/*)",
   "type": "module",
   "main": "dist/bin/testchimp.js",