@adhdev/daemon-core 0.9.19 → 0.9.20

package/dist/index.mjs

@@ -1958,6 +1958,7 @@ var init_provider_cli_runtime = __esm({
 var provider_cli_adapter_exports = {};
 __export(provider_cli_adapter_exports, {
   ProviderCliAdapter: () => ProviderCliAdapter,
+  appendBoundedText: () => appendBoundedText,
   normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
 });
 import * as os10 from "os";
@@ -1991,6 +1992,14 @@ function parsedTranscriptIsRicherThanCommitted(parsedMessages, committedMessages
   }
   return false;
 }
+function appendBoundedText(current, chunk, maxChars) {
+  if (!chunk) return current.length <= maxChars ? current : current.slice(-maxChars);
+  if (maxChars <= 0) return "";
+  if (chunk.length >= maxChars) return chunk.slice(-maxChars);
+  const keepFromCurrent = maxChars - chunk.length;
+  if (current.length <= keepFromCurrent) return current + chunk;
+  return current.slice(-keepFromCurrent) + chunk;
+}
 var ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
@@ -2067,15 +2076,17 @@ var init_provider_cli_adapter = __esm({
       startupFirstOutputAt = 0;
       // PTY I/O
       onPtyDataCallback = null;
-      pendingOutputParseBuffer = "";
+      pendingOutputParseChunks = [];
       pendingOutputParseTimer = null;
-      ptyOutputBuffer = "";
+      ptyOutputChunks = [];
       ptyOutputFlushTimer = null;
       pendingTerminalQueryTail = "";
       lastOutputAt = 0;
       lastNonEmptyOutputAt = 0;
       lastScreenChangeAt = 0;
       lastScreenSnapshot = "";
+      lastScreenText = "";
+      lastScreenSnapshotReadAt = Number.NEGATIVE_INFINITY;
       // Server log forwarding
       serverConn = null;
       logBuffer = [];
@@ -2121,6 +2132,9 @@ var init_provider_cli_adapter = __esm({
       traceSeq = 0;
       traceSessionId = "";
       parsedStatusCache = null;
+      lastStatusHotPathParseAt = Number.NEGATIVE_INFINITY;
+      static STATUS_HOT_PATH_PARSE_MIN_INTERVAL_MS = 1e3;
+      static SCREEN_SNAPSHOT_MIN_INTERVAL_MS = 250;
       static MAX_TRACE_ENTRIES = 250;
       providerResolutionMeta;
       static FINISH_RETRY_DELAY_MS = 300;
@@ -2129,6 +2143,30 @@ var init_provider_cli_adapter = __esm({
         this.messages = [...this.committedMessages];
         this.structuredMessages = [...this.committedMessages];
       }
+      readTerminalScreenText(now = Date.now()) {
+        const screenText = this.terminalScreen.getText() || "";
+        this.lastScreenText = screenText;
+        this.lastScreenSnapshotReadAt = now;
+        return screenText;
+      }
+      shouldReadTerminalScreenSnapshot(now) {
+        if (!this.lastScreenText) return true;
+        return now - this.lastScreenSnapshotReadAt >= _ProviderCliAdapter.SCREEN_SNAPSHOT_MIN_INTERVAL_MS;
+      }
+      resetTerminalScreen(rows, cols) {
+        this.terminalScreen.reset(rows, cols);
+        this.lastScreenText = "";
+        this.lastScreenSnapshot = "";
+        this.lastScreenChangeAt = 0;
+        this.lastScreenSnapshotReadAt = Number.NEGATIVE_INFINITY;
+      }
+      getFreshParsedStatusCache() {
+        const cached = this.parsedStatusCache;
+        if (cached && cached.committedMessagesRef === this.committedMessages && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBuffer === this.accumulatedRawBuffer && cached.screenText === this.lastScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName && cached.lastOutputAt === this.lastOutputAt) {
+          return cached.result;
+        }
+        return null;
+      }
       getIdleFinishConfirmMs() {
         return this.timeouts.idleFinishConfirm;
       }
@@ -2243,9 +2281,9 @@ var init_provider_cli_adapter = __esm({
           clearTimeout(this.pendingOutputParseTimer);
           this.pendingOutputParseTimer = null;
         }
-        if (!this.pendingOutputParseBuffer) return;
-        const rawData = this.pendingOutputParseBuffer;
-        this.pendingOutputParseBuffer = "";
+        if (this.pendingOutputParseChunks.length === 0) return;
+        const rawData = this.pendingOutputParseChunks.join("");
+        this.pendingOutputParseChunks = [];
         this.handleOutput(rawData);
       }
       async spawn() {
@@ -2300,7 +2338,7 @@ var init_provider_cli_adapter = __esm({
               terminalScreen: this.terminalScreen
             });
           }
-          this.pendingOutputParseBuffer += data;
+          this.pendingOutputParseChunks.push(data);
           if (!this.pendingOutputParseTimer) {
             this.pendingOutputParseTimer = setTimeout(() => {
               this.pendingOutputParseTimer = null;
@@ -2308,13 +2346,13 @@ var init_provider_cli_adapter = __esm({
             }, this.timeouts.ptyFlush);
           }
           if (this.onPtyDataCallback) {
-            this.ptyOutputBuffer += data;
+            this.ptyOutputChunks.push(data);
             if (!this.ptyOutputFlushTimer) {
               this.ptyOutputFlushTimer = setTimeout(() => {
-                if (this.ptyOutputBuffer && this.onPtyDataCallback) {
-                  this.onPtyDataCallback(this.ptyOutputBuffer);
+                if (this.ptyOutputChunks.length > 0 && this.onPtyDataCallback) {
+                  this.onPtyDataCallback(this.ptyOutputChunks.join(""));
                 }
-                this.ptyOutputBuffer = "";
+                this.ptyOutputChunks = [];
                 this.ptyOutputFlushTimer = null;
               }, this.timeouts.ptyFlush);
             }
@@ -2339,7 +2377,7 @@ var init_provider_cli_adapter = __esm({
           clearTimeout(this.startupSettleTimer);
           this.startupSettleTimer = null;
         }
-        this.terminalScreen.reset(24, 80);
+        this.resetTerminalScreen(24, 80);
         this.pendingTerminalQueryTail = "";
         this.currentTurnScope = null;
         this.finishRetryCount = 0;
@@ -2361,11 +2399,12 @@ var init_provider_cli_adapter = __esm({
         this.terminalScreen.write(rawData);
         const cleanData = sanitizeTerminalText(rawData);
         const now = Date.now();
-        const screenText = this.terminalScreen.getText();
-        const normalizedScreenSnapshot = normalizeScreenSnapshot(screenText);
+        const shouldReadScreen = this.shouldReadTerminalScreenSnapshot(now);
+        const screenText = shouldReadScreen ? this.readTerminalScreenText(now) : this.lastScreenText;
+        const normalizedScreenSnapshot = shouldReadScreen ? normalizeScreenSnapshot(screenText) : this.lastScreenSnapshot;
         this.lastOutputAt = now;
         if (cleanData.trim()) this.lastNonEmptyOutputAt = now;
-        if (normalizedScreenSnapshot !== this.lastScreenSnapshot) {
+        if (shouldReadScreen && normalizedScreenSnapshot !== this.lastScreenSnapshot) {
           this.lastScreenSnapshot = normalizedScreenSnapshot;
           this.lastScreenChangeAt = now;
         }
@@ -2387,7 +2426,7 @@ var init_provider_cli_adapter = __esm({
           this.scheduleStartupSettleCheck();
         }
         if (this.isWaitingForResponse && cleanData) {
-          this.responseBuffer = (this.responseBuffer + cleanData).slice(-8e3);
+          this.responseBuffer = appendBoundedText(this.responseBuffer, cleanData, 8e3);
         }
         if (cleanData.trim()) {
           if (this.serverConn) {
@@ -2396,11 +2435,11 @@ var init_provider_cli_adapter = __esm({
             this.logBuffer.push({ message: cleanData.trim(), level: "info" });
           }
         }
-        this.recentOutputBuffer = (this.recentOutputBuffer + cleanData).slice(-1e3);
         const prevAccumulatedLen = this.accumulatedBuffer.length;
         const prevAccumulatedRawLen = this.accumulatedRawBuffer.length;
-        this.accumulatedBuffer = (this.accumulatedBuffer + cleanData).slice(-_ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
-        this.accumulatedRawBuffer = (this.accumulatedRawBuffer + rawData).slice(-_ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        this.recentOutputBuffer = appendBoundedText(this.recentOutputBuffer, cleanData, 1e3);
+        this.accumulatedBuffer = appendBoundedText(this.accumulatedBuffer, cleanData, _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        this.accumulatedRawBuffer = appendBoundedText(this.accumulatedRawBuffer, rawData, _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
         if (this.currentTurnScope) {
           const droppedClean = prevAccumulatedLen + cleanData.length - this.accumulatedBuffer.length;
           const droppedRaw = prevAccumulatedRawLen + rawData.length - this.accumulatedRawBuffer.length;
@@ -2411,14 +2450,14 @@ var init_provider_cli_adapter = __esm({
             this.currentTurnScope.rawBufferStart = Math.max(0, this.currentTurnScope.rawBufferStart - droppedRaw);
           }
         }
-        this.resolveStartupState("output");
+        this.resolveStartupState("output", screenText, normalizedScreenSnapshot, now);
         this.scheduleSettle();
       }
-      resolveStartupState(trigger) {
+      resolveStartupState(trigger, screenTextOverride, normalizedScreenOverride, nowOverride) {
         if (!this.startupParseGate) return;
-        const now = Date.now();
-        const screenText = this.terminalScreen.getText() || "";
-        const normalizedScreen = normalizeScreenSnapshot(screenText);
+        const now = typeof nowOverride === "number" ? nowOverride : Date.now();
+        const screenText = typeof screenTextOverride === "string" ? screenTextOverride : this.readTerminalScreenText();
+        const normalizedScreen = typeof normalizedScreenOverride === "string" ? normalizedScreenOverride : normalizeScreenSnapshot(screenText);
         const hasStartupOutput = !!this.startupFirstOutputAt || !!normalizedScreen.trim();
         if (!hasStartupOutput) return;
         const stableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
@@ -2653,40 +2692,28 @@ var init_provider_cli_adapter = __esm({
           }, delayTime);
           return;
         }
-        const tail = this.settledBuffer;
-        const screenText = this.terminalScreen.getText() || "";
         this.resolveStartupState("settled");
-        if (this.startupParseGate) {
-          return;
-        }
-        const parsedTranscript = this.parseCurrentTranscript(
-          this.committedMessages,
-          this.responseBuffer,
-          this.currentTurnScope
-        );
-        const parsedModal = parsedTranscript?.activeModal && Array.isArray(parsedTranscript.activeModal.buttons) && parsedTranscript.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsedTranscript.activeModal : null;
-        const modal = this.runParseApproval(tail) || parsedModal;
-        const rawScriptStatus = this.runDetectStatus(tail);
-        const scriptStatus = parsedTranscript?.status === "waiting_approval" && modal ? "waiting_approval" : rawScriptStatus;
-        const parsedMessages = Array.isArray(parsedTranscript?.messages) ? normalizeCliParsedMessages(parsedTranscript.messages, {
+        if (this.startupParseGate) return;
+        const session = this.runParseSession();
+        if (!session) return;
+        const { status, messages, modal, parsedStatus } = session;
+        const parsedMessages = normalizeCliParsedMessages(messages, {
           committedMessages: this.committedMessages,
           scope: this.currentTurnScope,
           lastOutputAt: this.lastOutputAt
-        }) : [];
-        if (this.maybeCommitVisibleIdleTranscript(parsedTranscript)) {
-          return;
-        }
-        const lastParsedAssistant = [...parsedMessages].reverse().find((message) => message.role === "assistant");
-        const parsedShowsLiveAssistantProgress = parsedTranscript?.status === "generating" && !!lastParsedAssistant && parsedMessages.length > this.committedMessages.length;
+        });
+        if (this.maybeCommitVisibleIdleTranscript(session, parsedMessages)) return;
+        const lastParsedAssistant = [...parsedMessages].reverse().find((m) => m.role === "assistant");
         const normalizedPromptSnippet = normalizePromptText(this.submitRetryPromptSnippet || this.currentTurnScope?.prompt || "");
+        const screenText = this.terminalScreen.getText() || "";
         this.recordTrace("settled", {
-          tail: summarizeCliTraceText(tail, 500),
+          tail: summarizeCliTraceText(this.settledBuffer, 500),
           screenText: summarizeCliTraceText(screenText, 1200),
-          detectStatus: scriptStatus,
-          parsedStatus: parsedTranscript?.status || null,
+          detectStatus: status,
+          parsedStatus: parsedStatus || null,
           parsedMessageCount: parsedMessages.length,
           parsedLastAssistant: lastParsedAssistant ? summarizeCliTraceText(lastParsedAssistant.content, 280) : "",
-          parsedActiveModal: parsedTranscript?.activeModal ?? null,
+          parsedActiveModal: modal,
           approval: modal,
           ...buildCliTraceParseSnapshot({
             accumulatedBuffer: this.accumulatedBuffer,
@@ -2720,36 +2747,36 @@ var init_provider_cli_adapter = __esm({
             `[${this.cliType}] Settled without assistant: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 220)).slice(0, 260)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"}`
           );
         }
-        if (!scriptStatus) return;
+        if (!status) return;
         const prevStatus = this.currentStatus;
-        const ctx = { now, screenText, modal, scriptStatus, parsedTranscript, parsedMessages, lastParsedAssistant, parsedShowsLiveAssistantProgress, prevStatus };
+        const ctx = { now, modal, status, parsedMessages, lastParsedAssistant, parsedStatus: parsedStatus || null, prevStatus };
         if (!this.applyPendingScriptStatusDebounce(ctx)) return;
         const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
         LOG.info(
           "CLI",
-          `[${this.cliType}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 140)} scriptStatus=${String(scriptStatus || "")} parsedStatus=${String(parsedTranscript?.status || "")} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify(summarizeCliTraceText(lastParsedAssistant?.content || "", 120)).slice(0, 160)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 160)).slice(0, 220)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 160)).slice(0, 220)}`
+          `[${this.cliType}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 140)} status=${String(status || "")} parsedStatus=${String(parsedStatus || "")} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify(summarizeCliTraceText(lastParsedAssistant?.content || "", 120)).slice(0, 160)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 160)).slice(0, 220)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 160)).slice(0, 220)}`
         );
-        const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity && !(parsedTranscript?.status === "idle" && !!lastParsedAssistant);
+        const shouldHoldGenerating = status === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity && !(parsedStatus === "idle" && !!lastParsedAssistant);
         if (shouldHoldGenerating) {
           this.applyHoldGenerating(ctx, recentInteractiveActivity);
           return;
         }
-        if (scriptStatus === "waiting_approval") {
+        if (status === "waiting_approval") {
           this.applyWaitingApproval(ctx);
           return;
         }
-        if (scriptStatus === "generating") {
+        if (status === "generating") {
           this.applyGenerating(ctx);
           return;
         }
-        if (scriptStatus === "idle") {
+        if (status === "idle") {
           this.applyIdle(ctx, now);
         }
       }
       // Returns false if the caller should bail out (debounce pending).
       applyPendingScriptStatusDebounce(ctx) {
-        const { now, scriptStatus, prevStatus } = ctx;
-        const shouldDebounce = prevStatus === "idle" && !this.isWaitingForResponse && !this.currentTurnScope && (scriptStatus === "generating" || scriptStatus === "waiting_approval");
+        const { now, status, prevStatus } = ctx;
+        const shouldDebounce = prevStatus === "idle" && !this.isWaitingForResponse && !this.currentTurnScope && (status === "generating" || status === "waiting_approval");
         if (!shouldDebounce) {
           this.pendingScriptStatus = null;
           this.pendingScriptStatusSince = 0;
@@ -2767,8 +2794,8 @@ var init_provider_cli_adapter = __esm({
             this.evaluateSettled();
           }, delayMs);
         };
-        if (this.pendingScriptStatus !== scriptStatus) {
-          this.pendingScriptStatus = scriptStatus;
+        if (this.pendingScriptStatus !== status) {
+          this.pendingScriptStatus = status;
           this.pendingScriptStatusSince = now;
           armPending(_ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS);
           return false;
@@ -2781,7 +2808,7 @@ var init_provider_cli_adapter = __esm({
         return true;
       }
       applyHoldGenerating(ctx, recentInteractiveActivity) {
-        const { scriptStatus } = ctx;
+        const { status } = ctx;
         this.clearIdleFinishCandidate("hold_generating_recent_activity");
         this.setStatus("generating", "recent_activity_hold");
         if (this.idleTimeout) clearTimeout(this.idleTimeout);
@@ -2792,7 +2819,7 @@ var init_provider_cli_adapter = __esm({
           }
         }, this.timeouts.generatingIdle);
         this.recordTrace("hold_generating_recent_activity", {
-          scriptStatus,
+          scriptStatus: status,
           recentInteractiveActivity,
           lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
           lastScreenChangeAt: this.lastScreenChangeAt,
@@ -2846,11 +2873,13 @@ var init_provider_cli_adapter = __esm({
         }
       }
       applyGenerating(ctx) {
-        const { screenText, modal, parsedShowsLiveAssistantProgress, prevStatus } = ctx;
+        const { modal, parsedMessages, lastParsedAssistant, parsedStatus, prevStatus } = ctx;
         this.clearIdleFinishCandidate("generating");
+        const screenText = this.terminalScreen.getText() || "";
         const effectiveScreenText = screenText || this.accumulatedBuffer;
         const noActiveTurn = !this.currentTurnScope;
         const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(effectiveScreenText) || /accept edits on/i.test(effectiveScreenText) && (/Update available!/i.test(screenText) || /\/effort/i.test(screenText) || /^.*➜\s+\S+/m.test(effectiveScreenText));
+        const parsedShowsLiveAssistantProgress = parsedStatus === "generating" && !!lastParsedAssistant && parsedMessages.length > this.committedMessages.length;
         if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome && !parsedShowsLiveAssistantProgress) {
           return;
         }
@@ -2877,7 +2906,7 @@ var init_provider_cli_adapter = __esm({
         this.onStatusChange?.();
       }
       applyIdle(ctx, now) {
-        const { screenText, modal, lastParsedAssistant, prevStatus } = ctx;
+        const { modal, lastParsedAssistant, prevStatus } = ctx;
         if (prevStatus === "waiting_approval") {
           if (this.approvalExitTimeout) {
             clearTimeout(this.approvalExitTimeout);
@@ -2999,20 +3028,15 @@ var init_provider_cli_adapter = __esm({
         this.setStatus("idle", "response_finished");
         this.onStatusChange?.();
       }
-      maybeCommitVisibleIdleTranscript(parsed) {
+      maybeCommitVisibleIdleTranscript(session, parsedMessages) {
         const allowImmediateScriptIdleCommit = this.provider.allowInputDuringGeneration === true;
         if (!allowImmediateScriptIdleCommit) return false;
-        if (!parsed || !Array.isArray(parsed.messages) || parsed.status !== "idle" || !this.isWaitingForResponse || !this.currentTurnScope || this.activeModal || parsed.activeModal) {
+        if (!session || session.status !== "idle" || !this.isWaitingForResponse || !this.currentTurnScope || this.activeModal || session.modal) {
           return false;
         }
-        const hydratedForIdleCommit = normalizeCliParsedMessages(parsed.messages, {
-          committedMessages: this.committedMessages,
-          scope: this.currentTurnScope,
-          lastOutputAt: this.lastOutputAt
-        });
-        const visibleAssistant = [...hydratedForIdleCommit].reverse().find((message) => message.role === "assistant" && message.content.trim());
+        const visibleAssistant = [...parsedMessages].reverse().find((m) => m.role === "assistant" && m.content.trim());
         if (!visibleAssistant) return false;
-        this.committedMessages = hydratedForIdleCommit;
+        this.committedMessages = parsedMessages;
         this.trimLastAssistantEcho(this.committedMessages, this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages));
         this.clearAllTimers();
         this.syncMessageViews();
@@ -3090,6 +3114,59 @@ var init_provider_cli_adapter = __esm({
         };
       }
       // ─── Script Execution ──────────────────────────
+      runParseSession() {
+        if (typeof this.cliScripts?.parseSession === "function") {
+          try {
+            const screenText = this.terminalScreen.getText();
+            const tail = this.recentOutputBuffer.slice(-500);
+            const input = buildCliParseInput({
+              accumulatedBuffer: this.accumulatedBuffer,
+              accumulatedRawBuffer: this.accumulatedRawBuffer,
+              recentOutputBuffer: this.recentOutputBuffer,
+              terminalScreenText: screenText,
+              baseMessages: this.committedMessages,
+              partialResponse: this.responseBuffer,
+              isWaitingForResponse: this.isWaitingForResponse,
+              scope: this.currentTurnScope,
+              runtimeSettings: this.runtimeSettings
+            });
+            const session = this.cliScripts.parseSession({ ...input, tail, tailScreen: buildCliScreenSnapshot(tail) });
+            this.parseErrorMessage = null;
+            return session && typeof session === "object" ? session : null;
+          } catch (e) {
+            const message = e?.message || String(e);
+            this.parseErrorMessage = message;
+            LOG.warn("CLI", `[${this.cliType}] parseSession error: ${message}`);
+            return null;
+          }
+        }
+        if (!this.cliScripts?.detectStatus && !this.cliScripts?.parseOutput) return null;
+        try {
+          const tail = this.settledBuffer;
+          const parsedTranscript = this.parseCurrentTranscript(
+            this.committedMessages,
+            this.responseBuffer,
+            this.currentTurnScope
+          );
+          const parsedModal = parsedTranscript?.activeModal && Array.isArray(parsedTranscript.activeModal.buttons) && parsedTranscript.activeModal.buttons.some((b) => typeof b === "string" && b.trim()) ? parsedTranscript.activeModal : null;
+          const approval = this.runParseApproval(tail);
+          const modal = approval || parsedModal;
+          const rawStatus = this.runDetectStatus(tail);
+          const parsedStatus = typeof parsedTranscript?.status === "string" ? parsedTranscript.status : null;
+          const effectiveStatus = parsedStatus === "waiting_approval" && modal ? "waiting_approval" : rawStatus || parsedStatus || "idle";
+          return {
+            status: effectiveStatus,
+            messages: Array.isArray(parsedTranscript?.messages) ? parsedTranscript.messages : [],
+            modal,
+            parsedStatus
+          };
+        } catch (e) {
+          const message = e?.message || String(e);
+          this.parseErrorMessage = message;
+          LOG.warn("CLI", `[${this.cliType}] parseSession fallback error: ${message}`);
+          return null;
+        }
+      }
       runDetectStatus(text) {
         if (!this.cliScripts?.detectStatus) return null;
         try {
@@ -3163,14 +3240,21 @@ var init_provider_cli_adapter = __esm({
         let effectiveStatus = this.projectEffectiveStatus(startupModal);
         let effectiveModal = startupModal || this.activeModal;
         if (!startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === "function") {
-          try {
-            const parsed = this.getScriptParsedStatus();
-            const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
-            if (parsed?.status === "waiting_approval" && parsedModal) {
-              effectiveStatus = "waiting_approval";
-              effectiveModal = parsedModal;
+          let parsed = this.getFreshParsedStatusCache();
+          if (!parsed && effectiveStatus !== "idle") {
+            const now = Date.now();
+            if (now - this.lastStatusHotPathParseAt >= _ProviderCliAdapter.STATUS_HOT_PATH_PARSE_MIN_INTERVAL_MS) {
+              this.lastStatusHotPathParseAt = now;
+              try {
+                parsed = this.getScriptParsedStatus();
+              } catch {
+              }
             }
-          } catch {
+          }
+          const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
+          if (parsed?.status === "waiting_approval" && parsedModal) {
+            effectiveStatus = "waiting_approval";
+            effectiveModal = parsedModal;
           }
         }
         return {
@@ -3202,7 +3286,7 @@ var init_provider_cli_adapter = __esm({
        * Called by command handler / dashboard for rich content rendering.
        */
       getScriptParsedStatus() {
-        const screenText = this.terminalScreen.getText();
+        const screenText = this.readTerminalScreenText();
         const cached = this.parsedStatusCache;
         if (cached && cached.committedMessagesRef === this.committedMessages && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBuffer === this.accumulatedRawBuffer && cached.screenText === screenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName && cached.lastOutputAt === this.lastOutputAt) {
           return cached.result;
@@ -3222,8 +3306,21 @@ var init_provider_cli_adapter = __esm({
             this.onStatusChange?.();
           }
         }
-        if (this.maybeCommitVisibleIdleTranscript(parsed)) {
-          return this.getScriptParsedStatus();
+        if (parsed && Array.isArray(parsed.messages)) {
+          const hydratedForCommit = normalizeCliParsedMessages(parsed.messages, {
+            committedMessages: this.committedMessages,
+            scope: this.currentTurnScope,
+            lastOutputAt: this.lastOutputAt
+          });
+          const fakeSession = {
+            status: parsed.status || "idle",
+            messages: parsed.messages,
+            modal: parsedModal,
+            parsedStatus: parsed.status || null
+          };
+          if (this.maybeCommitVisibleIdleTranscript(fakeSession, hydratedForCommit)) {
+            return this.getScriptParsedStatus();
+          }
         }
         const shouldPreferCommittedMessages = !this.currentTurnScope && !this.activeModal && this.currentStatus === "idle";
         let result;
@@ -3405,6 +3502,17 @@ var init_provider_cli_adapter = __esm({
         }
         await this.sendMessage(promptText);
       }
+      isSubmitStuck(normalizedPromptSnippet) {
+        if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return false;
+        if (this.hasActionableApproval()) return false;
+        if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return false;
+        const screenText = this.terminalScreen.getText();
+        if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return false;
+        const liveApproval = this.runParseApproval(screenText) || this.runParseApproval(this.recentOutputBuffer);
+        if (liveApproval) return false;
+        const liveStatus = this.runDetectStatus(screenText) || this.runDetectStatus(this.recentOutputBuffer);
+        return liveStatus !== "generating" && liveStatus !== "waiting_approval";
+      }
       async writeToPty(data) {
         if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
         await this.ptyProcess.write(data);
@@ -3428,6 +3536,121 @@ var init_provider_cli_adapter = __esm({
           this.finishRetryTimer = null;
         }
       }
+      commitSendUserTurn(state) {
+        if (state.didCommitUserTurn) return;
+        state.didCommitUserTurn = true;
+        this.committedMessages.push({ role: "user", content: state.text, timestamp: Date.now() });
+        this.syncMessageViews();
+      }
+      armResponseTimeout() {
+        if (this.responseTimeout) clearTimeout(this.responseTimeout);
+        this.responseTimeout = setTimeout(() => {
+          if (this.isWaitingForResponse) this.finishResponse();
+        }, this.timeouts.maxResponse);
+      }
+      writeSubmitKeyForRetry(mode) {
+        void this.writeToPty(this.sendKey).catch((error) => {
+          LOG.warn("CLI", `[${this.cliType}] ${mode} write failed: ${error?.message || error}`);
+        });
+      }
+      retrySubmitIfStuck(state, attempt) {
+        this.submitRetryTimer = null;
+        if (!this.isSubmitStuck(state.normalizedPromptSnippet)) return;
+        const screenText = this.terminalScreen.getText();
+        this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+        LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
+        this.recordTrace("submit_write", {
+          mode: "submit_retry",
+          attempt,
+          sendKey: this.sendKey,
+          screenText: summarizeCliTraceText(screenText, 500)
+        });
+        this.writeSubmitKeyForRetry("submit_retry");
+        if (attempt >= 3) {
+          this.submitRetryUsed = true;
+          return;
+        }
+        this.submitRetryTimer = setTimeout(() => this.retrySubmitIfStuck(state, attempt + 1), state.retryDelayMs);
+      }
+      retryImmediateSubmitIfStuck(state) {
+        this.submitRetryTimer = null;
+        if (!this.isSubmitStuck(state.normalizedPromptSnippet)) return;
+        const screenText = this.terminalScreen.getText();
+        this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+        LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
+        this.recordTrace("submit_write", {
+          mode: "immediate_retry",
+          attempt: 1,
+          sendKey: this.sendKey,
+          screenText: summarizeCliTraceText(screenText, 500)
+        });
+        this.writeSubmitKeyForRetry("immediate_retry");
+        this.submitRetryUsed = true;
+      }
+      submitSendKey(state, completion) {
+        if (!this.ptyProcess) {
+          completion.resolveOnce();
+          return;
+        }
+        this.submitPendingUntil = 0;
+        const screenText = this.terminalScreen.getText();
+        this.recordTrace("submit_write", {
+          mode: "submit_key",
+          sendKey: this.sendKey,
+          screenText: summarizeCliTraceText(screenText, 500)
+        });
+        void this.writeToPty(this.sendKey).then(() => {
+          this.commitSendUserTurn(state);
+          this.submitRetryTimer = setTimeout(() => this.retrySubmitIfStuck(state, 1), state.retryDelayMs);
+          this.armResponseTimeout();
+          completion.resolveOnce();
+        }, completion.rejectOnce);
+      }
+      submitImmediatePrompt(state, completion) {
+        this.submitPendingUntil = 0;
+        this.recordTrace("submit_write", {
+          mode: "immediate",
+          text: summarizeCliTraceText(state.text, 500),
+          sendKey: this.sendKey,
+          screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
+        });
+        void this.writeToPty(state.text + this.sendKey).then(() => {
+          this.commitSendUserTurn(state);
+          this.submitRetryTimer = setTimeout(() => this.retryImmediateSubmitIfStuck(state), state.retryDelayMs);
+          this.armResponseTimeout();
+          completion.resolveOnce();
+        }, completion.rejectOnce);
+      }
+      waitForEchoAndSubmit(state, completion, submitStartedAt, lastNormalizedScreen = "", lastScreenChangeAt = submitStartedAt) {
+        if (!this.ptyProcess) {
+          completion.resolveOnce();
+          return;
+        }
+        const now = Date.now();
+        const elapsed = now - submitStartedAt;
+        const screenText = this.terminalScreen.getText();
+        const normalizedScreen = normalizePromptText(screenText);
+        const nextScreenChangeAt = normalizedScreen !== lastNormalizedScreen ? now : lastScreenChangeAt;
+        const echoVisible = !state.normalizedPromptSnippet || promptLikelyVisible(screenText, state.normalizedPromptSnippet);
+        if (echoVisible) {
+          const screenSettled = now - nextScreenChangeAt >= 500;
+          if (elapsed >= state.submitDelayMs && screenSettled) {
+            this.submitSendKey(state, completion);
+            return;
+          }
+        }
+        if (elapsed >= state.maxEchoWaitMs) {
+          this.submitSendKey(state, completion);
+          return;
+        }
+        setTimeout(() => this.waitForEchoAndSubmit(
+          state,
+          completion,
+          submitStartedAt,
+          normalizedScreen,
+          nextScreenChangeAt
+        ), 50);
+      }
       async sendMessage(text) {
         if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
         const allowInputDuringGeneration = this.provider.allowInputDuringGeneration === true;
@@ -3503,12 +3726,13 @@ var init_provider_cli_adapter = __esm({
         const submitDelayMs = this.sendDelayMs + Math.min(2e3, Math.max(0, estimatedLines - 1) * 350);
         const maxEchoWaitMs = submitDelayMs + Math.max(1500, Math.min(5e3, estimatedLines * 500));
         const retryDelayMs = Math.max(350, Math.min(1500, Math.max(this.sendDelayMs, submitDelayMs)));
-        let didCommitUserTurn = false;
-        const commitUserTurn = () => {
-          if (didCommitUserTurn) return;
-          didCommitUserTurn = true;
-          this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
-          this.syncMessageViews();
+        const sendState = {
+          text,
+          normalizedPromptSnippet,
+          submitDelayMs,
+          maxEchoWaitMs,
+          retryDelayMs,
+          didCommitUserTurn: false
         };
         if (this.settleTimer) {
           clearTimeout(this.settleTimer);
@@ -3516,110 +3740,23 @@ var init_provider_cli_adapter = __esm({
         }
         this.responseEpoch += 1;
         this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
-        const startResponseTimeout = () => {
-          if (this.responseTimeout) clearTimeout(this.responseTimeout);
-          this.responseTimeout = setTimeout(() => {
-            if (this.isWaitingForResponse) this.finishResponse();
-          }, this.timeouts.maxResponse);
-        };
         await new Promise((resolve12, reject) => {
           let resolved = false;
-          const resolveOnce = () => {
-            if (resolved) return;
-            resolved = true;
-            resolve12();
-          };
-          const rejectOnce = (error) => {
-            if (resolved) return;
-            this.resetPendingSendState("send_write_failed");
-            resolved = true;
-            reject(error);
-          };
-          const writeRetryKey = (mode) => {
-            void this.writeToPty(this.sendKey).catch((error) => {
-              LOG.warn("CLI", `[${this.cliType}] ${mode} write failed: ${error?.message || error}`);
-            });
-          };
-          const submit = () => {
-            if (!this.ptyProcess) {
-              resolveOnce();
-              return;
+          const completion = {
+            resolveOnce: () => {
+              if (resolved) return;
+              resolved = true;
+              resolve12();
+            },
+            rejectOnce: (error) => {
+              if (resolved) return;
+              this.resetPendingSendState("send_write_failed");
+              resolved = true;
+              reject(error);
             }
-            this.submitPendingUntil = 0;
-            const screenText = this.terminalScreen.getText();
-            this.recordTrace("submit_write", {
-              mode: "submit_key",
-              sendKey: this.sendKey,
-              screenText: summarizeCliTraceText(screenText, 500)
-            });
-            const retrySubmitIfStuck = (attempt) => {
-              this.submitRetryTimer = null;
-              if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-              if (this.hasActionableApproval()) return;
-              if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
-              const screenText2 = this.terminalScreen.getText();
-              if (!promptLikelyVisible(screenText2, normalizedPromptSnippet)) return;
-              const liveApproval = this.runParseApproval(screenText2) || this.runParseApproval(this.recentOutputBuffer);
-              if (liveApproval) return;
-              const liveStatus = this.runDetectStatus(screenText2) || this.runDetectStatus(this.recentOutputBuffer);
-              if (liveStatus === "generating" || liveStatus === "waiting_approval") return;
-              this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
-              LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
-              this.recordTrace("submit_write", {
-                mode: "submit_retry",
-                attempt,
-                sendKey: this.sendKey,
-                screenText: summarizeCliTraceText(screenText2, 500)
-              });
-              writeRetryKey("submit_retry");
-              if (attempt >= 3) {
-                this.submitRetryUsed = true;
-                return;
-              }
-              this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
-            };
-            void this.writeToPty(this.sendKey).then(() => {
-              commitUserTurn();
-              this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
-              startResponseTimeout();
-              resolveOnce();
-            }, rejectOnce);
           };
           if (this.submitStrategy === "immediate") {
-            this.submitPendingUntil = 0;
-            this.recordTrace("submit_write", {
-              mode: "immediate",
-              text: summarizeCliTraceText(text, 500),
-              sendKey: this.sendKey,
-              screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
-            });
-            void this.writeToPty(text + this.sendKey).then(() => {
-              commitUserTurn();
-              this.submitRetryTimer = setTimeout(() => {
-                this.submitRetryTimer = null;
-                if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-                if (this.hasActionableApproval()) return;
-                if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
-                const screenText = this.terminalScreen.getText();
-                if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
-                const liveApproval = this.runParseApproval(screenText) || this.runParseApproval(this.recentOutputBuffer);
-                if (liveApproval) return;
-                const liveStatus = this.runDetectStatus(screenText) || this.runDetectStatus(this.recentOutputBuffer);
-                if (liveStatus === "generating" || liveStatus === "waiting_approval") return;
-                LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
-                this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
-                this.recordTrace("submit_write", {
-                  mode: "immediate_retry",
-                  attempt: 1,
-                  sendKey: this.sendKey,
-                  screenText: summarizeCliTraceText(screenText, 500)
-                });
-                writeRetryKey("immediate_retry");
-                this.submitRetryUsed = true;
-              }, retryDelayMs);
-              startResponseTimeout();
-              resolveOnce();
-            }, rejectOnce);
+            this.submitImmediatePrompt(sendState, completion);
             return;
           }
           if (submitDelayMs > 0) {
@@ -3632,36 +3769,10 @@ var init_provider_cli_adapter = __esm({
             screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
           });
           const submitStartedAt = Date.now();
-          let lastNormalizedScreen = "";
-          let lastScreenChangeAt = submitStartedAt;
-          const waitForEchoAndSubmit = () => {
-            if (!this.ptyProcess) {
-              resolveOnce();
-              return;
-            }
-            const now = Date.now();
-            const elapsed = now - submitStartedAt;
-            const screenText = this.terminalScreen.getText();
-            const normalizedScreen = normalizePromptText(screenText);
-            if (normalizedScreen !== lastNormalizedScreen) {
-              lastNormalizedScreen = normalizedScreen;
-              lastScreenChangeAt = now;
-            }
-            const echoVisible = !normalizedPromptSnippet || promptLikelyVisible(screenText, normalizedPromptSnippet);
-            if (echoVisible) {
-              const screenSettled = now - lastScreenChangeAt >= 500;
-              if (elapsed >= submitDelayMs && screenSettled) {
-                submit();
-                return;
-              }
-            }
-            if (elapsed >= maxEchoWaitMs) {
-              submit();
-              return;
-            }
-            setTimeout(waitForEchoAndSubmit, 50);
-          };
-          void this.writeToPty(text).then(() => waitForEchoAndSubmit(), rejectOnce);
+          void this.writeToPty(text).then(
+            () => this.waitForEchoAndSubmit(sendState, completion, submitStartedAt),
+            completion.rejectOnce
+          );
         });
       }
       getPartialResponse() {
@@ -3738,9 +3849,9 @@ var init_provider_cli_adapter = __esm({
       shutdown() {
         this.clearIdleFinishCandidate("shutdown");
         this.clearAllTimers();
-        this.pendingOutputParseBuffer = "";
+        this.pendingOutputParseChunks = [];
         this.pendingTerminalQueryTail = "";
-        this.ptyOutputBuffer = "";
+        this.ptyOutputChunks = [];
         this.finishRetryCount = 0;
         if (this.ptyProcess) {
           this.ptyProcess.write("");
@@ -3761,9 +3872,9 @@ var init_provider_cli_adapter = __esm({
       detach() {
         this.clearIdleFinishCandidate("detach");
         this.clearAllTimers();
-        this.pendingOutputParseBuffer = "";
+        this.pendingOutputParseChunks = [];
         this.pendingTerminalQueryTail = "";
-        this.ptyOutputBuffer = "";
+        this.ptyOutputChunks = [];
         this.finishRetryCount = 0;
         if (this.ptyProcess) {
           try {
@@ -3794,19 +3905,19 @@ var init_provider_cli_adapter = __esm({
           clearTimeout(this.pendingOutputParseTimer);
           this.pendingOutputParseTimer = null;
         }
-        this.pendingOutputParseBuffer = "";
+        this.pendingOutputParseChunks = [];
         this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
         }
-        this.ptyOutputBuffer = "";
+        this.ptyOutputChunks = [];
         if (this.finishRetryTimer) {
           clearTimeout(this.finishRetryTimer);
           this.finishRetryTimer = null;
         }
         this.finishRetryCount = 0;
-        this.terminalScreen.reset();
+        this.resetTerminalScreen();
         this.ptyProcess?.clearBuffer?.();
         this.onStatusChange?.();
       }
@@ -3923,7 +4034,7 @@ var init_provider_cli_adapter = __esm({
           traceEntryCount: this.traceEntries.length,
           statusHistory: this.statusHistory.slice(-30),
           timeouts: this.timeouts,
-          pendingOutputParseBufferLength: this.pendingOutputParseBuffer.length,
+          pendingOutputParseBufferLength: this.pendingOutputParseChunks.reduce((total, chunk) => total + chunk.length, 0),
           pendingOutputParseScheduled: !!this.pendingOutputParseTimer,
           ptyAlive: !!this.ptyProcess
         };
@@ -9514,14 +9625,14 @@ function buildIdeWorkspaceSession(state, cdpManagers, options) {
     id: state.instanceId || state.type,
     parentId: null,
     providerType: state.type,
-    ...includeSessionMetadata && { providerName: state.name },
+    providerName: state.name,
     kind: "workspace",
     transport: "cdp-page",
     status: normalizeManagedStatus(activeChat?.status || state.status, {
       activeModal: activeChat?.activeModal || null
     }),
     title,
-    ...includeSessionMetadata && { workspace: state.workspace || null },
+    workspace: state.workspace || null,
     activeChat,
     ...summaryMetadata && { summaryMetadata },
     ...includeSessionMetadata && { capabilities: state.sessionCapabilities || IDE_SESSION_CAPABILITIES },
@@ -9546,7 +9657,7 @@ function buildExtensionAgentSession(parent, ext, options) {
     id: ext.instanceId || `${parent.instanceId}:${ext.type}`,
     parentId: parent.instanceId || parent.type,
     providerType: ext.type,
-    ...includeSessionMetadata && { providerName: ext.name },
+    providerName: ext.name,
     providerSessionId: ext.providerSessionId,
     kind: "agent",
     transport: "cdp-webview",
@@ -9554,7 +9665,7 @@ function buildExtensionAgentSession(parent, ext, options) {
       activeModal: activeChat?.activeModal || null
     }),
     title: activeChat?.title || ext.name,
-    ...includeSessionMetadata && { workspace: parent.workspace || null },
+    workspace: parent.workspace || null,
     activeChat,
     ...summaryMetadata && { summaryMetadata },
     ...includeSessionMetadata && { capabilities: ext.sessionCapabilities || EXTENSION_SESSION_CAPABILITIES },
@@ -9594,7 +9705,7 @@ function buildCliSession(state, options) {
     id: state.instanceId,
     parentId: null,
     providerType: state.type,
-    ...includeSessionMetadata && { providerName: state.name },
+    providerName: state.name,
     providerSessionId: state.providerSessionId,
     kind: "agent",
     transport: "pty",
@@ -9602,7 +9713,7 @@ function buildCliSession(state, options) {
       activeModal: activeChat?.activeModal || null
     }),
     title: activeChat?.title || state.name,
-    ...includeSessionMetadata && { workspace: state.workspace || null },
+    workspace: state.workspace || null,
     ...includeRuntimeMetadata && {
       runtimeKey: state.runtime?.runtimeKey,
       runtimeDisplayName: state.runtime?.displayName,
@@ -9641,14 +9752,14 @@ function buildAcpSession(state, options) {
     id: state.instanceId,
     parentId: null,
     providerType: state.type,
-    ...includeSessionMetadata && { providerName: state.name },
+    providerName: state.name,
     kind: "agent",
     transport: "acp",
     status: normalizeManagedStatus(activeChat?.status || state.status, {
       activeModal: activeChat?.activeModal || null
     }),
     title: activeChat?.title || state.name,
-    ...includeSessionMetadata && { workspace: state.workspace || null },
+    workspace: state.workspace || null,
     activeChat,
     ...summaryMetadata && { summaryMetadata },
     ...includeSessionMetadata && { capabilities: ACP_SESSION_CAPABILITIES },
@@ -10095,26 +10206,26 @@ function buildReadChatReplayCollapseSignature(message) {
 function shouldCollapseReadChatReplayDuplicate(message) {
   if (!message) return false;
   const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
-  if (role !== "assistant" && role !== "system") return false;
-  const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
-  return kind === "tool" || kind === "terminal" || kind === "thought" || kind === "system";
+  return role === "assistant" || role === "system";
 }
 function collapseReplayDuplicatesFromReadChat(messages) {
   const collapsed = [];
-  let lastReplayTurnSignature = "";
+  const replaySignaturesInCurrentTurn = /* @__PURE__ */ new Set();
   for (const message of messages) {
+    const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+    if (role === "user") {
+      replaySignaturesInCurrentTurn.clear();
+    }
     const signature = buildReadChatReplayCollapseSignature(message);
     const previous = collapsed[collapsed.length - 1];
     const previousSignature = buildReadChatReplayCollapseSignature(previous);
     if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
       if (previousSignature === signature) continue;
-      if (lastReplayTurnSignature === signature) continue;
+      if (replaySignaturesInCurrentTurn.has(signature)) continue;
     }
     collapsed.push(message);
     if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
-      lastReplayTurnSignature = signature;
-    } else if ((message.role || "").toLowerCase() === "user") {
-      lastReplayTurnSignature = "";
+      replaySignaturesInCurrentTurn.add(signature);
     }
   }
   return collapsed;
@@ -17622,6 +17733,18 @@ function getUnreadState(hasContentChange, status, lastUsedAt, lastSeenAt, lastRo
   const unread = completionMarker ? completionMarker !== seenCompletionMarker : hasContentChange && lastUsedAt > lastSeenAt && lastRole !== "user" && lastRole !== "human" && lastRole !== "system";
   return { unread, inboxBucket: unread ? "task_complete" : "idle" };
 }
+function projectLiveSessionFromFull(session) {
+  const {
+    capabilities: _capabilities,
+    controlValues: _controlValues,
+    providerControls: _providerControls,
+    ...rest
+  } = session;
+  return {
+    ...rest,
+    activeChat: normalizeActiveChatData(session.activeChat, LIVE_STATUS_ACTIVE_CHAT_OPTIONS)
+  };
+}
 function buildRecentLaunches(recentActivity) {
   return recentActivity.map((item) => ({
     id: item.id,
@@ -17646,7 +17769,7 @@ function buildStatusSnapshot(options) {
     options.cdpManagers,
     { profile: "full" }
   );
-  const sessions = profile === "full" ? unreadSourceSessions : buildSessionEntries(
+  const sessions = profile === "full" ? unreadSourceSessions : profile === "live" ? unreadSourceSessions.map(projectLiveSessionFromFull) : buildSessionEntries(
     options.allStates,
     options.cdpManagers,
     { profile }
@@ -18932,10 +19055,6 @@ var DaemonStatusReporter = class {
         LOG.info("StatusReport", `\u2192${target} ${baseSummary}`);
       }
     }
-    const sessions = buildSessionEntries(
-      allStates,
-      this.deps.cdpManagers
-    );
     const payload = {
       ...buildStatusSnapshot({
         allStates,
@@ -18955,9 +19074,9 @@ var DaemonStatusReporter = class {
       }),
       screenshotUsage: this.deps.getScreenshotUsage?.() || null
     };
-    const payloadBytes = JSON.stringify(payload).length;
     const p2pSent = this.sendP2PPayload(payload);
     if (p2pSent) {
+      const payloadBytes = JSON.stringify(payload).length;
       LOG.debug("P2P", `sent (${payloadBytes} bytes)`);
       if (payloadBytes > 256 * 1024) {
         LOG.warn(
@@ -18967,8 +19086,10 @@ var DaemonStatusReporter = class {
       }
     }
     if (opts?.p2pOnly) return;
+    if (!serverConnected || !serverConn) return;
+    const payloadSessions = Array.isArray(payload.sessions) ? payload.sessions : [];
     const wsPayload = {
-      sessions: sessions.map((session) => ({
+      sessions: payloadSessions.map((session) => ({
         id: session.id,
         parentId: session.parentId,
         providerType: session.providerType,
@@ -18994,8 +19115,9 @@ var DaemonStatusReporter = class {
       return;
     }
     this.lastServerStatusHash = wsHash;
+    const wsPayloadBytes = JSON.stringify(wsPayload).length;
     serverConn.sendMessage("status_report", wsPayload);
-    LOG.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)${opts?.reason ? ` [${opts.reason}]` : ""}`);
+    LOG.debug("Server", `sent status_report (${wsPayloadBytes} bytes)${opts?.reason ? ` [${opts.reason}]` : ""}`);
   }
   // ─── P2P ─────────────────────────────────────────
   sendP2PPayload(payload) {