@adhdev/daemon-standalone 0.9.82-rc.130 → 0.9.82-rc.131

package/dist/index.js

@@ -39305,6 +39305,21 @@ ${effect.notification.body || ""}`.trim();
       });
       return { ...sessionHistory, lookup: "session" };
     }
+    function readLiveCodexWorkspaceNativeHistory(agentStr, args) {
+      if (agentStr !== "codex-cli") return null;
+      const workspace = typeof args.workspace === "string" ? args.workspace.trim() : "";
+      if (!workspace) return null;
+      const history = readProviderChatHistory(agentStr, {
+        canonicalHistory: args.canonicalHistory,
+        workspace,
+        offset: args.offset,
+        limit: args.limit,
+        excludeRecentCount: args.excludeRecentCount,
+        historyBehavior: args.historyBehavior,
+        scripts: args.scripts
+      });
+      return { ...history, lookup: "workspace" };
+    }
     function isNativeHistoryFreshEnough(args) {
       const nativeNewest = getMessageNewestReceivedAt(args.nativeMessages);
       const ptyNewest = getMessageNewestReceivedAt(args.ptyMessages);
@@ -40057,18 +40072,7 @@ ${effect.notification.body || ""}`.trim();
                   ptyStatusApprovalOnly: true
                 });
               } else {
-                const fallbackReason = buildNativeHistoryFallbackReason({
-                  providerType,
-                  provider,
-                  nativeSource: nativeHistory.source,
-                  nativeHistoryCoverage,
-                  unavailableReason,
-                  nativeMessageCount: nativeMessages.length,
-                  safeMapping,
-                  freshEnough
-                });
-                const unsafeNativeFallback = adapter.cliType === "codex-cli" && isUnsafeNativeTranscriptFallback(fallbackReason);
-                const safeCurrentRuntimePtyMessages = unsafeNativeFallback && isCurrentRuntimePtySafelyAttributed({
+                const liveCurrentRuntimePtySafe = isCurrentRuntimePtySafelyAttributed({
                   adapter,
                   helpers: h,
                   readChatArgs: args,
@@ -40076,57 +40080,130 @@ ${effect.notification.body || ""}`.trim();
                   intendedWorkspace,
                   ptyMessages: returnedMessages
                 });
-                const safeRuntimeAckMessages = unsafeNativeFallback && !safeCurrentRuntimePtyMessages ? selectRuntimeInputAckMessages(returnedMessages) : [];
-                const exactRuntimeMirrorMessages = unsafeNativeFallback && !safeCurrentRuntimePtyMessages && safeRuntimeAckMessages.length === 0 ? readExactRuntimeMirrorMessages({
-                  providerType,
-                  targetSessionId: typeof args?.targetSessionId === "string" ? args.targetSessionId : void 0,
-                  currentSessionId: typeof h.currentSession?.sessionId === "string" ? h.currentSession.sessionId : void 0,
-                  tailLimit: nativeHistoryLimit,
-                  historyBehavior: provider?.historyBehavior
-                }) : [];
-                const safeDaemonMessages = safeRuntimeAckMessages.length > 0 ? safeRuntimeAckMessages : exactRuntimeMirrorMessages;
-                if (unsafeNativeFallback) {
-                  if (safeCurrentRuntimePtyMessages) {
-                    selectedMessages = returnedMessages;
-                    selectedTranscriptAuthority = "daemon";
-                    selectedCoverage = coverage || "current-turn";
-                    selectedStatus = returnedStatus;
-                  } else {
-                    selectedMessages = safeDaemonMessages;
-                    selectedTranscriptAuthority = safeDaemonMessages.length > 0 ? "daemon" : void 0;
-                    selectedCoverage = safeDaemonMessages.length > 0 ? "tail" : void 0;
-                    selectedStatus = coerceUnsafeNativeFallbackStatus(returnedStatus, activeModal);
-                  }
-                }
-                messageSource = buildCliMessageSourceProvenance({
-                  selected: "pty-parser",
-                  provider: adapter.cliType,
-                  nativeHandle: historyProviderSessionId || nativeHistorySessionId || historySessionId,
-                  sessionWorkspace,
-                  intendedWorkspace,
-                  transcriptWorkspace,
-                  fallbackReason,
-                  nativeSource: nativeHistory.source,
-                  sourcePath: nativeHistory.sourcePath,
-                  sourceMtimeMs: nativeHistory.sourceMtimeMs,
-                  nativeHistoryCoverage,
-                  partialReason,
-                  unavailableReason,
-                  nativeMessages,
+                const mayProbeLiveCodexWorkspaceNative = adapter.cliType === "codex-cli" && liveCurrentRuntimePtySafe && !(typeof args?.providerSessionId === "string" && args.providerSessionId.trim()) && !(providerSessionId && providerSessionId.trim()) && (!historyProviderSessionId || historyProviderSessionId === nativeHistorySessionId || historyProviderSessionId === historySessionId);
+                const liveWorkspaceNativeHistory = mayProbeLiveCodexWorkspaceNative ? readLiveCodexWorkspaceNativeHistory(agentStr, {
+                  canonicalHistory: provider?.canonicalHistory,
+                  workspace,
+                  offset: 0,
+                  limit: nativeHistoryLimit,
+                  excludeRecentCount: 0,
+                  historyBehavior: provider?.historyBehavior,
+                  scripts: provider?.scripts
+                }) : null;
+                const liveWorkspaceNativeMessages = Array.isArray(liveWorkspaceNativeHistory?.messages) ? normalizeNativeHistoryMessages(agentStr, liveWorkspaceNativeHistory.messages, liveWorkspaceNativeHistory?.providerSessionId) : [];
+                const liveWorkspaceNativeProviderSessionId = typeof liveWorkspaceNativeHistory?.providerSessionId === "string" ? liveWorkspaceNativeHistory.providerSessionId : readHistorySessionIdFromMessages(liveWorkspaceNativeMessages);
+                const liveWorkspaceTranscriptWorkspace = typeof liveWorkspaceNativeHistory?.workspace === "string" ? liveWorkspaceNativeHistory.workspace : liveWorkspaceNativeMessages.map((message) => typeof message?.workspace === "string" ? message.workspace.trim() : "").find(Boolean);
+                const liveWorkspaceNativeSafeMapping = liveWorkspaceNativeMessages.length > 0 && hasSafeNativeHistoryMapping({
+                  workspace,
+                  nativeMessages: liveWorkspaceNativeMessages,
                   ptyMessages: returnedMessages,
-                  returnedMessages: unsafeNativeFallback && !safeCurrentRuntimePtyMessages ? safeDaemonMessages : returnedMessages,
-                  safeMapping,
-                  freshEnough,
-                  ptyStatusApprovalOnly: unsafeNativeFallback && !safeCurrentRuntimePtyMessages
+                  requireWorkspaceContentOverlap: true
+                });
+                const liveWorkspaceNativeFreshEnough = liveWorkspaceNativeMessages.length > 0 && isNativeHistoryFreshEnough({
+                  sourceMtimeMs: liveWorkspaceNativeHistory?.sourceMtimeMs,
+                  nativeMessages: liveWorkspaceNativeMessages,
+                  ptyMessages: returnedMessages
                 });
-                if (safeCurrentRuntimePtyMessages) {
-                  messageSource.selectedDaemonSource = "current-runtime-pty";
-                  messageSource.transcriptAuthority = "daemon";
+                const liveWorkspaceNativeUsable = liveWorkspaceNativeHistory?.source === "provider-native" && liveWorkspaceNativeMessages.length > 0 && liveWorkspaceNativeHistory?.nativeHistoryCoverage !== "partial" && liveWorkspaceNativeHistory?.nativeHistoryCoverage !== "unavailable" && liveWorkspaceNativeSafeMapping && liveWorkspaceNativeFreshEnough;
+                if (liveWorkspaceNativeUsable) {
+                  selectedMessages = finalizeStreamingMessagesWhenIdle(liveWorkspaceNativeMessages, returnedStatus);
+                  selectedProviderSessionId = liveWorkspaceNativeProviderSessionId || providerSessionId;
+                  selectedTranscriptAuthority = "provider";
+                  selectedCoverage = liveWorkspaceNativeHistory.hasMore ? "tail" : "full";
+                  messageSource = buildCliMessageSourceProvenance({
+                    selected: "native-history",
+                    provider: adapter.cliType,
+                    nativeHandle: selectedProviderSessionId || nativeHistorySessionId || historySessionId,
+                    sessionWorkspace,
+                    intendedWorkspace,
+                    transcriptWorkspace: liveWorkspaceTranscriptWorkspace,
+                    nativeSource: liveWorkspaceNativeHistory.source,
+                    sourcePath: liveWorkspaceNativeHistory.sourcePath,
+                    sourceMtimeMs: liveWorkspaceNativeHistory.sourceMtimeMs,
+                    nativeHistoryCoverage: liveWorkspaceNativeHistory.nativeHistoryCoverage,
+                    partialReason: liveWorkspaceNativeHistory.partialReason,
+                    unavailableReason: liveWorkspaceNativeHistory.unavailableReason,
+                    nativeMessages: liveWorkspaceNativeMessages,
+                    ptyMessages: returnedMessages,
+                    returnedMessages: selectedMessages,
+                    safeMapping: true,
+                    freshEnough: true,
+                    ptyStatusApprovalOnly: true
+                  });
+                  messageSource.selectedDaemonSource = "live-workspace-native-history";
                   messageSource.runtimeMappingSafe = true;
-                }
-                if (unsafeNativeFallback && exactRuntimeMirrorMessages.length > 0) {
-                  messageSource.selectedDaemonSource = "exact-runtime-mirror";
-                  messageSource.transcriptAuthority = "daemon";
+                } else {
+                  const fallbackReason = buildNativeHistoryFallbackReason({
+                    providerType,
+                    provider,
+                    nativeSource: nativeHistory.source,
+                    nativeHistoryCoverage,
+                    unavailableReason,
+                    nativeMessageCount: nativeMessages.length,
+                    safeMapping,
+                    freshEnough
+                  });
+                  const unsafeNativeFallback = adapter.cliType === "codex-cli" && isUnsafeNativeTranscriptFallback(fallbackReason);
+                  const safeCurrentRuntimePtyMessages = unsafeNativeFallback && isCurrentRuntimePtySafelyAttributed({
+                    adapter,
+                    helpers: h,
+                    readChatArgs: args,
+                    sessionWorkspace,
+                    intendedWorkspace,
+                    ptyMessages: returnedMessages
+                  });
+                  const safeRuntimeAckMessages = unsafeNativeFallback && !safeCurrentRuntimePtyMessages ? selectRuntimeInputAckMessages(returnedMessages) : [];
+                  const exactRuntimeMirrorMessages = unsafeNativeFallback && !safeCurrentRuntimePtyMessages && safeRuntimeAckMessages.length === 0 ? readExactRuntimeMirrorMessages({
+                    providerType,
+                    targetSessionId: typeof args?.targetSessionId === "string" ? args.targetSessionId : void 0,
+                    currentSessionId: typeof h.currentSession?.sessionId === "string" ? h.currentSession.sessionId : void 0,
+                    tailLimit: nativeHistoryLimit,
+                    historyBehavior: provider?.historyBehavior
+                  }) : [];
+                  const safeDaemonMessages = safeRuntimeAckMessages.length > 0 ? safeRuntimeAckMessages : exactRuntimeMirrorMessages;
+                  if (unsafeNativeFallback) {
+                    if (safeCurrentRuntimePtyMessages) {
+                      selectedMessages = returnedMessages;
+                      selectedTranscriptAuthority = "daemon";
+                      selectedCoverage = coverage || "current-turn";
+                      selectedStatus = returnedStatus;
+                    } else {
+                      selectedMessages = safeDaemonMessages;
+                      selectedTranscriptAuthority = safeDaemonMessages.length > 0 ? "daemon" : void 0;
+                      selectedCoverage = safeDaemonMessages.length > 0 ? "tail" : void 0;
+                      selectedStatus = coerceUnsafeNativeFallbackStatus(returnedStatus, activeModal);
+                    }
+                  }
+                  messageSource = buildCliMessageSourceProvenance({
+                    selected: "pty-parser",
+                    provider: adapter.cliType,
+                    nativeHandle: historyProviderSessionId || nativeHistorySessionId || historySessionId,
+                    sessionWorkspace,
+                    intendedWorkspace,
+                    transcriptWorkspace,
+                    fallbackReason,
+                    nativeSource: nativeHistory.source,
+                    sourcePath: nativeHistory.sourcePath,
+                    sourceMtimeMs: nativeHistory.sourceMtimeMs,
+                    nativeHistoryCoverage,
+                    partialReason,
+                    unavailableReason,
+                    nativeMessages,
+                    ptyMessages: returnedMessages,
+                    returnedMessages: unsafeNativeFallback && !safeCurrentRuntimePtyMessages ? safeDaemonMessages : returnedMessages,
+                    safeMapping,
+                    freshEnough,
+                    ptyStatusApprovalOnly: unsafeNativeFallback && !safeCurrentRuntimePtyMessages
+                  });
+                  if (safeCurrentRuntimePtyMessages) {
+                    messageSource.selectedDaemonSource = "current-runtime-pty";
+                    messageSource.transcriptAuthority = "daemon";
+                    messageSource.runtimeMappingSafe = true;
+                  }
+                  if (unsafeNativeFallback && exactRuntimeMirrorMessages.length > 0) {
+                    messageSource.selectedDaemonSource = "exact-runtime-mirror";
+                    messageSource.transcriptAuthority = "daemon";
+                  }
                 }
               }
             }