@testchimp/cli 0.1.35 → 0.1.37

package/dist/chimphands/run.d.ts

@@ -1,7 +1,7 @@
 /**
  * ChimpHands GitHub Actions bridge: bootstrap → OpenCode → inbound SSE turns.
  * Relies on TESTCHIMP_API_KEY (+ optional TESTCHIMP_BACKEND_URL; defaults to prod).
- * Does not write mcp.json — CLI/skill use process env.
+ * Does not write mcp.json — TestChimp MCP is wired via opencode.json for OpenCode.
  */
 type RunOptions = {
     sessionId: string;

package/dist/chimphands/run.js

@@ -1,7 +1,7 @@
 /**
  * ChimpHands GitHub Actions bridge: bootstrap → OpenCode → inbound SSE turns.
  * Relies on TESTCHIMP_API_KEY (+ optional TESTCHIMP_BACKEND_URL; defaults to prod).
- * Does not write mcp.json — CLI/skill use process env.
+ * Does not write mcp.json — TestChimp MCP is wired via opencode.json for OpenCode.
  */
 import { spawn, execFileSync } from "node:child_process";
 import { mkdirSync, writeFileSync } from "node:fs";
@@ -16,6 +16,13 @@ const STATUS_RUNNING = "CHIMPHANDS_SESSION_STATUS_RUNNING";
 const STATUS_WAITING_USER = "CHIMPHANDS_SESSION_STATUS_WAITING_USER";
 const STATUS_IDLE = "CHIMPHANDS_SESSION_STATUS_IDLE";
 const STATUS_FAILED = "CHIMPHANDS_SESSION_STATUS_FAILED";
+function ensureTestchimpPrompt(content) {
+    const trimmed = content.trim();
+    if (!trimmed)
+        return trimmed;
+    const rest = trimmed.replace(/^\/testchimp\s*/i, "").trim();
+    return rest ? `/testchimp ${rest}` : "/testchimp";
+}
 function apiHeaders(apiKey) {
     return {
         "Content-Type": "application/json",
@@ -35,25 +42,111 @@ async function postJson(backend, apiKey, path, body) {
     return text;
 }
 function postJsonFireAndForget(backend, apiKey, path, body) {
-    void postJson(backend, apiKey, path, body).catch(() => {
-        /* best-effort agent telemetry */
+    void postJson(backend, apiKey, path, body).catch((err) => {
+        const detail = err instanceof Error ? err.message : String(err);
+        console.error(`ChimpHands API telemetry failed ${path}: ${detail}`);
     });
 }
+const TESTCHIMP_PROVIDER_ID = "testchimp";
+function resolveOpencodeModelId(boot) {
+    const raw = (boot.llm_model || "gpt-4o-mini").trim();
+    const modelId = raw.includes("/") ? raw.split("/").pop() || "gpt-4o-mini" : raw;
+    return modelId;
+}
+function resolveOpencodeModel(boot) {
+    return `${TESTCHIMP_PROVIDER_ID}/${resolveOpencodeModelId(boot)}`;
+}
+function extractOpencodeFatalError(raw) {
+    const line = raw.trim();
+    if (!line)
+        return null;
+    try {
+        const ev = JSON.parse(line);
+        if (ev.type === "error" || ev.name === "UnknownError") {
+            const msg = ev.data?.message || ev.message || line;
+            const ref = ev.data?.ref ? ` (ref ${ev.data.ref})` : "";
+            return `${msg}${ref}`;
+        }
+    }
+    catch {
+        /* plain text */
+    }
+    if (line.includes("Unexpected server error") && line.includes("UnknownError")) {
+        return line;
+    }
+    const errorLine = line.match(/^Error:\s*(.+)$/i);
+    if (errorLine?.[1]?.trim()) {
+        return errorLine[1].trim();
+    }
+    if (/not found/i.test(line) && line.length < 240) {
+        return line.trim();
+    }
+    return null;
+}
+function summarizeOpencodeFailure(stderr, stdout, exitCode) {
+    for (const chunk of [stderr, stdout]) {
+        for (const line of chunk.split("\n")) {
+            const fatal = extractOpencodeFatalError(line);
+            if (fatal)
+                return fatal;
+        }
+    }
+    const merged = `${stderr}\n${stdout}`.trim();
+    if (merged) {
+        const errorLines = merged
+            .split("\n")
+            .map((l) => l.trim())
+            .filter((l) => /^error:/i.test(l) || /not found/i.test(l));
+        if (errorLines.length)
+            return errorLines[errorLines.length - 1].replace(/^error:\s*/i, "").trim();
+        return merged.slice(0, 1200);
+    }
+    return exitCode ? `opencode exited with code ${exitCode}` : "opencode failed";
+}
 function writeOpencodeConfig(backend, apiKey, boot) {
     const llmBase = (boot.llm_base_url || `${backend}/v1`).replace(/\/$/, "");
     const llmKey = apiKey || boot.llm_api_key || "";
-    const llmModel = boot.llm_model || "gpt-4o-mini";
+    const modelId = resolveOpencodeModelId(boot);
+    const model = `${TESTCHIMP_PROVIDER_ID}/${modelId}`;
+    const mcpEnv = {
+        TESTCHIMP_API_KEY: apiKey,
+        TESTCHIMP_BACKEND_URL: backend,
+    };
+    const serviceUserId = boot.chimphands_service_account_user_id?.trim();
+    if (serviceUserId) {
+        mcpEnv.TESTCHIMP_USER_ID = serviceUserId;
+    }
     writeFileSync("opencode.json", JSON.stringify({
-        model: llmModel,
+        $schema: "https://opencode.ai/config.json",
+        model,
+        autoupdate: false,
         provider: {
-            openai: {
-                apiKey: llmKey,
-                baseURL: llmBase,
+            [TESTCHIMP_PROVIDER_ID]: {
+                npm: "@ai-sdk/openai-compatible",
+                name: "TestChimp",
+                options: {
+                    apiKey: llmKey,
+                    baseURL: llmBase,
+                },
+                models: {
+                    [modelId]: {
+                        name: modelId,
+                    },
+                },
+            },
+        },
+        mcp: {
+            testchimp: {
+                type: "local",
+                enabled: true,
+                command: ["npx", "-y", "@testchimp/cli@latest", "mcp"],
+                environment: mcpEnv,
             },
         },
     }, null, 2));
+    return model;
 }
-function runOpencode(prompt, childEnv, postEvent) {
+function runOpencode(prompt, model, childEnv, postEvent) {
     const help = (() => {
         try {
             return execFileSync("opencode", ["run", "--help"], { encoding: "utf8", env: childEnv });
@@ -63,8 +156,9 @@ function runOpencode(prompt, childEnv, postEvent) {
         }
     })();
     const useJson = help.includes("--format");
+    const baseArgs = ["run", prompt, "--model", model];
     if (useJson) {
-        const child = spawn("opencode", ["run", prompt, "--format", "json"], {
+        const child = spawn("opencode", [...baseArgs, "--format", "json"], {
             stdio: ["ignore", "pipe", "pipe"],
             env: childEnv,
         });
@@ -74,6 +168,7 @@ function runOpencode(prompt, childEnv, postEvent) {
         });
         return new Promise((resolve) => {
             let buf = "";
+            let fatalError = null;
             child.stdout.on("data", (chunk) => {
                 buf += chunk.toString();
                 const lines = buf.split("\n");
@@ -81,6 +176,11 @@ function runOpencode(prompt, childEnv, postEvent) {
                 for (const line of lines) {
                     if (!line.trim())
                         continue;
+                    const fatal = extractOpencodeFatalError(line);
+                    if (fatal) {
+                        fatalError = fatal;
+                        continue;
+                    }
                     let content = line;
                     let role = ROLE_ASSISTANT;
                     try {
@@ -98,27 +198,48 @@ function runOpencode(prompt, childEnv, postEvent) {
                 }
             });
             child.on("close", (code) => {
-                if (buf.trim())
-                    postEvent(ROLE_ASSISTANT, buf.trim());
+                if (buf.trim()) {
+                    const fatal = extractOpencodeFatalError(buf);
+                    if (fatal)
+                        fatalError = fatal;
+                    else if (!fatalError)
+                        postEvent(ROLE_ASSISTANT, buf.trim());
+                }
+                const stderrFatal = extractOpencodeFatalError(err);
+                if (stderrFatal)
+                    fatalError = stderrFatal;
+                if (fatalError) {
+                    resolve({ code: 1, err: fatalError });
+                    return;
+                }
+                if (code != null && code !== 0) {
+                    resolve({ code, err: summarizeOpencodeFailure(err, buf, code) });
+                    return;
+                }
                 resolve({ code: code == null ? 1 : code, err });
             });
         });
     }
     try {
-        const out = execFileSync("opencode", ["run", prompt], {
+        const out = execFileSync("opencode", baseArgs, {
             encoding: "utf8",
             maxBuffer: 20 * 1024 * 1024,
             stdio: ["ignore", "pipe", "pipe"],
             env: childEnv,
         });
+        const fatal = extractOpencodeFatalError(out);
+        if (fatal)
+            return Promise.resolve({ code: 1, err: fatal });
         if (out)
             postEvent(ROLE_ASSISTANT, out);
         return Promise.resolve({ code: 0, err: "" });
     }
     catch (e) {
         const errObj = e;
-        const err = (errObj.stderr && errObj.stderr.toString()) || errObj.message || "opencode failed";
-        return Promise.resolve({ code: errObj.status || 1, err });
+        const stderr = errObj.stderr?.toString() || "";
+        const stdout = errObj.stdout?.toString() || "";
+        const fatal = summarizeOpencodeFailure(stderr, stdout, errObj.status ?? 1);
+        return Promise.resolve({ code: errObj.status || 1, err: fatal });
     }
 }
 function connectInbound(backend, apiKey, sessionId, onUserMessage, onIdle, onClosed) {
@@ -184,15 +305,23 @@ export async function runChimphands(opts) {
     }
     const promptInput = (opts.prompt ?? process.env.PROMPT ?? "").trim();
     const bootText = await postJson(backend, apiKey, "/api/chimphands/bootstrap", {
-        session_id: sessionId,
+        sessionId,
     });
     const boot = JSON.parse(bootText);
+    const githubRunId = (process.env.GITHUB_RUN_ID || "").trim();
+    if (githubRunId) {
+        postJsonFireAndForget(backend, apiKey, "/api/chimphands/post_agent_event", {
+            sessionId,
+            githubRunId,
+        });
+    }
     const userId = boot.chimphands_service_account_user_id || "";
     if (userId) {
         process.env.TESTCHIMP_USER_ID = userId;
     }
     mkdirSync(".opencode", { recursive: true });
-    writeOpencodeConfig(backend, apiKey, boot);
+    const opencodeModel = writeOpencodeConfig(backend, apiKey, boot);
+    console.error(`ChimpHands OpenCode model: ${opencodeModel}`);
     const idleMs = (Number(boot.idle_timeout_seconds) || 600) * 1000;
     const queue = [];
     let idle = false;
@@ -200,7 +329,7 @@ export async function runChimphands(opts) {
     let lastUserActivity = Date.now();
     const postEvent = (role, content, status) => {
         const body = {
-            session_id: sessionId,
+            sessionId,
             role,
             content: String(content || "").slice(0, 20000),
         };
@@ -209,9 +338,11 @@ export async function runChimphands(opts) {
         postJsonFireAndForget(backend, apiKey, "/api/chimphands/post_agent_event", body);
     };
     const complete = (status, errorMessage) => {
-        const body = { session_id: sessionId, status };
+        const body = { sessionId, status };
         if (errorMessage)
-            body.error_message = String(errorMessage).slice(0, 4000);
+            body.errorMessage = String(errorMessage).slice(0, 4000);
+        if (githubRunId)
+            body.githubRunId = githubRunId;
         postJsonFireAndForget(backend, apiKey, "/api/chimphands/complete_session", body);
     };
     const childEnv = {
@@ -222,7 +353,7 @@ export async function runChimphands(opts) {
     if (userId)
         childEnv.TESTCHIMP_USER_ID = userId;
     connectInbound(backend, apiKey, sessionId, (content) => {
-        queue.push(content);
+        queue.push(ensureTestchimpPrompt(content));
         lastUserActivity = Date.now();
     }, () => {
         idle = true;
@@ -230,18 +361,18 @@ export async function runChimphands(opts) {
         closed = true;
     });
     postEvent(ROLE_STATUS, "Agent ready", STATUS_RUNNING);
-    let prompt = promptInput || boot.initial_prompt || "";
+    let prompt = ensureTestchimpPrompt(promptInput || boot.initial_prompt || "");
     if (boot.conversation_summary) {
         prompt = `Conversation so far:\n${boot.conversation_summary}\n\nCurrent task:\n${prompt}`;
     }
     for (const m of boot.pending_user_messages || []) {
         if (m?.content)
-            queue.push(m.content);
+            queue.push(ensureTestchimpPrompt(m.content));
     }
     const waitForNextPrompt = () => new Promise((resolve) => {
         const tick = () => {
             if (queue.length) {
-                resolve(queue.shift());
+                resolve(ensureTestchimpPrompt(queue.shift()));
                 return;
             }
             if (idle || closed || Date.now() - lastUserActivity >= idleMs) {
@@ -253,14 +384,39 @@ export async function runChimphands(opts) {
         tick();
     });
     while (prompt) {
-        const result = await runOpencode(prompt, childEnv, postEvent);
+        const result = await runOpencode(ensureTestchimpPrompt(prompt), opencodeModel, childEnv, postEvent);
         if (result.code !== 0) {
-            complete(STATUS_FAILED, result.err || "opencode failed");
-            process.exitCode = result.code || 1;
-            return;
+            const errMsg = (result.err || "opencode failed").trim() || "opencode failed";
+            console.error(`ChimpHands OpenCode failed: ${errMsg}`);
+            try {
+                await postJson(backend, apiKey, "/api/chimphands/post_agent_event", {
+                    sessionId,
+                    role: ROLE_STATUS,
+                    content: errMsg,
+                    status: STATUS_FAILED,
+                    githubRunId: githubRunId || undefined,
+                });
+                await postJson(backend, apiKey, "/api/chimphands/complete_session", {
+                    sessionId,
+                    status: STATUS_FAILED,
+                    errorMessage: errMsg,
+                    githubRunId: githubRunId || undefined,
+                });
+            }
+            catch (reportErr) {
+                const detail = reportErr instanceof Error ? reportErr.message : String(reportErr);
+                console.error(`ChimpHands failed to report OpenCode error to backend: ${detail}`);
+                postEvent(ROLE_STATUS, errMsg, STATUS_FAILED);
+                complete(STATUS_FAILED, errMsg);
+            }
+            process.exit(result.code || 1);
         }
         postEvent(ROLE_STATUS, "Waiting for user input", STATUS_WAITING_USER);
+        // Idle countdown starts when the agent finishes a turn, not at job bootstrap.
+        lastUserActivity = Date.now();
+        idle = false;
         prompt = (await waitForNextPrompt()) || "";
     }
+    console.error("ChimpHands session idle — no user input before timeout; completing.");
     complete(STATUS_IDLE);
 }

package/dist/cli/program.js

@@ -1578,7 +1578,7 @@ export function buildCliProgram() {
         catch (e) {
             const msg = e instanceof Error ? e.message : String(e);
             console.error(`[testchimp chimphands] ${msg}`);
-            process.exitCode = 1;
+            process.exit(1);
         }
     });
     program.on("--help", () => {

package/package.json

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