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

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/config/chat-history.d.ts

@@ -116,6 +116,10 @@ export declare function readProviderChatHistory(agentType: string, options?: {
     source: 'provider-native' | 'adhdev-mirror' | 'native-unavailable';
     sourcePath?: string;
     sourceMtimeMs?: number;
+    providerSessionId?: string;
+    nativeHistoryCoverage?: string;
+    partialReason?: string;
+    unavailableReason?: string;
 };
 export declare function listProviderHistorySessions(agentType: string, options?: {
     canonicalHistory?: ProviderCanonicalHistoryConfig;

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,
@@ -13517,7 +13572,11 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
   return {
     records,
     sourcePath: typeof result.sourcePath === "string" ? result.sourcePath : "",
-    sourceMtimeMs: Number(result.sourceMtimeMs) || 0
+    sourceMtimeMs: Number(result.sourceMtimeMs) || 0,
+    providerSessionId: typeof result.providerSessionId === "string" ? result.providerSessionId.trim() : void 0,
+    nativeHistoryCoverage: typeof result.nativeHistoryCoverage === "string" ? result.nativeHistoryCoverage.trim() : void 0,
+    partialReason: typeof result.partialReason === "string" ? result.partialReason.trim() : void 0,
+    unavailableReason: typeof result.unavailableReason === "string" ? result.unavailableReason.trim() : void 0
   };
 }
 function buildNativeHistoryReadResult(agentType, canonicalHistory, scripts, historySessionId, workspace) {
@@ -13559,7 +13618,11 @@ function readProviderChatHistory(agentType, options = {}) {
       ...pageHistoryRecords(agentType, nativeResult.records, options.offset || 0, options.limit || 30, options.excludeRecentCount || 0, options.historyBehavior),
       source: "provider-native",
       sourcePath: nativeResult.sourcePath,
-      sourceMtimeMs: nativeResult.sourceMtimeMs
+      sourceMtimeMs: nativeResult.sourceMtimeMs,
+      providerSessionId: nativeResult.providerSessionId,
+      nativeHistoryCoverage: nativeResult.nativeHistoryCoverage,
+      partialReason: nativeResult.partialReason,
+      unavailableReason: nativeResult.unavailableReason
     };
   }
   return {
@@ -16355,6 +16418,9 @@ function buildCliMessageSourceProvenance(args) {
     ...args.fallbackReason ? { fallbackReason: args.fallbackReason } : {},
     ...args.nativeSource ? { nativeSource: args.nativeSource } : {},
     ...args.sourcePath ? { sourcePath: args.sourcePath } : {},
+    ...args.nativeHistoryCoverage ? { nativeHistoryCoverage: args.nativeHistoryCoverage } : {},
+    ...args.partialReason ? { partialReason: args.partialReason } : {},
+    ...args.unavailableReason ? { unavailableReason: args.unavailableReason } : {},
     ptyStatusApprovalOnly: args.ptyStatusApprovalOnly === true,
     staleness: {
       sourceMtimeMs: sourceMtimeMs || void 0,
@@ -16374,6 +16440,8 @@ function buildCliMessageSourceProvenance(args) {
 function buildNativeHistoryFallbackReason(args) {
   if (!supportsCliNativeTranscript(args.providerType, args.provider)) return "provider_native_transcript_not_supported";
   if (args.nativeSource === "native-unavailable") return "native_history_unavailable";
+  if (args.nativeHistoryCoverage === "partial") return "native_history_partial";
+  if (args.nativeHistoryCoverage === "unavailable") return "native_history_unavailable";
   if (args.nativeSource && args.nativeSource !== "provider-native") return `native_history_source_${args.nativeSource}`;
   if (args.nativeMessageCount <= 0) return "native_history_empty";
   if (!args.safeMapping) return "native_history_not_safely_mapped";
@@ -17107,6 +17175,9 @@ async function handleReadChat(h, args) {
         if (nativeHistory) {
           const nativeMessages = Array.isArray(nativeHistory.messages) ? normalizeNativeHistoryMessages(agentStr, nativeHistory.messages) : [];
           const historyProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId : readHistorySessionIdFromMessages(nativeMessages) || nativeHistorySessionId || historySessionId;
+          const nativeHistoryCoverage = typeof nativeHistory?.nativeHistoryCoverage === "string" ? nativeHistory.nativeHistoryCoverage : void 0;
+          const partialReason = typeof nativeHistory?.partialReason === "string" ? nativeHistory.partialReason : void 0;
+          const unavailableReason = typeof nativeHistory?.unavailableReason === "string" ? nativeHistory.unavailableReason : void 0;
           const lookup = nativeHistory.lookup === "workspace" ? "workspace" : "session";
           const safeMapping = hasSafeNativeHistoryMapping({
             historySessionId: lookup === "workspace" ? void 0 : nativeHistorySessionId,
@@ -17121,7 +17192,7 @@ async function handleReadChat(h, args) {
             nativeMessages,
             ptyMessages: returnedMessages
           });
-          if (nativeHistory.source === "provider-native" && nativeMessages.length > 0 && safeMapping && freshEnough) {
+          if (nativeHistory.source === "provider-native" && nativeMessages.length > 0 && nativeHistoryCoverage !== "partial" && nativeHistoryCoverage !== "unavailable" && safeMapping && freshEnough) {
             selectedMessages = finalizeStreamingMessagesWhenIdle(nativeMessages, returnedStatus);
             selectedProviderSessionId = historyProviderSessionId || providerSessionId;
             selectedTranscriptAuthority = "provider";
@@ -17133,6 +17204,9 @@ async function handleReadChat(h, args) {
               nativeSource: nativeHistory.source,
               sourcePath: nativeHistory.sourcePath,
               sourceMtimeMs: nativeHistory.sourceMtimeMs,
+              nativeHistoryCoverage,
+              partialReason,
+              unavailableReason,
               nativeMessages,
               ptyMessages: returnedMessages,
               returnedMessages: selectedMessages,
@@ -17145,6 +17219,7 @@ async function handleReadChat(h, args) {
               providerType,
               provider,
               nativeSource: nativeHistory.source,
+              nativeHistoryCoverage,
               nativeMessageCount: nativeMessages.length,
               safeMapping,
               freshEnough
@@ -17157,6 +17232,9 @@ async function handleReadChat(h, args) {
               nativeSource: nativeHistory.source,
               sourcePath: nativeHistory.sourcePath,
               sourceMtimeMs: nativeHistory.sourceMtimeMs,
+              nativeHistoryCoverage,
+              partialReason,
+              unavailableReason,
               nativeMessages,
               ptyMessages: returnedMessages,
               returnedMessages,
@@ -17222,13 +17300,16 @@ async function handleReadChat(h, args) {
       const lookup = history.lookup === "workspace" ? "workspace" : "session";
       const historyMessages = Array.isArray(history?.messages) ? normalizeNativeHistoryMessages(agentStr, history.messages) : [];
       const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : readHistorySessionIdFromMessages(historyMessages) || historySessionId;
+      const nativeHistoryCoverage = typeof history?.nativeHistoryCoverage === "string" ? history.nativeHistoryCoverage : void 0;
+      const partialReason = typeof history?.partialReason === "string" ? history.partialReason : void 0;
+      const unavailableReason = typeof history?.unavailableReason === "string" ? history.unavailableReason : void 0;
       const safeMapping = supportsCliNativeTranscript(agentStr, provider) ? hasSafeNativeHistoryMapping({
         historySessionId: lookup === "workspace" ? void 0 : historySessionId,
         providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId,
         workspace,
         nativeMessages: historyMessages
       }) : false;
-      const nativeSelected = supportsCliNativeTranscript(agentStr, provider) && history.source === "provider-native" && historyMessages.length > 0 && safeMapping;
+      const nativeSelected = supportsCliNativeTranscript(agentStr, provider) && history.source === "provider-native" && historyMessages.length > 0 && nativeHistoryCoverage !== "partial" && nativeHistoryCoverage !== "unavailable" && safeMapping;
       const messageSource = buildCliMessageSourceProvenance({
         selected: nativeSelected ? "native-history" : "pty-parser",
         provider: agentStr,
@@ -17237,6 +17318,7 @@ async function handleReadChat(h, args) {
           providerType: agentStr,
           provider,
           nativeSource: history.source,
+          nativeHistoryCoverage,
           nativeMessageCount: historyMessages.length,
           safeMapping,
           freshEnough: true
@@ -17244,6 +17326,9 @@ async function handleReadChat(h, args) {
         nativeSource: history.source,
         sourcePath: history.sourcePath,
         sourceMtimeMs: history.sourceMtimeMs,
+        nativeHistoryCoverage,
+        partialReason,
+        unavailableReason,
         nativeMessages: historyMessages,
         returnedMessages: historyMessages,
         safeMapping,
@@ -19949,8 +20034,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 +20048,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 : ""