@adhdev/daemon-core 0.8.88 → 0.8.90

package/dist/cli-adapters/provider-cli-adapter.d.ts

@@ -146,6 +146,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private commitCurrentTranscript;
     private runDetectStatus;
     private runParseApproval;
+    private projectEffectiveStatus;
     getStatus(): CliSessionStatus;
     seedCommittedMessages(messages: SeedCliChatMessage[]): void;
     /**

package/dist/index.js

@@ -1664,8 +1664,8 @@ function buildCliParseInput(options) {
     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 {
@@ -1697,8 +1697,8 @@ function summarizeCliTraceMessages(messages, limit = 3) {
 }
 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),
@@ -2362,6 +2362,7 @@ var init_provider_cli_adapter = __esm({
       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;
@@ -2462,8 +2463,7 @@ var init_provider_cli_adapter = __esm({
         const buttons = Array.isArray(modal.buttons) ? modal.buttons : [];
         if (buttons.length !== 1) return false;
         const buttonLabel = String(buttons[0] || "").trim();
-        const modalText = `${modal.message || ""} ${buttonLabel}`.trim();
-        return looksLikeConfirmOnlyLabel(buttonLabel) || /Quick safety check|project trust|trust (?:this project|the contents of this directory|the files in this folder)|Enter to confirm/i.test(modalText);
+        return looksLikeConfirmOnlyLabel(buttonLabel);
       }
       async waitForInteractivePrompt(maxWaitMs = 5e3) {
         const startedAt = Date.now();
@@ -2675,7 +2675,7 @@ var init_provider_cli_adapter = __esm({
             `[${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");
@@ -3077,13 +3077,22 @@ var init_provider_cli_adapter = __esm({
           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.projectEffectiveStatus(startupModal);
         return {
-          status: this.parseErrorMessage ? "error" : this.currentStatus,
+          status: effectiveStatus,
           messages: [...this.committedMessages],
           workingDir: this.workingDir,
-          activeModal: this.activeModal,
+          activeModal: startupModal || this.activeModal,
           errorMessage: this.parseErrorMessage || void 0,
           errorReason: this.parseErrorMessage ? "parse_error" : void 0
         };
@@ -3137,7 +3146,8 @@ var init_provider_cli_adapter = __esm({
             receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
           }));
           const parsedLastAssistant = [...parsedHydratedMessages].reverse().find((message) => message.role === "assistant" && typeof message.content === "string" && message.content.trim());
-          const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && this.currentStatus === "idle" && parsedHydratedMessages.length > committedHydratedMessages.length && !!parsedLastAssistant;
+          const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
+          const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedHydratedMessages.length > committedHydratedMessages.length && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && visibleIdlePrompt);
           if (shouldAdoptParsedIdleReplay) {
             this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
               committedMessages: this.committedMessages,
@@ -3145,6 +3155,18 @@ var init_provider_cli_adapter = __esm({
               lastOutputAt: this.lastOutputAt
             });
             this.syncMessageViews();
+            if (this.currentStatus !== "idle" || this.isWaitingForResponse) {
+              this.responseBuffer = "";
+              this.isWaitingForResponse = false;
+              this.responseSettleIgnoreUntil = 0;
+              this.submitRetryUsed = false;
+              this.submitRetryPromptSnippet = "";
+              this.finishRetryCount = 0;
+              this.currentTurnScope = null;
+              this.activeModal = null;
+              this.setStatus("idle", "parsed_idle_replay_commit");
+              this.onStatusChange?.();
+            }
           }
           const effectiveCommittedHydratedMessages = shouldAdoptParsedIdleReplay ? this.committedMessages.map((message, index) => buildChatMessage({
             ...message,
@@ -3755,8 +3777,9 @@ ${data.message || ""}`.trim();
         this.ptyProcess?.write(data);
       }
       resolveModal(buttonIndex) {
-        if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !this.activeModal) return;
-        const modal = this.activeModal;
+        const screenText = this.terminalScreen.getText() || "";
+        const modal = this.activeModal || this.getStartupConfirmationModal(screenText);
+        if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !modal) return;
         this.clearIdleFinishCandidate("resolve_modal");
         this.recordTrace("resolve_modal", {
           buttonIndex,
@@ -3771,7 +3794,10 @@ ${data.message || ""}`.trim();
         }
         this.setStatus("generating", "approval_resolved");
         this.onStatusChange?.();
-        if (this.shouldResolveModalWithEnter(modal, buttonIndex)) {
+        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)) {
           this.ptyProcess.write("\r");
         } else if (buttonIndex in this.approvalKeys) {
           this.ptyProcess.write(this.approvalKeys[buttonIndex]);
@@ -3792,20 +3818,24 @@ ${data.message || ""}`.trim();
         }
       }
       getDebugState() {
+        const screenText = sanitizeTerminalText(this.terminalScreen.getText());
+        const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
+        const effectiveStatus = this.projectEffectiveStatus(startupModal);
+        const effectiveReady = this.ready || !!startupModal;
         return {
           type: this.cliType,
           name: this.cliName,
           providerResolution: this.providerResolutionMeta,
-          status: this.currentStatus,
-          ready: this.ready,
+          status: effectiveStatus,
+          ready: effectiveReady,
           startupParseGate: this.startupParseGate,
           spawnAt: this.spawnAt,
           workingDir: this.workingDir,
-          messages: this.messages.slice(-20),
-          committedMessages: this.committedMessages.slice(-20),
-          structuredMessages: this.structuredMessages.slice(-20),
+          messages: this.messages,
+          committedMessages: this.committedMessages,
+          structuredMessages: this.structuredMessages,
           messageCount: this.committedMessages.length,
-          screenText: sanitizeTerminalText(this.terminalScreen.getText()).slice(-4e3),
+          screenText: screenText.slice(-4e3),
           currentTurnScope: this.currentTurnScope,
           startupBuffer: this.startupBuffer.slice(-4e3),
           recentOutputBuffer: this.recentOutputBuffer.slice(-500),
@@ -3820,7 +3850,7 @@ ${data.message || ""}`.trim();
           lastScreenChangeAt: this.lastScreenChangeAt,
           lastScreenSnapshot: this.lastScreenSnapshot.slice(-500),
           isWaitingForResponse: this.isWaitingForResponse,
-          activeModal: this.activeModal,
+          activeModal: startupModal || this.activeModal,
           lastApprovalResolvedAt: this.lastApprovalResolvedAt,
           sendDelayMs: this.sendDelayMs,
           sendKey: this.sendKey,