@testchimp/cli 0.1.55 → 0.1.57

package/dist/chimphands/run.js

@@ -23,6 +23,34 @@ const STREAM_POST_MIN_INTERVAL_MS = 150;
 function isStreamFanoutRole(role) {
     return role === ROLE_ASSISTANT || role === ROLE_TOOL || role === ROLE_REASONING;
 }
+/**
+ * OpenCode sometimes emits the same thought as both a reasoning part and a text part.
+ * Skip ASSISTANT fanout when content matches (or is a streaming prefix of) reasoning.
+ */
+function isTextDuplicateOfReasoning(text, reasoningBodies) {
+    const a = String(text || "").trim();
+    if (!a)
+        return false;
+    for (const raw of reasoningBodies) {
+        const r = String(raw || "").trim();
+        if (!r)
+            continue;
+        if (a === r)
+            return true;
+        if (a.length >= 32 && r.length >= 32 && (r.startsWith(a) || a.startsWith(r))) {
+            return true;
+        }
+    }
+    return false;
+}
+function reasoningBodiesFromPartMap(textByPartId) {
+    const out = [];
+    for (const [key, val] of textByPartId) {
+        if (key.startsWith("reasoning:"))
+            out.push(val);
+    }
+    return out;
+}
 const CHIMPHANDS_AGENT_PROMPT = `You are ChimpHands, TestChimp's coding agent. You run on GitHub Actions, but this chat is an **interactive** conversation with the user in the TestChimp UI — same expectations as Cursor/Claude Code locally.
 
 ## Interactive session (mandatory — default)
@@ -386,9 +414,16 @@ async function reconcileOpencodeSessionMessages(attachUrl, opencodeSessionId, po
     for (const msg of turnSlice) {
         if ((msg.info?.role || "").toLowerCase() !== "assistant")
             continue;
+        const reasoningBodies = (msg.parts || [])
+            .filter((p) => p.type === "reasoning" && p.text?.trim())
+            .map((p) => p.text.trim());
         for (const part of msg.parts || []) {
             if (part.type === "text" && part.text?.trim()) {
-                postEvent(ROLE_ASSISTANT, part.text.trim(), {
+                const text = part.text.trim();
+                if (isTextDuplicateOfReasoning(text, reasoningBodies)) {
+                    continue;
+                }
+                postEvent(ROLE_ASSISTANT, text, {
                     messageId: opencodeMessageId("oc_text_", part),
                 });
                 posted += 1;
@@ -498,6 +533,9 @@ function startOpencodeSseRelay(attachUrl, callbacks) {
             if (field === "text") {
                 const next = (textByPartId.get(partId) || "") + props.delta;
                 textByPartId.set(partId, next);
+                if (isTextDuplicateOfReasoning(next, reasoningBodiesFromPartMap(textByPartId))) {
+                    return;
+                }
                 callbacks.postEvent(ROLE_ASSISTANT, next, liveOpts({
                     messageId: `oc_text_${partId}`,
                 }));
@@ -537,6 +575,9 @@ function startOpencodeSseRelay(attachUrl, callbacks) {
                 textByPartId.set(partId, next);
                 if (!next)
                     return;
+                if (isTextDuplicateOfReasoning(next, reasoningBodiesFromPartMap(textByPartId))) {
+                    return;
+                }
                 callbacks.postEvent(ROLE_ASSISTANT, next, liveOpts({
                     messageId: opencodeMessageId("oc_text_", part),
                 }));
@@ -712,6 +753,35 @@ function isMissingOpencodeSessionError(message) {
         m.includes("unknown session") ||
         m.includes("invalid session"));
 }
+/** Strip one layer of wrapping quotes models sometimes add when echoing. */
+function stripOuterQuotes(text) {
+    const a = String(text || "").trim();
+    if ((a.startsWith('"') && a.endsWith('"')) ||
+        (a.startsWith("'") && a.endsWith("'"))) {
+        return a.slice(1, -1).trim();
+    }
+    return a;
+}
+/**
+ * True when assistant text is an echo of a prompt we just sent to OpenCode
+ * (raw user text and/or host-wrapped effectivePrompt) — exact or streaming prefix.
+ */
+function isAssistantEchoOfSentPrompt(assistant, ...sentPrompts) {
+    const a = stripOuterQuotes(assistant);
+    if (!a)
+        return false;
+    for (const raw of sentPrompts) {
+        const p = String(raw || "").trim();
+        if (!p)
+            continue;
+        if (a === p)
+            return true;
+        // Streaming echo of the (usually long) wrapped prompt: only when clearly a prefix.
+        if (p.length >= 64 && a.length >= 24 && p.startsWith(a))
+            return true;
+    }
+    return false;
+}
 function wrapPromptWithContext(conversationSummary, userPrompt, isNewOpencodeSession, workingBranch, pullRequestUrl) {
     const parts = [];
     if (workingBranch?.trim()) {
@@ -1018,7 +1088,9 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
                         return;
                     const partId = ev.part?.id || ev.part?.messageID;
                     if (!partId) {
-                        callbacks.postEvent(ROLE_ASSISTANT, chunk, { throttle: true });
+                        if (!isTextDuplicateOfReasoning(chunk, reasoningBodiesFromPartMap(textByPartId))) {
+                            callbacks.postEvent(ROLE_ASSISTANT, chunk, { throttle: true });
+                        }
                         return;
                     }
                     // Without attach, --format json may emit completed cumulative or deltas.
@@ -1030,6 +1102,9 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
                             ? chunk
                             : prev + chunk;
                     textByPartId.set(partId, next);
+                    if (isTextDuplicateOfReasoning(next, reasoningBodiesFromPartMap(textByPartId))) {
+                        return;
+                    }
                     callbacks.postEvent(ROLE_ASSISTANT, next, {
                         throttle: true,
                         messageId: opencodeMessageId("oc_text_", ev.part),
@@ -1404,6 +1479,16 @@ export async function runChimphands(opts) {
         }
         poster.fireAndForget(role, content, bodyOpts);
     };
+    /**
+     * Drop ASSISTANT bubbles that echo the prompt we just sent — either the raw
+     * user text or the host-wrapped effectivePrompt (exact string OpenCode got).
+     */
+    const postEventForTurn = (userPrompt, wrappedPrompt, role, content, opts) => {
+        if (role === ROLE_ASSISTANT && isAssistantEchoOfSentPrompt(content, userPrompt, wrappedPrompt)) {
+            return;
+        }
+        postEvent(role, content, opts);
+    };
     const complete = (status, errorMessage) => {
         const body = { sessionId, status };
         if (errorMessage)
@@ -1502,6 +1587,7 @@ export async function runChimphands(opts) {
             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);
             // 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 });
@@ -1514,7 +1600,7 @@ export async function runChimphands(opts) {
                     }).catch(() => { });
                 },
                 onWorkingBranch: noteWorkingBranch,
-                postEvent,
+                postEvent: turnPostEvent,
             }, attachUrl);
             if (result.code !== 0 &&
                 useOpencodeSessionId &&
@@ -1532,7 +1618,7 @@ export async function runChimphands(opts) {
                         }).catch(() => { });
                     },
                     onWorkingBranch: noteWorkingBranch,
-                    postEvent,
+                    postEvent: turnPostEvent,
                 }, attachUrl);
             }
             await poster.flush();
@@ -1545,7 +1631,7 @@ export async function runChimphands(opts) {
             if (attachUrl && opencodeSessionId) {
                 try {
                     await reconcileOpencodeSessionMessages(attachUrl, opencodeSessionId, (role, content, opts) => {
-                        void poster.enqueue(role, content, {
+                        turnPostEvent(role, content, {
                             ...opts,
                             opencodeSessionId,
                             durable: true,

package/package.json

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