@adhdev/daemon-core 0.9.82-rc.176 → 0.9.82-rc.178

package/dist/config/chat-history.d.ts

@@ -113,6 +113,7 @@ export declare function readProviderChatHistory(agentType: string, options?: {
     excludeInProgressTurn?: boolean;
     sessionStartedAtMs?: number;
     envOverrides?: Record<string, string>;
+    forceRefresh?: boolean;
 }): {
     messages: HistoryMessage[];
     hasMore: boolean;

package/dist/index.js

@@ -12719,6 +12719,12 @@ function createNativeHistoryDispatcher(reader) {
     const requestedProviderSid = input.providerSessionId || "";
     const sourcePath = resolveSourcePath(reader, workspace, sessionId);
     if (!sourcePath) return null;
+    if (input.forceRefresh === true || input.args?.forceRefresh === true) {
+      try {
+        fs18.statSync(sourcePath);
+      } catch {
+      }
+    }
     const session = readByReader(reader, sourcePath, sessionId, workspace);
     if (!session) return null;
     if (requestedProviderSid && session.providerSessionId && session.providerSessionId !== requestedProviderSid) {
@@ -19673,7 +19679,7 @@ function normalizeProviderNativeHistoryRecords(agentType, historySessionId, reco
     return sanitizeHistoryMessage(agentType, base);
   }).filter(Boolean);
 }
-function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides) {
+function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh) {
   const fn = getProviderNativeHistoryScript(scripts, canonicalHistory, "readSession");
   if (!fn) return null;
   const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
@@ -19687,7 +19693,8 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
     excludeInProgressTurn: excludeInProgressTurn === true,
     sessionStartedAtMs,
     envOverrides,
-    args: { sessionId: normalizedSessionId, historySessionId: normalizedSessionId, workspace, excludeInProgressTurn: excludeInProgressTurn === true, sessionStartedAtMs, envOverrides }
+    forceRefresh: forceRefresh === true,
+    args: { sessionId: normalizedSessionId, historySessionId: normalizedSessionId, workspace, excludeInProgressTurn: excludeInProgressTurn === true, sessionStartedAtMs, envOverrides, forceRefresh: forceRefresh === true }
   });
   if (!result || typeof result !== "object") return null;
   const records = normalizeProviderNativeHistoryRecords(agentType, normalizedSessionId, result.messages || result.records);
@@ -19702,11 +19709,11 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
     unavailableReason: typeof result.unavailableReason === "string" ? result.unavailableReason.trim() : void 0
   };
 }
