@adhdev/daemon-standalone 0.9.82-rc.110 → 0.9.82-rc.112

package/dist/index.js

@@ -26809,6 +26809,8 @@ Next step: ${nextStep}`;
           pendingOutboundQueue = [];
           pendingOutboundFlushTimer = null;
           pendingOutboundFlushInFlight = false;
+          providerErrorRetryTimer = null;
+          providerErrorRetryKey = "";
           // Resize redraw suppression
           resizeSuppressUntil = 0;
           // Debug: status transition history
@@ -27415,6 +27417,11 @@ ${lastSnapshot}`;
               clearTimeout(this.ptyOutputFlushTimer);
               this.ptyOutputFlushTimer = null;
             }
+            if (this.providerErrorRetryTimer) {
+              clearTimeout(this.providerErrorRetryTimer);
+              this.providerErrorRetryTimer = null;
+            }
+            this.providerErrorRetryKey = "";
           }
           clearStaleIdleResponseGuard(reason) {
             const blockingModal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
@@ -27564,6 +27571,7 @@ ${lastSnapshot}`;
               return;
             }
             if (status === "error") {
+              if (this.maybeScheduleProviderErrorRetry(ctx, session)) return;
               this.applyError(ctx, session);
               return;
             }
@@ -27750,6 +27758,63 @@ ${lastSnapshot}`;
             });
             this.onStatusChange?.();
           }
