@adhdev/daemon-standalone 0.8.90 → 0.8.91

package/dist/index.js

@@ -30418,14 +30418,15 @@ var require_dist2 = __commonJS({
               return;
             }
             const startupModal = this.getStartupConfirmationModal(screenText);
-            const modal = this.runParseApproval(tail) || startupModal;
-            const rawScriptStatus = this.runDetectStatus(tail);
-            const scriptStatus = startupModal ? "waiting_approval" : rawScriptStatus;
             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 || startupModal;
+            const rawScriptStatus = this.runDetectStatus(tail);
+            const scriptStatus = startupModal ? "waiting_approval" : parsedModal && parsedTranscript?.status === "waiting_approval" ? "waiting_approval" : rawScriptStatus;
             const parsedMessages = Array.isArray(parsedTranscript?.messages) ? normalizeCliParsedMessages(parsedTranscript.messages, {
               committedMessages: this.committedMessages,
               scope: this.currentTurnScope,
@@ -30435,6 +30436,7 @@ var require_dist2 = __commonJS({
               return;
             }
             const lastParsedAssistant = [...parsedMessages].reverse().find((message) => message.role === "assistant");
+            const parsedShowsLiveAssistantProgress = parsedTranscript?.status === "generating" && !!lastParsedAssistant && parsedMessages.length > this.committedMessages.length;
             const normalizedPromptSnippet = normalizePromptText(this.submitRetryPromptSnippet || this.currentTurnScope?.prompt || "");
             this.recordTrace("settled", {
               tail: summarizeCliTraceText(tail, 500),
@@ -30589,7 +30591,7 @@ var require_dist2 = __commonJS({
               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));
-              if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome) {
+              if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome && !parsedShowsLiveAssistantProgress) {
                 return;
               }
               if (prevStatus === "waiting_approval") {
@@ -37907,10 +37909,11 @@ ${effect.notification.body || ""}`.trim();
           const parsedRecord = parsedStatus && typeof parsedStatus === "object" ? parsedStatus : null;
           const adapterStatus = adapter.getStatus();
           const shouldPreferAdapterMessages = Array.isArray(adapterStatus.messages) && adapterStatus.messages.length > 0 && Array.isArray(parsedRecord?.messages) && adapterStatus.messages.length > parsedRecord.messages.length;
+          const parsedShowsApproval = hasNonEmptyModalButtons(parsedRecord?.activeModal) && parsedRecord?.status === "waiting_approval";
           const status = parsedRecord ? {
             ...parsedRecord,
             messages: shouldPreferAdapterMessages ? adapterStatus.messages : parsedRecord.messages,
-            status: adapterStatus.status !== "idle" ? adapterStatus.status : parsedRecord.status || adapterStatus.status,
+            status: parsedShowsApproval ? parsedRecord.status : adapterStatus.status !== "idle" ? adapterStatus.status : parsedRecord.status || adapterStatus.status,
             activeModal: parsedRecord.activeModal || adapterStatus.activeModal
           } : adapterStatus;
           const title = typeof parsedRecord?.title === "string" ? parsedRecord.title : void 0;
@@ -46030,6 +46033,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
       }
       onStatusChange() {
+        if (this.deps.p2p?.isConnected) {
+          this.resetP2PHash();
+          this.sendUnifiedStatusReport({ p2pOnly: true, reason: "status-change" }).catch((e) => LOG2.warn("Status", `Immediate P2P status send failed: ${e?.message}`));
+        }
         this.throttledReport();
       }
       throttledReport() {
@@ -46127,10 +46134,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
       async sendUnifiedStatusReport(opts) {
         const { serverConn, p2p } = this.deps;
-        if (!serverConn?.isConnected()) return;
+        const serverConnected = !!serverConn?.isConnected();
+        const p2pConnected = !!p2p?.isConnected;
+        if (!serverConnected && !p2pConnected) return;
         this.lastStatusSentAt = Date.now();
         const now = this.lastStatusSentAt;
-        const target = opts?.p2pOnly ? "P2P" : "P2P+Server";
+        const target = opts?.p2pOnly ? "P2P" : serverConnected ? "P2P+Server" : "P2P";
         const allStates = this.deps.instanceManager.collectAllStates();
         const ideStates = allStates.filter((s15) => s15.category === "ide");
         const cliStates = allStates.filter((s15) => s15.category === "cli");
@@ -46209,6 +46218,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           ...wsPayload,
           timestamp: void 0
         }));
+        if (!serverConnected || !serverConn) return;
         if (!opts?.forceServer && wsHash === this.lastServerStatusHash) {
           LOG2.debug("Server", `skip duplicate status_report${opts?.reason ? ` (${opts.reason})` : ""}`);
           return;