@adhdev/daemon-standalone 0.8.89 → 0.8.91

package/dist/index.js

@@ -29514,8 +29514,8 @@ var require_dist2 = __commonJS({
         scope,
         runtimeSettings
       } = options;
-      const buffer = scope ? sliceFromOffset(accumulatedBuffer, scope.bufferStart) || accumulatedBuffer : accumulatedBuffer;
-      const rawBuffer = scope ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) || accumulatedRawBuffer : accumulatedRawBuffer;
+      const buffer = scope ? sliceFromOffset(accumulatedBuffer, scope.bufferStart) : accumulatedBuffer;
+      const rawBuffer = scope ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) : accumulatedRawBuffer;
       const screenText = terminalScreenText;
       const recentBuffer = buffer.slice(-1e3) || recentOutputBuffer;
       return {
@@ -29547,8 +29547,8 @@ var require_dist2 = __commonJS({
     }
     function buildCliTraceParseSnapshot(options) {
       const { accumulatedBuffer, accumulatedRawBuffer, responseBuffer, partialResponse, scope } = options;
-      const scopedBuffer = scope ? sliceFromOffset(accumulatedBuffer, scope.bufferStart) || accumulatedBuffer : accumulatedBuffer;
-      const scopedRawBuffer = scope ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) || accumulatedRawBuffer : accumulatedRawBuffer;
+      const scopedBuffer = scope ? sliceFromOffset(accumulatedBuffer, scope.bufferStart) : accumulatedBuffer;
+      const scopedRawBuffer = scope ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) : accumulatedRawBuffer;
       return {
         currentTurnScope: scope || null,
         responseBuffer: summarizeCliTraceText(responseBuffer, 1200),
@@ -30208,6 +30208,7 @@ var require_dist2 = __commonJS({
           looksLikeClaudeGeneratingLine(line) {
             const trimmed = String(line || "").trim();
             if (!trimmed) return false;
+            if (/^⏵⏵\s+accept edits on/i.test(trimmed)) return false;
             if (/esc to (cancel|interrupt|stop)/i.test(trimmed)) return true;
             if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+\S+.*\b(?:thinking|thought for \d+s?)\b/i.test(trimmed)) return true;
             if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+[A-Z][A-Za-z-]{3,}ing\b.*(?:…|\.{3})/u.test(trimmed)) return true;
@@ -30417,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,
@@ -30434,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),
@@ -30520,7 +30523,7 @@ var require_dist2 = __commonJS({
                 `[${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)} visibleIdlePrompt=${String(visibleIdlePrompt)} visibleAssistantCandidate=${String(visibleAssistantCandidate)} 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 && !(visibleIdlePrompt && visibleAssistantCandidate);
+            const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity && !(visibleIdlePrompt && visibleAssistantCandidate) && !(parsedTranscript?.status === "idle" && !!lastParsedAssistant);
             if (shouldHoldGenerating) {
               this.clearIdleFinishCandidate("hold_generating_recent_activity");
               this.setStatus("generating", "recent_activity_hold");
@@ -30588,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") {
@@ -30922,11 +30925,17 @@ var require_dist2 = __commonJS({
               return null;
             }
           }
+          projectEffectiveStatus(startupModal = null) {
+            if (this.parseErrorMessage) return "error";
+            if (startupModal) return "waiting_approval";
+            if (this.isWaitingForResponse && this.currentTurnScope && this.currentStatus === "idle") return "generating";
+            return this.currentStatus;
+          }
           // ─── Public API (CliAdapter) ───────────────────
           getStatus() {
             const screenText = this.terminalScreen.getText() || "";
             const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
-            const effectiveStatus = this.parseErrorMessage ? "error" : startupModal ? "waiting_approval" : this.currentStatus;
+            const effectiveStatus = this.projectEffectiveStatus(startupModal);
             return {
               status: effectiveStatus,
               messages: [...this.committedMessages],
@@ -31633,7 +31642,7 @@ ${data.message || ""}`.trim();
             }
             this.setStatus("generating", "approval_resolved");
             this.onStatusChange?.();
-            const startupTrustModal = /Quick safety check|project trust|trust (?:this project|the contents of this directory|the files in this folder)/i.test(String(modal?.message || ""));
+            const startupTrustModal = /Quick safety check|project trust|Confirm Claude Code project trust|trust (?:this project|the contents of this directory|the files in this folder)/i.test(String(modal?.message || ""));
             if (startupTrustModal && buttonIndex in this.approvalKeys) {
               this.ptyProcess.write(`${this.approvalKeys[buttonIndex]}\r`);
             } else if (this.shouldResolveModalWithEnter(modal, buttonIndex)) {
@@ -31659,7 +31668,7 @@ ${data.message || ""}`.trim();
           getDebugState() {
             const screenText = sanitizeTerminalText(this.terminalScreen.getText());
             const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
-            const effectiveStatus = startupModal ? "waiting_approval" : this.currentStatus;
+            const effectiveStatus = this.projectEffectiveStatus(startupModal);
             const effectiveReady = this.ready || !!startupModal;
             return {
               type: this.cliType,
@@ -37900,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;
@@ -46023,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() {
@@ -46120,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");
@@ -46202,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;