@testchimp/cli 0.1.46 → 0.1.47

package/dist/chimphands/run.js

@@ -3,8 +3,8 @@
  * Relies on TESTCHIMP_API_KEY (+ optional TESTCHIMP_BACKEND_URL; defaults to prod).
  * Does not write mcp.json — TestChimp MCP is wired via opencode.json for OpenCode.
  */
-import { spawn } from "node:child_process";
-import { mkdirSync, writeFileSync } from "node:fs";
+import { execSync, spawn } from "node:child_process";
+import { mkdirSync, openSync, writeFileSync } from "node:fs";
 import http from "node:http";
 import https from "node:https";
 import { URL } from "node:url";
@@ -372,7 +372,16 @@ function writeOpencodeConfig(backend, apiKey, boot) {
     return model;
 }
 function buildOpencodeArgs(prompt, model, opencodeSessionId, attachUrl) {
-    const args = ["run", prompt, "--model", model, "--format", "json", "--agent", OPENCODE_AGENT_ID];
+    const args = [
+        "run",
+        prompt,
+        "--model",
+        model,
+        "--format",
+        "json",
+        "--agent",
+        OPENCODE_AGENT_ID,
+    ];
     if (opencodeSessionId?.trim()) {
         args.push("--session", opencodeSessionId.trim());
     }
@@ -381,6 +390,74 @@ function buildOpencodeArgs(prompt, model, opencodeSessionId, attachUrl) {
     }
     return args;
 }
+function killListenersOnPort(port) {
+    try {
+        const out = execSync(`lsof -tiTCP:${port} -sTCP:LISTEN`, {
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+        }).trim();
+        for (const pid of out.split(/\s+/).filter(Boolean)) {
+            const n = Number(pid);
+            if (!Number.isFinite(n) || n <= 0)
+                continue;
+            try {
+                process.kill(n, "SIGTERM");
+            }
+            catch {
+                /* already gone */
+            }
+        }
+    }
+    catch {
+        /* nothing listening */
+    }
+}
+async function waitForOpencodeHttp(attachUrl, timeoutMs) {
+    const base = attachUrl.replace(/\/$/, "");
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        for (const path of ["/global/health", "/"]) {
+            try {
+                const res = await fetch(`${base}${path}`);
+                if (res.ok || res.status === 401 || res.status === 404)
+                    return;
+            }
+            catch {
+                /* retry */
+            }
+        }
+        await sleep(400);
+    }
+    throw new Error(`OpenCode server not ready at ${attachUrl} within ${timeoutMs}ms`);
+}
+/**
+ * Restart local `opencode serve` after writing opencode.json so the server loads
+ * TestChimp provider + default_agent. Workflow may have started serve earlier without config.
+ */
+async function restartLocalOpencodeServer(attachUrl) {
+    const u = new URL(attachUrl);
+    const hostname = u.hostname || "127.0.0.1";
+    const port = u.port || (u.protocol === "https:" ? "443" : "80");
+    killListenersOnPort(port);
+    await sleep(300);
+    const logFd = openSync("opencode-server.log", "a");
+    const child = spawn("opencode", ["serve", "--port", port, "--hostname", hostname], {
+        detached: true,
+        stdio: ["ignore", logFd, logFd],
+        env: process.env,
+    });
+    child.unref();
+    if (child.pid) {
+        try {
+            writeFileSync("/tmp/opencode-server.pid", String(child.pid));
+        }
+        catch {
+            /* best effort */
+        }
+    }
+    console.error(`ChimpHands restarted OpenCode serve on ${hostname}:${port} (pid ${child.pid ?? "?"})`);
+    await waitForOpencodeHttp(attachUrl, 60_000);
+}
 function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, attachUrl) {
     let activeSessionId = opencodeSessionId?.trim() || undefined;
     const baseArgs = buildOpencodeArgs(prompt, model, activeSessionId, attachUrl);
@@ -649,6 +726,9 @@ export async function runChimphands(opts) {
     console.error(`ChimpHands OpenCode model: ${opencodeModel}`);
     if (attachUrl) {
         console.error(`ChimpHands OpenCode attach: ${attachUrl}`);
+        // Serve must load opencode.json (provider + default_agent). Workflow often starts
+        // serve before this file exists; restart so attach mode can omit --agent safely.
+        await restartLocalOpencodeServer(attachUrl);
     }
     let opencodeSessionId = bootStr(boot, "opencode_session_id", "opencodeSessionId") || undefined;
     const conversationSummary = bootStr(boot, "conversation_summary", "conversationSummary");
@@ -1213,18 +1293,6 @@ export async function serveChimphands(opts) {
     if (!attachUrl) {
         throw new Error("--attach URL is required for chimphands serve");
     }
-    // Wait for OpenCode server readiness.
-    const deadline = Date.now() + 60_000;
-    while (Date.now() < deadline) {
-        try {
-            const res = await fetch(attachUrl.replace(/\/$/, "") + "/");
-            if (res.ok || res.status === 401 || res.status === 404)
-                break;
-        }
-        catch {
-            /* retry */
-        }
-        await sleep(500);
-    }
+    // Server is (re)started inside runChimphands after opencode.json is written.
     await runChimphands({ ...opts, attachUrl });
 }

package/package.json

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