@testchimp/cli 0.1.49 → 0.1.51

package/dist/chimphands/run.js

@@ -137,10 +137,8 @@ class AgentEventPoster {
         if (opts?.pullRequestUrl)
             body.pullRequestUrl = opts.pullRequestUrl;
         const streamRole = isStreamFanoutRole(role);
-        // Live token fanout only while UI watching; completed json events always go durable.
-        if (streamRole && opts?.liveStream && !this.uiAttached) {
-            return this.chain;
-        }
+        // Never drop liveStream tokens: ephemeral when UI is on this replica path,
+        // otherwise durable post_agent_event (cross-replica / detached safe).
         this.chain = this.chain.then(async () => {
             if (opts?.throttle || (streamRole && opts?.liveStream)) {
                 const now = Date.now();
@@ -584,7 +582,7 @@ function startOpencodeSseRelay(attachUrl, callbacks) {
             if (stopped || ac.signal.aborted)
                 return;
             if (!connected && attempt === 0) {
-                console.error("ChimpHands OpenCode SSE unavailable — falling back to completed-only --format json events (will keep retrying SSE)");
+                console.error("ChimpHands OpenCode SSE not connected yet — using completed-only --format json until SSE connects (retrying)");
             }
             attempt += 1;
             const backoff = Math.min(30_000, 2_000 * attempt);
@@ -863,7 +861,7 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
             callbacks.postEvent(ROLE_STATUS, "Agent is still working… (waiting for OpenCode output)", {
                 status: STATUS_RUNNING,
             });
-        }, 45_000);
+        }, 15_000);
         const noteSessionId = (sessionId) => {
             const id = sessionId?.trim();
             if (!id || id === activeSessionId)
@@ -887,7 +885,15 @@ function runOpencode(prompt, model, childEnv, opencodeSessionId, callbacks, atta
                 fatalError = fatal;
                 return;
             }
-            const ev = parseOpencodeEvent(line);
+            let parsed;
+            try {
+                parsed = JSON.parse(line);
+            }
+            catch {
+                return;
+            }
+            // Newer OpenCode --format json uses bus shape (message.part.updated); normalize first.
+            const ev = normalizeStdoutOpencodeEvent(parsed) || parseOpencodeEvent(line);
             if (!ev?.type)
                 return;
             noteSessionId(ev.sessionID);
@@ -1090,29 +1096,58 @@ export async function runChimphands(opts) {
     const poster = new AgentEventPoster(backend, apiKey, sessionId);
     poster.uiAttached = !!(boot.uiAttached ?? boot.ui_attached);
     let stopLiveSse = null;
+    /** Do not open localhost OpenCode /event until serve has been (re)started with config. */
+    let opencodeHttpReady = !attachUrl;
+    let pendingUiAttached = !!(boot.uiAttached ?? boot.ui_attached);
+    /** Consecutive uiAttached=false heartbeats before stopping OpenCode SSE (multi-replica poison). */
+    let consecutiveUiDetached = 0;
+    const UI_DETACHED_STOP_AFTER = 3;
+    const startLiveSseIfNeeded = (reason) => {
+        if (!attachUrl || !opencodeHttpReady || stopLiveSse)
+            return;
+        console.error(`ChimpHands ${reason}`);
+        stopLiveSse = startOpencodeSseRelay(attachUrl, {
+            getActiveSessionId: () => opencodeSessionId,
+            noteSessionId: (id) => {
+                if (id?.trim())
+                    opencodeSessionId = id.trim();
+            },
+            postEvent: (role, content, opts) => {
+                poster.fireAndForget(role, content, {
+                    ...opts,
+                    opencodeSessionId: opts?.opencodeSessionId || opencodeSessionId,
+                });
+            },
+            onWorkingBranch: noteWorkingBranchPlaceholder,
+        });
+    };
     const syncLiveSse = (attached) => {
         poster.uiAttached = attached;
+        pendingUiAttached = attached;
         if (!attachUrl)
             return;
-        if (attached && !stopLiveSse) {
-            console.error("ChimpHands UI attached — starting OpenCode SSE fanout");
-            stopLiveSse = startOpencodeSseRelay(attachUrl, {
-                getActiveSessionId: () => opencodeSessionId,
-                noteSessionId: (id) => {
-                    if (id?.trim())
-                        opencodeSessionId = id.trim();
-                },
-                postEvent: (role, content, opts) => {
-                    poster.fireAndForget(role, content, {
-                        ...opts,
-                        opencodeSessionId: opts?.opencodeSessionId || opencodeSessionId,
-                    });
-                },
-                onWorkingBranch: noteWorkingBranchPlaceholder,
-            });
+        if (!opencodeHttpReady) {
+            if (attached) {
+                console.error("ChimpHands UI attached — deferring OpenCode SSE until serve is ready");
+            }
+            return;
+        }
+        if (attached) {
+            consecutiveUiDetached = 0;
+            startLiveSseIfNeeded("UI attached — starting OpenCode SSE fanout");
+            return;
         }
-        else if (!attached && stopLiveSse) {
-            console.error("ChimpHands UI detached — stopping OpenCode SSE fanout");
+        // Keep SSE running so live tokens can durable-post even when heartbeat
+        // briefly reports false (UI EventSource on another FS replica).
+        consecutiveUiDetached += 1;
+        if (consecutiveUiDetached < UI_DETACHED_STOP_AFTER) {
+            if (!stopLiveSse) {
+                startLiveSseIfNeeded("starting OpenCode SSE fanout (durable until UI attaches)");
+            }
+            return;
+        }
+        if (stopLiveSse) {
+            console.error(`ChimpHands UI detached for ${consecutiveUiDetached} heartbeats — stopping OpenCode SSE fanout`);
             stopLiveSse();
             stopLiveSse = null;
         }
@@ -1167,7 +1202,10 @@ export async function runChimphands(opts) {
         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.
+        // Heartbeat may have already reported ui_attached — wait until after restart to open SSE.
         await restartLocalOpencodeServer(attachUrl);
+        opencodeHttpReady = true;
+        syncLiveSse(pendingUiAttached);
     }
     let opencodeSessionId = bootStr(boot, "opencode_session_id", "opencodeSessionId") || undefined;
     const conversationSummary = bootStr(boot, "conversation_summary", "conversationSummary");
@@ -1307,10 +1345,22 @@ export async function runChimphands(opts) {
     try {
         poster.fireAndForget(ROLE_STATUS, "Agent ready", { status: STATUS_RUNNING });
         let prompt = normalizeUserMessage(promptInput || bootStr(boot, "initial_prompt", "initialPrompt"));
+        // Bootstrap sets initialPrompt from the last pending user message AND returns
+        // pendingUserMessages — enqueue only messages that are not the initial prompt
+        // (otherwise the same turn runs twice: session=new then session=ses_…).
         const pending = boot.pending_user_messages || boot.pendingUserMessages || [];
+        const initialNorm = normalizeUserMessage(prompt);
         for (const m of pending) {
-            if (m?.content)
-                enqueueUserMessage({ content: m.content });
+            const content = normalizeUserMessage(m?.content || "");
+            if (!content)
+                continue;
+            if (initialNorm && content === initialNorm)
+                continue;
+            const id = ("id" in m && m.id) ||
+                ("message_id" in m && m.message_id) ||
+                ("messageId" in m && m.messageId) ||
+                undefined;
+            enqueueUserMessage({ id: id || undefined, content });
         }
         const waitForNextPrompt = () => new Promise((resolve) => {
             let lastPollAt = 0;
@@ -1440,7 +1490,9 @@ function startRuntimeHeartbeat(backend, apiKey, runtimeId, onUiAttached) {
             try {
                 const data = JSON.parse(text);
                 const attached = !!(data.uiAttached ?? data.ui_attached);
-                if (attached !== lastAttached) {
+                // Always notify on false so syncLiveSse can accumulate detach hysteresis;
+                // still skip duplicate true→true noise.
+                if (attached !== lastAttached || !attached) {
                     lastAttached = attached;
                     onUiAttached?.(attached);
                 }

package/package.json

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