@adhdev/daemon-core 0.9.82-rc.100 → 0.9.82-rc.101

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

@@ -174,6 +174,9 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private runParseApproval;
     private hasActionableApproval;
     private parsedStatusHasFinalAssistantMessage;
+    private parsedStatusHasFinalStandardAssistantMessage;
+    private shouldKeepCodexTurnOpenForFinish;
+    private rescheduleCodexFinishCheck;
     private projectEffectiveStatus;
     getStatus(options?: {
         allowParse?: boolean;

package/dist/index.js

@@ -5615,6 +5615,11 @@ ${lastSnapshot}`;
         this.idleTimeout = setTimeout(() => {
           if (this.isWaitingForResponse && !this.hasActionableApproval()) {
             if (this.shouldDeferIdleTimeoutFinish()) return;
+            const parsed = this.runParseSession();
+            if (this.shouldKeepCodexTurnOpenForFinish(parsed)) {
+              this.rescheduleCodexFinishCheck("codex_idle_timeout_not_final");
+              return;
+            }
             this.clearIdleFinishCandidate("idle_timeout_finish");
             this.finishResponse();
           }
@@ -5623,6 +5628,11 @@ ${lastSnapshot}`;
       finishResponse() {
         if (this.submitPendingUntil > Date.now()) return;
         if (this.responseSettleIgnoreUntil > Date.now()) return;
+        const parsedBeforeFinish = this.runParseSession();
+        if (this.shouldKeepCodexTurnOpenForFinish(parsedBeforeFinish)) {
+          this.rescheduleCodexFinishCheck("codex_finish_not_final");
+          return;
+        }
         this.clearIdleFinishCandidate("finish_response_enter");
         this.recordTrace("finish_response", {
           ...buildCliTraceParseSnapshot({
@@ -5838,6 +5848,44 @@ ${lastSnapshot}`;
         });
         return !!lastAssistant;
       }
+      parsedStatusHasFinalStandardAssistantMessage(parsed) {
+        const messages = Array.isArray(parsed?.messages) ? parsed.messages : [];
+        const lastAssistant = [...messages].reverse().find((message) => {
+          if (!message || message.role !== "assistant") return false;
+          return typeof message.content === "string" && message.content.trim().length > 0;
+        });
+        if (!lastAssistant) return false;
+        const kind = typeof lastAssistant.kind === "string" && lastAssistant.kind.trim() ? lastAssistant.kind.trim() : "standard";
+        return kind === "standard" && lastAssistant.meta?.streaming !== true;
+      }
+      shouldKeepCodexTurnOpenForFinish(parsed) {
+        if (this.cliType !== "codex-cli") return false;
+        if (!this.isWaitingForResponse || !this.currentTurnScope || this.hasActionableApproval()) return false;
+        const parsedStatus = typeof parsed?.status === "string" ? parsed.status.trim() : "";
+        if (parsedStatus !== "idle") return true;
+        if (parsed?.activeModal || parsed?.modal) return true;
+        return !this.parsedStatusHasFinalStandardAssistantMessage(parsed);
+      }
+      rescheduleCodexFinishCheck(reason) {
+        this.clearIdleFinishCandidate(reason);
+        this.setStatus("generating", reason);
+        if (this.idleTimeout) clearTimeout(this.idleTimeout);
+        this.idleTimeout = setTimeout(() => {
+          if (!this.isWaitingForResponse || this.hasActionableApproval()) return;
+          this.settledBuffer = this.recentOutputBuffer;
+          this.evaluateSettled();
+        }, this.getIdleFinishConfirmMs());
+        this.recordTrace("codex_finish_deferred", {
+          reason,
+          ...buildCliTraceParseSnapshot({
+            accumulatedBuffer: this.accumulatedBuffer,
+            accumulatedRawBuffer: this.accumulatedRawBuffer,
+            responseBuffer: this.responseBuffer,
+            partialResponse: this.responseBuffer,
+            scope: this.currentTurnScope
+          })
+        });
+      }
       projectEffectiveStatus(startupModal = null) {
         if (this.parseErrorMessage) return "error";
         if (this.hasActionableApproval(startupModal)) return "waiting_approval";
@@ -5915,6 +5963,8 @@ ${lastSnapshot}`;
           }),
           activeModal,
           providerSessionId: typeof parsed.providerSessionId === "string" ? parsed.providerSessionId : void 0,
+          errorMessage: typeof parsed.errorMessage === "string" && parsed.errorMessage.trim() ? parsed.errorMessage.trim() : void 0,
+          errorReason: typeof parsed.errorReason === "string" && parsed.errorReason.trim() ? parsed.errorReason.trim() : void 0,
           ...bufferState ? { bufferState } : {},
           ...parsed.transcriptAuthority === "provider" || parsed.transcriptAuthority === "daemon" ? { transcriptAuthority: parsed.transcriptAuthority } : this.providerOwnsTranscript() ? { transcriptAuthority: "provider" } : {},
           ...parsed.coverage === "full" || parsed.coverage === "tail" || parsed.coverage === "current-turn" ? { coverage: parsed.coverage } : this.providerOwnsTranscript() ? { coverage: this.shouldUseFullProviderTranscriptContext() ? "full" : "tail" } : {}
@@ -6718,6 +6768,9 @@ ${lastSnapshot}`;
         const parsedDebugState = this.getParsedDebugState();
         const parsedMessages = Array.isArray(parsedDebugState?.messages) ? parsedDebugState.messages : [];
         let effectiveStatus = this.projectEffectiveStatus(startupModal);
+        if (parsedDebugState?.status === "error") {
+          effectiveStatus = "error";
+        }
         if (startupDetectedStatus === "waiting_approval") {
           effectiveStatus = "waiting_approval";
         }
@@ -6745,6 +6798,8 @@ ${lastSnapshot}`;
             providerSessionId: parsedDebugState.providerSessionId,
             transcriptAuthority: parsedDebugState.transcriptAuthority,
             coverage: parsedDebugState.coverage,
+            errorMessage: parsedDebugState.errorMessage,
+            errorReason: parsedDebugState.errorReason,
             activeModal: parsedDebugState.activeModal,
             messageCount: parsedMessages.length
           } : null,
@@ -19949,8 +20004,10 @@ var CliProviderInstance = class {
     if (typeof this.adapter.getScriptParsedStatus === "function") {
       try {
         parsedStatus = this.adapter.getScriptParsedStatus() || null;
-        this.errorMessage = void 0;
-        this.errorReason = void 0;
+        const parsedErrorMessage = typeof parsedStatus?.errorMessage === "string" && parsedStatus.errorMessage.trim() ? parsedStatus.errorMessage.trim() : void 0;
+        const parsedErrorReason = typeof parsedStatus?.errorReason === "string" && parsedStatus.errorReason.trim() ? parsedStatus.errorReason.trim() : void 0;
+        this.errorMessage = parsedErrorMessage;
+        this.errorReason = parsedErrorReason;
       } catch (error) {
         parseErrorMessage = error?.message || String(error);
         this.errorMessage = parseErrorMessage;
@@ -19961,7 +20018,7 @@ var CliProviderInstance = class {
       this.errorReason = void 0;
     }
     const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, Date.now());
-    const visibleStatus = parseErrorMessage ? "error" : autoApproveActive ? "generating" : adapterStatus.status;
+    const visibleStatus = parseErrorMessage || parsedStatus?.status === "error" ? "error" : autoApproveActive ? "generating" : adapterStatus.status;
     const parsedProviderSessionId = normalizeProviderSessionId(
       this.provider,
       typeof parsedStatus?.providerSessionId === "string" ? parsedStatus.providerSessionId : ""