@adhdev/daemon-core 0.9.82-rc.109 → 0.9.82-rc.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.109",
+  "version": "0.9.82-rc.110",
   "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

@@ -145,6 +145,9 @@ export class ProviderCliAdapter implements CliAdapter {
     private isWaitingForResponse = false;
     private activeModal: { message: string; buttons: string[] } | null = null;
     private parseErrorMessage: string | null = null;
+    private providerSessionId: string | null = null;
+    private providerErrorMessage: string | null = null;
+    private providerErrorReason: string | null = null;
     private responseTimeout: NodeJS.Timeout | null = null;
     private idleTimeout: NodeJS.Timeout | null = null;
     private ready = false;
@@ -1151,6 +1154,7 @@ export class ProviderCliAdapter implements CliAdapter {
             && !(parsedStatus === 'idle' && !!lastParsedAssistant);
 
         if (shouldHoldGenerating) { this.applyHoldGenerating(ctx, recentInteractiveActivity); return; }
+        if (status === 'error') { this.applyError(ctx, session); return; }
         if (status === 'waiting_approval') { this.applyWaitingApproval(ctx); return; }
         if (status === 'generating') { this.applyGenerating(ctx); return; }
         if (status === 'idle') { this.applyIdle(ctx, now); }
@@ -1294,6 +1298,41 @@ export class ProviderCliAdapter implements CliAdapter {
         this.onStatusChange?.();
     }
 
+    private applyError(ctx: SettledEvalContext, session: ParsedSession): void {
+        this.clearIdleFinishCandidate('provider_error');
+        if (this.responseTimeout) { clearTimeout(this.responseTimeout); this.responseTimeout = null; }
+        if (this.idleTimeout) { clearTimeout(this.idleTimeout); this.idleTimeout = null; }
+        if (this.approvalExitTimeout) { clearTimeout(this.approvalExitTimeout); this.approvalExitTimeout = null; }
+        this.isWaitingForResponse = false;
+        this.responseSettleIgnoreUntil = 0;
+        this.submitRetryUsed = false;
+        this.submitRetryPromptSnippet = '';
+        this.finishRetryCount = 0;
+        this.currentTurnScope = null;
+        this.activeModal = null;
+        this.providerErrorMessage = typeof session.errorMessage === 'string' && session.errorMessage.trim()
+            ? session.errorMessage.trim()
+            : 'Provider reported an error';
+        this.providerErrorReason = typeof session.errorReason === 'string' && session.errorReason.trim()
+            ? session.errorReason.trim()
+            : 'provider_error';
+        this.setStatus('error', this.providerErrorReason);
+        this.recordTrace('provider_error', {
+            errorMessage: this.providerErrorMessage,
+            errorReason: this.providerErrorReason,
+            parsedStatus: ctx.parsedStatus || ctx.status,
+            messageCount: ctx.parsedMessages.length,
+            ...buildCliTraceParseSnapshot({
+                accumulatedBuffer: this.accumulatedBuffer,
+                accumulatedRawBuffer: this.accumulatedRawBuffer,
+                responseBuffer: this.responseBuffer,
+                partialResponse: this.responseBuffer,
+                scope: this.currentTurnScope,
+            }),
+        });
+        this.onStatusChange?.();
+    }
+
     private applyIdle(ctx: SettledEvalContext, now: number): void {
         const { modal, lastParsedAssistant, prevStatus } = ctx;
         if (prevStatus === 'waiting_approval') {
@@ -1567,6 +1606,7 @@ export class ProviderCliAdapter implements CliAdapter {
                 { ...input, tail, tailScreen: buildCliScreenSnapshot(tail) },
             );
             this.parseErrorMessage = null;
+            if (session && typeof session === 'object') this.applyParsedSessionMetadata(session);
             return session && typeof session === 'object' ? session : null;
         } catch (e: any) {
             const message = e?.message || String(e);
@@ -1628,6 +1668,22 @@ export class ProviderCliAdapter implements CliAdapter {
         return !!lastAssistant;
     }
 
+    private applyParsedSessionMetadata(parsed: any): void {
+        const providerSessionId = typeof parsed?.providerSessionId === 'string' && parsed.providerSessionId.trim()
+            ? parsed.providerSessionId.trim()
+            : '';
+        if (providerSessionId) {
+            this.providerSessionId = providerSessionId;
+            this.updateRuntimeMeta({ providerSessionId });
+        }
+        this.providerErrorMessage = typeof parsed?.errorMessage === 'string' && parsed.errorMessage.trim()
+            ? parsed.errorMessage.trim()
+            : null;
+        this.providerErrorReason = typeof parsed?.errorReason === 'string' && parsed.errorReason.trim()
+            ? parsed.errorReason.trim()
+            : null;
+    }
+
     private parsedStatusHasFinalStandardAssistantMessage(parsed: any): boolean {
         const messages = Array.isArray(parsed?.messages) ? parsed.messages : [];
         const lastAssistant = [...messages].reverse().find((message: any) => {
@@ -1730,8 +1786,9 @@ export class ProviderCliAdapter implements CliAdapter {
                 queuedAt: message.queuedAt,
                 source: message.source,
             })),
-            errorMessage: this.parseErrorMessage || undefined,
-            errorReason: this.parseErrorMessage ? 'parse_error' : undefined,
+            errorMessage: this.parseErrorMessage || this.providerErrorMessage || undefined,
+            errorReason: this.parseErrorMessage ? 'parse_error' : (this.providerErrorReason || undefined),
+            providerSessionId: this.providerSessionId || undefined,
             ...(bufferState ? { bufferState } : {}),
         };
     }
@@ -1778,7 +1835,7 @@ export class ProviderCliAdapter implements CliAdapter {
                 lastOutputAt: this.lastOutputAt,
             }),
             activeModal,
-            providerSessionId: typeof (parsed as any).providerSessionId === 'string' ? (parsed as any).providerSessionId : undefined,
+            providerSessionId: this.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,

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

@@ -38,6 +38,7 @@ export interface CliSessionStatus {
     }>;
     errorMessage?: string;
     errorReason?: string;
+    providerSessionId?: string;
     bufferState?: {
         responseBuffer?: { truncated: boolean; droppedChars: number; maxChars: number };
         recentOutputBuffer?: { truncated: boolean; droppedChars: number; maxChars: number };
@@ -51,6 +52,9 @@ export interface ParsedSession {
     messages: any[];
     modal: { message: string; buttons: string[] } | null;
     parsedStatus: string | null;
+    errorMessage?: string;
+    errorReason?: string;
+    providerSessionId?: string;
     transcriptAuthority?: 'provider' | 'daemon';
     coverage?: 'full' | 'tail' | 'current-turn';
 }

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

@@ -514,6 +514,13 @@ export class CliProviderInstance implements ProviderInstance {
             this.errorMessage = undefined;
             this.errorReason = undefined;
         }
+        const adapterProviderSessionId = normalizeProviderSessionId(
+            this.provider,
+            typeof adapterStatus?.providerSessionId === 'string' ? adapterStatus.providerSessionId : '',
+        );
+        if (adapterProviderSessionId) {
+            this.promoteProviderSessionId(adapterProviderSessionId);
+        }
         const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, Date.now());
         const visibleStatus = parseErrorMessage || parsedStatus?.status === 'error'
             ? 'error'
@@ -970,6 +977,13 @@ export class CliProviderInstance implements ProviderInstance {
         // during long-running CLI sessions. Keep this path on adapter-owned light
         // state only; rich provider parsing is reserved for getState/read_chat.
         const adapterStatus = this.adapter.getStatus({ allowParse: false });
+        const adapterProviderSessionId = normalizeProviderSessionId(
+            this.provider,
+            typeof adapterStatus?.providerSessionId === 'string' ? adapterStatus.providerSessionId : '',
+        );
+        if (adapterProviderSessionId) {
+            this.promoteProviderSessionId(adapterProviderSessionId);
+        }
         const parsedStatus = null;
         const rawStatus = adapterStatus.status;
         const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, now);
@@ -1051,6 +1065,23 @@ export class CliProviderInstance implements ProviderInstance {
                 }
             } else if (newStatus === 'idle' && this.lastStatus === 'starting') {
                 this.pushEvent({ event: 'agent:ready', chatTitle, timestamp: now });
+            } else if (newStatus === 'error') {
+                if (this.generatingDebounceTimer) { clearTimeout(this.generatingDebounceTimer); this.generatingDebounceTimer = null; }
+                this.generatingDebouncePending = null;
+                if (this.completedDebounceTimer) { clearTimeout(this.completedDebounceTimer); this.completedDebounceTimer = null; }
+                this.completedDebouncePending = null;
+                this.errorMessage = adapterStatus.errorMessage || this.errorMessage;
+                this.errorReason = (adapterStatus.errorReason as ProviderErrorReason) || this.errorReason;
+                this.pushEvent({
+                    event: 'agent:stopped',
+                    chatTitle,
+                    timestamp: now,
+                    finalSummary: adapterStatus.errorMessage || adapterStatus.errorReason || 'Provider reported an error',
+                    completionDiagnostic: {
+                        reason: adapterStatus.errorReason || 'provider_error',
+                        errorMessage: adapterStatus.errorMessage || undefined,
+                    },
+                });
             } else if (newStatus === 'stopped') {
                 // Cancel any pending debounce
                 if (this.generatingDebounceTimer) { clearTimeout(this.generatingDebounceTimer); this.generatingDebounceTimer = null; }