@adhdev/daemon-standalone 0.9.22 → 0.9.24

package/dist/index.js

@@ -31839,8 +31839,10 @@ var require_dist2 = __commonJS({
             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);
             }
           }
@@ -38144,13 +38146,40 @@ ${effect.notification.body || ""}`.trim();
       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];
@@ -38158,11 +38187,15 @@ ${effect.notification.body || ""}`.trim();
         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;
     }
@@ -40900,6 +40933,12 @@ ${effect.notification.body || ""}`.trim();
         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";
@@ -53977,8 +54016,8 @@ data: ${JSON.stringify(msg.data)}
         }
         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}`);
         }
       }
     };