@testchimp/cli 0.1.71 → 0.1.73

package/dist/chimphands/run.js

@@ -1632,10 +1632,8 @@ async function ackWorktreeFileWrite(backend, apiKey, sessionId, requestId, ok, e
     });
 }
 async function applyUserFileEdit(backend, apiKey, sessionId, edit, turnActive) {
-    if (turnActive()) {
-        await ackWorktreeFileWrite(backend, apiKey, sessionId, edit.requestId, false, "agent turn in progress");
-        return;
-    }
+    // Never hard-nack mid-turn: write to disk immediately so the next agent prompt
+    // sees the edit. Defer commit/push while a turn is active — post-turn always commits.
     try {
         const relative = normalizeWorktreeRelativePath(edit.path);
         const root = process.cwd();
@@ -1646,6 +1644,11 @@ async function applyUserFileEdit(backend, apiKey, sessionId, edit, turnActive) {
         }
         await fs.mkdir(path.dirname(full), { recursive: true });
         await fs.writeFile(full, edit.content, "utf8");
+        if (turnActive()) {
+            console.error(`ChimpHands applied user_file_edit mid-turn (deferred commit): ${relative}`);
+            await ackWorktreeFileWrite(backend, apiKey, sessionId, edit.requestId, true);
+            return;
+        }
         const pushed = await commitAndPushDirtyWorktree("User Update");
         if (!pushed.ok) {
             await ackWorktreeFileWrite(backend, apiKey, sessionId, edit.requestId, false, pushed.error || "commit/push failed");
@@ -2402,11 +2405,9 @@ export async function runChimphands(opts) {
                     console.error(`ChimpHands turn-end reconcile failed: ${err instanceof Error ? err.message : String(err)}`);
                 }
             }
-            // Async / no UI: checkpoint dirty worktree after each turn so PR + Files changed
-            // are reviewable when the user opens the session later (live VCS tunnel may be idle).
-            if (!poster.uiAttached) {
-                await commitAndPushDirtyWorktree("chimphands: commit after turn (async / no UI attached)");
-            }
+            // Always checkpoint dirty worktree after each turn so PR + Files pane
+            // (GitHub compare) stay current whether or not a browser UI is attached.
+            await commitAndPushDirtyWorktree("chimphands: commit after turn");
             if (attachUrl && opencodeSessionId && midTurnInjectedById.size) {
                 try {
                     await releaseUnansweredMidTurnMessages(attachUrl, opencodeSessionId, midTurnInjectedById, queue, wakePromptWaiter, midTurnSidecarAnswered);
@@ -2681,11 +2682,31 @@ function startTunnelWorker(backend, apiKey, runtimeId, attachUrl, sessionId, han
             }
         };
         try {
+            // Prefer JSON for workspace-scoped APIs — OpenCode SPA fallback is text/html.
+            if (opencodeProxyNeedsDirectory(pathPart) && !headers.Accept && !headers.accept) {
+                headers.Accept = "application/json";
+            }
             const upstream = await fetch(target, init);
             const respHeaders = {};
             upstream.headers.forEach((v, k) => {
                 respHeaders[k] = v;
             });
+            const contentType = String(respHeaders["content-type"] || respHeaders["Content-Type"] || "").toLowerCase();
+            // Root-cause: never tunnel OpenCode SPA HTML as a successful VCS/API response.
+            if (opencodeProxyNeedsDirectory(pathPart) &&
+                contentType.includes("text/html")) {
+                const msg = `OpenCode returned HTML SPA shell for ${pathPart} ` +
+                    "(expected JSON API; check directory routing / API path)";
+                console.error(`ChimpHands ${msg}`);
+                send({
+                    type: "http_response",
+                    requestId,
+                    status: 502,
+                    headers: { "Content-Type": "text/plain; charset=utf-8" },
+                    bodyBase64: Buffer.from(msg, "utf8").toString("base64"),
+                });
+                return;
+            }
             send({
                 type: "http_response_start",
                 requestId,

package/package.json

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