@adhdev/daemon-standalone 0.9.18 → 0.9.20

package/dist/index.js

@@ -29827,6 +29827,7 @@ var require_dist2 = __commonJS({
     var provider_cli_adapter_exports = {};
     __export2(provider_cli_adapter_exports, {
       ProviderCliAdapter: () => ProviderCliAdapter,
+      appendBoundedText: () => appendBoundedText,
       normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
     });
     function normalizeComparableTranscriptText(value) {
@@ -29859,6 +29860,14 @@ var require_dist2 = __commonJS({
       }
       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 os10;
     var ProviderCliAdapter;
     var init_provider_cli_adapter = __esm2({
@@ -29937,15 +29946,17 @@ var require_dist2 = __commonJS({
           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 = [];
@@ -29991,6 +30002,9 @@ var require_dist2 = __commonJS({
           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;
@@ -29999,6 +30013,30 @@ var require_dist2 = __commonJS({
             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 cached2 = this.parsedStatusCache;
+            if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBuffer === this.accumulatedRawBuffer && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName && cached2.lastOutputAt === this.lastOutputAt) {
+              return cached2.result;
+            }
+            return null;
+          }
           getIdleFinishConfirmMs() {
             return this.timeouts.idleFinishConfirm;
           }
@@ -30113,9 +30151,9 @@ var require_dist2 = __commonJS({
               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() {
@@ -30170,7 +30208,7 @@ var require_dist2 = __commonJS({
                   terminalScreen: this.terminalScreen
                 });
               }
-              this.pendingOutputParseBuffer += data;
+              this.pendingOutputParseChunks.push(data);
               if (!this.pendingOutputParseTimer) {
                 this.pendingOutputParseTimer = setTimeout(() => {
                   this.pendingOutputParseTimer = null;
@@ -30178,13 +30216,13 @@ var require_dist2 = __commonJS({
                 }, 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);
                 }
@@ -30209,7 +30247,7 @@ var require_dist2 = __commonJS({
               clearTimeout(this.startupSettleTimer);
               this.startupSettleTimer = null;
             }
-            this.terminalScreen.reset(24, 80);
+            this.resetTerminalScreen(24, 80);
             this.pendingTerminalQueryTail = "";
             this.currentTurnScope = null;
             this.finishRetryCount = 0;
@@ -30231,11 +30269,12 @@ var require_dist2 = __commonJS({
             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;
             }
@@ -30257,7 +30296,7 @@ var require_dist2 = __commonJS({
               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) {
@@ -30266,11 +30305,11 @@ var require_dist2 = __commonJS({
                 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;
@@ -30281,14 +30320,14 @@ var require_dist2 = __commonJS({
                 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;
@@ -30523,40 +30562,28 @@ var require_dist2 = __commonJS({
               }, 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,
@@ -30590,36 +30617,36 @@ var require_dist2 = __commonJS({
                 `[${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);
             LOG2.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;
@@ -30637,8 +30664,8 @@ var require_dist2 = __commonJS({
                 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;
@@ -30651,7 +30678,7 @@ var require_dist2 = __commonJS({
             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);
@@ -30662,7 +30689,7 @@ var require_dist2 = __commonJS({
               }
             }, this.timeouts.generatingIdle);
             this.recordTrace("hold_generating_recent_activity", {
-              scriptStatus,
+              scriptStatus: status,
               recentInteractiveActivity,
               lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
               lastScreenChangeAt: this.lastScreenChangeAt,
@@ -30716,11 +30743,13 @@ var require_dist2 = __commonJS({
             }
           }
           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;
             }
@@ -30747,7 +30776,7 @@ var require_dist2 = __commonJS({
             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);
@@ -30869,20 +30898,15 @@ var require_dist2 = __commonJS({
             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();
@@ -30960,6 +30984,59 @@ var require_dist2 = __commonJS({
             };
           }
           // ─── 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;
+                LOG2.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((b2) => typeof b2 === "string" && b2.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;
+              LOG2.warn("CLI", `[${this.cliType}] parseSession fallback error: ${message}`);
+              return null;
+            }
+          }
           runDetectStatus(text) {
             if (!this.cliScripts?.detectStatus) return null;
             try {
@@ -31033,14 +31110,21 @@ var require_dist2 = __commonJS({
             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 {
@@ -31072,7 +31156,7 @@ var require_dist2 = __commonJS({
            * Called by command handler / dashboard for rich content rendering.
            */
           getScriptParsedStatus() {
-            const screenText = this.terminalScreen.getText();
+            const screenText = this.readTerminalScreenText();
             const cached2 = this.parsedStatusCache;
             if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBuffer === this.accumulatedRawBuffer && cached2.screenText === screenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName && cached2.lastOutputAt === this.lastOutputAt) {
               return cached2.result;
@@ -31092,8 +31176,21 @@ var require_dist2 = __commonJS({
                 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;
@@ -31275,6 +31372,17 @@ var require_dist2 = __commonJS({
             }
             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);
@@ -31298,6 +31406,121 @@ var require_dist2 = __commonJS({
               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((error48) => {
+              LOG2.warn("CLI", `[${this.cliType}] ${mode} write failed: ${error48?.message || error48}`);
+            });
+          }
+          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;
+            LOG2.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;
+            LOG2.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;
@@ -31373,12 +31596,13 @@ var require_dist2 = __commonJS({
             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);
@@ -31386,110 +31610,23 @@ var require_dist2 = __commonJS({
             }
             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 = (error48) => {
-                if (resolved) return;
-                this.resetPendingSendState("send_write_failed");
-                resolved = true;
-                reject(error48);
-              };
-              const writeRetryKey = (mode) => {
-                void this.writeToPty(this.sendKey).catch((error48) => {
-                  LOG2.warn("CLI", `[${this.cliType}] ${mode} write failed: ${error48?.message || error48}`);
-                });
-              };
-              const submit = () => {
-                if (!this.ptyProcess) {
-                  resolveOnce();
-                  return;
+              const completion = {
+                resolveOnce: () => {
+                  if (resolved) return;
+                  resolved = true;
+                  resolve12();
+                },
+                rejectOnce: (error48) => {
+                  if (resolved) return;
+                  this.resetPendingSendState("send_write_failed");
+                  resolved = true;
+                  reject(error48);
                 }
-                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;
-                  LOG2.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;
-                    LOG2.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) {
@@ -31502,36 +31639,10 @@ var require_dist2 = __commonJS({
                 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() {
@@ -31608,9 +31719,9 @@ var require_dist2 = __commonJS({
           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("");
@@ -31631,9 +31742,9 @@ var require_dist2 = __commonJS({
           detach() {
             this.clearIdleFinishCandidate("detach");
             this.clearAllTimers();
-            this.pendingOutputParseBuffer = "";
+            this.pendingOutputParseChunks = [];
             this.pendingTerminalQueryTail = "";
-            this.ptyOutputBuffer = "";
+            this.ptyOutputChunks = [];
             this.finishRetryCount = 0;
             if (this.ptyProcess) {
               try {
@@ -31664,19 +31775,19 @@ var require_dist2 = __commonJS({
               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?.();
           }
@@ -31793,7 +31904,7 @@ var require_dist2 = __commonJS({
               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
             };
@@ -37468,14 +37579,14 @@ ${effect.notification.body || ""}`.trim();
         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 },
@@ -37500,7 +37611,7 @@ ${effect.notification.body || ""}`.trim();
         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",
@@ -37508,7 +37619,7 @@ ${effect.notification.body || ""}`.trim();
           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 },
@@ -37548,7 +37659,7 @@ ${effect.notification.body || ""}`.trim();
         id: state.instanceId,
         parentId: null,
         providerType: state.type,
-        ...includeSessionMetadata && { providerName: state.name },
+        providerName: state.name,
         providerSessionId: state.providerSessionId,
         kind: "agent",
         transport: "pty",
@@ -37556,7 +37667,7 @@ ${effect.notification.body || ""}`.trim();
           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,
@@ -37595,14 +37706,14 @@ ${effect.notification.body || ""}`.trim();
         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 },
@@ -38031,26 +38142,26 @@ ${effect.notification.body || ""}`.trim();
     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;
@@ -45505,6 +45616,18 @@ Run 'adhdev doctor' for detailed diagnostics.`
       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,
@@ -45529,7 +45652,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         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 }
@@ -46809,10 +46932,6 @@ Run 'adhdev doctor' for detailed diagnostics.`
             LOG2.info("StatusReport", `\u2192${target} ${baseSummary}`);
           }
         }
-        const sessions = buildSessionEntries(
-          allStates,
-          this.deps.cdpManagers
-        );
         const payload = {
           ...buildStatusSnapshot2({
             allStates,
@@ -46832,9 +46951,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
           }),
           screenshotUsage: this.deps.getScreenshotUsage?.() || null
         };
-        const payloadBytes = JSON.stringify(payload).length;
         const p2pSent = this.sendP2PPayload(payload);
         if (p2pSent) {
+          const payloadBytes = JSON.stringify(payload).length;
           LOG2.debug("P2P", `sent (${payloadBytes} bytes)`);
           if (payloadBytes > 256 * 1024) {
             LOG2.warn(
@@ -46844,8 +46963,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
           }
         }
         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,
@@ -46871,8 +46992,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
           return;
         }
         this.lastServerStatusHash = wsHash;
+        const wsPayloadBytes = JSON.stringify(wsPayload).length;
         serverConn.sendMessage("status_report", wsPayload);
-        LOG2.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)${opts?.reason ? ` [${opts.reason}]` : ""}`);
+        LOG2.debug("Server", `sent status_report (${wsPayloadBytes} bytes)${opts?.reason ? ` [${opts.reason}]` : ""}`);
       }
       // ─── P2P ─────────────────────────────────────────
       sendP2PPayload(payload) {