@adhdev/daemon-core 0.9.76-rc.54 → 0.9.76-rc.56

package/dist/index.js

@@ -12067,7 +12067,7 @@ function normalizeReadChatTailLimit(args) {
 }
 function normalizeReadChatMessages(payload) {
   const messages = Array.isArray(payload.messages) ? payload.messages : [];
-  return messages;
+  return normalizeChatMessages(messages);
 }
 function deriveHistoryDedupKey(message) {
   const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
@@ -15799,16 +15799,46 @@ ${effect.notification.body || ""}`.trim();
     const runtimeEntries = this.runtimeMessages.map((entry, index) => ({
       message: entry.message,
       index: parsedMessages.length + index,
-      source: "runtime"
+      source: "runtime",
+      runtimeKey: entry.key
     }));
     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() : "";
+      if (key.startsWith("auto_approval:")) return true;
+      return !isUserFacingChatMessage(entry.message);
+    };
+    const shouldKeepParsedBeforeUntimedRuntime = (message) => {
+      const role = getRole(message);
+      return role === "user" || role === "human";
+    };
+    const shouldKeepParsedAfterUntimedRuntime = (message) => {
+      const role = getRole(message);
+      if (role !== "assistant") return false;
+      const kind = resolveChatMessageKind(message);
+      return kind === "standard" || kind === "terminal";
+    };
     return normalizeChatMessages([...parsedEntries, ...runtimeEntries].sort((a, b) => {
       const aTime = getTime(a.message);
       const bTime = getTime(b.message);
       if (aTime && bTime && aTime !== bTime) return aTime - bTime;
+      if (a.source !== b.source && aTime !== bTime) {
+        const parsedEntry = a.source === "parsed" ? a : b.source === "parsed" ? b : null;
+        const runtimeEntry = a.source === "runtime" ? a : b.source === "runtime" ? b : null;
+        if (parsedEntry && runtimeEntry && isRuntimeOverlay(runtimeEntry) && getTime(parsedEntry.message) === 0 && getTime(runtimeEntry.message) > 0) {
+          if (shouldKeepParsedBeforeUntimedRuntime(parsedEntry.message)) {
+            return a.source === "parsed" ? -1 : 1;
+          }
+          if (shouldKeepParsedAfterUntimedRuntime(parsedEntry.message)) {
+            return a.source === "parsed" ? 1 : -1;
+          }
+        }
+      }
       return a.index - b.index;
     }).map((entry) => entry.message));
   }