@adhdev/daemon-core 0.9.39 → 0.9.41

package/dist/providers/acp-provider-instance.d.ts

@@ -15,7 +15,7 @@
  * 5. dispose() → kill process
  */
 import type { ProviderModule, ContentBlock, InputEnvelope } from './contracts.js';
-import type { ProviderInstance, AcpProviderState, InstanceContext } from './provider-instance.js';
+import type { ProviderInstance, AcpProviderState, InstanceContext, SessionModalState } from './provider-instance.js';
 export declare function buildAcpPromptParts(input: InputEnvelope, agentCapabilities?: Record<string, any>): ContentBlock[];
 export declare class AcpProviderInstance implements ProviderInstance {
     private cliArgs;
@@ -59,6 +59,7 @@ export declare class AcpProviderInstance implements ProviderInstance {
     constructor(provider: ProviderModule, workingDir: string, cliArgs?: string[]);
     init(context: InstanceContext): Promise<void>;
     onTick(): Promise<void>;
+    getSessionModalState(): SessionModalState;
     getState(): AcpProviderState;
     onEvent(event: string, data?: any): void;
     getInstanceId(): string;

package/dist/providers/cli-provider-instance.d.ts

@@ -5,7 +5,7 @@
  * collectCliData() + status transition logic from daemon-status.ts moved here.
  */
 import { type ProviderModule } from './contracts.js';
-import type { ProviderInstance, ProviderState, InstanceContext, HotChatSessionState } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, InstanceContext, HotChatSessionState, SessionModalState } from './provider-instance.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
 type PersistableCliHistoryMessage = {
@@ -91,6 +91,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     setPresentationMode(mode: 'terminal' | 'chat'): void;
     getPresentationMode(): 'terminal' | 'chat';
     getHotChatSessionState(): HotChatSessionState;
+    getSessionModalState(): SessionModalState;
     updateSettings(newSettings: Record<string, any>): void;
     onEvent(event: string, data?: any): void;
     dispose(): void;

package/dist/providers/extension-provider-instance.d.ts

@@ -5,7 +5,7 @@
  * CDP webview discovery + agent stream collection moved here.
  */
 import { type ProviderModule } from './contracts.js';
-import type { ProviderInstance, ProviderState, InstanceContext } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, InstanceContext, SessionModalState } from './provider-instance.js';
 export declare class ExtensionProviderInstance implements ProviderInstance {
     readonly type: string;
     readonly category: "extension";
@@ -37,6 +37,7 @@ export declare class ExtensionProviderInstance implements ProviderInstance {
     init(context: InstanceContext): Promise<void>;
     onTick(): Promise<void>;
     getState(): ProviderState;
+    getSessionModalState(sessionId?: string): SessionModalState | null;
     onEvent(event: string, data?: any): void;
     dispose(): void;
     updateSettings(newSettings: Record<string, any>): void;

package/dist/providers/ide-provider-instance.d.ts

@@ -9,7 +9,7 @@
  * Daemon collects all via a single IDE Instance.getState() call.
  */
 import { type ProviderModule } from './contracts.js';
-import type { ProviderInstance, ProviderState, InstanceContext } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, InstanceContext, SessionModalState } from './provider-instance.js';
 import { ExtensionProviderInstance } from './extension-provider-instance.js';
 export declare class IdeProviderInstance implements ProviderInstance {
     readonly type: string;
@@ -37,6 +37,7 @@ export declare class IdeProviderInstance implements ProviderInstance {
     init(context: InstanceContext): Promise<void>;
     onTick(): Promise<void>;
     getState(): ProviderState;
+    getSessionModalState(sessionId?: string): SessionModalState | null;
     onEvent(event: string, data?: any): void;
     dispose(): void;
     updateSettings(newSettings: Record<string, any>): void;

package/dist/providers/provider-instance-manager.d.ts

@@ -7,7 +7,7 @@
  * 3. Collect overall state
  * 4. Event collection and propagation
  */
-import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, HotChatSessionState } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, HotChatSessionState, SessionModalState } from './provider-instance.js';
 export declare class ProviderInstanceManager {
     private instances;
     private tickTimer;
@@ -46,6 +46,9 @@ export declare class ProviderInstanceManager {
     */
     collectAllStates(): ProviderState[];
     collectHotChatSessionStates(): HotChatSessionState[];
+    getSessionModalState(sessionId: string, options?: {
+        instanceKey?: string | null;
+    }): SessionModalState | null;
     /**
     * Per-category status collect
     */

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

@@ -123,6 +123,12 @@ export interface HotChatSessionState {
     runtimeRestoredFromStorage?: unknown;
     runtimeRecoveryState?: unknown;
 }
+export interface SessionModalState {
+    id: string;
+    status?: unknown;
+    title?: unknown;
+    activeModal?: unknown;
+}
 export interface InstanceContext {
     /** CDP connection (IDE/Extension) */
     cdp?: {
@@ -159,6 +165,11 @@ export interface ProviderInstance {
      * parsing here; callers use this on P2P hot flush paths.
      */
     getHotChatSessionState?(): HotChatSessionState | HotChatSessionState[] | null;
+    /**
+     * Return the cheap modal metadata for a single session subscription. This is
+     * used on P2P topic flushes and must not invoke rich chat/transcript parsing.
+     */
+    getSessionModalState?(sessionId?: string): SessionModalState | null;
     /** Receive event (external → Instance) */
     onEvent(event: string, data?: any): void;
     /** Update settings at runtime (called when user changes settings from dashboard) */

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

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

@@ -273,12 +273,10 @@ export class ProviderCliAdapter implements CliAdapter {
         currentTurnScope: TurnParseScope | null;
         recentOutputBuffer: string;
         accumulatedBuffer: string;
-        accumulatedRawBuffer: string;
         screenText: string;
         currentStatus: CliSessionStatus['status'];
         activeModal: { message: string; buttons: string[] } | null;
         cliName: string;
-        lastOutputAt: number;
         result: any;
     } | null = null;
     private lastStatusHotPathParseAt = Number.NEGATIVE_INFINITY;
@@ -352,12 +350,10 @@ export class ProviderCliAdapter implements CliAdapter {
             && cached.currentTurnScope === this.currentTurnScope
             && cached.recentOutputBuffer === this.recentOutputBuffer
             && cached.accumulatedBuffer === this.accumulatedBuffer
-            && cached.accumulatedRawBuffer === this.accumulatedRawBuffer
             && cached.screenText === this.lastScreenText
             && cached.currentStatus === this.currentStatus
             && cached.activeModal === this.activeModal
             && cached.cliName === this.cliName
-            && cached.lastOutputAt === this.lastOutputAt
         ) {
             return cached.result;
         }
@@ -1835,12 +1831,10 @@ export class ProviderCliAdapter implements CliAdapter {
             && cached.currentTurnScope === this.currentTurnScope
             && cached.recentOutputBuffer === this.recentOutputBuffer
             && cached.accumulatedBuffer === this.accumulatedBuffer
-            && cached.accumulatedRawBuffer === this.accumulatedRawBuffer
             && cached.screenText === screenText
             && cached.currentStatus === this.currentStatus
             && cached.activeModal === this.activeModal
             && cached.cliName === this.cliName
-            && cached.lastOutputAt === this.lastOutputAt
         ) {
             return cached.result;
         }
@@ -2002,12 +1996,10 @@ export class ProviderCliAdapter implements CliAdapter {
             currentTurnScope: this.currentTurnScope,
             recentOutputBuffer: this.recentOutputBuffer,
             accumulatedBuffer: this.accumulatedBuffer,
-            accumulatedRawBuffer: this.accumulatedRawBuffer,
             screenText,
             currentStatus: this.currentStatus,
             activeModal: this.activeModal,
             cliName: this.cliName,
-            lastOutputAt: this.lastOutputAt,
             result,
         };
         return result;

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

@@ -173,10 +173,12 @@ export function hydrateCliParsedMessages(
         });
 }
 
-function chooseMoreComparableCliMessage(left: CliChatMessage, right: CliChatMessage): CliChatMessage {
-    const leftComparable = normalizeComparableMessageContent(left.content || '');
-    const rightComparable = normalizeComparableMessageContent(right.content || '');
-
+function chooseMoreComparableCliMessage(
+    left: CliChatMessage,
+    right: CliChatMessage,
+    leftComparable = normalizeComparableMessageContent(left.content || ''),
+    rightComparable = normalizeComparableMessageContent(right.content || ''),
+): CliChatMessage {
     if (leftComparable && leftComparable === rightComparable) {
         const leftNewlines = String(left.content || '').split(/\r\n|\n|\r/g).length - 1;
         const rightNewlines = String(right.content || '').split(/\r\n|\n|\r/g).length - 1;
@@ -187,35 +189,43 @@ function chooseMoreComparableCliMessage(left: CliChatMessage, right: CliChatMess
 }
 
 function dedupeConsecutiveComparableCliMessages(messages: CliChatMessage[]): CliChatMessage[] {
-    const deduped: CliChatMessage[] = [];
+    const deduped: Array<{ message: CliChatMessage; comparable: string }> = [];
 
     for (const message of messages) {
         const current = {
             ...message,
             content: typeof message.content === 'string' ? message.content : String(message.content || ''),
         } as CliChatMessage;
+        const currentComparable = normalizeComparableMessageContent(current.content || '');
         const previous = deduped[deduped.length - 1];
         if (!previous) {
-            deduped.push(current);
+            deduped.push({ message: current, comparable: currentComparable });
             continue;
         }
 
-        const previousComparable = normalizeComparableMessageContent(previous.content || '');
-        const currentComparable = normalizeComparableMessageContent(current.content || '');
-        const sameRole = previous.role === current.role;
-        const sameKind = (previous.kind || 'standard') === (current.kind || 'standard');
-        const sameSender = (previous.senderName || '') === (current.senderName || '');
-        const comparableMatch = previousComparable && previousComparable === currentComparable;
+        const sameRole = previous.message.role === current.role;
+        const sameKind = (previous.message.kind || 'standard') === (current.kind || 'standard');
+        const sameSender = (previous.message.senderName || '') === (current.senderName || '');
+        const comparableMatch = previous.comparable && previous.comparable === currentComparable;
 
         if (sameRole && sameKind && sameSender && comparableMatch) {
-            deduped[deduped.length - 1] = chooseMoreComparableCliMessage(previous, current);
+            const selected = chooseMoreComparableCliMessage(
+                previous.message,
+                current,
+                previous.comparable,
+                currentComparable,
+            );
+            deduped[deduped.length - 1] = {
+                message: selected,
+                comparable: selected === current ? currentComparable : previous.comparable,
+            };
             continue;
         }
 
-        deduped.push(current);
+        deduped.push({ message: current, comparable: currentComparable });
     }
 
-    return deduped;
+    return deduped.map((entry) => entry.message);
 }
 
 export function normalizeCliParsedMessages(

package/src/commands/chat-commands.ts

@@ -178,85 +178,90 @@ function normalizeReadChatMessages(payload: Record<string, any>): ChatMessage[]
     return normalizeChatMessages(messages);
 }
 
-function buildReadChatReplayCollapseSignature(message: ChatMessage | null | undefined): string {
-    if (!message) return '';
-    const role = typeof message.role === 'string' ? message.role.trim().toLowerCase() : '';
-    const kind = typeof message.kind === 'string' ? message.kind.trim().toLowerCase() : 'standard';
-    const senderName = typeof message.senderName === 'string' ? message.senderName.trim().toLowerCase() : '';
-    const content = flattenContent(message.content || '').replace(/\s+/g, ' ').trim();
-    return `${role}:${kind}:${senderName}:${content}`;
-}
-
-function shouldCollapseReadChatReplayDuplicate(message: ChatMessage | null | undefined): boolean {
-    if (!message) return false;
-    const role = typeof message.role === 'string' ? message.role.trim().toLowerCase() : '';
-    return role === 'assistant' || role === 'system';
+interface ReadChatReplayCollapseInfo {
+    role: string;
+    kind: string;
+    senderName: string;
+    content: string;
+    signature: string;
+    collapsible: boolean;
 }
 
-function normalizeReadChatReplayText(message: ChatMessage | null | undefined): string {
-    return flattenContent(message?.content || '').replace(/\s+/g, ' ').trim();
+function normalizeReadChatReplayTextContent(content: ChatMessage['content'] | undefined): string {
+    return flattenContent(content || '').replace(/\s+/g, ' ').trim();
 }
 
-function isStableReadChatAssistantAnswer(message: ChatMessage | null | undefined): boolean {
-    if (!message) return false;
+function getReadChatReplayCollapseInfo(message: ChatMessage | null | undefined): ReadChatReplayCollapseInfo | null {
+    if (!message) return null;
     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;
+    const senderName = typeof message.senderName === 'string' ? message.senderName.trim().toLowerCase() : '';
+    const collapsible = role === 'assistant' || role === 'system';
+    if (!collapsible) return { role, kind, senderName, content: '', signature: '', collapsible };
+    const content = normalizeReadChatReplayTextContent(message.content);
+    return {
+        role,
+        kind,
+        senderName,
+        content,
+        signature: `${role}:${kind}:${senderName}:${content}`,
+        collapsible,
+    };
+}
+
+function isStableReadChatAssistantAnswerInfo(info: ReadChatReplayCollapseInfo | null): boolean {
+    if (!info) return false;
+    if (info.role !== 'assistant') return false;
+    if (info.kind && info.kind !== 'standard') return false;
+    if (info.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;
+    if (/^(bash|shell|terminal) command\b/i.test(info.content)) return false;
     return true;
 }
 
-function isReplayedAssistantAnswerAfterStableAnswer(
-    message: ChatMessage | null | undefined,
-    stableAnswer: ChatMessage | null,
+function isReplayedAssistantAnswerAfterStableAnswerInfo(
+    info: ReadChatReplayCollapseInfo | null,
+    stableContent: string,
 ): 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 (!info || !stableContent) return false;
+    if (info.role !== 'assistant') return false;
+    if (info.kind && info.kind !== 'standard') return false;
+    const content = info.content;
     if (content.length < 80 || stableContent.length < 80) return false;
     return content === stableContent || content.startsWith(stableContent) || stableContent.startsWith(content);
 }
 
-function collapseReplayDuplicatesFromReadChat(messages: ChatMessage[]): ChatMessage[] {
+export function collapseReplayDuplicatesFromReadChat(messages: ChatMessage[]): ChatMessage[] {
     const collapsed: ChatMessage[] = [];
     const replaySignaturesInCurrentTurn = new Set<string>();
-    let stableAssistantAnswerInCurrentTurn: ChatMessage | null = null;
+    let stableAssistantAnswerContentInCurrentTurn = '';
+    let previousReplaySignature = '';
 
     for (const message of messages) {
-        const role = typeof message.role === 'string' ? message.role.trim().toLowerCase() : '';
-        if (role === 'user') {
+        const info = getReadChatReplayCollapseInfo(message);
+        if (info?.role === 'user') {
             replaySignaturesInCurrentTurn.clear();
-            stableAssistantAnswerInCurrentTurn = null;
+            stableAssistantAnswerContentInCurrentTurn = '';
+            previousReplaySignature = '';
         }
 
-        const signature = buildReadChatReplayCollapseSignature(message);
-        const previous = collapsed[collapsed.length - 1];
-        const previousSignature = buildReadChatReplayCollapseSignature(previous);
-
-        if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
-            if (previousSignature === signature) continue;
-            if (replaySignaturesInCurrentTurn.has(signature)) continue;
-            if (isReplayedAssistantAnswerAfterStableAnswer(message, stableAssistantAnswerInCurrentTurn)) continue;
+        if (info?.collapsible && info.signature) {
+            if (previousReplaySignature === info.signature) continue;
+            if (replaySignaturesInCurrentTurn.has(info.signature)) continue;
+            if (isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableAssistantAnswerContentInCurrentTurn)) continue;
         }
 
         collapsed.push(message);
-        if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
-            replaySignaturesInCurrentTurn.add(signature);
+        previousReplaySignature = info?.collapsible ? info.signature : '';
+        if (info?.collapsible && info.signature) {
+            replaySignaturesInCurrentTurn.add(info.signature);
         }
-        if (isStableReadChatAssistantAnswer(message)) {
-            stableAssistantAnswerInCurrentTurn = message;
+        if (isStableReadChatAssistantAnswerInfo(info)) {
+            stableAssistantAnswerContentInCurrentTurn = info?.content || '';
         }
     }
 
@@ -369,13 +374,17 @@ function computeReadChatSync(messages: ChatMessage[], cursor: Required<ReadChatC
     }
 
     if (cursor.tailLimit > 0 && knownSignature === lastMessageSignature) {
-        return {
-            syncMode: 'noop',
-            replaceFrom: totalMessages,
-            messages: [],
-            totalMessages,
-            lastMessageSignature,
-        };
+        const requestedTailCount = Math.min(totalMessages, cursor.tailLimit);
+        if (knownMessageCount >= requestedTailCount) {
+            return {
+                syncMode: 'noop',
+                replaceFrom: totalMessages,
+                messages: [],
+                totalMessages,
+                lastMessageSignature,
+            };
+        }
+        return buildBoundedTailSync(messages, cursor);
     }
 
     if (knownMessageCount < totalMessages) {

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

@@ -49,7 +49,7 @@ import {
 import type { ProviderModule, ContentBlock, InputEnvelope, ToolCallInfo, ToolCallContent as TCC, ToolKind, ToolCallStatus as TCS } from './contracts.js';
 import { normalizeContent, flattenContent, normalizeInputEnvelope } from './contracts.js';
 import { assertProviderSupportsDeclaredInput } from './provider-input-support.js';
-import type { ProviderInstance, ProviderState, AcpProviderState, ProviderErrorReason, ProviderEvent, InstanceContext } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, AcpProviderState, ProviderErrorReason, ProviderEvent, InstanceContext, SessionModalState } from './provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
 import { buildLegacyModelModeSummaryMetadata } from './summary-metadata.js';
 import {
@@ -283,6 +283,19 @@ export class AcpProviderInstance implements ProviderInstance {
         }
     }
 
+    getSessionModalState(): SessionModalState {
+        const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
+        return {
+            id: this.instanceId,
+            status: this.currentStatus,
+            title: `${this.provider.name} · ${dirName}`,
+            activeModal: this.currentStatus === 'waiting_approval' ? {
+                message: this.activeToolCalls.find(t => t.status === 'running')?.name || 'Permission requested',
+                buttons: ['Approve', 'Reject'],
+            } : null,
+        };
+    }
+
     getState(): AcpProviderState {
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
 

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

@@ -12,7 +12,7 @@ import * as fs from 'fs';
 import { createRequire } from 'node:module';
 import { normalizeInputEnvelope, type ProviderModule, flattenContent } from './contracts.js';
 import { assertTextOnlyInput } from './provider-input-support.js';
-import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, ProviderErrorReason, HotChatSessionState } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, ProviderErrorReason, HotChatSessionState, SessionModalState } from './provider-instance.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { CliProviderModule } from '../cli-adapters/provider-cli-adapter.js';
 import type { PtyRuntimeMetadata, PtyTransportFactory } from '../cli-adapters/pty-transport.js';
@@ -533,6 +533,19 @@ export class CliProviderInstance implements ProviderInstance {
         };
     }
 
+    getSessionModalState(): SessionModalState {
+        const adapterStatus = this.adapter.getStatus({ allowParse: false });
+        const autoApproveActive = adapterStatus.status === 'waiting_approval' && this.shouldAutoApprove();
+        const visibleStatus = autoApproveActive ? 'generating' : adapterStatus.status;
+        const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
+        return {
+            id: this.instanceId,
+            status: visibleStatus,
+            title: dirName,
+            activeModal: autoApproveActive ? null : adapterStatus.activeModal,
+        };
+    }
+
     updateSettings(newSettings: Record<string, any>): void {
         this.settings = { ...newSettings };
         this.adapter.updateRuntimeSettings?.(this.settings);

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

@@ -6,7 +6,7 @@
  */
 
 import { flattenContent, type ProviderModule } from './contracts.js';
-import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, SessionModalState } from './provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
 import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from './control-effects.js';
 import { ChatHistoryWriter } from '../config/chat-history.js';
@@ -110,6 +110,16 @@ export class ExtensionProviderInstance implements ProviderInstance {
         };
     }
 
+    getSessionModalState(sessionId?: string): SessionModalState | null {
+        if (sessionId && sessionId !== this.instanceId) return null;
+        return {
+            id: this.instanceId,
+            status: this.currentStatus,
+            title: this.chatTitle || this.agentName || this.provider.name,
+            activeModal: this.activeModal,
+        };
+    }
+
     onEvent(event: string, data?: any): void {
         if (event === 'stream_update') {
  // Reflect data collected from agent-stream-manager

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

@@ -12,7 +12,7 @@
 import * as os from 'os';
 import * as crypto from 'crypto';
 import { flattenContent, type ProviderModule } from './contracts.js';
-import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, SessionModalState } from './provider-instance.js';
 import { ExtensionProviderInstance } from './extension-provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
 import { ChatHistoryWriter } from '../config/chat-history.js';
@@ -172,6 +172,30 @@ export class IdeProviderInstance implements ProviderInstance {
         };
     }
 
+    getSessionModalState(sessionId?: string): SessionModalState | null {
+        if (sessionId && sessionId !== this.instanceId) {
+            for (const ext of this.extensions.values()) {
+                const projected = ext.getSessionModalState?.(sessionId);
+                if (projected?.id === sessionId) return projected;
+            }
+            return null;
+        }
+
+        const autoApproveActive = (
+            this.currentStatus === 'waiting_approval'
+            || this.cachedChat?.status === 'waiting_approval'
+        ) && this.canAutoApprove();
+        const visibleStatus = autoApproveActive ? 'generating' : this.currentStatus;
+        return {
+            id: this.instanceId,
+            status: autoApproveActive && this.cachedChat?.status === 'waiting_approval'
+                ? 'generating'
+                : (this.cachedChat?.status || visibleStatus),
+            title: this.cachedChat?.title || this.type,
+            activeModal: autoApproveActive ? null : (this.cachedChat?.activeModal || null),
+        };
+    }
+
     onEvent(event: string, data?: any): void {
         if (event === 'cdp_connected') {
 // CDP connection done

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

@@ -8,7 +8,7 @@
  * 4. Event collection and propagation
  */
 
-import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, HotChatSessionState } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, HotChatSessionState, SessionModalState } from './provider-instance.js';
 import { LOG } from '../logging/logger.js';
 
 function projectHotChatSessionStatesFromProviderState(state: ProviderState): HotChatSessionState[] {
@@ -165,6 +165,32 @@ export class ProviderInstanceManager {
         return sessions;
     }
 
+    getSessionModalState(sessionId: string, options: { instanceKey?: string | null } = {}): SessionModalState | null {
+        if (!sessionId) return null;
+        const candidates = [sessionId];
+        if (options.instanceKey && options.instanceKey !== sessionId) {
+            candidates.push(options.instanceKey);
+        }
+
+        for (const id of candidates) {
+            const instance = this.instances.get(id);
+            if (!instance?.getSessionModalState) continue;
+            try {
+                const projected = instance.getSessionModalState(sessionId);
+                if (!projected?.id) continue;
+                if (projected.id !== sessionId) {
+                    LOG.warn('InstanceMgr', `[InstanceManager] Ignoring mismatched session modal projection from ${id}: requested=${sessionId} projected=${projected.id}`);
+                    continue;
+                }
+                return projected;
+            } catch (e) {
+                LOG.warn('InstanceMgr', `[InstanceManager] Failed to project session modal metadata from ${id}: ${(e as Error).message}`);
+            }
+        }
+
+        return null;
+    }
+
  /**
  * Per-category status collect
  */

package/src/providers/provider-instance.ts

@@ -147,6 +147,13 @@ export interface HotChatSessionState {
     runtimeRecoveryState?: unknown;
 }
 
+export interface SessionModalState {
+    id: string;
+    status?: unknown;
+    title?: unknown;
+    activeModal?: unknown;
+}
+
 // ─── ProviderInstance interface ─────────────────
 
 export interface InstanceContext {
@@ -191,6 +198,12 @@ export interface ProviderInstance {
      */
     getHotChatSessionState?(): HotChatSessionState | HotChatSessionState[] | null;
 
+    /**
+     * Return the cheap modal metadata for a single session subscription. This is
+     * used on P2P topic flushes and must not invoke rich chat/transcript parsing.
+     */
+    getSessionModalState?(sessionId?: string): SessionModalState | null;
+
  /** Receive event (external → Instance) */
     onEvent(event: string, data?: any): void;