@adhdev/daemon-core 0.9.76-rc.16 → 0.9.76-rc.18

package/dist/index.mjs

@@ -11853,6 +11853,34 @@ function normalizeReadChatCommandStatus(status, activeModal) {
       return raw;
   }
 }
+function isGeneratingLikeStatus(status) {
+  return status === "generating" || status === "streaming" || status === "long_generating" || status === "starting";
+}
+function shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus) {
+  if (!isGeneratingLikeStatus(parsedStatus)) return false;
+  if (hasNonEmptyModalButtons(activeModal)) return false;
+  const adapterRawStatus = typeof adapterStatus?.status === "string" ? adapterStatus.status.trim() : "";
+  if (adapterRawStatus !== "idle") return false;
+  if (typeof adapter.isProcessing === "function" && adapter.isProcessing()) return false;
+  return true;
+}
+function normalizeCliReadChatStatus(parsedStatus, activeModal, adapter, adapterStatus) {
+  if (shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus)) return "idle";
+  return typeof parsedStatus === "string" && parsedStatus.trim() ? parsedStatus : "idle";
+}
+function finalizeStreamingMessagesWhenIdle(messages, status) {
+  if (status !== "idle") return messages;
+  return messages.map((message) => {
+    const meta = message.meta && typeof message.meta === "object" ? message.meta : void 0;
+    const hasStreamingMeta = meta?.streaming === true;
+    if (message.bubbleState !== "streaming" && !hasStreamingMeta) return message;
+    return {
+      ...message,
+      ...message.bubbleState === "streaming" ? { bubbleState: "final" } : {},
+      ...hasStreamingMeta ? { meta: { ...meta, streaming: false } } : {}
+    };
+  });
+}
 function buildReadChatCommandResult(payload, args) {
   let validatedPayload;
   const debugReadChat = payload?.debugReadChat && typeof payload.debugReadChat === "object" ? payload.debugReadChat : void 0;
@@ -12291,10 +12319,13 @@ async function handleReadChat(h, args) {
       const transcriptAuthority = parsedRecord.transcriptAuthority === "provider" || parsedRecord.transcriptAuthority === "daemon" ? parsedRecord.transcriptAuthority : void 0;
       const coverage = parsedRecord.coverage === "full" || parsedRecord.coverage === "tail" || parsedRecord.coverage === "current-turn" ? parsedRecord.coverage : void 0;
       const activeModal = parsedRecord.activeModal ?? parsedRecord.modal ?? null;
-      const returnedStatus = parsedRecord.status || "idle";
-      LOG.debug("Command", `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord.status || "")} parsedMsgCount=${parsedRecord.messages.length}`);
+      const returnedStatus = normalizeCliReadChatStatus(parsedRecord.status, activeModal, adapter, adapterStatus);
+      const runtimeMessageMerger = getTargetInstance(h, args);
+      const parsedMessages = finalizeStreamingMessagesWhenIdle(parsedRecord.messages, returnedStatus);
+      const returnedMessages = runtimeMessageMerger?.category === "cli" && runtimeMessageMerger.type === adapter.cliType && typeof runtimeMessageMerger.mergeRuntimeChatMessages === "function" ? runtimeMessageMerger.mergeRuntimeChatMessages(parsedMessages) : parsedMessages;
+      LOG.debug("Command", `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord.status || "")} parsedMsgCount=${parsedRecord.messages.length} returnedMsgCount=${returnedMessages.length}`);
       return buildReadChatCommandResult({
-        messages: parsedRecord.messages,
+        messages: returnedMessages,
         status: returnedStatus,
         activeModal,
         debugReadChat: {
@@ -12305,7 +12336,7 @@ async function handleReadChat(h, args) {
           returnedStatus: String(returnedStatus || ""),
           shouldPreferAdapterMessages: false,
           parsedMsgCount: parsedRecord.messages.length,
-          returnedMsgCount: parsedRecord.messages.length
+          returnedMsgCount: returnedMessages.length
         },
         ...title ? { title } : {},
         ...providerSessionId ? { providerSessionId } : {},
@@ -15432,6 +15463,9 @@ ${effect.notification.body || ""}`.trim();
       );
     }
   }
+  mergeRuntimeChatMessages(parsedMessages) {
+    return this.mergeConversationMessages(parsedMessages);
+  }
   mergeConversationMessages(parsedMessages) {
     if (this.runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
     return normalizeChatMessages([...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b) => {