@adhdev/daemon-standalone 0.9.36 → 0.9.38

package/dist/index.js

@@ -29560,27 +29560,86 @@ var require_dist2 = __commonJS({
     function hydrateCliParsedMessages(parsedMessages, options) {
       const { committedMessages, scope, lastOutputAt } = options;
       const referenceMessages = [...committedMessages];
-      const referenceComparables = referenceMessages.map((message) => normalizeComparableMessageContent(message?.content || ""));
+      const referenceComparables = new Array(referenceMessages.length);
       const usedReferenceIndexes = /* @__PURE__ */ new Set();
       const now = options.now ?? Date.now();
-      const findReferenceTimestamp = (role, content, parsedIndex) => {
+      let exactReferenceIndexesByKey = null;
+      const exactReferenceCursorByKey = /* @__PURE__ */ new Map();
+      const hasFiniteTimestamp = (message) => typeof message?.timestamp === "number" && Number.isFinite(message.timestamp);
+      const getReferenceComparable = (index) => {
+        if (typeof referenceComparables[index] === "string") return referenceComparables[index] || "";
+        const comparable = normalizeComparableMessageContent(referenceMessages[index]?.content || "");
+        referenceComparables[index] = comparable;
+        return comparable;
+      };
+      const messagesShareStableIdentity = (parsed, reference) => {
+        if (!parsed || !reference) return false;
+        const parsedId = typeof parsed.id === "string" ? parsed.id.trim() : "";
+        const referenceId = typeof reference.id === "string" ? reference.id.trim() : "";
+        if (parsedId && referenceId && parsedId === referenceId) return true;
+        return typeof parsed.index === "number" && Number.isFinite(parsed.index) && typeof reference.index === "number" && Number.isFinite(reference.index) && parsed.index === reference.index;
+      };
+      const exactReferenceKey = (role, comparable) => `${role}\0${comparable}`;
+      const ensureExactReferenceIndex = () => {
+        if (exactReferenceIndexesByKey) return exactReferenceIndexesByKey;
+        const byKey = /* @__PURE__ */ new Map();
+        for (let i = 0; i < referenceMessages.length; i++) {
+          const candidate = referenceMessages[i];
+          if (!candidate || candidate.role !== "user" && candidate.role !== "assistant" || !hasFiniteTimestamp(candidate)) continue;
+          const comparable = getReferenceComparable(i);
+          if (!comparable) continue;
+          const key = exactReferenceKey(candidate.role, comparable);
+          const indexes = byKey.get(key);
+          if (indexes) {
+            indexes.push(i);
+          } else {
+            byKey.set(key, [i]);
+          }
+        }
+        exactReferenceIndexesByKey = byKey;
+        return byKey;
+      };
+      const takeExactReferenceTimestamp = (role, normalizedContent) => {
+        const key = exactReferenceKey(role, normalizedContent);
+        const indexes = ensureExactReferenceIndex().get(key);
+        if (!indexes) return void 0;
+        let cursor = exactReferenceCursorByKey.get(key) || 0;
+        while (cursor < indexes.length) {
+          const candidateIndex = indexes[cursor];
+          cursor += 1;
+          if (usedReferenceIndexes.has(candidateIndex)) continue;
+          const candidate = referenceMessages[candidateIndex];
+          if (!candidate || candidate.role !== role || !hasFiniteTimestamp(candidate)) continue;
+          usedReferenceIndexes.add(candidateIndex);
+          exactReferenceCursorByKey.set(key, cursor);
+          return candidate.timestamp;
+        }
+        exactReferenceCursorByKey.set(key, cursor);
+        return void 0;
+      };
+      const findReferenceTimestamp = (message, role, content, parsedIndex) => {
+        const sameIndex = referenceMessages[parsedIndex];
+        if (sameIndex && !usedReferenceIndexes.has(parsedIndex) && sameIndex.role === role && hasFiniteTimestamp(sameIndex) && messagesShareStableIdentity(message, sameIndex)) {
+          usedReferenceIndexes.add(parsedIndex);
+          return sameIndex.timestamp;
+        }
         const normalizedContent = normalizeComparableMessageContent(content);
         if (!normalizedContent) return void 0;
-        const sameIndex = referenceMessages[parsedIndex];
-        if (sameIndex && !usedReferenceIndexes.has(parsedIndex) && sameIndex.role === role && referenceComparables[parsedIndex] === normalizedContent && typeof sameIndex.timestamp === "number" && Number.isFinite(sameIndex.timestamp)) {
+        if (sameIndex && !usedReferenceIndexes.has(parsedIndex) && sameIndex.role === role && getReferenceComparable(parsedIndex) === normalizedContent && hasFiniteTimestamp(sameIndex)) {
           usedReferenceIndexes.add(parsedIndex);
           return sameIndex.timestamp;
         }
+        const exactTimestamp = takeExactReferenceTimestamp(role, normalizedContent);
+        if (typeof exactTimestamp === "number") return exactTimestamp;
         for (let i = 0; i < referenceMessages.length; i++) {
           if (usedReferenceIndexes.has(i)) continue;
           const candidate = referenceMessages[i];
           if (!candidate || candidate.role !== role) continue;
-          const candidateContent = referenceComparables[i];
+          const candidateContent = getReferenceComparable(i);
           if (!candidateContent) continue;
-          const exactMatch = candidateContent === normalizedContent;
           const fuzzyMatch = candidateContent.includes(normalizedContent) || normalizedContent.includes(candidateContent);
-          if (!exactMatch && !fuzzyMatch) continue;
-          if (typeof candidate.timestamp === "number" && Number.isFinite(candidate.timestamp)) {
+          if (!fuzzyMatch) continue;
+          if (hasFiniteTimestamp(candidate)) {
             usedReferenceIndexes.add(i);
             return candidate.timestamp;
           }
@@ -29591,7 +29650,7 @@ var require_dist2 = __commonJS({
         const role = message.role;
         const content = typeof message.content === "string" ? message.content : String(message.content || "");
         const parsedTimestamp = typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : void 0;
-        const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(role, content, index);
+        const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(message, role, content, index);
         const fallbackTimestamp = role === "user" ? scope?.startedAt || now : lastOutputAt || scope?.startedAt || now;
         const timestamp = referenceTimestamp ?? fallbackTimestamp;
         return {
@@ -31208,11 +31267,12 @@ var require_dist2 = __commonJS({
             };
           }
           // ─── Public API (CliAdapter) ───────────────────
-          getStatus() {
-            const startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
+          getStatus(options = {}) {
+            const allowParse = options.allowParse !== false;
+            const startupModal = allowParse && this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
             let effectiveStatus = this.projectEffectiveStatus(startupModal);
             let effectiveModal = startupModal || this.activeModal;
-            if (!startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === "function") {
+            if (allowParse && !startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === "function") {
               let parsed = this.getFreshParsedStatusCache();
               if (!parsed && effectiveStatus !== "idle") {
                 const now = Date.now();
@@ -40991,17 +41051,24 @@ ${effect.notification.body || ""}`.trim();
         normalizePersistableCliHistoryContent(message.content)
       ].join("|");
     }
+    function hasSamePersistableCliHistoryIdentity(a, b2) {
+      return String(a?.role || "") === String(b2?.role || "") && String(a?.kind || "") === String(b2?.kind || "") && String(a?.senderName || "") === String(b2?.senderName || "") && String(a?.content || "") === String(b2?.content || "");
+    }
     function buildIncrementalHistoryAppendMessages(previousMessages, currentMessages) {
       if (!Array.isArray(currentMessages) || currentMessages.length === 0) return [];
       if (!Array.isArray(previousMessages) || previousMessages.length === 0) return currentMessages;
-      const previousSignatures = previousMessages.map(buildPersistableCliHistorySignature);
-      const currentSignatures = currentMessages.map(buildPersistableCliHistorySignature);
+      const comparableLength = Math.min(previousMessages.length, currentMessages.length);
       let sharedPrefixLength = 0;
-      while (sharedPrefixLength < previousSignatures.length && sharedPrefixLength < currentSignatures.length && previousSignatures[sharedPrefixLength] === currentSignatures[sharedPrefixLength]) {
+      while (sharedPrefixLength < comparableLength && hasSamePersistableCliHistoryIdentity(previousMessages[sharedPrefixLength], currentMessages[sharedPrefixLength])) {
         sharedPrefixLength += 1;
       }
-      if (sharedPrefixLength === currentSignatures.length) return [];
-      if (sharedPrefixLength === previousSignatures.length) return currentMessages.slice(sharedPrefixLength);
+      if (sharedPrefixLength === currentMessages.length) return [];
+      if (sharedPrefixLength === previousMessages.length) return currentMessages.slice(sharedPrefixLength);
+      while (sharedPrefixLength < comparableLength && buildPersistableCliHistorySignature(previousMessages[sharedPrefixLength]) === buildPersistableCliHistorySignature(currentMessages[sharedPrefixLength])) {
+        sharedPrefixLength += 1;
+      }
+      if (sharedPrefixLength === currentMessages.length) return [];
+      if (sharedPrefixLength === previousMessages.length) return currentMessages.slice(sharedPrefixLength);
       return currentMessages;
     }
     var CachedDatabaseSync = null;
@@ -41247,13 +41314,15 @@ ${effect.notification.body || ""}`.trim();
           }));
           if (!canonicalBackedHistory && !shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
             const incrementalMessages = buildIncrementalHistoryAppendMessages(this.lastPersistedHistoryMessages, normalizedMessagesToSave);
-            this.historyWriter.appendNewMessages(
-              this.type,
-              incrementalMessages,
-              parsedStatus?.title || dirName,
-              this.instanceId,
-              this.providerSessionId
-            );
+            if (incrementalMessages.length > 0) {
+              this.historyWriter.appendNewMessages(
+                this.type,
+                incrementalMessages,
+                parsedStatus?.title || dirName,
+                this.instanceId,
+                this.providerSessionId
+              );
+            }
           }
           if (!canonicalBackedHistory) {
             this.lastPersistedHistoryMessages = normalizedMessagesToSave;
@@ -41312,7 +41381,7 @@ ${effect.notification.body || ""}`.trim();
         return this.presentationMode;
       }
       getHotChatSessionState() {
-        const adapterStatus = this.adapter.getStatus();
+        const adapterStatus = this.adapter.getStatus({ allowParse: false });
         const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
         const visibleStatus = autoApproveActive ? "generating" : adapterStatus.status;
         const runtime = this.adapter.getRuntimeMetadata();