@testchimp/cli 0.1.56 → 0.1.58

package/dist/chimphands/run.js

@@ -280,6 +280,30 @@ function extractOpencodeFatalError(raw) {
     }
     return null;
 }
+/**
+ * OpenCode `message.part.delta` always sends `field: "text"` for both reasoning and
+ * answer parts. Resolve kind from partID → type learned via `message.part.updated`.
+ */
+function resolveDeltaPartKind(partId, field, partType, partTypeById) {
+    if (partType) {
+        partTypeById.set(partId, partType);
+    }
+    const known = partTypeById.get(partId);
+    if (known === "reasoning" || partType === "reasoning") {
+        partTypeById.set(partId, "reasoning");
+        return "reasoning";
+    }
+    if (known === "text" || partType === "text") {
+        partTypeById.set(partId, "text");
+        return "text";
+    }
+    // Unknown part: field is unreliable (reasoning deltas also use field "text").
+    if (field === "reasoning") {
+        partTypeById.set(partId, "reasoning");
+        return "reasoning";
+    }
+    return "text";
+}
 function parseOpencodeEvent(line) {
     try {
         return JSON.parse(line);
@@ -292,8 +316,11 @@ function parseOpencodeEvent(line) {
  * Newer OpenCode `--format json` lines often use the SSE bus shape
  * (`message.part.updated` + `properties.part`) instead of legacy `type: "text"`.
  * Normalize both into the same OpencodeEvent used by the stdout switch.
+ *
+ * `partTypeById` must be shared across lines: deltas use `field: "text"` for
+ * reasoning parts too — type comes from earlier `message.part.updated`.
  */
-function normalizeStdoutOpencodeEvent(raw) {
+function normalizeStdoutOpencodeEvent(raw, partTypeById) {
     if (!raw || typeof raw !== "object")
         return null;
     const o = raw;
@@ -312,18 +339,25 @@ function normalizeStdoutOpencodeEvent(raw) {
         const deltaProps = props;
         const part = deltaProps.part;
         if (part) {
-            const partType = part.type || deltaProps.field || "";
+            const partId = part.id || part.messageID || deltaProps.partID || "";
+            const kind = partId
+                ? resolveDeltaPartKind(partId, deltaProps.field, part.type, partTypeById)
+                : part.type === "reasoning"
+                    ? "reasoning"
+                    : "text";
             let mapped;
-            if (partType === "text")
+            if (kind === "text" || part.type === "text")
                 mapped = "text";
-            else if (partType === "reasoning")
+            else if (kind === "reasoning" || part.type === "reasoning")
                 mapped = "reasoning";
-            else if (partType === "tool")
+            else if (part.type === "tool")
                 mapped = "tool_use";
             else
                 return null;
             if (deltaProps.delta && !part.text)
                 part.text = deltaProps.delta;
+            if (mapped === "reasoning")
+                part.type = "reasoning";
             return {
                 type: mapped,
                 sessionID: part.sessionID || deltaProps.sessionID,
@@ -331,22 +365,29 @@ function normalizeStdoutOpencodeEvent(raw) {
             };
         }
         const partID = deltaProps.partID;
-        const field = deltaProps.field || "text";
         const delta = deltaProps.delta;
         if (!partID || delta == null || delta === "")
             return null;
-        if (field !== "text" && field !== "reasoning")
+        if (deltaProps.field && deltaProps.field !== "text" && deltaProps.field !== "reasoning") {
+            return null;
+        }
+        const kind = resolveDeltaPartKind(partID, deltaProps.field, undefined, partTypeById);
+        if (kind !== "text" && kind !== "reasoning")
             return null;
         return {
-            type: field === "reasoning" ? "reasoning" : "text",
+            type: kind,
             sessionID: deltaProps.sessionID,
-            part: { id: partID, type: field, text: delta },
+            part: { id: partID, type: kind, text: delta },
         };
     }
     if (type === "message.part.updated") {
         const part = props.part;
         if (!part)
             return null;
+        const partId = part.id || part.messageID;
+        if (partId && part.type) {
+            partTypeById.set(partId, part.type);
+        }
         const partType = part.type || "";
         let mapped;
         if (partType === "text")
@@ -487,6 +528,8 @@ function startOpencodeSseRelay(attachUrl, callbacks) {
     const ac = new AbortController();
     let stopped = false;
     const textByPartId = new Map();
+    /** partID → "text" | "reasoning" | … from message.part.updated (deltas lie about field). */
+    const partTypeById = new Map();
     const directory = process.cwd();
     const sessionMatches = (sessionId) => {
         const active = callbacks.getActiveSessionId();
@@ -519,18 +562,27 @@ function startOpencodeSseRelay(attachUrl, callbacks) {
         const ev = unwrapped;
         const type = ev.type || "";
         const props = ev.properties || {};
-        // Token stream: { partID, field, delta } — often no `part` object.
+        // Token stream: { partID, field, delta } — field is usually "text" even for reasoning.
         if (type === "message.part.delta") {
             const part = props.part;
             const partId = props.partID || part?.id || part?.messageID;
-            const field = props.field || part?.type || "text";
             const sessionId = part?.sessionID || props.sessionID;
             if (!sessionMatches(sessionId))
                 return;
             callbacks.noteSessionId(sessionId);
             if (!partId || props.delta == null || props.delta === "")
                 return;
-            if (field === "text") {
+            const kind = resolveDeltaPartKind(partId, props.field, part?.type, partTypeById);
+            if (kind === "reasoning") {
+                const key = `reasoning:${partId}`;
+                const next = (textByPartId.get(key) || "") + props.delta;
+                textByPartId.set(key, next);
+                callbacks.postEvent(ROLE_REASONING, next, liveOpts({
+                    messageId: `oc_reasoning_${partId}`,
+                }));
+                return;
+            }
+            if (kind === "text") {
                 const next = (textByPartId.get(partId) || "") + props.delta;
                 textByPartId.set(partId, next);
                 if (isTextDuplicateOfReasoning(next, reasoningBodiesFromPartMap(textByPartId))) {
@@ -539,15 +591,6 @@ function startOpencodeSseRelay(attachUrl, callbacks) {
                 callbacks.postEvent(ROLE_ASSISTANT, next, liveOpts({
                     messageId: `oc_text_${partId}`,
                 }));
-                return;
-            }
-            if (field === "reasoning") {
-                const key = `reasoning:${partId}`;
-                const next = (textByPartId.get(key) || "") + props.delta;
-                textByPartId.set(key, next);
-                callbacks.postEvent(ROLE_REASONING, next, liveOpts({
-                    messageId: `oc_reasoning_${partId}`,
-                }));
             }
             return;
         }
@@ -559,8 +602,11 @@ function startOpencodeSseRelay(attachUrl, callbacks) {
             if (!sessionMatches(sessionId))
                 return;
             callbacks.noteSessionId(sessionId);
+            const partId = part.id || part.messageID;
+            if (partId && part.type) {
+                partTypeById.set(partId, part.type);
+            }
             if (part.type === "text") {
-                const partId = part.id || part.messageID;
                 if (!partId)
                     return;
                 let next = part.text || "";
@@ -584,12 +630,19 @@ function startOpencodeSseRelay(attachUrl, callbacks) {
                 return;
             }
             if (part.type === "reasoning") {
-                const partId = part.id || part.messageID;
                 if (!partId)
                     return;
+                // Deltas before type was known may have been buffered under the text key.
+                const orphanText = textByPartId.get(partId);
+                if (orphanText) {
+                    textByPartId.delete(partId);
+                }
                 let next = part.text || "";
                 if (props.delta && !part.text) {
-                    next = (textByPartId.get(`reasoning:${partId}`) || "") + props.delta;
+                    next = (textByPartId.get(`reasoning:${partId}`) || orphanText || "") + props.delta;
+                }
+                else if (!next && orphanText) {
+                    next = orphanText;
                 }
                 if (part.text)
                     next = part.text;
@@ -753,6 +806,38 @@ 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 from the start of the wrapped prompt.
+        if (p.length >= 64 && a.length >= 24 && p.startsWith(a))
+            return true;
+        // Mid-wrap regurgitation (e.g. only the "Conversation so far:" section).
+        if (p.length >= 64 && a.length >= 40 && p.includes(a))
+            return true;
+    }
+    return false;
+}
 function wrapPromptWithContext(conversationSummary, userPrompt, isNewOpencodeSession, workingBranch, pullRequestUrl) {
     const parts = [];
     if (workingBranch?.trim()) {
@@ -991,6 +1076,7 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
         let buf = "";
         let fatalError = null;
         const textByPartId = new Map();
+        const partTypeById = new Map();
         let sawStdout = false;
         let progressTicker = setInterval(() => {
             if (sawStdout) {
@@ -1035,7 +1121,7 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
                 return;
             }
             // Newer OpenCode --format json uses bus shape (message.part.updated); normalize first.
-            const ev = normalizeStdoutOpencodeEvent(parsed) || parseOpencodeEvent(line);
+            const ev = normalizeStdoutOpencodeEvent(parsed, partTypeById) || parseOpencodeEvent(line);
             if (!ev?.type)
                 return;
             noteSessionId(ev.sessionID);
@@ -1450,19 +1536,13 @@ 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;
-                }
-            }
+    /**
+     * 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);
     };
@@ -1564,7 +1644,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);
+            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 });

package/package.json

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