@adhdev/daemon-standalone 0.9.35 → 0.9.37

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 {
@@ -30094,7 +30153,16 @@ var require_dist2 = __commonJS({
             if (baseMessages.length <= _ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT) return baseMessages;
             return baseMessages.slice(-_ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT);
           }
+          messagesShareStableIdentity(left, right) {
+            if (left === right) return true;
+            if (!left || !right) return false;
+            if ((left.role || "") !== (right.role || "")) return false;
+            if (left.id && right.id && String(left.id) === String(right.id)) return true;
+            if (typeof left.index === "number" && typeof right.index === "number" && left.index === right.index) return true;
+            return false;
+          }
           messagesComparable(left, right) {
+            if (this.messagesShareStableIdentity(left, right)) return true;
             if (!left || !right) return false;
             if ((left.role || "") !== (right.role || "")) return false;
             const leftText = normalizeComparableTranscriptText(left.content);
@@ -31199,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();
@@ -31245,6 +31314,69 @@ var require_dist2 = __commonJS({
             this.committedMessages = normalized;
             this.syncMessageViews();
           }
+          getSharedCommittedPrefixLength(parsedMessages) {
+            const committedMessages = this.committedMessages;
+            const max = Math.min(parsedMessages.length, committedMessages.length);
+            let index = 0;
+            while (index < max && this.messagesShareStableIdentity(parsedMessages[index], committedMessages[index])) {
+              index += 1;
+            }
+            return index;
+          }
+          hydrateCommittedPrefixForParsedStatus(parsedMessages) {
+            const sharedPrefixLength = this.getSharedCommittedPrefixLength(parsedMessages);
+            if (sharedPrefixLength !== this.committedMessages.length) return null;
+            const committedHydratedMessages = this.committedMessages.map((message, index) => {
+              const timestamp = typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : this.lastOutputAt || this.currentTurnScope?.startedAt || Date.now();
+              const contentValue = message.content;
+              return {
+                role: message.role,
+                content: typeof contentValue === "string" ? contentValue : String(contentValue || ""),
+                timestamp,
+                receivedAt: typeof message.receivedAt === "number" && Number.isFinite(message.receivedAt) ? message.receivedAt : timestamp,
+                kind: message.kind,
+                id: message.id || `msg_${index}`,
+                index: typeof message.index === "number" ? message.index : index,
+                meta: message.meta,
+                senderName: message.senderName
+              };
+            });
+            const extraMessages = parsedMessages.slice(sharedPrefixLength);
+            if (extraMessages.length === 0) return committedHydratedMessages;
+            const extraHydratedMessages = hydrateCliParsedMessages(extraMessages, {
+              committedMessages: [],
+              scope: this.currentTurnScope,
+              lastOutputAt: this.lastOutputAt
+            }).map((message, offset) => ({
+              ...message,
+              id: message.id || `msg_${sharedPrefixLength + offset}`,
+              index: typeof message.index === "number" ? message.index : sharedPrefixLength + offset
+            }));
+            return [...committedHydratedMessages, ...extraHydratedMessages];
+          }
+          hydrateParsedMessagesForStatus(parsedMessages) {
+            return this.hydrateCommittedPrefixForParsedStatus(parsedMessages) || hydrateCliParsedMessages(parsedMessages, {
+              committedMessages: this.committedMessages,
+              scope: this.currentTurnScope,
+              lastOutputAt: this.lastOutputAt
+            });
+          }
+          buildCommittedChatMessages() {
+            return this.committedMessages.map((message, index) => {
+              const contentValue = message.content;
+              return buildChatMessage({
+                role: message.role,
+                content: typeof contentValue === "string" ? contentValue : String(contentValue || ""),
+                timestamp: message.timestamp,
+                kind: message.kind,
+                meta: message.meta,
+                senderName: message.senderName,
+                id: message.id || `msg_${index}`,
+                index: typeof message.index === "number" ? message.index : index,
+                receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
+              });
+            });
+          }
           /**
            * Script-based full parse — returns ReadChatResult.
            * Called by command handler / dashboard for rich content rendering.
@@ -31270,7 +31402,7 @@ var require_dist2 = __commonJS({
                 this.onStatusChange?.();
               }
             }
-            if (parsed && Array.isArray(parsed.messages)) {
+            if (parsed && Array.isArray(parsed.messages) && this.provider.allowInputDuringGeneration === true) {
               const hydratedForCommit = normalizeCliParsedMessages(parsed.messages, {
                 committedMessages: this.committedMessages,
                 scope: this.currentTurnScope,
@@ -31289,21 +31421,21 @@ var require_dist2 = __commonJS({
             const shouldPreferCommittedMessages = !this.currentTurnScope && !this.activeModal && this.currentStatus === "idle";
             let result;
             if (parsed && Array.isArray(parsed.messages)) {
-              const parsedHydratedMessages = hydrateCliParsedMessages(parsed.messages, {
-                committedMessages: this.committedMessages,
-                scope: this.currentTurnScope,
-                lastOutputAt: this.lastOutputAt
-              });
-              const committedHydratedMessages = this.committedMessages.map((message, index) => buildChatMessage({
-                ...message,
-                id: message.id || `msg_${index}`,
-                index: typeof message.index === "number" ? message.index : index,
-                receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
-              }));
+              const parsedHydratedMessages = this.hydrateParsedMessagesForStatus(parsed.messages);
               const parsedLastAssistant = [...parsedHydratedMessages].reverse().find((message) => message.role === "assistant" && typeof message.content === "string" && message.content.trim());
-              const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, committedHydratedMessages) && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && this.runDetectStatus(this.recentOutputBuffer) === "idle");
+              const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, this.committedMessages) && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && this.runDetectStatus(this.recentOutputBuffer) === "idle");
               if (shouldAdoptParsedIdleReplay) {
-                this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
+                this.committedMessages = this.getSharedCommittedPrefixLength(parsed.messages) === this.committedMessages.length ? parsedHydratedMessages.map((message) => ({
+                  role: message.role,
+                  content: typeof message.content === "string" ? message.content : String(message.content || ""),
+                  timestamp: message.timestamp,
+                  receivedAt: message.receivedAt,
+                  kind: message.kind,
+                  id: message.id,
+                  index: message.index,
+                  meta: message.meta,
+                  senderName: message.senderName
+                })) : normalizeCliParsedMessages(parsed.messages, {
                   committedMessages: this.committedMessages,
                   scope: this.currentTurnScope,
                   lastOutputAt: this.lastOutputAt
@@ -31322,15 +31454,9 @@ var require_dist2 = __commonJS({
                   this.onStatusChange?.();
                 }
               }
-              const effectiveCommittedHydratedMessages = shouldAdoptParsedIdleReplay ? this.committedMessages.map((message, index) => buildChatMessage({
-                ...message,
-                id: message.id || `msg_${index}`,
-                index: typeof message.index === "number" ? message.index : index,
-                receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
-              })) : committedHydratedMessages;
-              const shouldPreferCommittedHistoryReplay = !this.currentTurnScope && !this.activeModal && effectiveCommittedHydratedMessages.length > parsedHydratedMessages.length;
+              const shouldPreferCommittedHistoryReplay = !this.currentTurnScope && !this.activeModal && this.committedMessages.length > parsedHydratedMessages.length;
               const shouldPreferCommittedIdleReplay = shouldPreferCommittedMessages && !shouldAdoptParsedIdleReplay;
-              const hydratedMessages = shouldPreferCommittedIdleReplay || shouldPreferCommittedHistoryReplay ? effectiveCommittedHydratedMessages : parsedHydratedMessages;
+              const hydratedMessages = shouldPreferCommittedIdleReplay || shouldPreferCommittedHistoryReplay ? this.buildCommittedChatMessages() : parsedHydratedMessages;
               result = {
                 id: parsed.id || "cli_session",
                 status: parsed.status || this.currentStatus,
@@ -41246,7 +41372,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();