-function buildNativeHistoryReadResult(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides) {
+function buildNativeHistoryReadResult(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh) {
   const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
   const normalizedWorkspace = typeof workspace === "string" ? workspace.trim() : "";
   if (!canonicalHistory || !normalizedSessionId && !normalizedWorkspace || !isNativeSourceCanonicalHistory(canonicalHistory)) return null;
-  return callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, normalizedSessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides);
+  return callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, normalizedSessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh);
 }
 function materializeNativeHistoryToMirror(agentType, canonicalHistory, historySessionId, workspace, scripts) {
   const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
@@ -19735,7 +19742,7 @@ function isNativeSourceCanonicalHistory(canonicalHistory) {
 }
 function readProviderChatHistory(agentType, options = {}) {
   if (isNativeSourceCanonicalHistory(options.canonicalHistory) && (options.historySessionId || options.workspace)) {
-    const nativeResult = buildNativeHistoryReadResult(agentType, options.canonicalHistory, options.scripts, options.historySessionId, options.workspace, options.excludeInProgressTurn, options.sessionStartedAtMs, options.envOverrides);
+    const nativeResult = buildNativeHistoryReadResult(agentType, options.canonicalHistory, options.scripts, options.historySessionId, options.workspace, options.excludeInProgressTurn, options.sessionStartedAtMs, options.envOverrides, options.forceRefresh);
     if (!nativeResult) return { messages: [], hasMore: false, source: "native-unavailable" };
     return {
       ...pageHistoryRecords(agentType, nativeResult.records, options.offset || 0, options.limit || 30, options.excludeRecentCount || 0, options.historyBehavior),
@@ -28162,7 +28169,7 @@ var SpecCliAdapter = class {
         activeInteractivePrompt: this.activeInteractivePrompt
       };
     }
-    if (/busy|generating|working|running|thinking/i.test(lc + " " + state.label)) {
+    if (lc === "busy" || lc === "generating") {
       return { status: "generating", messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt };
     }
     return { status: "idle", messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt };
@@ -28296,13 +28303,37 @@ var SpecCliAdapter = class {
     return Promise.resolve({ ok: true, effects });
   }
   getDebugSnapshot() {
+    let screen = "";
+    let sections;
+    try {
+      screen = this.driver.snapshot();
+      const lines = screen.split("\n");
+      sections = {};
+      for (const sec of this.spec.layout?.sections ?? []) {
+        const from = sec.from_top;
+        const fromBottom = sec.from_bottom;
+        let start = 0;
+        let end = lines.length;
+        if (typeof from === "number") start = Math.max(0, from);
+        else if (typeof fromBottom === "number") start = Math.max(0, lines.length - fromBottom);
+        const until = sec.until;
+        if (until && typeof until === "object" && typeof until.section === "string") {
+          const ref = (this.spec.layout?.sections ?? []).find((s) => s.id === until.section);
+          if (ref && typeof ref.from_bottom === "number") end = Math.max(start, lines.length - ref.from_bottom);
+        }
+        sections[sec.id] = lines.slice(start, end).join("\n");
+      }
+    } catch {
+    }
     return {
       cliType: this.cliType,
       spec_id: this.spec.id,
       current_state: this.latestState,
       current_modal: this.latestModal,
       activeInteractivePrompt: this.activeInteractivePrompt,
-      exited: this.exited
+      exited: this.exited,
+      screen,
+      sections
     };
   }
   getRuntimeMetadata() {
@@ -29068,6 +29099,7 @@ var CliProviderInstance = class {
   }
   completedDebounceTimer = null;
   completedDebouncePending = null;
+  lastExternalCompletionProbe = null;
   async enforceFreshSessionLaunchIfNeeded() {
     const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
     if (!scriptName) return;
@@ -29100,11 +29132,44 @@ var CliProviderInstance = class {
     if (looksLikeActiveApprovalPromptText(content)) return false;
     return true;
   }
+  buildExternalTranscriptProbe(messages, sourcePath, sourceMtimeMs) {
+    const visibleMessages = messages.filter((message) => isUserFacingChatMessage(message));
+    const lastVisible = visibleMessages[visibleMessages.length - 1];
+    const readAt = Date.now();
+    const mtimeMs = Number(sourceMtimeMs) || 0;
+    return {
+      readAt,
+      msgCount: messages.length,
+      lastRole: typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : null,
+      lastKind: typeof lastVisible?.kind === "string" ? lastVisible.kind : null,
+      contentLen: lastVisible ? flattenContent(lastVisible.content).trim().length : 0,
+      sourcePath: typeof sourcePath === "string" && sourcePath ? sourcePath : null,
+      sourceMtimeMs: mtimeMs || null,
+      mtimeAgeMs: mtimeMs ? Math.max(0, readAt - mtimeMs) : null
+    };
+  }
+  recordPendingTranscriptProbe(pending) {
+    const probe = this.lastExternalCompletionProbe;
+    if (!probe) return null;
+    const history = pending.transcriptProbeHistory || [];
+    const last = history[history.length - 1];
+    if (!last || last.readAt !== probe.readAt || last.msgCount !== probe.msgCount || last.lastRole !== probe.lastRole || last.contentLen !== probe.contentLen) {
+      history.push(probe);
+      pending.transcriptProbeHistory = history.slice(-5);
+    }
+    return probe;
+  }
   readExternalCompletionMessages() {
     const adapterOwnsMessagesElsewhere = this.adapter?.chatMessagesOwnedExternally === true;
     if (!adapterOwnsMessagesElsewhere) return null;
     if (!this.providerSessionId) return null;
     if (!isNativeSourceCanonicalHistory(this.provider.nativeHistory)) return null;
+    if (this.lastExternalCompletionProbe?.sourcePath) {
+      try {
+        fs12.statSync(this.lastExternalCompletionProbe.sourcePath);
+      } catch {
+      }
+    }
     const restoredHistory = readProviderChatHistory(this.type, {
       canonicalHistory: this.provider.nativeHistory,
       historySessionId: this.providerSessionId,
@@ -29113,9 +29178,18 @@ var CliProviderInstance = class {
       limit: Number.MAX_SAFE_INTEGER,
       historyBehavior: this.provider.historyBehavior,
       scripts: this.provider.scripts,
-      sessionStartedAtMs: this.startedAt
+      sessionStartedAtMs: this.startedAt,
+      forceRefresh: true
     });
-    if (restoredHistory.source !== "provider-native") return null;
+    if (restoredHistory.source !== "provider-native") {
+      this.lastExternalCompletionProbe = null;
+      return null;
+    }
+    this.lastExternalCompletionProbe = this.buildExternalTranscriptProbe(
+      restoredHistory.messages,
+      restoredHistory.sourcePath,
+      restoredHistory.sourceMtimeMs
+    );
     return restoredHistory.messages;
   }
   completionFinalAssistantEvidence(parsedMessages) {
@@ -29153,6 +29227,9 @@ var CliProviderInstance = class {
       parseError = error?.message || String(error);
     }
     const evidence = this.completionFinalAssistantEvidence(parsed?.messages);
+    if (evidence.source === "external-native") {
+      this.recordPendingTranscriptProbe(args.pending);
+    }
     const visibleMessages = (Array.isArray(evidence.messages) ? evidence.messages : []).filter((message) => isUserFacingChatMessage(message));
     const lastVisible = visibleMessages[visibleMessages.length - 1];
     const lastVisibleRole = typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : null;
@@ -29181,7 +29258,8 @@ var CliProviderInstance = class {
       pendingFirstObservedAt: args.pending.firstObservedAt,
       pendingTimestamp: args.pending.timestamp,
       pendingDurationSec: args.pending.duration,
-      previousBlockReason: args.pending.loggedBlockReason || null
+      previousBlockReason: args.pending.loggedBlockReason || null,
+      transcriptProbeHistory: args.pending.transcriptProbeHistory || []
     };
   }
   hasAdapterPendingResponse() {
@@ -29239,6 +29317,11 @@ var CliProviderInstance = class {
     if (!finalAssistantEvidence.present) {
       if (adapterOwnsMessagesElsewhere) {
         if (finalAssistantEvidence.source === "external-native") {
+          const probe = this.recordPendingTranscriptProbe(pending);
+          if (probe && !pending.loggedTranscriptProbe) {
+            LOG.info("CLI", `[${this.type}] external transcript probe: msgCount=${probe.msgCount} lastRole=${probe.lastRole || "none"} lastKind=${probe.lastKind || "none"} contentLen=${probe.contentLen} sourceMtime=${probe.sourceMtimeMs ?? "unknown"} mtimeAge=${probe.mtimeAgeMs ?? "unknown"}ms`);
+            pending.loggedTranscriptProbe = true;
+          }
           return { reason: "missing_final_assistant", terminal: true };
         }
         if (this.provider.requiresFinalAssistantBeforeIdle === true) {