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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.100",
+  "version": "0.9.82-rc.101",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli-adapters/provider-cli-adapter.ts

@@ -1372,6 +1372,11 @@ export class ProviderCliAdapter implements CliAdapter {
         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();
             }
@@ -1381,6 +1386,11 @@ export class ProviderCliAdapter implements CliAdapter {
     private finishResponse(): void {
         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({
@@ -1618,6 +1628,49 @@ export class ProviderCliAdapter implements CliAdapter {
         return !!lastAssistant;
     }
 
+    private parsedStatusHasFinalStandardAssistantMessage(parsed: any): boolean {
+        const messages = Array.isArray(parsed?.messages) ? parsed.messages : [];
+        const lastAssistant = [...messages].reverse().find((message: any) => {
+            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;
+    }
+
+    private shouldKeepCodexTurnOpenForFinish(parsed: any): boolean {
+        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);
+    }
+
+    private rescheduleCodexFinishCheck(reason: string): void {
+        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,
+            }),
+        });
+    }
+
     private projectEffectiveStatus(startupModal: { message: string; buttons: string[] } | null = null): CliSessionStatus['status'] {
         if (this.parseErrorMessage) return 'error';
         if (this.hasActionableApproval(startupModal)) return 'waiting_approval';
@@ -1726,6 +1779,12 @@ export class ProviderCliAdapter implements CliAdapter {
             }),
             activeModal,
             providerSessionId: typeof (parsed as any).providerSessionId === 'string' ? (parsed as any).providerSessionId : undefined,
+            errorMessage: typeof (parsed as any).errorMessage === 'string' && (parsed as any).errorMessage.trim()
+                ? (parsed as any).errorMessage.trim()
+                : undefined,
+            errorReason: typeof (parsed as any).errorReason === 'string' && (parsed as any).errorReason.trim()
+                ? (parsed as any).errorReason.trim()
+                : undefined,
             ...(bufferState ? { bufferState } : {}),
             ...((parsed as any).transcriptAuthority === 'provider' || (parsed as any).transcriptAuthority === 'daemon'
                 ? { transcriptAuthority: (parsed as any).transcriptAuthority }
@@ -2596,6 +2655,9 @@ export class ProviderCliAdapter implements CliAdapter {
         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';
         }
@@ -2627,6 +2689,8 @@ export class ProviderCliAdapter implements CliAdapter {
                 providerSessionId: parsedDebugState.providerSessionId,
                 transcriptAuthority: parsedDebugState.transcriptAuthority,
                 coverage: parsedDebugState.coverage,
+                errorMessage: parsedDebugState.errorMessage,
+                errorReason: parsedDebugState.errorReason,
                 activeModal: parsedDebugState.activeModal,
                 messageCount: parsedMessages.length,
             } : null,

package/src/providers/cli-provider-instance.ts

@@ -497,8 +497,14 @@ export class CliProviderInstance implements ProviderInstance {
         if (typeof this.adapter.getScriptParsedStatus === 'function') {
             try {
                 parsedStatus = this.adapter.getScriptParsedStatus() || null;
-                this.errorMessage = undefined;
-                this.errorReason = undefined;
+                const parsedErrorMessage = typeof parsedStatus?.errorMessage === 'string' && parsedStatus.errorMessage.trim()
+                    ? parsedStatus.errorMessage.trim()
+                    : undefined;
+                const parsedErrorReason = typeof parsedStatus?.errorReason === 'string' && parsedStatus.errorReason.trim()
+                    ? parsedStatus.errorReason.trim() as ProviderErrorReason
+                    : undefined;
+                this.errorMessage = parsedErrorMessage;
+                this.errorReason = parsedErrorReason;
             } catch (error: any) {
                 parseErrorMessage = error?.message || String(error);
                 this.errorMessage = parseErrorMessage;
@@ -509,7 +515,7 @@ export class CliProviderInstance implements ProviderInstance {
             this.errorReason = undefined;
         }
         const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, Date.now());
-        const visibleStatus = parseErrorMessage
+        const visibleStatus = parseErrorMessage || parsedStatus?.status === 'error'
             ? 'error'
             : (autoApproveActive ? 'generating' : adapterStatus.status);
         const parsedProviderSessionId = normalizeProviderSessionId(