adhdev 0.9.22 → 0.9.24

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;
 }
@@ -14547,8 +14578,10 @@ var init_provider_cli_adapter = __esm({
         if (buttonIndex in this.approvalKeys) {
           this.ptyProcess.write(this.approvalKeys[buttonIndex]);
         } else {
+          const buttonCount = Array.isArray(modal?.buttons) ? modal.buttons.length : 0;
+          const clampedIndex = buttonCount > 0 ? Math.min(Math.max(0, buttonIndex), buttonCount - 1) : Math.max(0, buttonIndex);
           const DOWN = "\x1B[B";
-          const keys = DOWN.repeat(Math.max(0, buttonIndex)) + "\r";
+          const keys = DOWN.repeat(clampedIndex) + "\r";
           this.ptyProcess.write(keys);
         }
       }
@@ -14922,6 +14955,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";
@@ -46333,8 +46372,8 @@ var init_session_host_transport = __esm({
         }
         try {
           await this.client.close();
-        } catch {
-          if (destroy) throw new Error(`Failed to close session host client: ${this.options.runtimeId}`);
+        } catch (err) {
+          if (destroy) throw err instanceof Error ? err : new Error(`Failed to close session host client: ${this.options.runtimeId}`);
         }
       }
     };
@@ -79148,7 +79187,7 @@ var init_screenshot_sender = __esm({
         });
         let sentAny = false;
         for (const peer of peers.values()) {
-          if (peer.state !== "connected" || !peer.dataChannel) continue;
+          if (peer.state !== "connected" || !peer.dataChannel?.isOpen()) continue;
           try {
             peer.dataChannel.sendMessage(payload);
             sentAny = true;
@@ -79165,7 +79204,7 @@ var init_screenshot_sender = __esm({
         });
         let sentAny = false;
         for (const peer of peers.values()) {
-          if (peer.state !== "connected" || !peer.dataChannel) continue;
+          if (peer.state !== "connected" || !peer.dataChannel?.isOpen()) continue;
           try {
             peer.dataChannel.sendMessage(payload);
             sentAny = true;
@@ -79175,7 +79214,7 @@ var init_screenshot_sender = __esm({
         return sentAny;
       }
       sendTopicUpdateToPeer(peer, update) {
-        if (!peer?.dataChannel || peer.state !== "connected") return false;
+        if (!peer?.dataChannel || peer.state !== "connected" || !peer.dataChannel.isOpen()) return false;
         try {
           peer.dataChannel.sendMessage(JSON.stringify({
             type: "topic_update",
@@ -79191,7 +79230,7 @@ var init_screenshot_sender = __esm({
         const msg = JSON.stringify({ type: "session_output", sessionId, data });
         let sentAny = false;
         for (const peer of peers.values()) {
-          if (peer.state !== "connected" || !peer.dataChannel) continue;
+          if (peer.state !== "connected" || !peer.dataChannel?.isOpen()) continue;
           try {
             peer.dataChannel.sendMessage(msg);
             sentAny = true;
@@ -79717,7 +79756,7 @@ ${e?.stack || ""}`);
       }
       get isConnected() {
         for (const peer of this.peers.values()) {
-          if (peer.state === "connected" && peer.dataChannel) return true;
+          if (peer.state === "connected" && peer.dataChannel?.isOpen()) return true;
         }
         return false;
       }
@@ -79895,7 +79934,22 @@ ${e?.stack || ""}`);
             if (!update) return;
             this.screenshotSender.sendTopicUpdateToPeer(peer, update);
           } catch (error48) {
-            log(`chat_tail flush skipped: peer=${peer.peerId} session=${subscription.params.targetSessionId} error=${error48?.message || error48}`);
+            log(`chat_tail flush error: peer=${peer.peerId} session=${subscription.params.targetSessionId} error=${error48?.message || error48}`);
+            const errorUpdate = {
+              topic: "session.chat_tail",
+              key: subscription.key,
+              sessionId: subscription.params.targetSessionId,
+              seq: subscription.seq,
+              timestamp: Date.now(),
+              syncMode: "noop",
+              messages: [],
+              status: "",
+              replaceFrom: 0,
+              totalMessages: 0,
+              lastMessageSignature: "",
+              error: error48?.message || "chat_tail build failed"
+            };
+            this.screenshotSender.sendTopicUpdateToPeer(peer, errorUpdate);
           }
         }, { concurrency: 4 });
       }
@@ -87400,7 +87454,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.22" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.24" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -87414,6 +87468,8 @@ var init_adhdev_daemon = __esm({
       pendingP2PChatFlush = false;
       pendingP2PChatFlushOnlyActive = true;
       hotP2PChatSessionIds = /* @__PURE__ */ new Set();
+      hotChatSnapshotCache = null;
+      static HOT_CHAT_SNAPSHOT_CACHE_TTL_MS = 1500;
       components = null;
       sessionHostEndpoint = null;
       sessionHostController = null;
@@ -87595,8 +87651,17 @@ var init_adhdev_daemon = __esm({
           profile: "live"
         });
       }
+      invalidateHotChatSnapshotCache() {
+        this.hotChatSnapshotCache = null;
+      }
       getHotChatSessionIdsForP2PFlush() {
-        const sessions = this.buildLiveStatusSnapshot().sessions || [];
+        const now = Date.now();
+        const cached2 = this.hotChatSnapshotCache;
+        const sessions = cached2 && now - cached2.builtAt < _AdhdevDaemon.HOT_CHAT_SNAPSHOT_CACHE_TTL_MS ? cached2.sessions : (() => {
+          const built = this.buildLiveStatusSnapshot().sessions || [];
+          this.hotChatSnapshotCache = { sessions: built, builtAt: now };
+          return built;
+        })();
         const hotSessions = classifyHotChatSessionsForSubscriptionFlush(
           sessions,
           this.hotP2PChatSessionIds
@@ -87828,6 +87893,7 @@ ${err?.stack || ""}`);
                 }
               }),
               onStatusChange: () => {
+                this.invalidateHotChatSnapshotCache();
                 this.statusReporter?.onStatusChange();
                 void this.flushP2PChatSubscriptions({ onlyActive: true });
               },
@@ -87857,6 +87923,7 @@ ${err?.stack || ""}`);
             statusInstanceId: instanceId,
             statusVersion: pkgVersion,
             onStatusChange: () => {
+              this.invalidateHotChatSnapshotCache();
               this.statusReporter?.onStatusChange();
               void this.flushP2PChatSubscriptions({ onlyActive: true });
             },