adhdev 0.9.39 → 0.9.41

package/dist/cli/index.js

@@ -5510,6 +5510,15 @@ var init_extension_provider_instance = __esm({
           pendingEvents: this.flushEvents()
         };
       }
+      getSessionModalState(sessionId) {
+        if (sessionId && sessionId !== this.instanceId) return null;
+        return {
+          id: this.instanceId,
+          status: this.currentStatus,
+          title: this.chatTitle || this.agentName || this.provider.name,
+          activeModal: this.activeModal
+        };
+      }
       onEvent(event, data) {
         if (event === "stream_update") {
           if (data?.streams) this.agentStreams = data.streams;
@@ -6137,6 +6146,23 @@ var init_ide_provider_instance = __esm({
           pendingEvents: this.flushEvents()
         };
       }
+      getSessionModalState(sessionId) {
+        if (sessionId && sessionId !== this.instanceId) {
+          for (const ext of this.extensions.values()) {
+            const projected = ext.getSessionModalState?.(sessionId);
+            if (projected?.id === sessionId) return projected;
+          }
+          return null;
+        }
+        const autoApproveActive = (this.currentStatus === "waiting_approval" || this.cachedChat?.status === "waiting_approval") && this.canAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : this.currentStatus;
+        return {
+          id: this.instanceId,
+          status: autoApproveActive && this.cachedChat?.status === "waiting_approval" ? "generating" : this.cachedChat?.status || visibleStatus,
+          title: this.cachedChat?.title || this.type,
+          activeModal: autoApproveActive ? null : this.cachedChat?.activeModal || null
+        };
+      }
       onEvent(event, data) {
         if (event === "cdp_connected") {
         } else if (event === "cdp_disconnected") {
@@ -7892,68 +7918,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;
@@ -8033,13 +8057,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]);
@@ -12478,9 +12506,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;
@@ -12495,24 +12521,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) => ({
@@ -12963,7 +12997,7 @@ var init_provider_cli_adapter = __esm({
       }
       getFreshParsedStatusCache() {
         const cached2 = this.parsedStatusCache;
-        if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBuffer === this.accumulatedRawBuffer && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName && cached2.lastOutputAt === this.lastOutputAt) {
+        if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
           return cached2.result;
         }
         return null;
@@ -14211,7 +14245,7 @@ var init_provider_cli_adapter = __esm({
       getScriptParsedStatus() {
         const screenText = this.readTerminalScreenText();
         const cached2 = this.parsedStatusCache;
-        if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBuffer === this.accumulatedRawBuffer && cached2.screenText === screenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName && cached2.lastOutputAt === this.lastOutputAt) {
+        if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === screenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
           return cached2.result;
         }
         const parsed = this.parseCurrentTranscript(
@@ -14330,12 +14364,10 @@ var init_provider_cli_adapter = __esm({
           currentTurnScope: this.currentTurnScope,
           recentOutputBuffer: this.recentOutputBuffer,
           accumulatedBuffer: this.accumulatedBuffer,
-          accumulatedRawBuffer: this.accumulatedRawBuffer,
           screenText,
           currentStatus: this.currentStatus,
           activeModal: this.activeModal,
           cliName: this.cliName,
-          lastOutputAt: this.lastOutputAt,
           result
         };
         return result;
@@ -15424,6 +15456,18 @@ var init_cli_provider_instance = __esm({
           runtimeRecoveryState: runtime?.recoveryState ?? null
         };
       }
+      getSessionModalState() {
+        const adapterStatus = this.adapter.getStatus({ allowParse: false });
+        const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : adapterStatus.status;
+        const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
+        return {
+          id: this.instanceId,
+          status: visibleStatus,
+          title: dirName,
+          activeModal: autoApproveActive ? null : adapterStatus.activeModal
+        };
+      }
       updateSettings(newSettings) {
         this.settings = { ...newSettings };
         this.adapter.updateRuntimeSettings?.(this.settings);
@@ -32461,6 +32505,18 @@ var init_acp_provider_instance = __esm({
           this.detectStatusTransition();
         }
       }
+      getSessionModalState() {
+        const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
+        return {
+          id: this.instanceId,
+          status: this.currentStatus,
+          title: `${this.provider.name} \xB7 ${dirName}`,
+          activeModal: this.currentStatus === "waiting_approval" ? {
+            message: this.activeToolCalls.find((t) => t.status === "running")?.name || "Permission requested",
+            buttons: ["Approve", "Reject"]
+          } : null
+        };
+      }
       getState() {
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const recentMessages = normalizeChatMessages(this.messages.map((m) => {
@@ -41258,6 +41314,29 @@ var init_provider_instance_manager = __esm({
         }
         return sessions;
       }
+      getSessionModalState(sessionId, options = {}) {
+        if (!sessionId) return null;
+        const candidates = [sessionId];
+        if (options.instanceKey && options.instanceKey !== sessionId) {
+          candidates.push(options.instanceKey);
+        }
+        for (const id of candidates) {
+          const instance = this.instances.get(id);
+          if (!instance?.getSessionModalState) continue;
+          try {
+            const projected = instance.getSessionModalState(sessionId);
+            if (!projected?.id) continue;
+            if (projected.id !== sessionId) {
+              LOG.warn("InstanceMgr", `[InstanceManager] Ignoring mismatched session modal projection from ${id}: requested=${sessionId} projected=${projected.id}`);
+              continue;
+            }
+            return projected;
+          } catch (e) {
+            LOG.warn("InstanceMgr", `[InstanceManager] Failed to project session modal metadata from ${id}: ${e.message}`);
+          }
+        }
+        return null;
+      }
       /**
       * Per-category status collect
       */
@@ -88312,7 +88391,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.39" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.41" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -88628,37 +88707,20 @@ var init_adhdev_daemon = __esm({
           async (subscription) => this.buildSessionHostDiagnosticsUpdateForSubscription(subscription)
         );
       }
-      findProviderStateBySessionId(sessionId) {
+      findSessionModalStateBySessionId(sessionId) {
         if (!this.components || !sessionId) return null;
-        const directInstance = this.components.instanceManager.getInstance(sessionId);
-        if (directInstance) {
-          try {
-            return directInstance.getState();
-          } catch (error48) {
-            LOG.warn("P2P", `Failed to collect subscribed session state for ${sessionId}: ${error48?.message || String(error48)}`);
-            return null;
-          }
-        }
-        for (const instance of this.components.instanceManager.getByCategory("ide")) {
-          try {
-            const state = instance.getState();
-            if (state.instanceId === sessionId) return state;
-            if (state.category !== "ide") continue;
-            const child = state.extensions.find((entry) => entry.instanceId === sessionId);
-            if (child) return child;
-          } catch (error48) {
-            LOG.warn("P2P", `Failed to collect IDE child state for ${sessionId}: ${error48?.message || String(error48)}`);
-          }
-        }
-        return null;
+        const target = this.components.sessionRegistry.get(sessionId);
+        return this.components.instanceManager.getSessionModalState(sessionId, {
+          instanceKey: target?.instanceKey
+        });
       }
       buildSessionModalUpdateForSubscription(subscription) {
-        const state = this.findProviderStateBySessionId(subscription.params.targetSessionId);
+        const state = this.findSessionModalStateBySessionId(subscription.params.targetSessionId);
         if (!state) return null;
         const now = Date.now();
-        const activeModal = state.activeChat?.activeModal;
-        const status = String(state.activeChat?.status || state.status || "idle");
-        const title = typeof state.activeChat?.title === "string" ? state.activeChat.title : void 0;
+        const activeModal = state.activeModal;
+        const status = String(state.status || "idle");
+        const title = typeof state.title === "string" ? state.title : void 0;
         const interactionId = this.getSessionInteractionId(subscription.params.targetSessionId);
         const prepared = prepareSessionModalUpdate({
           key: subscription.key,