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

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

@@ -35,6 +35,9 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private isWaitingForResponse;
     private activeModal;
     private parseErrorMessage;
+    private providerSessionId;
+    private providerErrorMessage;
+    private providerErrorReason;
     private responseTimeout;
     private idleTimeout;
     private ready;
@@ -164,6 +167,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private applyHoldGenerating;
     private applyWaitingApproval;
     private applyGenerating;
+    private applyError;
     private applyIdle;
     private finishResponse;
     private maybeCommitVisibleIdleTranscript;
@@ -174,6 +178,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private runParseApproval;
     private hasActionableApproval;
     private parsedStatusHasFinalAssistantMessage;
+    private applyParsedSessionMetadata;
     private parsedStatusHasFinalStandardAssistantMessage;
     private shouldKeepCodexTurnOpenForFinish;
     private rescheduleCodexFinishCheck;

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

@@ -36,6 +36,7 @@ export interface CliSessionStatus {
     }>;
     errorMessage?: string;
     errorReason?: string;
+    providerSessionId?: string;
     bufferState?: {
         responseBuffer?: {
             truncated: boolean;
@@ -67,6 +68,9 @@ export interface ParsedSession {
         buttons: string[];
     } | null;
     parsedStatus: string | null;
+    errorMessage?: string;
+    errorReason?: string;
+    providerSessionId?: string;
     transcriptAuthority?: 'provider' | 'daemon';
     coverage?: 'full' | 'tail' | 'current-turn';
 }

package/dist/index.js

@@ -4601,6 +4601,9 @@ var init_provider_cli_adapter = __esm({
       isWaitingForResponse = false;
       activeModal = null;
       parseErrorMessage = null;
+      providerSessionId = null;
+      providerErrorMessage = null;
+      providerErrorReason = null;
       responseTimeout = null;
       idleTimeout = null;
       ready = false;
@@ -5402,6 +5405,10 @@ ${lastSnapshot}`;
           this.applyHoldGenerating(ctx, recentInteractiveActivity);
           return;
         }
+        if (status === "error") {
+          this.applyError(ctx, session);
+          return;
+        }
         if (status === "waiting_approval") {
           this.applyWaitingApproval(ctx);
           return;
@@ -5546,6 +5553,45 @@ ${lastSnapshot}`;
         }, this.timeouts.generatingIdle);
         this.onStatusChange?.();
       }
+      applyError(ctx, session) {
+        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?.();
+      }
       applyIdle(ctx, now) {
         const { modal, lastParsedAssistant, prevStatus } = ctx;
         if (prevStatus === "waiting_approval") {
@@ -5792,6 +5838,7 @@ ${lastSnapshot}`;
             { ...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) {
           const message = e?.message || String(e);
@@ -5848,6 +5895,15 @@ ${lastSnapshot}`;
         });
         return !!lastAssistant;
       }
+      applyParsedSessionMetadata(parsed) {
+        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;
+      }
       parsedStatusHasFinalStandardAssistantMessage(parsed) {
         const messages = Array.isArray(parsed?.messages) ? parsed.messages : [];
         const lastAssistant = [...messages].reverse().find((message) => {
@@ -5930,8 +5986,9 @@ ${lastSnapshot}`;
             queuedAt: message.queuedAt,
             source: message.source
           })),
-          errorMessage: this.parseErrorMessage || void 0,
-          errorReason: this.parseErrorMessage ? "parse_error" : void 0,
+          errorMessage: this.parseErrorMessage || this.providerErrorMessage || void 0,
+          errorReason: this.parseErrorMessage ? "parse_error" : this.providerErrorReason || void 0,
+          providerSessionId: this.providerSessionId || void 0,
           ...bufferState ? { bufferState } : {}
         };
       }
@@ -5962,7 +6019,7 @@ ${lastSnapshot}`;
             lastOutputAt: this.lastOutputAt
           }),
           activeModal,
-          providerSessionId: typeof parsed.providerSessionId === "string" ? parsed.providerSessionId : void 0,
+          providerSessionId: this.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 } : {},
@@ -20053,6 +20110,13 @@ var CliProviderInstance = class {
       this.errorMessage = void 0;
       this.errorReason = void 0;
     }
+    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" : autoApproveActive ? "generating" : adapterStatus.status;
     const parsedProviderSessionId = normalizeProviderSessionId(
@@ -20437,6 +20501,13 @@ var CliProviderInstance = class {
   detectStatusTransition() {
     const now = Date.now();
     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);
@@ -20518,6 +20589,29 @@ var CliProviderInstance = class {
         }
       } 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 || 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 || void 0
+          }
+        });
       } else if (newStatus === "stopped") {
         if (this.generatingDebounceTimer) {
           clearTimeout(this.generatingDebounceTimer);