@testchimp/cli 0.1.54 → 0.1.56

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)
@@ -140,19 +168,19 @@ class AgentEventPoster {
             body.pullRequestUrl = opts.pullRequestUrl;
         const streamRole = isStreamFanoutRole(role);
         this.chain = this.chain.then(async () => {
-            // Mid-turn live tokens only while UI is attached — async runs skip FS fanout
-            // and rely on turn-end reconcile for durable PG.
-            if (opts?.liveStream && !this.uiAttached) {
+            const live = !!opts?.liveStream && !opts?.durable;
+            // Mid-turn tokens never hit PG. Async / detached: drop. Attached: ephemeral only.
+            if (live && !this.uiAttached) {
                 return;
             }
-            if (opts?.throttle || (streamRole && opts?.liveStream)) {
+            if (opts?.throttle || (streamRole && live)) {
                 const now = Date.now();
                 const wait = STREAM_POST_MIN_INTERVAL_MS - (now - this.lastStreamPostAt);
                 if (wait > 0)
                     await sleep(wait);
                 this.lastStreamPostAt = Date.now();
             }
-            const tryEphemeral = streamRole && this.uiAttached;
+            const tryEphemeral = live && streamRole && this.uiAttached;
             if (tryEphemeral) {
                 const eph = {
                     sessionId: this.sessionId,
@@ -164,35 +192,14 @@ class AgentEventPoster {
                 if (opts?.opencodeSessionId)
                     eph.opencodeSessionId = opts.opencodeSessionId;
                 try {
-                    const text = await postJson(this.backend, this.apiKey, "/api/chimphands/post_ephemeral_agent_event", eph);
+                    await postJson(this.backend, this.apiKey, "/api/chimphands/post_ephemeral_agent_event", eph);
                     this.ephemeralFailCount = 0;
-                    let delivered = false;
-                    try {
-                        const parsed = JSON.parse(text);
-                        delivered = !!parsed.delivered;
-                    }
-                    catch {
-                        /* ignore */
-                    }
-                    if (delivered)
-                        return;
-                    // Mid-turn liveStream must not fall through to durable — that would write
-                    // every token to PG. Turn-end reconcile persists the final transcript.
-                    if (opts?.liveStream) {
-                        this.logEphemeralIssue("ephemeral not delivered (replica miss?) — skipping durable for liveStream");
-                        return;
-                    }
-                    // Completed/non-live: durable fallback for cross-replica UI.
-                    console.error("ChimpHands ephemeral not delivered (replica miss?) — persisting via post_agent_event");
                 }
                 catch (err) {
                     const detail = err instanceof Error ? err.message : String(err);
-                    if (opts?.liveStream) {
-                        this.logEphemeralIssue(`ephemeral post failed — skipping durable for liveStream: ${detail}`);
-                        return;
-                    }
-                    console.error(`ChimpHands ephemeral post failed — durable fallback: ${detail}`);
+                    this.logEphemeralIssue(`ephemeral post failed — not persisting liveStream: ${detail}`);
                 }
+                return;
             }
             await postJson(this.backend, this.apiKey, "/api/chimphands/post_agent_event", body);
         });
@@ -407,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;
@@ -519,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}`,
                 }));
@@ -558,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),
                 }));
@@ -1039,7 +1059,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.
@@ -1051,6 +1073,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),
@@ -1425,6 +1450,22 @@ export async function runChimphands(opts) {
         }
         poster.fireAndForget(role, content, bodyOpts);
     };
+    /** Drop assistant bubbles that are just the current user prompt echoed (often quoted). */
+    const postEventForTurn = (userPrompt, role, content, opts) => {
+        if (role === ROLE_ASSISTANT) {
+            const a = String(content || "").trim();
+            const u = normalizeUserMessage(userPrompt);
+            if (a && u) {
+                const unquoted = (a.startsWith('"') && a.endsWith('"')) || (a.startsWith("'") && a.endsWith("'"))
+                    ? a.slice(1, -1).trim()
+                    : a;
+                if (a === u || unquoted === u) {
+                    return;
+                }
+            }
+        }
+        postEvent(role, content, opts);
+    };
     const complete = (status, errorMessage) => {
         const body = { sessionId, status };
         if (errorMessage)
@@ -1523,6 +1564,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, 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 });
@@ -1535,7 +1577,7 @@ export async function runChimphands(opts) {
                     }).catch(() => { });
                 },
                 onWorkingBranch: noteWorkingBranch,
-                postEvent,
+                postEvent: turnPostEvent,
             }, attachUrl);
             if (result.code !== 0 &&
                 useOpencodeSessionId &&
@@ -1553,7 +1595,7 @@ export async function runChimphands(opts) {
                         }).catch(() => { });
                     },
                     onWorkingBranch: noteWorkingBranch,
-                    postEvent,
+                    postEvent: turnPostEvent,
                 }, attachUrl);
             }
             await poster.flush();
@@ -1566,10 +1608,10 @@ 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,
-                            // Explicitly not liveStream → always durable post_agent_event.
+                            durable: true,
                         });
                     }, noteWorkingBranch);
                     await poster.flush();

package/package.json

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