adhdev 0.9.21 → 0.9.23

package/dist/cli/index.js

@@ -7876,13 +7876,40 @@ function shouldCollapseReadChatReplayDuplicate(message) {
   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();
+}
+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;
+  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);
+  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;
   for (const message of messages) {
     const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
     if (role === "user") {
       replaySignaturesInCurrentTurn.clear();
+      stableAssistantAnswerInCurrentTurn = null;
     }
     const signature = buildReadChatReplayCollapseSignature(message);
     const previous = collapsed[collapsed.length - 1];
@@ -7890,11 +7917,15 @@ function collapseReplayDuplicatesFromReadChat(messages) {
     if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
       if (previousSignature === signature) continue;
       if (replaySignaturesInCurrentTurn.has(signature)) continue;
+      if (isReplayedAssistantAnswerAfterStableAnswer(message, stableAssistantAnswerInCurrentTurn)) continue;
     }
     collapsed.push(message);
     if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
       replaySignaturesInCurrentTurn.add(signature);
     }
+    if (isStableReadChatAssistantAnswer(message)) {
+      stableAssistantAnswerInCurrentTurn = message;
+    }
   }
   return collapsed;
 }
@@ -13456,7 +13487,7 @@ var init_provider_cli_adapter = __esm({
         const screenText = this.terminalScreen.getText() || "";
         const effectiveScreenText = screenText || this.accumulatedBuffer;
         const noActiveTurn = !this.currentTurnScope;
-        const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(effectiveScreenText) || /accept edits on/i.test(effectiveScreenText) && (/Update available!/i.test(screenText) || /\/effort/i.test(screenText) || /^.*➜\s+\S+/m.test(effectiveScreenText));
+        const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(effectiveScreenText);
         const parsedShowsLiveAssistantProgress = parsedStatus === "generating" && !!lastParsedAssistant && parsedMessages.length > this.committedMessages.length;
         if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome && !parsedShowsLiveAssistantProgress) {
           return;
@@ -14922,6 +14953,12 @@ var init_cli_provider_instance = __esm({
         if (historyMessageCount !== null) {
           parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
         }
+        const committedMessages = Array.isArray(adapterStatus.messages) ? adapterStatus.messages : [];
+        const isActiveNonIdle = adapterStatus.status !== "idle";
+        const shouldApplyCommittedFloor = parsedMessages.length < committedMessages.length && (adapterStatus.status === "waiting_approval" || isActiveNonIdle && historyMessageCount === null);
+        if (shouldApplyCommittedFloor) {
+          parsedMessages = normalizeChatMessages(committedMessages);
+        }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
         const canonicalBackedHistory = this.syncCanonicalSavedHistoryIfNeeded();
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
@@ -87400,7 +87437,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.21" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.23" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;