+          maybeScheduleProviderErrorRetry(ctx, session) {
+            const retryPrompt = typeof session.retryPrompt === "string" ? String(session.retryPrompt).trim() : "";
+            const retryDelayMs = typeof session.retryDelayMs === "number" ? Number(session.retryDelayMs) : NaN;
+            if (!retryPrompt || !Number.isFinite(retryDelayMs) || retryDelayMs < 0) return false;
+            if (!this.ptyProcess) return false;
+            const retryAttempt = typeof session.retryAttempt === "number" ? Number(session.retryAttempt) : 0;
+            const retryMaxAttempts = typeof session.retryMaxAttempts === "number" ? Number(session.retryMaxAttempts) : 0;
+            const errorReason = typeof session.errorReason === "string" && session.errorReason.trim() ? session.errorReason.trim() : "provider_error";
+            const retryKey = `${errorReason}:${retryAttempt}:${retryPrompt}`;
+            if (this.providerErrorRetryTimer && this.providerErrorRetryKey === retryKey) return true;
+            if (this.providerErrorRetryTimer) clearTimeout(this.providerErrorRetryTimer);
+            this.providerErrorRetryKey = retryKey;
+            this.clearIdleFinishCandidate("provider_error_retry");
+            if (this.idleTimeout) {
+              clearTimeout(this.idleTimeout);
+              this.idleTimeout = null;
+            }
+            if (this.approvalExitTimeout) {
+              clearTimeout(this.approvalExitTimeout);
+              this.approvalExitTimeout = null;
+            }
+            this.providerErrorMessage = typeof session.errorMessage === "string" && session.errorMessage.trim() ? session.errorMessage.trim() : "Provider reported an error";
+            this.providerErrorReason = errorReason;
+            this.activeModal = null;
+            this.responseSettleIgnoreUntil = Date.now() + retryDelayMs + this.timeouts.outputSettle + 400;
+            this.setStatus("generating", "provider_error_retry_scheduled");
+            this.recordTrace("provider_error_retry_scheduled", {
+              retryPrompt,
+              retryDelayMs,
+              retryAttempt,
+              retryMaxAttempts,
+              errorReason,
+              parsedStatus: ctx.parsedStatus || ctx.status
+            });
+            this.onStatusChange?.();
+            this.providerErrorRetryTimer = setTimeout(() => {
+              this.providerErrorRetryTimer = null;
+              this.providerErrorRetryKey = "";
+              if (!this.ptyProcess) return;
+              this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+              this.submitRetryUsed = false;
+              this.recordTrace("provider_error_retry_write", {
+                retryPrompt,
+                retryAttempt,
+                retryMaxAttempts,
+                errorReason
+              });
+              this.ptyProcess.write(`${retryPrompt}\r`);
+              if (this.settleTimer) clearTimeout(this.settleTimer);
+              this.settleTimer = setTimeout(() => {
+                this.settleTimer = null;
+                this.settledBuffer = this.recentOutputBuffer;
+                this.evaluateSettled();
+              }, this.timeouts.outputSettle + 150);
+            }, retryDelayMs);
+            return true;
+          }
           applyIdle(ctx, now) {
             const { modal, lastParsedAssistant, prevStatus } = ctx;
             if (prevStatus === "waiting_approval") {
@@ -30862,11 +30927,17 @@ ${lastSnapshot}`;
     }
     function getSessionSeenAt(state, sessionId, providerSessionId) {
       const providerKey = buildSessionReadStateKey(sessionId, providerSessionId);
-      return state.sessionReads?.[providerKey] || state.sessionReads?.[sessionId] || 0;
+      return Math.max(state.sessionReads?.[providerKey] || 0, state.sessionReads?.[sessionId] || 0);
     }
     function getSessionSeenMarker(state, sessionId, providerSessionId) {
       const providerKey = buildSessionReadStateKey(sessionId, providerSessionId);
-      return state.sessionReadMarkers?.[providerKey] || state.sessionReadMarkers?.[sessionId] || "";
+      const providerSeenAt = state.sessionReads?.[providerKey] || 0;
+      const sessionSeenAt = state.sessionReads?.[sessionId] || 0;
+      const providerMarker = state.sessionReadMarkers?.[providerKey] || "";
+      const sessionMarker = state.sessionReadMarkers?.[sessionId] || "";
+      if (sessionSeenAt > providerSeenAt && sessionMarker) return sessionMarker;
+      if (providerSeenAt > sessionSeenAt && providerMarker) return providerMarker;
+      return providerMarker || sessionMarker;
     }
     function getSessionNotificationDismissal(state, sessionId, providerSessionId) {
       const providerKey = buildSessionReadStateKey(sessionId, providerSessionId);
@@ -39160,7 +39231,20 @@ ${effect.notification.body || ""}`.trim();
           if (visibleCount > excludeRecentCount) excludeRecentCount = visibleCount;
         }
         const workspace = typeof args?.workspace === "string" ? args.workspace : typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : void 0;
-        const result = readProviderChatHistory(agentStr, {
+        const exactNativeHistoryScope = Boolean(
+          typeof args?.targetSessionId === "string" && args.targetSessionId.trim() || typeof args?.historySessionId === "string" && args.historySessionId.trim() || typeof args?.providerSessionId === "string" && args.providerSessionId.trim()
+        );
+        const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory) ? readCliProviderNativeHistory(agentStr, {
+          canonicalHistory: provider?.canonicalHistory,
+          historySessionId,
+          workspace,
+          offset: offset || 0,
+          limit: limit || 30,
+          excludeRecentCount,
+          historyBehavior: provider?.historyBehavior,
+          scripts: provider?.scripts,
+          exactSessionScoped: exactNativeHistoryScope
+        }) : readProviderChatHistory(agentStr, {
           canonicalHistory: provider?.canonicalHistory,
           historySessionId,
           workspace,
@@ -39170,6 +39254,26 @@ ${effect.notification.body || ""}`.trim();
           historyBehavior: provider?.historyBehavior,
           scripts: provider?.scripts
         });
+        if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory)) {
+          const lookup = result.lookup === "workspace" ? "workspace" : "session";
+          const messages = Array.isArray(result.messages) ? normalizeNativeHistoryMessages(agentStr, result.messages) : [];
+          const historyProviderSessionId = typeof result?.providerSessionId === "string" ? result.providerSessionId : readHistorySessionIdFromMessages(messages) || historySessionId;
+          const safeMapping = hasSafeNativeHistoryMapping({
+            historySessionId: lookup === "workspace" ? void 0 : historySessionId,
+            providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId,
+            workspace,
+            nativeMessages: messages
+          });
+          if (result.source === "provider-native" && messages.length > 0 && !safeMapping) {
+            return {
+              success: true,
+              messages: [],
+              hasMore: false,
+              source: "native-unavailable",
+              agent: agentStr
+            };
+          }
+        }
         return { success: true, ...result, agent: agentStr };
       } catch (e) {
         return { success: false, error: e.message };
@@ -41779,6 +41883,16 @@ ${effect.notification.body || ""}`.trim();
       }
       return normalizedId;
     }
+    function isIdleStatus(value) {
+      const status = typeof value === "string" ? value.trim().toLowerCase() : "";
+      return !status || status === "idle" || status === "ready";
+    }
+    function getMessageTime(message) {
+      if (!message || typeof message !== "object") return 0;
+      const record2 = message;
+      const value = Number(record2.receivedAt ?? record2.timestamp ?? 0);
+      return Number.isFinite(value) ? value : 0;
+    }
     var COMPLETED_FINALIZATION_RETRY_MS = 1e3;
     var COMPLETED_FINALIZATION_MAX_WAIT_MS = 3e4;
     var IMAGE_MIME_EXTENSIONS = {
@@ -42040,7 +42154,7 @@ ${effect.notification.body || ""}`.trim();
         await this.adapter.spawn();
         await this.enforceFreshSessionLaunchIfNeeded();
         this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
-        if (this.providerSessionId) {
+        if (this.providerSessionId && this.shouldHydrateExistingProviderHistory()) {
           this.restorePersistedHistoryFromCurrentSession();
         }
         if (this.providerSessionId && this.launchMode === "resume") {
@@ -42122,28 +42236,37 @@ ${effect.notification.body || ""}`.trim();
           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 runtime = this.adapter.getRuntimeMetadata();
+        this.maybeAppendRuntimeRecoveryMessage(runtime);
+        let parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
         const parsedProviderSessionId = normalizeProviderSessionId(
           this.provider,
           typeof parsedStatus?.providerSessionId === "string" ? parsedStatus.providerSessionId : ""
         );
-        if (parsedProviderSessionId) {
+        const suppressFreshLaunchStartupReplay = this.shouldSuppressFreshLaunchStartupReplay(
+          parsedMessages,
+          parsedStatus,
+          adapterStatus,
+          parsedProviderSessionId
+        );
+        if (adapterProviderSessionId && !suppressFreshLaunchStartupReplay) {
+          this.promoteProviderSessionId(adapterProviderSessionId);
+        }
+        if (parsedProviderSessionId && !suppressFreshLaunchStartupReplay) {
           this.promoteProviderSessionId(parsedProviderSessionId);
         }
-        const runtime = this.adapter.getRuntimeMetadata();
-        this.maybeAppendRuntimeRecoveryMessage(runtime);
+        if (suppressFreshLaunchStartupReplay) {
+          parsedMessages = [];
+        }
         const activeChatId = this.providerSessionId || runtime?.runtimeId || this.instanceId;
-        let parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
         const historyMessageCount = Number.isFinite(parsedStatus?.historyMessageCount) ? Math.max(0, Number(parsedStatus.historyMessageCount)) : null;
         if (historyMessageCount !== null) {
           parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
         }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
-        const canonicalBackedHistory = this.syncCanonicalSavedHistoryIfNeeded();
+        const canonicalBackedHistory = this.shouldHydrateExistingProviderHistory() ? this.syncCanonicalSavedHistoryIfNeeded() : false;
         const statusMessages = canonicalBackedHistory && this.lastPersistedHistoryMessages.length > 0 ? this.lastPersistedHistoryMessages.map((message) => ({
           role: message.role,
           content: message.content,
@@ -42186,7 +42309,10 @@ ${effect.notification.body || ""}`.trim();
             this.lastPersistedHistoryMessages = normalizedMessagesToSave;
           }
         }
-        this.applyProviderResponse(parsedStatus, { phase: "immediate" });
+        this.applyProviderResponse(
+          suppressFreshLaunchStartupReplay && parsedStatus && typeof parsedStatus === "object" ? { ...parsedStatus, providerSessionId: void 0 } : parsedStatus,
+          { phase: "immediate" }
+        );
         const surface = resolveProviderStateSurface({
           summaryMetadata: this.summaryMetadata,
           controlValues: this.controlValues
@@ -42938,7 +43064,9 @@ ${effect.notification.body || ""}`.trim();
         this.providerSessionId = nextSessionId;
         this.historyWriter.promoteHistorySession(this.type, previousHistorySessionId, nextSessionId);
         this.historyWriter.writeSessionStart(this.type, nextSessionId, this.workingDir, this.instanceId);
-        this.restorePersistedHistoryFromCurrentSession();
+        if (this.shouldHydrateExistingProviderHistory()) {
+          this.restorePersistedHistoryFromCurrentSession();
+        }
         this.adapter.updateRuntimeMeta({ providerSessionId: nextSessionId });
         this.onProviderSessionResolved?.({
           instanceId: this.instanceId,
@@ -42950,6 +43078,18 @@ ${effect.notification.body || ""}`.trim();
         });
         LOG2.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
       }
+      shouldHydrateExistingProviderHistory() {
+        return this.launchMode === "resume" || this.launchMode === "manual";
+      }
+      shouldSuppressFreshLaunchStartupReplay(parsedMessages, parsedStatus, adapterStatus, parsedProviderSessionId = "") {
+        if (this.launchMode !== "new") return false;
+        if (this.providerSessionId) return false;
+        if (!Array.isArray(parsedMessages) || parsedMessages.length === 0) return false;
+        if (!isIdleStatus(adapterStatus?.status) || !isIdleStatus(parsedStatus?.status)) return false;
+        if (parsedProviderSessionId) return true;
+        const newestMessageAt = parsedMessages.reduce((newest, message) => Math.max(newest, getMessageTime(message)), 0);
+        return newestMessageAt === 0;
+      }
       syncCanonicalSavedHistoryIfNeeded() {
         if (!this.providerSessionId) return false;
         const canonicalHistory = this.provider.canonicalHistory;
@@ -53489,7 +53629,8 @@ ${block2}`);
           update: null
         };
       }
-      const fullMessages = normalizeChatMessages(Array.isArray(result.messages) ? result.messages : []);
+      const rawMessages = Array.isArray(result.messages) ? result.messages : Array.isArray(result.messagesTail) ? result.messagesTail : [];
+      const fullMessages = normalizeChatMessages(rawMessages);
       const messages = fullMessages;
       const title = typeof result.title === "string" ? result.title : void 0;
       const activeModal = normalizeChatTailActiveModal(result.activeModal);