@adhdev/daemon-standalone 0.9.82-rc.127 → 0.9.82-rc.129

package/dist/index.js

@@ -39133,9 +39133,9 @@ ${effect.notification.body || ""}`.trim();
           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
         }
       };
     }
@@ -39151,6 +39151,42 @@ ${effect.notification.body || ""}`.trim();
       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 isRuntimeInputAckMessage(message) {
+      if (!message || typeof message !== "object") return false;
+      const role = String(message.role || "").trim().toLowerCase();
+      if (role !== "user" && role !== "human") return false;
+      const meta3 = message.meta;
+      return !!meta3 && typeof meta3 === "object" && !Array.isArray(meta3) && meta3.runtimeInputAck === true;
+    }
+    function selectRuntimeInputAckMessages(messages) {
+      return messages.filter((message) => isRuntimeInputAckMessage(message));
+    }
+    function readExactRuntimeMirrorMessages(args) {
+      const targetSessionId = String(args.targetSessionId || "").trim();
+      const currentSessionId = String(args.currentSessionId || "").trim();
+      if (!targetSessionId || targetSessionId !== currentSessionId) return [];
+      const history = readChatHistory(
+        args.providerType,
+        0,
+        Math.max(args.tailLimit || 0, 200),
+        targetSessionId,
+        0,
+        args.historyBehavior
+      );
+      return normalizeChatMessages(history.messages || []).filter((message) => {
+        const historySessionId = String(message.historySessionId || "").trim();
+        const instanceId = String(message.instanceId || "").trim();
+        return historySessionId === targetSessionId || instanceId === targetSessionId;
+      });
+    }
     function supportsCliNativeTranscript(providerType, provider) {
       if (CLI_NATIVE_TRANSCRIPT_PROVIDERS.has(providerType)) return true;
       return provider?.category === "cli" && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
@@ -39886,6 +39922,7 @@ ${effect.notification.body || ""}`.trim();
           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({
@@ -39997,6 +40034,22 @@ ${effect.notification.body || ""}`.trim();
                   safeMapping,
                   freshEnough
                 });
+                const unsafeNativeFallback = adapter.cliType === "codex-cli" && isUnsafeNativeTranscriptFallback(fallbackReason);
+                const safeRuntimeAckMessages = unsafeNativeFallback ? selectRuntimeInputAckMessages(returnedMessages) : [];
+                const exactRuntimeMirrorMessages = unsafeNativeFallback && 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) {
+                  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,
@@ -40013,18 +40066,22 @@ ${effect.notification.body || ""}`.trim();
                   unavailableReason,
                   nativeMessages,
                   ptyMessages: returnedMessages,
-                  returnedMessages,
+                  returnedMessages: unsafeNativeFallback ? safeDaemonMessages : returnedMessages,
                   safeMapping,
                   freshEnough,
-                  ptyStatusApprovalOnly: false
+                  ptyStatusApprovalOnly: unsafeNativeFallback
                 });
+                if (unsafeNativeFallback && exactRuntimeMirrorMessages.length > 0) {
+                  messageSource.selectedDaemonSource = "exact-runtime-mirror";
+                  messageSource.transcriptAuthority = "daemon";
+                }
               }
             }
           }
           LOG2.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,
@@ -40033,10 +40090,10 @@ ${effect.notification.body || ""}`.trim();
               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
             },
@@ -40352,14 +40409,14 @@ ${effect.notification.body || ""}`.trim();
           try {
             const hasStructuredParts = input.parts.some((part) => part.type !== "text");
             if (hasStructuredParts) {
-              const target = getTargetInstance(h, args);
-              if (!target || target.category !== "cli") {
+              const target2 = getTargetInstance(h, args);
+              if (!target2 || target2.category !== "cli") {
                 return { success: false, error: `CLI instance not found for ${provider?.type || args?.agentType || "unknown"}` };
               }
               assertProviderSupportsDeclaredInput(provider, input);
               await waitOnceForFreshHermesCliStart(adapter, _log);
-              target.onEvent("send_message", { input });
-              return _logSendSuccess(`${transport}-instance`, target.type);
+              target2.onEvent("send_message", { input });
+              return _logSendSuccess(`${transport}-instance`, target2.type);
             }
             assertTextOnlyInput(provider, input);
             if (!text) return { success: false, error: "text required for PTY send" };
@@ -40372,6 +40429,10 @@ ${effect.notification.body || ""}`.trim();
             } else {
               await adapter.sendMessage(text);
             }
+            const target = getTargetInstance(h, args);
+            if (target?.category === "cli" && target.type === adapter.cliType && typeof target.recordAcknowledgedUserInput === "function") {
+              target.recordAcknowledgedUserInput(input);
+            }
             return {
               ..._logSendSuccess(`${transport}-adapter`, adapter.cliType),
               ...forceSend ? { forceSent: true } : {}
@@ -43019,6 +43080,26 @@ ${effect.notification.body || ""}`.trim();
           this.applyProviderResponse(data, { phase: "immediate" });
         }
       }
+      recordAcknowledgedUserInput(input) {
+        const content = typeof input === "string" ? input.trim() : buildCliStructuredInputPrompt(input).trim();
+        if (!content) return;
+        const receivedAt = Date.now();
+        const dedupKey = `user_input_ack:${crypto3.createHash("sha256").update(`${this.instanceId}:${content}:${receivedAt}`).digest("hex").slice(0, 24)}`;
+        this.appendRuntimeMessage(buildChatMessage({
+          role: "user",
+          senderName: "User",
+          kind: "standard",
+          content,
+          receivedAt,
+          timestamp: receivedAt,
+          source: "runtime_input_ack",
+          meta: {
+            runtimeInputAck: true,
+            provider: this.type,
+            workspace: this.workingDir
+          }
+        }), dedupKey);
+      }
       dispose() {
         this.adapter.shutdown();
         this.monitor.reset();
@@ -43628,17 +43709,28 @@ ${effect.notification.body || ""}`.trim();
           index,
           source: "parsed"
         }));
+        const getRole = (message) => typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
         const runtimeEntries = this.runtimeMessages.map((entry, index) => ({
           message: entry.message,
           index: parsedMessages.length + index,
           source: "runtime",
           runtimeKey: entry.key
-        }));
+        })).filter((entry) => {
+          const meta3 = entry.message.meta && typeof entry.message.meta === "object" && !Array.isArray(entry.message.meta) ? entry.message.meta : {};
+          if (meta3.runtimeInputAck !== true) return true;
+          const runtimeText = flattenContent(entry.message.content).replace(/\s+/g, " ").trim();
+          if (!runtimeText) return false;
+          return !parsedEntries.some((parsedEntry) => {
+            const parsedRole = getRole(parsedEntry.message);
+            if (parsedRole !== "user" && parsedRole !== "human") return false;
+            const parsedText = flattenContent(parsedEntry.message.content).replace(/\s+/g, " ").trim();
+            return parsedText === runtimeText;
+          });
+        });
         const getTime = (message) => {
           const value = typeof message.receivedAt === "number" ? message.receivedAt : typeof message.timestamp === "number" ? message.timestamp : 0;
           return Number.isFinite(value) && value > 0 ? value : 0;
         };
-        const getRole = (message) => typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
         const isRuntimeOverlay = (entry) => {
           if (entry.source !== "runtime") return false;
           const key = typeof entry.runtimeKey === "string" ? entry.runtimeKey.trim().toLowerCase() : "";