@adhdev/daemon-core 0.9.30 → 0.9.32

package/dist/providers/provider-loader.d.ts

@@ -85,6 +85,7 @@ export declare class ProviderLoader {
         probeStarts?: string[];
     });
     private log;
+    private debugLog;
     /**
      * User override root (~/.adhdev/providers by default).
      */

package/dist/status/chat-tail-hot-sessions.d.ts

@@ -15,6 +15,7 @@ export declare function classifyHotChatSessionsForSubscriptionFlush(sessions: Ho
     now?: number;
     recentMessageGraceMs?: number;
     activeStatuses?: ReadonlySet<string>;
+    activeSessionIds?: ReadonlySet<string>;
 }): {
     active: Set<string>;
     finalizing: Set<string>;

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

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.9.30",
+  "version": "0.9.32",
   "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.30",
+  "version": "0.9.32",
   "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

@@ -282,6 +282,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private static readonly STATUS_HOT_PATH_PARSE_MIN_INTERVAL_MS = 1000;
     private static readonly SCREEN_SNAPSHOT_MIN_INTERVAL_MS = 250;
     private static readonly MAX_TRACE_ENTRIES = 250;
+    private static readonly PARSE_MESSAGE_TAIL_LIMIT = 100;
 
     private readonly providerResolutionMeta: ProviderResolutionMeta;
     private static readonly FINISH_RETRY_DELAY_MS = 300;
@@ -333,6 +334,42 @@ export class ProviderCliAdapter implements CliAdapter {
         return null;
     }
 
+    private selectParseBaseMessages(baseMessages: CliChatMessage[]): CliChatMessage[] {
+        if (baseMessages.length <= ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT) return baseMessages;
+        return baseMessages.slice(-ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT);
+    }
+
+    private messagesComparable(left: any, right: any): boolean {
+        if (!left || !right) return false;
+        if ((left.role || '') !== (right.role || '')) return false;
+        const leftText = normalizeComparableTranscriptText(left.content);
+        const rightText = normalizeComparableTranscriptText(right.content);
+        return !!leftText && leftText === rightText;
+    }
+
+    private stitchParsedMessagesWithCommittedBase(
+        parsedMessages: any[],
+        fullBaseMessages: CliChatMessage[],
+        parseBaseMessages: CliChatMessage[],
+    ): any[] {
+        if (!Array.isArray(parsedMessages) || parsedMessages.length === 0) return parsedMessages;
+        if (fullBaseMessages.length <= parseBaseMessages.length) return parsedMessages;
+
+        const parsedFirst = parsedMessages[0];
+        const fullFirst = fullBaseMessages[0];
+        if (parsedMessages.length >= fullBaseMessages.length && this.messagesComparable(parsedFirst, fullFirst)) {
+            return parsedMessages;
+        }
+
+        const tailFirst = parseBaseMessages[0];
+        if (tailFirst && this.messagesComparable(parsedFirst, tailFirst)) {
+            const prefixLength = fullBaseMessages.length - parseBaseMessages.length;
+            return [...fullBaseMessages.slice(0, prefixLength), ...parsedMessages];
+        }
+
+        return [...fullBaseMessages, ...parsedMessages];
+    }
+
     private getIdleFinishConfirmMs(): number {
         return this.timeouts.idleFinishConfirm;
     }
@@ -1044,7 +1081,7 @@ export class ProviderCliAdapter implements CliAdapter {
         if (!this.applyPendingScriptStatusDebounce(ctx)) return;
 
         const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
-        LOG.info(
+        LOG.debug(
             'CLI',
             `[${this.cliType}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope?.prompt || '').slice(0, 140)} status=${String(status || '')} parsedStatus=${String(parsedStatus || '')} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify(summarizeCliTraceText(lastParsedAssistant?.content || '', 120)).slice(0, 160)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 160)).slice(0, 220)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 160)).slice(0, 220)}`
         );
@@ -1439,18 +1476,26 @@ export class ProviderCliAdapter implements CliAdapter {
             try {
                 const screenText = this.terminalScreen.getText();
                 const tail = this.recentOutputBuffer.slice(-500);
+                const parseBaseMessages = this.selectParseBaseMessages(this.committedMessages);
                 const input = buildCliParseInput({
                     accumulatedBuffer: this.accumulatedBuffer,
                     accumulatedRawBuffer: this.accumulatedRawBuffer,
                     recentOutputBuffer: this.recentOutputBuffer,
                     terminalScreenText: screenText,
-                    baseMessages: this.committedMessages,
+                    baseMessages: parseBaseMessages,
                     partialResponse: this.responseBuffer,
                     isWaitingForResponse: this.isWaitingForResponse,
                     scope: this.currentTurnScope,
                     runtimeSettings: this.runtimeSettings,
                 });
                 const session = this.cliScripts.parseSession({ ...input, tail, tailScreen: buildCliScreenSnapshot(tail) });
+                if (session && typeof session === 'object' && Array.isArray(session.messages)) {
+                    session.messages = this.stitchParsedMessagesWithCommittedBase(
+                        session.messages,
+                        this.committedMessages,
+                        parseBaseMessages,
+                    );
+                }
                 this.parseErrorMessage = null;
                 return session && typeof session === 'object' ? session : null;
             } catch (e: any) {
@@ -1871,12 +1916,13 @@ export class ProviderCliAdapter implements CliAdapter {
         }
         try {
             const screenText = typeof screenTextOverride === 'string' ? screenTextOverride : this.terminalScreen.getText();
+            const parseBaseMessages = this.selectParseBaseMessages(baseMessages);
             const input = buildCliParseInput({
                 accumulatedBuffer: this.accumulatedBuffer,
                 accumulatedRawBuffer: this.accumulatedRawBuffer,
                 recentOutputBuffer: this.recentOutputBuffer,
                 terminalScreenText: screenText,
-                baseMessages,
+                baseMessages: parseBaseMessages,
                 partialResponse,
                 isWaitingForResponse: this.isWaitingForResponse,
                 scope,
@@ -1888,6 +1934,11 @@ export class ProviderCliAdapter implements CliAdapter {
             }
             const normalizedParsed = this.suppressStaleParsedApproval(parsed, input.recentBuffer, input.screenText);
             if (normalizedParsed && Array.isArray(normalizedParsed.messages)) {
+                normalizedParsed.messages = this.stitchParsedMessagesWithCommittedBase(
+                    normalizedParsed.messages,
+                    baseMessages,
+                    parseBaseMessages,
+                );
                 this.trimLastAssistantEcho(normalizedParsed.messages, scope?.prompt || getLastUserPromptText(baseMessages));
             }
             this.parseErrorMessage = null;

package/src/commands/chat-commands.ts

@@ -583,11 +583,18 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
 
     // Extension transport: evaluateInSession
     if (isExtensionTransport(transport)) {
+        let extensionReadChatError = '';
         try {
             const evalResult = await h.evaluateProviderScript('readChat', undefined, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
             if (evalResult?.result) {
                 let parsed = evalResult.result;
-                if (typeof parsed === 'string') { try { parsed = JSON.parse(parsed); } catch { } }
+                if (typeof parsed === 'string') {
+                    try {
+                        parsed = JSON.parse(parsed);
+                    } catch (e: any) {
+                        extensionReadChatError = `extension read_chat parse failed: ${e?.message || String(e)}`;
+                    }
+                }
                 if (parsed && typeof parsed === 'object') {
                     const validated = validateReadChatResultPayload(parsed, 'extension read_chat');
                     _log(`Extension OK: ${validated.messages?.length || 0} msgs`);
@@ -610,8 +617,14 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     );
                     return buildReadChatCommandResult(validated as Record<string, any>, args);
                 }
+                if (!extensionReadChatError) {
+                    extensionReadChatError = 'extension read_chat returned a non-object payload';
+                }
+            } else {
+                extensionReadChatError = 'extension read_chat returned no payload';
             }
         } catch (e: any) {
+            extensionReadChatError = `extension read_chat failed: ${e?.message || String(e)}`;
             _log(`Extension error: ${e.message}`);
             traceProviderEvent(args, 'provider', 'extension.read_chat.error', {
                 h,
@@ -626,8 +639,8 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             const parentSessionId = h.currentSession?.parentSessionId;
             if (cdp && parentSessionId) {
                 const stream = await h.agentStream.collectActiveSession(cdp, parentSessionId);
-                if (stream?.agentType !== provider?.type) {
-                    return buildReadChatCommandResult({ messages: [], status: 'idle' }, args);
+                if (stream && stream.agentType !== provider?.type) {
+                    return { success: false, error: `extension read_chat stream agent mismatch for ${provider?.type || 'unknown_extension'}` };
                 }
                 if (stream) {
                     h.historyWriter.appendNewMessages(
@@ -645,7 +658,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 }
             }
         }
-        return buildReadChatCommandResult({ messages: [], status: 'idle' }, args);
+        return { success: false, error: extensionReadChatError || 'extension read_chat unavailable' };
     }
 
     // IDE category (default): cdp.evaluate
@@ -655,6 +668,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
     // webview IDE (Kiro, PearAI) → evaluateInWebviewFrame directly use
     const webviewScript = h.getProviderScript('webviewReadChat') || h.getProviderScript('webview_read_chat');
     if (webviewScript) {
+        let webviewReadChatError = '';
         try {
             const matchText = provider?.webviewMatchText;
             const matchFn = matchText
@@ -663,37 +677,56 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             const raw = await cdp.evaluateInWebviewFrame(webviewScript, matchFn);
             if (raw) {
                 let parsed: any = raw;
-                if (typeof parsed === 'string') { try { parsed = JSON.parse(parsed); } catch { } }
+                if (typeof parsed === 'string') {
+                    try {
+                        parsed = JSON.parse(parsed);
+                    } catch (e: any) {
+                        webviewReadChatError = `webview read_chat parse failed: ${e?.message || String(e)}`;
+                    }
+                }
                 if (parsed && typeof parsed === 'object') {
                     const validated = validateReadChatResultPayload(parsed, 'webview read_chat');
                     _log(`Webview OK: ${validated.messages?.length || 0} msgs`);
-                h.historyWriter.appendNewMessages(
-                    provider?.type || getCurrentProviderType(h, 'unknown_webview'),
-                    toHistoryPersistedMessages(normalizeReadChatMessages(validated)),
-                    validated.title,
-                    args?.targetSessionId,
-                    historySessionId,
-                );
+                    h.historyWriter.appendNewMessages(
+                        provider?.type || getCurrentProviderType(h, 'unknown_webview'),
+                        toHistoryPersistedMessages(normalizeReadChatMessages(validated)),
+                        validated.title,
+                        args?.targetSessionId,
+                        historySessionId,
+                    );
                     return buildReadChatCommandResult(validated as Record<string, any>, args);
                 }
+                if (!webviewReadChatError) {
+                    webviewReadChatError = 'webview read_chat returned a non-object payload';
+                }
+            } else {
+                webviewReadChatError = 'webview read_chat returned no payload';
             }
         } catch (e: any) {
+            webviewReadChatError = `webview read_chat failed: ${e?.message || String(e)}`;
             _log(`Webview readChat error: ${e.message}`);
         }
-        return buildReadChatCommandResult({ messages: [], status: 'idle' }, args);
+        return { success: false, error: webviewReadChatError || 'webview read_chat unavailable' };
     }
 
     // Regular IDE (Cursor, Windsurf, Trae etc) → main DOM evaluate
     const script = h.getProviderScript('readChat') || h.getProviderScript('read_chat');
     if (script) {
+        let ideReadChatError = '';
         try {
             const evalResult = await h.evaluateProviderScript('readChat', undefined, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
             if (evalResult?.result) {
                 let parsed: any = evalResult.result;
-                if (typeof parsed === 'string') { try { parsed = JSON.parse(parsed); } catch { } }
-                if (parsed && typeof parsed === 'object' && parsed.messages?.length > 0) {
+                if (typeof parsed === 'string') {
+                    try {
+                        parsed = JSON.parse(parsed);
+                    } catch (e: any) {
+                        ideReadChatError = `ide read_chat parse failed: ${e?.message || String(e)}`;
+                    }
+                }
+                if (parsed && typeof parsed === 'object') {
                     const validated = validateReadChatResultPayload(parsed, 'ide read_chat');
-                    _log(`OK: ${validated.messages?.length} msgs`);
+                    _log(`OK: ${validated.messages?.length || 0} msgs`);
                     traceProviderEvent(args, 'provider', 'ide.read_chat.success', {
                         h,
                         provider,
@@ -713,8 +746,14 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     );
                     return buildReadChatCommandResult(validated as Record<string, any>, args);
                 }
+                if (!ideReadChatError) {
+                    ideReadChatError = 'ide read_chat returned a non-object payload';
+                }
+            } else {
+                ideReadChatError = 'ide read_chat returned no payload';
             }
         } catch (e: any) {
+            ideReadChatError = `ide read_chat failed: ${e?.message || String(e)}`;
             LOG.info('Command', `[read_chat] Script error: ${e.message}`);
             traceProviderEvent(args, 'provider', 'ide.read_chat.error', {
                 h,
@@ -723,9 +762,10 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 payload: { method: 'evaluate', error: e.message },
             });
         }
+        return { success: false, error: ideReadChatError || 'ide read_chat unavailable' };
     }
 
-    return buildReadChatCommandResult({ messages: [], status: 'idle' }, args);
+    return { success: false, error: 'read_chat unavailable' };
 }
 
 export async function handleSendChat(h: CommandHelpers, args: any): Promise<CommandResult> {

package/src/logging/logger.ts

@@ -175,19 +175,18 @@ export function daemonLog(category: string, msg: string, level: LogLevel = 'info
     const label = LEVEL_LABEL[level];
     const line = `[${ts()}] [${label}] [${category}] ${msg}`;
 
- // Always record to file (including DEBUG)
+ // Apply the active log level consistently to console, file, and the remote ring buffer.
+ // Debug hot paths are useful when explicitly enabled, but should not inflate normal-mode logs.
+    if (!shouldOutput) return;
+
     writeToFile(line);
 
- // Always save to ring buffer (for remote transmission)
     ringBuffer.push({ ts: Date.now(), level, category, message: msg });
     if (ringBuffer.length > RING_BUFFER_SIZE) {
         ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
     }
 
- // Apply filter to console output
-    if (shouldOutput) {
-        origConsoleLog(line);
-    }
+    origConsoleLog(line);
 }
 
 // ─── Convenience API ────────────────────────────────

package/src/providers/provider-loader.ts

@@ -199,6 +199,10 @@ export class ProviderLoader {
     this.logFn(`[ProviderLoader] ${msg}`);
   }
 
+  private debugLog(msg: string): void {
+    LOG.debug('Provider', `[ProviderLoader] ${msg}`);
+  }
+
  // ─── Public API ────────────────────────────────
 
   /**
@@ -892,7 +896,7 @@ export class ProviderLoader {
             const loaded = this.loadScriptsFromDir(type, entry.scriptDir);
             if (loaded) {
               resolved.scripts = loaded;
-              this.log(`  [compatibility] ${type} v${currentVersion} → ${entry.scriptDir}`);
+              this.debugLog(`  [compatibility] ${type} v${currentVersion} → ${entry.scriptDir}`);
               resolved._resolvedScriptDir = entry.scriptDir;
               resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
               if (providerDir) {
@@ -912,7 +916,7 @@ export class ProviderLoader {
           const loaded = this.loadScriptsFromDir(type, base.defaultScriptDir);
           if (loaded) {
             resolved.scripts = loaded;
-            this.log(`  [compatibility] ${type} v${currentVersion} → default: ${base.defaultScriptDir}`);
+            this.debugLog(`  [compatibility] ${type} v${currentVersion} → default: ${base.defaultScriptDir}`);
             resolved._resolvedScriptDir = base.defaultScriptDir;
             resolved._resolvedScriptsSource = 'defaultScriptDir:version_miss';
             if (providerDir) {
@@ -955,7 +959,7 @@ export class ProviderLoader {
       const loaded = this.loadScriptsFromDir(type, base.defaultScriptDir);
       if (loaded) {
         resolved.scripts = loaded;
-        this.log(`  [compatibility] ${type} no version detected → default: ${base.defaultScriptDir}`);
+        this.debugLog(`  [compatibility] ${type} no version detected → default: ${base.defaultScriptDir}`);
         resolved._resolvedScriptDir = base.defaultScriptDir;
         resolved._resolvedScriptsSource = 'defaultScriptDir:no_version';
         if (providerDir) {

package/src/status/chat-tail-hot-sessions.ts

@@ -59,6 +59,7 @@ export function classifyHotChatSessionsForSubscriptionFlush(
     now?: number;
     recentMessageGraceMs?: number;
     activeStatuses?: ReadonlySet<string>;
+    activeSessionIds?: ReadonlySet<string>;
   } = {},
 ): { active: Set<string>; finalizing: Set<string> } {
   const now = options.now ?? Date.now();
@@ -69,6 +70,7 @@ export function classifyHotChatSessionsForSubscriptionFlush(
       : DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS,
   );
   const activeStatuses = options.activeStatuses ?? DEFAULT_ACTIVE_CHAT_POLL_STATUSES;
+  const activeSessionIds = options.activeSessionIds ?? new Set<string>();
   const active = new Set<string>();
   const excluded = new Set<string>();
 
@@ -79,6 +81,10 @@ export function classifyHotChatSessionsForSubscriptionFlush(
       excluded.add(sessionId);
       continue;
     }
+    if (activeSessionIds.has(sessionId)) {
+      active.add(sessionId);
+      continue;
+    }
 
     const status = String(session?.status || '').toLowerCase();
     const unread = session?.unread === true;