@adhdev/daemon-core 0.9.22 → 0.9.24

package/dist/shared-types.d.ts

@@ -162,6 +162,7 @@ export interface SessionChatTailUpdate extends ReadChatSyncResult {
     interactionId?: string;
     seq: number;
     timestamp: number;
+    error?: string;
 }
 export interface SessionRuntimeOutputUpdate {
     topic: 'session.runtime_output';

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.9.22",
+  "version": "0.9.24",
   "description": "ADHDev local session host core \u2014 session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.22",
+  "version": "0.9.24",
   "description": "ADHDev daemon core \u2014 CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli-adapters/provider-cli-adapter.ts

@@ -2414,8 +2414,12 @@ export class ProviderCliAdapter implements CliAdapter {
         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);
         }
     }

package/src/cli-adapters/session-host-transport.ts

@@ -423,8 +423,8 @@ class SessionHostRuntimeTransport implements PtyRuntimeTransport {
         } catch { /* noop */ }
         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}`);
         }
     }
 }

package/src/commands/chat-commands.ts

@@ -193,14 +193,52 @@ function shouldCollapseReadChatReplayDuplicate(message: ChatMessage | null | und
     return role === 'assistant' || role === 'system';
 }
 
+function normalizeReadChatReplayText(message: ChatMessage | null | undefined): string {
+    return flattenContent(message?.content || '').replace(/\s+/g, ' ').trim();
+}
+
+function isStableReadChatAssistantAnswer(message: ChatMessage | null | undefined): boolean {
+    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;
+
+    // A provider may surface expanded command output as a standard assistant bubble
+    // (for example Claude Code's "Bash command ..." block). That is live work output,
+    // not a stable final answer. Treating it as a terminal answer would hide the
+    // real final response and violate read_chat fidelity.
+    if (/^(bash|shell|terminal) command\b/i.test(content)) return false;
+    return true;
+}
+
+function isReplayedAssistantAnswerAfterStableAnswer(
+    message: ChatMessage | null | undefined,
+    stableAnswer: ChatMessage | null,
+): boolean {
+    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: ChatMessage[]): ChatMessage[] {
     const collapsed: ChatMessage[] = [];
     const replaySignaturesInCurrentTurn = new Set<string>();
+    let stableAssistantAnswerInCurrentTurn: ChatMessage | null = 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);
@@ -210,12 +248,16 @@ function collapseReplayDuplicatesFromReadChat(messages: ChatMessage[]): ChatMess
         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;

package/src/providers/cli-provider-instance.ts

@@ -367,6 +367,25 @@ export class CliProviderInstance implements ProviderInstance {
                 ? parsedMessages.slice(-historyMessageCount)
                 : [];
         }
+        // committedMessages (adapterStatus.messages) is the adapter's accumulated
+        // conversation history — use it as a floor to prevent history from disappearing.
+        //
+        // waiting_approval: always override — the approval dialog fills the terminal,
+        // pushing prior conversation out of view; parsedMessages will be partial or empty
+        // regardless of historyMessageCount.
+        //
+        // Other active states (generating, long_generating, error): apply floor only
+        // when the script has not explicitly windowed via historyMessageCount, so
+        // intentional windowing is preserved. Excludes idle — scripts may legitimately
+        // return messages:[] when the CLI exits or a new session begins.
+        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 as any);
+        }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
         const canonicalBackedHistory = this.syncCanonicalSavedHistoryIfNeeded();
 

package/src/shared-types.ts

@@ -215,6 +215,7 @@ export interface SessionChatTailUpdate extends ReadChatSyncResult {
     interactionId?: string;
     seq: number;
     timestamp: number;
+    error?: string;
 }
 
 export interface SessionRuntimeOutputUpdate {