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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.100",
+  "version": "0.9.82-rc.102",
   "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/commands/chat-commands.ts

@@ -336,6 +336,9 @@ function buildCliMessageSourceProvenance(args: {
     nativeSource?: string;
     sourcePath?: string;
     sourceMtimeMs?: number;
+    nativeHistoryCoverage?: string;
+    partialReason?: string;
+    unavailableReason?: string;
     nativeMessages?: ChatMessage[];
     ptyMessages?: ChatMessage[];
     returnedMessages?: ChatMessage[];
@@ -357,6 +360,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 || undefined,
@@ -378,12 +384,15 @@ function buildNativeHistoryFallbackReason(args: {
     providerType: string;
     provider?: ProviderModule;
     nativeSource?: string;
+    nativeHistoryCoverage?: string;
     nativeMessageCount: number;
     safeMapping: boolean;
     freshEnough: boolean;
 }): string {
     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';
@@ -1291,6 +1300,15 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     const historyProviderSessionId = typeof (nativeHistory as any)?.providerSessionId === 'string'
                         ? (nativeHistory as any).providerSessionId
                         : readHistorySessionIdFromMessages(nativeMessages) || nativeHistorySessionId || historySessionId;
+                    const nativeHistoryCoverage = typeof (nativeHistory as any)?.nativeHistoryCoverage === 'string'
+                        ? (nativeHistory as any).nativeHistoryCoverage
+                        : undefined;
+                    const partialReason = typeof (nativeHistory as any)?.partialReason === 'string'
+                        ? (nativeHistory as any).partialReason
+                        : undefined;
+                    const unavailableReason = typeof (nativeHistory as any)?.unavailableReason === 'string'
+                        ? (nativeHistory as any).unavailableReason
+                        : undefined;
                     const lookup = (nativeHistory as any).lookup === 'workspace' ? 'workspace' : 'session';
                     const safeMapping = hasSafeNativeHistoryMapping({
                         historySessionId: lookup === 'workspace' ? undefined : nativeHistorySessionId,
@@ -1305,7 +1323,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                         nativeMessages,
                         ptyMessages: returnedMessages,
                     });
-                    if ((nativeHistory as any).source === 'provider-native' && nativeMessages.length > 0 && safeMapping && freshEnough) {
+                    if ((nativeHistory as any).source === 'provider-native' && nativeMessages.length > 0 && nativeHistoryCoverage !== 'partial' && nativeHistoryCoverage !== 'unavailable' && safeMapping && freshEnough) {
                         selectedMessages = finalizeStreamingMessagesWhenIdle(nativeMessages, returnedStatus);
                         selectedProviderSessionId = historyProviderSessionId || providerSessionId;
                         selectedTranscriptAuthority = 'provider';
@@ -1317,6 +1335,9 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                             nativeSource: (nativeHistory as any).source,
                             sourcePath: (nativeHistory as any).sourcePath,
                             sourceMtimeMs: (nativeHistory as any).sourceMtimeMs,
+                            nativeHistoryCoverage,
+                            partialReason,
+                            unavailableReason,
                             nativeMessages,
                             ptyMessages: returnedMessages,
                             returnedMessages: selectedMessages,
@@ -1329,6 +1350,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                             providerType,
                             provider,
                             nativeSource: (nativeHistory as any).source,
+                            nativeHistoryCoverage,
                             nativeMessageCount: nativeMessages.length,
                             safeMapping,
                             freshEnough,
@@ -1341,6 +1363,9 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                             nativeSource: (nativeHistory as any).source,
                             sourcePath: (nativeHistory as any).sourcePath,
                             sourceMtimeMs: (nativeHistory as any).sourceMtimeMs,
+                            nativeHistoryCoverage,
+                            partialReason,
+                            unavailableReason,
                             nativeMessages,
                             ptyMessages: returnedMessages,
                             returnedMessages,
@@ -1425,6 +1450,15 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             const historyProviderSessionId = typeof (history as any)?.providerSessionId === 'string'
                 ? (history as any).providerSessionId
                 : readHistorySessionIdFromMessages(historyMessages) || historySessionId;
+            const nativeHistoryCoverage = typeof (history as any)?.nativeHistoryCoverage === 'string'
+                ? (history as any).nativeHistoryCoverage
+                : undefined;
+            const partialReason = typeof (history as any)?.partialReason === 'string'
+                ? (history as any).partialReason
+                : undefined;
+            const unavailableReason = typeof (history as any)?.unavailableReason === 'string'
+                ? (history as any).unavailableReason
+                : undefined;
             const safeMapping = supportsCliNativeTranscript(agentStr, provider)
                 ? hasSafeNativeHistoryMapping({
                     historySessionId: lookup === 'workspace' ? undefined : historySessionId,
@@ -1436,6 +1470,8 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             const nativeSelected = supportsCliNativeTranscript(agentStr, provider)
                 && (history as any).source === 'provider-native'
                 && historyMessages.length > 0
+                && nativeHistoryCoverage !== 'partial'
+                && nativeHistoryCoverage !== 'unavailable'
                 && safeMapping;
             const messageSource = buildCliMessageSourceProvenance({
                 selected: nativeSelected ? 'native-history' : 'pty-parser',
@@ -1447,6 +1483,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                         providerType: agentStr,
                         provider,
                         nativeSource: (history as any).source,
+                        nativeHistoryCoverage,
                         nativeMessageCount: historyMessages.length,
                         safeMapping,
                         freshEnough: true,
@@ -1454,6 +1491,9 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 nativeSource: (history as any).source,
                 sourcePath: (history as any).sourcePath,
                 sourceMtimeMs: (history as any).sourceMtimeMs,
+                nativeHistoryCoverage,
+                partialReason,
+                unavailableReason,
                 nativeMessages: historyMessages,
                 returnedMessages: historyMessages,
                 safeMapping,

package/src/config/chat-history.ts

@@ -1345,7 +1345,15 @@ function rewriteCanonicalSavedHistory(agentType: string, historySessionId: strin
 
 export type ProviderNativeHistoryScripts = Record<string, ((input: any) => any) | undefined>;
 
-type ProviderNativeHistoryReadResult = { records: HistoryMessage[]; sourcePath: string; sourceMtimeMs: number };
+type ProviderNativeHistoryReadResult = {
+    records: HistoryMessage[];
+    sourcePath: string;
+    sourceMtimeMs: number;
+    providerSessionId?: string;
+    nativeHistoryCoverage?: string;
+    partialReason?: string;
+    unavailableReason?: string;
+};
 
 function getNativeHistoryScriptName(canonicalHistory: ProviderCanonicalHistoryConfig | undefined, key: 'readSession' | 'listSessions'): string {
     const configured = canonicalHistory?.scripts?.[key];
@@ -1409,6 +1417,10 @@ function callProviderNativeHistoryRead(
         records,
         sourcePath: typeof (result as any).sourcePath === 'string' ? (result as any).sourcePath : '',
         sourceMtimeMs: Number((result as any).sourceMtimeMs) || 0,
+        providerSessionId: typeof (result as any).providerSessionId === 'string' ? (result as any).providerSessionId.trim() : undefined,
+        nativeHistoryCoverage: typeof (result as any).nativeHistoryCoverage === 'string' ? (result as any).nativeHistoryCoverage.trim() : undefined,
+        partialReason: typeof (result as any).partialReason === 'string' ? (result as any).partialReason.trim() : undefined,
+        unavailableReason: typeof (result as any).unavailableReason === 'string' ? (result as any).unavailableReason.trim() : undefined,
     };
 }
 
@@ -1479,7 +1491,17 @@ export function readProviderChatHistory(
         historyBehavior?: ProviderHistoryBehavior;
         scripts?: ProviderNativeHistoryScripts;
     } = {},
-): { messages: HistoryMessage[]; hasMore: boolean; source: 'provider-native' | 'adhdev-mirror' | 'native-unavailable'; sourcePath?: string; sourceMtimeMs?: number } {
+): {
+    messages: HistoryMessage[];
+    hasMore: boolean;
+    source: 'provider-native' | 'adhdev-mirror' | 'native-unavailable';
+    sourcePath?: string;
+    sourceMtimeMs?: number;
+    providerSessionId?: string;
+    nativeHistoryCoverage?: string;
+    partialReason?: string;
+    unavailableReason?: string;
+} {
     if (isNativeSourceCanonicalHistory(options.canonicalHistory) && (options.historySessionId || options.workspace)) {
         const nativeResult = buildNativeHistoryReadResult(agentType, options.canonicalHistory, options.scripts, options.historySessionId, options.workspace);
         if (!nativeResult) return { messages: [], hasMore: false, source: 'native-unavailable' };
@@ -1488,6 +1510,10 @@ export function readProviderChatHistory(
             source: 'provider-native',
             sourcePath: nativeResult.sourcePath,
             sourceMtimeMs: nativeResult.sourceMtimeMs,
+            providerSessionId: nativeResult.providerSessionId,
+            nativeHistoryCoverage: nativeResult.nativeHistoryCoverage,
+            partialReason: nativeResult.partialReason,
+            unavailableReason: nativeResult.unavailableReason,
         };
     }
     return {

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(