@adhdev/daemon-core 0.9.82-rc.127 → 0.9.82-rc.128

package/dist/index.js

@@ -17107,9 +17107,9 @@ function buildCliMessageSourceProvenance(args) {
       ptyMessageCount: ptyMessages.length,
       returnedMessageCount: returnedMessages.length,
       safeMapping: args.safeMapping === true,
-      // true when native-history was selected: PTY message bodies are suppressed and
-      // must not be treated as chat content. PTY only contributes status/approval/screen evidence.
-      ptyMessagesSuppressed: args.selected === "native-history"
+      // true when PTY message bodies are suppressed and must not be treated as
+      // chat content. PTY may still contribute status/approval/screen evidence.
+      ptyMessagesSuppressed: args.selected === "native-history" || args.ptyStatusApprovalOnly === true
     }
   };
 }
@@ -17125,6 +17125,14 @@ function buildNativeHistoryFallbackReason(args) {
   if (!args.freshEnough) return "native_history_stale";
   return "native_history_not_selected";
 }
+function isUnsafeNativeTranscriptFallback(reason) {
+  const value = String(reason || "").trim();
+  return value.startsWith("native_history_unavailable") || value === "native_history_not_safely_mapped" || value === "native_history_stale" || value === "native_history_partial";
+}
+function coerceUnsafeNativeFallbackStatus(status, activeModal) {
+  if (status === "waiting_approval" && activeModal) return status;
+  return "idle";
+}
 function supportsCliNativeTranscript(providerType, provider) {
   if (CLI_NATIVE_TRANSCRIPT_PROVIDERS.has(providerType)) return true;
   return provider?.category === "cli" && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
@@ -17860,6 +17868,7 @@ async function handleReadChat(h, args) {
       let selectedProviderSessionId = providerSessionId;
       let selectedTranscriptAuthority = transcriptAuthority;
       let selectedCoverage = coverage;
+      let selectedStatus = returnedStatus;
       const sessionWorkspace = typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : typeof adapter.workingDir === "string" ? adapter.workingDir : void 0;
       const intendedWorkspace = typeof args?.workspace === "string" ? args.workspace : void 0;
       let messageSource = buildCliMessageSourceProvenance({
@@ -17971,6 +17980,13 @@ async function handleReadChat(h, args) {
               safeMapping,
               freshEnough
             });
+            const unsafeNativeFallback = adapter.cliType === "codex-cli" && isUnsafeNativeTranscriptFallback(fallbackReason);
+            if (unsafeNativeFallback) {
+              selectedMessages = [];
+              selectedTranscriptAuthority = void 0;
+              selectedCoverage = void 0;
+              selectedStatus = coerceUnsafeNativeFallbackStatus(returnedStatus, activeModal);
+            }
             messageSource = buildCliMessageSourceProvenance({
               selected: "pty-parser",
               provider: adapter.cliType,
@@ -17987,10 +18003,10 @@ async function handleReadChat(h, args) {
               unavailableReason,
               nativeMessages,
               ptyMessages: returnedMessages,
-              returnedMessages,
+              returnedMessages: unsafeNativeFallback ? [] : returnedMessages,
               safeMapping,
               freshEnough,
-              ptyStatusApprovalOnly: false
+              ptyStatusApprovalOnly: unsafeNativeFallback
             });
           }
         }
@@ -17998,7 +18014,7 @@ async function handleReadChat(h, args) {
       LOG.debug("Command", `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord.status || "")} parsedMsgCount=${parsedRecord.messages.length} returnedMsgCount=${returnedMessages.length}`);
       return buildReadChatCommandResult({
         messages: selectedMessages,
-        status: returnedStatus,
+        status: selectedStatus,
         activeModal,
         messageSource,
         transcriptProvenance: messageSource,
@@ -18007,10 +18023,10 @@ async function handleReadChat(h, args) {
           targetSessionId: String(args?.targetSessionId || ""),
           adapterStatus: String(adapterStatus.status || ""),
           parsedStatus: String(parsedRecord.status || ""),
-          returnedStatus: String(returnedStatus || ""),
+          returnedStatus: String(selectedStatus || ""),
           selectedMessageSource: messageSource.selected,
           messageSource,
-          shouldPreferAdapterMessages: supportsCliNativeTranscript(providerType, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory) && messageSource.selected !== "native-history" && typeof messageSource.fallbackReason === "string" && messageSource.fallbackReason.startsWith("native_history_") && messageSource.fallbackReason !== "native_history_not_checked" && !(selectedTranscriptAuthority === "provider" && selectedCoverage === "full"),
+          shouldPreferAdapterMessages: supportsCliNativeTranscript(providerType, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory) && messageSource.selected !== "native-history" && typeof messageSource.fallbackReason === "string" && messageSource.fallbackReason.startsWith("native_history_") && messageSource.fallbackReason !== "native_history_not_checked" && !isUnsafeNativeTranscriptFallback(messageSource.fallbackReason) && !(selectedTranscriptAuthority === "provider" && selectedCoverage === "full"),
           parsedMsgCount: parsedRecord.messages.length,
           returnedMsgCount: selectedMessages.length
         },