adhdev 0.9.39 → 0.9.40

package/dist/index.js

@@ -7372,68 +7372,66 @@ function normalizeReadChatMessages(payload) {
   const messages = Array.isArray(payload.messages) ? payload.messages : [];
   return normalizeChatMessages(messages);
 }
-function buildReadChatReplayCollapseSignature(message) {
-  if (!message) return "";
+function normalizeReadChatReplayTextContent(content) {
+  return flattenContent(content || "").replace(/\s+/g, " ").trim();
+}
+function getReadChatReplayCollapseInfo(message) {
+  if (!message) return null;
   const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
   const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
   const senderName = typeof message.senderName === "string" ? message.senderName.trim().toLowerCase() : "";
-  const content = flattenContent(message.content || "").replace(/\s+/g, " ").trim();
-  return `${role}:${kind}:${senderName}:${content}`;
-}
-function shouldCollapseReadChatReplayDuplicate(message) {
-  if (!message) return false;
-  const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
-  return role === "assistant" || role === "system";
-}
-function normalizeReadChatReplayText(message) {
-  return flattenContent(message?.content || "").replace(/\s+/g, " ").trim();
+  const collapsible = role === "assistant" || role === "system";
+  if (!collapsible) return { role, kind, senderName, content: "", signature: "", collapsible };
+  const content = normalizeReadChatReplayTextContent(message.content);
+  return {
+    role,
+    kind,
+    senderName,
+    content,
+    signature: `${role}:${kind}:${senderName}:${content}`,
+    collapsible
+  };
 }
-function isStableReadChatAssistantAnswer(message) {
-  if (!message) return false;
-  const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
-  const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
-  if (role !== "assistant") return false;
-  if (kind && kind !== "standard") return false;
-  const content = normalizeReadChatReplayText(message);
-  if (content.length < 160) return false;
-  if (/^(bash|shell|terminal) command\b/i.test(content)) return false;
+function isStableReadChatAssistantAnswerInfo(info) {
+  if (!info) return false;
+  if (info.role !== "assistant") return false;
+  if (info.kind && info.kind !== "standard") return false;
+  if (info.content.length < 160) return false;
+  if (/^(bash|shell|terminal) command\b/i.test(info.content)) return false;
   return true;
 }
-function isReplayedAssistantAnswerAfterStableAnswer(message, stableAnswer) {
-  if (!message || !stableAnswer) return false;
-  const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
-  const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
-  if (role !== "assistant") return false;
-  if (kind && kind !== "standard") return false;
-  const content = normalizeReadChatReplayText(message);
-  const stableContent = normalizeReadChatReplayText(stableAnswer);
+function isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableContent) {
+  if (!info || !stableContent) return false;
+  if (info.role !== "assistant") return false;
+  if (info.kind && info.kind !== "standard") return false;
+  const content = info.content;
   if (content.length < 80 || stableContent.length < 80) return false;
   return content === stableContent || content.startsWith(stableContent) || stableContent.startsWith(content);
 }
 function collapseReplayDuplicatesFromReadChat(messages) {
   const collapsed = [];
   const replaySignaturesInCurrentTurn = /* @__PURE__ */ new Set();
-  let stableAssistantAnswerInCurrentTurn = null;
+  let stableAssistantAnswerContentInCurrentTurn = "";
+  let previousReplaySignature = "";
   for (const message of messages) {
-    const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
-    if (role === "user") {
+    const info = getReadChatReplayCollapseInfo(message);
+    if (info?.role === "user") {
       replaySignaturesInCurrentTurn.clear();
-      stableAssistantAnswerInCurrentTurn = null;
+      stableAssistantAnswerContentInCurrentTurn = "";
+      previousReplaySignature = "";
     }
-    const signature = buildReadChatReplayCollapseSignature(message);
-    const previous = collapsed[collapsed.length - 1];
-    const previousSignature = buildReadChatReplayCollapseSignature(previous);
-    if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
-      if (previousSignature === signature) continue;
-      if (replaySignaturesInCurrentTurn.has(signature)) continue;
-      if (isReplayedAssistantAnswerAfterStableAnswer(message, stableAssistantAnswerInCurrentTurn)) continue;
+    if (info?.collapsible && info.signature) {
+      if (previousReplaySignature === info.signature) continue;
+      if (replaySignaturesInCurrentTurn.has(info.signature)) continue;
+      if (isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableAssistantAnswerContentInCurrentTurn)) continue;
     }
     collapsed.push(message);
-    if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
-      replaySignaturesInCurrentTurn.add(signature);
+    previousReplaySignature = info?.collapsible ? info.signature : "";
+    if (info?.collapsible && info.signature) {
+      replaySignaturesInCurrentTurn.add(info.signature);
     }
-    if (isStableReadChatAssistantAnswer(message)) {
-      stableAssistantAnswerInCurrentTurn = message;
+    if (isStableReadChatAssistantAnswerInfo(info)) {
+      stableAssistantAnswerContentInCurrentTurn = info?.content || "";
     }
   }
   return collapsed;
@@ -7513,13 +7511,17 @@ function computeReadChatSync(messages, cursor) {
     };
   }
   if (cursor.tailLimit > 0 && knownSignature === lastMessageSignature) {
-    return {
-      syncMode: "noop",
-      replaceFrom: totalMessages,
-      messages: [],
-      totalMessages,
-      lastMessageSignature
-    };
+    const requestedTailCount = Math.min(totalMessages, cursor.tailLimit);
+    if (knownMessageCount >= requestedTailCount) {
+      return {
+        syncMode: "noop",
+        replaceFrom: totalMessages,
+        messages: [],
+        totalMessages,
+        lastMessageSignature
+      };
+    }
+    return buildBoundedTailSync(messages, cursor);
   }
   if (knownMessageCount < totalMessages) {
     const anchorSignature = getChatMessageSignature(messages[knownMessageCount - 1]);
@@ -11522,9 +11524,7 @@ function hydrateCliParsedMessages(parsedMessages, options) {
     };
   });
 }
-function chooseMoreComparableCliMessage(left2, right2) {
-  const leftComparable = normalizeComparableMessageContent(left2.content || "");
-  const rightComparable = normalizeComparableMessageContent(right2.content || "");
+function chooseMoreComparableCliMessage(left2, right2, leftComparable = normalizeComparableMessageContent(left2.content || ""), rightComparable = normalizeComparableMessageContent(right2.content || "")) {
   if (leftComparable && leftComparable === rightComparable) {
     const leftNewlines = String(left2.content || "").split(/\r\n|\n|\r/g).length - 1;
     const rightNewlines = String(right2.content || "").split(/\r\n|\n|\r/g).length - 1;
@@ -11539,24 +11539,32 @@ function dedupeConsecutiveComparableCliMessages(messages) {
       ...message,
       content: typeof message.content === "string" ? message.content : String(message.content || "")
     };
+    const currentComparable = normalizeComparableMessageContent(current.content || "");
     const previous = deduped[deduped.length - 1];
     if (!previous) {
-      deduped.push(current);
+      deduped.push({ message: current, comparable: currentComparable });
       continue;
     }
-    const previousComparable = normalizeComparableMessageContent(previous.content || "");
-    const currentComparable = normalizeComparableMessageContent(current.content || "");
-    const sameRole = previous.role === current.role;
-    const sameKind = (previous.kind || "standard") === (current.kind || "standard");
-    const sameSender = (previous.senderName || "") === (current.senderName || "");
-    const comparableMatch = previousComparable && previousComparable === currentComparable;
+    const sameRole = previous.message.role === current.role;
+    const sameKind = (previous.message.kind || "standard") === (current.kind || "standard");
+    const sameSender = (previous.message.senderName || "") === (current.senderName || "");
+    const comparableMatch = previous.comparable && previous.comparable === currentComparable;
     if (sameRole && sameKind && sameSender && comparableMatch) {
-      deduped[deduped.length - 1] = chooseMoreComparableCliMessage(previous, current);
+      const selected = chooseMoreComparableCliMessage(
+        previous.message,
+        current,
+        previous.comparable,
+        currentComparable
+      );
+      deduped[deduped.length - 1] = {
+        message: selected,
+        comparable: selected === current ? currentComparable : previous.comparable
+      };
       continue;
     }
-    deduped.push(current);
+    deduped.push({ message: current, comparable: currentComparable });
   }
-  return deduped;
+  return deduped.map((entry) => entry.message);
 }
 function normalizeCliParsedMessages(parsedMessages, options) {
   return dedupeConsecutiveComparableCliMessages(hydrateCliParsedMessages(parsedMessages, options).map((message) => ({
@@ -56592,7 +56600,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.39" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.40" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;