adhdev 0.8.90 → 0.8.91

package/dist/cli/index.js

@@ -7830,10 +7830,11 @@ async function handleReadChat(h, args) {
       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;
@@ -12848,14 +12849,15 @@ var init_provider_cli_adapter = __esm({
           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,
@@ -12865,6 +12867,7 @@ var init_provider_cli_adapter = __esm({
           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),
@@ -13019,7 +13022,7 @@ var init_provider_cli_adapter = __esm({
           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") {
@@ -38248,6 +38251,10 @@ var init_reporter = __esm({
         }
       }
       onStatusChange() {
+        if (this.deps.p2p?.isConnected) {
+          this.resetP2PHash();
+          this.sendUnifiedStatusReport({ p2pOnly: true, reason: "status-change" }).catch((e) => LOG.warn("Status", `Immediate P2P status send failed: ${e?.message}`));
+        }
         this.throttledReport();
       }
       throttledReport() {
@@ -38345,10 +38352,12 @@ var init_reporter = __esm({
       }
       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((s) => s.category === "ide");
         const cliStates = allStates.filter((s) => s.category === "cli");
@@ -38427,6 +38436,7 @@ var init_reporter = __esm({
           ...wsPayload,
           timestamp: void 0
         }));
+        if (!serverConnected || !serverConn) return;
         if (!opts?.forceServer && wsHash === this.lastServerStatusHash) {
           LOG.debug("Server", `skip duplicate status_report${opts?.reason ? ` (${opts.reason})` : ""}`);
           return;
@@ -86508,7 +86518,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.90" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.91" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;