@adhdev/daemon-standalone 0.9.0 → 0.9.1

package/dist/index.js

@@ -30188,6 +30188,10 @@ var require_dist2 = __commonJS({
               this.activeModal = startupModal;
               this.setStatus("waiting_approval", `startup_ready:${trigger}`);
             } else {
+              if (this.currentStatus === "waiting_approval" || this.activeModal) {
+                this.lastApprovalResolvedAt = Date.now();
+              }
+              this.activeModal = null;
               this.setStatus("idle", `startup_ready:${trigger}`);
             }
             LOG2.info(
@@ -30986,6 +30990,28 @@ var require_dist2 = __commonJS({
             if (this.isWaitingForResponse && this.currentTurnScope && this.currentStatus === "idle") return "generating";
             return this.currentStatus;
           }
+          suppressStaleParsedApproval(parsed, recentBuffer, screenText) {
+            const actionableParsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
+            if (!parsed || parsed?.status !== "waiting_approval" || !actionableParsedModal) {
+              return parsed;
+            }
+            const inApprovalCooldown = this.lastApprovalResolvedAt > 0 && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
+            if (!inApprovalCooldown) {
+              return parsed;
+            }
+            const startupModal = this.getStartupConfirmationModal(screenText || "");
+            const visibleModal = this.runParseApproval(recentBuffer) || startupModal;
+            if (visibleModal) {
+              return parsed;
+            }
+            const detectedStatus = this.runDetectStatus(recentBuffer);
+            const fallbackStatus = detectedStatus && detectedStatus !== "waiting_approval" ? detectedStatus : this.isWaitingForResponse || this.currentTurnScope ? "generating" : this.currentStatus === "waiting_approval" ? "idle" : this.currentStatus;
+            return {
+              ...parsed,
+              status: fallbackStatus,
+              activeModal: null
+            };
+          }
           // ─── Public API (CliAdapter) ───────────────────
           getStatus() {
             const screenText = this.terminalScreen.getText() || "";
@@ -31204,15 +31230,16 @@ var require_dist2 = __commonJS({
               if (parsed && refinedStatus && parsed.status !== refinedStatus) {
                 parsed.status = refinedStatus;
               }
+              const normalizedParsed = this.suppressStaleParsedApproval(parsed, input.recentBuffer, input.screenText);
               const promptForTrim = scope?.prompt || getLastUserPromptText(baseMessages);
-              if (parsed && Array.isArray(parsed.messages) && promptForTrim) {
-                const lastAssistant = [...parsed.messages].reverse().find((message) => message?.role === "assistant" && typeof message.content === "string");
+              if (normalizedParsed && Array.isArray(normalizedParsed.messages) && promptForTrim) {
+                const lastAssistant = [...normalizedParsed.messages].reverse().find((message) => message?.role === "assistant" && typeof message.content === "string");
                 if (lastAssistant) {
                   lastAssistant.content = trimPromptEchoPrefix(lastAssistant.content, promptForTrim);
                 }
               }
               this.parseErrorMessage = null;
-              return parsed;
+              return normalizedParsed;
             } catch (e) {
               const message = e?.message || String(e);
               this.parseErrorMessage = message;
@@ -37404,10 +37431,13 @@ ${effect.notification.body || ""}`.trim();
         ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,
         ...options
       };
-      return {
-        ...activeChat,
+      const {
+        messages: _messages,
+        ...rest
+      } = activeChat;
+      const normalized = {
+        ...rest,
         status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),
-        messages: trimMessagesForStatus(activeChat.messages, resolvedOptions),
         activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {
           message: truncateString(activeChat.activeModal.message || "", STATUS_MODAL_MESSAGE_LIMIT),
           buttons: (activeChat.activeModal.buttons || []).map(
@@ -37416,6 +37446,10 @@ ${effect.notification.body || ""}`.trim();
         } : null,
         inputContent: resolvedOptions.includeInputContent && activeChat.inputContent ? truncateString(activeChat.inputContent, 2 * 1024) : void 0
       };
+      if (resolvedOptions.includeMessages) {
+        normalized.messages = trimMessagesForStatus(activeChat.messages, resolvedOptions);
+      }
+      return normalized;
     }
     function getActiveChatOptions(profile) {
       if (profile === "full") return {};