@adhdev/daemon-core 0.8.81 → 0.8.83

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

@@ -91,8 +91,6 @@ export declare class AcpProviderInstance implements ProviderInstance {
     private handleLegacyUpdate;
     /** Map SDK ToolCallStatus to internal status */
     private mapToolCallStatus;
-    /** Truncate content for transport (text: 2000 chars, images preserved) */
-    private truncateContent;
     /** Build ContentBlock[] from current partial state */
     private buildPartialBlocks;
     private buildPartialThoughtMessage;

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

@@ -41,6 +41,8 @@ export declare class CliProviderInstance implements ProviderInstance {
     private runtimeMessages;
     readonly instanceId: string;
     private suppressIdleHistoryReplay;
+    private errorMessage;
+    private errorReason;
     private presentationMode;
     private providerSessionId?;
     private launchMode;

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

@@ -44,7 +44,7 @@ export interface ActiveChatData {
     inputContent?: string;
 }
 /** Standardized error reasons across all provider categories */
-export type ProviderErrorReason = 'not_installed' | 'auth_failed' | 'spawn_error' | 'init_failed' | 'crash' | 'timeout' | 'cdp_error' | 'disconnected';
+export type ProviderErrorReason = 'not_installed' | 'auth_failed' | 'spawn_error' | 'init_failed' | 'parse_error' | 'crash' | 'timeout' | 'cdp_error' | 'disconnected';
 /** Common fields shared by all provider categories */
 interface ProviderStateBase {
     /** Provider type (e.g. 'gemini-cli', 'cursor', 'cline') */

package/dist/shared-types.d.ts

@@ -225,7 +225,7 @@ export type UnsubscribeRequest = {
 export type StandaloneWsStatusPayload = StatusReportPayload;
 export type SessionTransport = 'cdp-page' | 'cdp-webview' | 'pty' | 'acp';
 export type SessionKind = 'workspace' | 'agent';
-export type SessionCapability = 'read_chat' | 'send_message' | 'new_session' | 'list_sessions' | 'switch_session' | 'resolve_action' | 'open_panel' | 'terminal_io' | 'resize_terminal' | 'change_model' | 'set_mode' | 'set_thought_level';
+export type SessionCapability = 'read_chat' | 'send_message' | 'new_session' | 'list_sessions' | 'switch_session' | 'resolve_action' | 'open_panel' | 'terminal_io' | 'resize_terminal' | 'change_model' | 'set_mode' | 'set_thought_level' | 'delete_notification' | 'mark_notification_unread';
 import type { RuntimeWriteOwner, RuntimeAttachedClient, SessionStatus } from './shared-types-extra.js';
 export type { RuntimeWriteOwner, RuntimeAttachedClient, SessionStatus } from './shared-types-extra.js';
 export interface SessionEntry {
@@ -270,6 +270,8 @@ export interface SessionEntry {
     unread?: boolean;
     lastSeenAt?: number;
     inboxBucket?: RecentSessionBucket;
+    completionMarker?: string;
+    seenCompletionMarker?: string;
     surfaceHidden?: boolean;
 }
 /**

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

@@ -3,6 +3,8 @@ export declare const DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS = 8000;
 export interface HotChatSessionLike {
     id?: string | null;
     status?: unknown;
+    unread?: unknown;
+    inboxBucket?: unknown;
     lastMessageAt?: unknown;
     runtimeLifecycle?: unknown;
     runtimeSurfaceKind?: unknown;

package/dist/status/snapshot.d.ts

@@ -59,6 +59,7 @@ export interface RecentReadDebugSnapshot {
 }
 export declare function shouldEmitRecentReadDebugLog(cache: Map<string, string>, snapshot: RecentReadDebugSnapshot): boolean;
 export declare function buildMachineInfo(profile?: 'full' | 'live' | 'metadata'): MachineInfo;
+export { getSessionCurrentNotificationId, applySessionNotificationOverlay } from '../config/recent-activity.js';
 export declare function getSessionCompletionMarker(session: {
     activeChat?: {
         messages?: Array<{

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

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.8.81",
+  "version": "0.8.83",
   "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.8.81",
+  "version": "0.8.83",
   "description": "ADHDev daemon core \u2014 CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli-adapter-types.d.ts

@@ -7,6 +7,8 @@ import type { ChatMessage } from './types.js';
 export interface CliAdapterStatus {
     status?: string;
     messages?: ChatMessage[];
+    errorMessage?: string;
+    errorReason?: string;
     activeModal?: {
         message: string;
         buttons: string[];

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

@@ -17,6 +17,7 @@
 import * as os from 'os';
 import type { CliAdapter } from '../cli-adapter-types.js';
 import { LOG } from '../logging/logger.js';
+import { getDebugRuntimeConfig } from '../logging/debug-config.js';
 import { TerminalScreen } from './terminal-screen.js';
 import {
     NodePtyTransportFactory,
@@ -113,6 +114,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private recentOutputBuffer = '';
     private isWaitingForResponse = false;
     private activeModal: { message: string; buttons: string[] } | null = null;
+    private parseErrorMessage: string | null = null;
     private responseTimeout: NodeJS.Timeout | null = null;
     private idleTimeout: NodeJS.Timeout | null = null;
     private ready = false;
@@ -181,8 +183,23 @@ export class ProviderCliAdapter implements CliAdapter {
     private currentTurnScope: TurnParseScope | null = null;
     private traceEntries: CliTraceEntry[] = [];
     private traceSeq = 0;
-    private traceSessionId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+    private traceSessionId = '';
+    private parsedStatusCache: {
+        committedMessagesRef: CliChatMessage[];
+        responseBuffer: string;
+        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 static readonly MAX_TRACE_ENTRIES = 250;
+
     private readonly providerResolutionMeta: ProviderResolutionMeta;
     private static readonly FINISH_RETRY_DELAY_MS = 300;
     private static readonly MAX_FINISH_RETRIES = 2;
@@ -322,7 +339,19 @@ export class ProviderCliAdapter implements CliAdapter {
                 `[${this.cliType}] Provider resolution: providerDir=${this.providerResolutionMeta.providerDir || '-'} scriptDir=${this.providerResolutionMeta.scriptDir || '-'} scriptsPath=${this.providerResolutionMeta.scriptsPath || '-'} source=${this.providerResolutionMeta.scriptsSource || '-'} version=${this.providerResolutionMeta.resolvedVersion || '-'}`
             );
         } else {
-            LOG.warn('CLI', `[${this.cliType}] ⚠ No CLI scripts loaded! Provider needs scripts/{version}/scripts.js`);
+            const resolutionSummary = `providerDir=${this.providerResolutionMeta.providerDir || '-'} scriptDir=${this.providerResolutionMeta.scriptDir || '-'} scriptsPath=${this.providerResolutionMeta.scriptsPath || '-'} source=${this.providerResolutionMeta.scriptsSource || '-'} version=${this.providerResolutionMeta.resolvedVersion || '-'}`;
+            const hasResolvedProviderScripts = Boolean(
+                this.providerResolutionMeta.providerDir
+                || this.providerResolutionMeta.scriptDir
+                || this.providerResolutionMeta.scriptsPath
+                || this.providerResolutionMeta.scriptsSource
+                || this.providerResolutionMeta.resolvedVersion,
+            );
+            if (hasResolvedProviderScripts) {
+                LOG.warn('CLI', `[${this.cliType}] ⚠ No CLI scripts loaded! Provider needs scripts/{version}/scripts.js (${resolutionSummary})`);
+            } else {
+                LOG.info('CLI', `[${this.cliType}] CLI scripts not yet resolved (${resolutionSummary})`);
+            }
         }
     }
 
@@ -484,7 +513,8 @@ export class ProviderCliAdapter implements CliAdapter {
         this.terminalScreen.write(rawData);
         const cleanData = sanitizeTerminalText(rawData);
         const now = Date.now();
-        const normalizedScreenSnapshot = normalizeScreenSnapshot(this.terminalScreen.getText());
+        const screenText = this.terminalScreen.getText();
+        const normalizedScreenSnapshot = normalizeScreenSnapshot(screenText);
         this.lastOutputAt = now;
         if (cleanData.trim()) this.lastNonEmptyOutputAt = now;
         if (normalizedScreenSnapshot !== this.lastScreenSnapshot) {
@@ -497,13 +527,14 @@ export class ProviderCliAdapter implements CliAdapter {
         if (this.idleFinishCandidate && (rawData.length > 0 || cleanData.length > 0)) {
             this.clearIdleFinishCandidate('new_output');
         }
-        this.recordTrace('output', {
-            rawLength: rawData.length,
-            cleanLength: cleanData.length,
-            rawPreview: summarizeCliTraceText(rawData, 300),
-            cleanPreview: summarizeCliTraceText(cleanData, 300),
-            screenText: summarizeCliTraceText(this.terminalScreen.getText(), 1200),
-        });
+        if (getDebugRuntimeConfig().collectDebugTrace) {
+            this.recordTrace('output', {
+                rawLength: rawData.length,
+                cleanLength: cleanData.length,
+                rawPreview: summarizeCliTraceText(rawData, 300),
+                cleanPreview: summarizeCliTraceText(cleanData, 300),
+            });
+        }
 
         if (this.startupParseGate) {
             this.scheduleStartupSettleCheck();
@@ -1267,10 +1298,12 @@ export class ProviderCliAdapter implements CliAdapter {
 
     getStatus(): CliSessionStatus {
         return {
-            status: this.currentStatus,
+            status: this.parseErrorMessage ? 'error' : this.currentStatus,
             messages: [...this.committedMessages],
             workingDir: this.workingDir,
             activeModal: this.activeModal,
+            errorMessage: this.parseErrorMessage || undefined,
+            errorReason: this.parseErrorMessage ? 'parse_error' : undefined,
         };
     }
 
@@ -1301,15 +1334,36 @@ export class ProviderCliAdapter implements CliAdapter {
      * Called by command handler / dashboard for rich content rendering.
      */
     getScriptParsedStatus(): any {
+        const screenText = this.terminalScreen.getText();
+        const cached = this.parsedStatusCache;
+        if (
+            cached
+            && cached.committedMessagesRef === this.committedMessages
+            && cached.responseBuffer === this.responseBuffer
+            && 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;
+        }
+
         const parsed = this.parseCurrentTranscript(
             this.committedMessages,
             this.responseBuffer,
             this.currentTurnScope,
+            screenText,
         );
         const shouldPreferCommittedMessages =
             !this.currentTurnScope
             && this.currentStatus === 'idle'
             && !this.activeModal;
+        let result: any;
         if (parsed && Array.isArray(parsed.messages)) {
             const hydratedMessages = shouldPreferCommittedMessages
                 ? this.committedMessages.map((message, index) => buildChatMessage({
@@ -1325,7 +1379,7 @@ export class ProviderCliAdapter implements CliAdapter {
                     scope: this.currentTurnScope,
                     lastOutputAt: this.lastOutputAt,
                 });
-            return {
+            result = {
                 id: parsed.id || 'cli_session',
                 status: parsed.status || this.currentStatus,
                 title: parsed.title || this.cliName,
@@ -1333,23 +1387,39 @@ export class ProviderCliAdapter implements CliAdapter {
                 activeModal: parsed.activeModal ?? this.activeModal,
                 providerSessionId: typeof parsed.providerSessionId === 'string' ? parsed.providerSessionId : undefined,
             };
+        } else {
+            const messages = [...this.committedMessages];
+            result = {
+                id: 'cli_session',
+                status: this.currentStatus,
+                title: this.cliName,
+                messages: messages.map((message, index) => buildChatMessage({
+                    ...message,
+                    id: message.id || `msg_${index}`,
+                    index: typeof message.index === 'number' ? message.index : index,
+                    receivedAt: typeof message.receivedAt === 'number'
+                        ? message.receivedAt
+                        : message.timestamp,
+                })),
+                activeModal: this.activeModal,
+            };
         }
 
-        const messages = [...this.committedMessages];
-        return {
-            id: 'cli_session',
-            status: this.currentStatus,
-            title: this.cliName,
-            messages: messages.slice(-50).map((message, index) => buildChatMessage({
-                ...message,
-                id: message.id || `msg_${index}`,
-                index: typeof message.index === 'number' ? message.index : index,
-                receivedAt: typeof message.receivedAt === 'number'
-                    ? message.receivedAt
-                    : message.timestamp,
-            })),
+        this.parsedStatusCache = {
+            committedMessagesRef: this.committedMessages,
+            responseBuffer: this.responseBuffer,
+            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;
     }
 
     async invokeScript(scriptName: string, args?: Record<string, any>): Promise<any> {
@@ -1374,14 +1444,18 @@ export class ProviderCliAdapter implements CliAdapter {
         }));
     }
 
-    private parseCurrentTranscript(baseMessages: CliChatMessage[], partialResponse: string, scope?: TurnParseScope | null): any {
-        if (!this.cliScripts?.parseOutput) return null;
+    private parseCurrentTranscript(baseMessages: CliChatMessage[], partialResponse: string, scope?: TurnParseScope | null, screenTextOverride?: string): any {
+        if (!this.cliScripts?.parseOutput) {
+            this.parseErrorMessage = null;
+            return null;
+        }
         try {
+            const screenText = typeof screenTextOverride === 'string' ? screenTextOverride : this.terminalScreen.getText();
             const input = buildCliParseInput({
                 accumulatedBuffer: this.accumulatedBuffer,
                 accumulatedRawBuffer: this.accumulatedRawBuffer,
                 recentOutputBuffer: this.recentOutputBuffer,
-                terminalScreenText: this.terminalScreen.getText(),
+                terminalScreenText: screenText,
                 baseMessages,
                 partialResponse,
                 isWaitingForResponse: this.isWaitingForResponse,
@@ -1403,10 +1477,13 @@ export class ProviderCliAdapter implements CliAdapter {
                     lastAssistant.content = trimPromptEchoPrefix(lastAssistant.content, promptForTrim);
                 }
             }
+            this.parseErrorMessage = null;
             return parsed;
         } catch (e: any) {
-            LOG.warn('CLI', `[${this.cliType}] parseOutput error: ${e.message}`);
-            return null;
+            const message = e?.message || String(e);
+            this.parseErrorMessage = message;
+            LOG.warn('CLI', `[${this.cliType}] parseOutput error: ${message}`);
+            throw e;
         }
     }
 

package/src/cli-adapters/provider-cli-shared.d.ts

@@ -15,10 +15,9 @@ export interface CliSessionStatus {
     status: 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting';
     messages: CliChatMessage[];
     workingDir: string;
-    activeModal: {
-        message: string;
-        buttons: string[];
-    } | null;
+    activeModal: { message: string; buttons: string[] } | null;
+    errorMessage?: string;
+    errorReason?: string;
 }
 export interface CliScripts {
     parseOutput?: (input: CliScriptInput) => any;

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

@@ -22,6 +22,8 @@ export interface CliSessionStatus {
     messages: CliChatMessage[];
     workingDir: string;
     activeModal: { message: string; buttons: string[] } | null;
+    errorMessage?: string;
+    errorReason?: string;
 }
 
 export interface CliScripts {

package/src/cli-adapters/terminal-screen.ts

@@ -67,10 +67,12 @@ function logTerminalBackendSelection(
     if (loggedTerminalBackends.has(key)) return;
     loggedTerminalBackends.add(key);
     if (backendKind === 'xterm' && preference !== 'xterm' && !ghosttyAvailable) {
-        LOG.warn(
-            'Terminal',
-            `[terminal-screen] ghostty-vt unavailable; using xterm fallback (preference=${preference})`,
-        );
+        const message = `[terminal-screen] ghostty-vt unavailable; using xterm fallback (preference=${preference})`;
+        if (preference === 'auto') {
+            LOG.info('Terminal', message);
+        } else {
+            LOG.warn('Terminal', message);
+        }
         return;
     }
     LOG.info(

package/src/commands/chat-commands.ts

@@ -469,9 +469,14 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
         const adapter = getTargetedCliAdapter(h, args, provider?.type);
         if (adapter) {
             _log(`${transport} adapter: ${adapter.cliType}`);
-            const parsedStatus = typeof adapter.getScriptParsedStatus === 'function'
-                ? parseMaybeJson(adapter.getScriptParsedStatus())
-                : null;
+            let parsedStatus: any = null;
+            if (typeof adapter.getScriptParsedStatus === 'function') {
+                try {
+                    parsedStatus = parseMaybeJson(adapter.getScriptParsedStatus());
+                } catch (error: any) {
+                    return { success: false, error: error?.message || String(error) };
+                }
+            }
             const parsedRecord = parsedStatus && typeof parsedStatus === 'object'
                 ? parsedStatus as Record<string, any>
                 : null;

package/src/commands/router.ts

@@ -21,7 +21,7 @@ import { launchWithCdp, killIdeProcess, isIdeRunning } from '../launch.js';
 import { loadConfig, saveConfig, updateConfig } from '../config/config.js';
 import { loadState, saveState } from '../config/state-store.js';
 import { resolveIdeLaunchWorkspace } from '../config/workspaces.js';
-import { appendRecentActivity, getRecentActivity, markSessionSeen } from '../config/recent-activity.js';
+import { appendRecentActivity, getRecentActivity, markSessionSeen, dismissSessionNotification, markSessionNotificationUnread } from '../config/recent-activity.js';
 import { getSavedProviderSessions } from '../config/saved-sessions.js';
 import { listSavedHistorySessions } from '../config/chat-history.js';
 import { detectIDEs } from '../detection/ide-detector.js';
@@ -733,6 +733,64 @@ export class DaemonCommandRouter {
                 };
             }
 
+            case 'delete_notification': {
+                const sessionId = args?.sessionId;
+                const notificationId = typeof args?.notificationId === 'string' ? args.notificationId.trim() : '';
+                if (!sessionId || typeof sessionId !== 'string') {
+                    return { success: false, error: 'sessionId is required' };
+                }
+                if (!notificationId) {
+                    return { success: false, error: 'notificationId is required' };
+                }
+                const sessionEntries = buildSessionEntries(
+                    this.deps.instanceManager.collectAllStates(),
+                    this.deps.cdpManagers,
+                );
+                const targetSession = sessionEntries.find((entry) => entry.id === sessionId);
+                const next = dismissSessionNotification(
+                    loadState(),
+                    sessionId,
+                    notificationId,
+                    targetSession?.providerSessionId,
+                );
+                saveState(next);
+                this.deps.onStatusChange?.();
+                return {
+                    success: true,
+                    sessionId,
+                    notificationId,
+                };
+            }
+
+            case 'mark_notification_unread': {
+                const sessionId = args?.sessionId;
+                const notificationId = typeof args?.notificationId === 'string' ? args.notificationId.trim() : '';
+                if (!sessionId || typeof sessionId !== 'string') {
+                    return { success: false, error: 'sessionId is required' };
+                }
+                if (!notificationId) {
+                    return { success: false, error: 'notificationId is required' };
+                }
+                const sessionEntries = buildSessionEntries(
+                    this.deps.instanceManager.collectAllStates(),
+                    this.deps.cdpManagers,
+                );
+                const targetSession = sessionEntries.find((entry) => entry.id === sessionId);
+                const next = markSessionNotificationUnread(
+                    loadState(),
+                    sessionId,
+                    notificationId,
+                    targetSession?.providerSessionId,
+                );
+                saveState(next);
+                this.deps.onStatusChange?.();
+                return {
+                    success: true,
+                    sessionId,
+                    notificationId,
+                };
+            }
+
             // ─── Daemon Self-Upgrade ───
             case 'daemon_upgrade': {
                 LOG.info('Upgrade', 'Remote upgrade requested from dashboard');

package/src/config/recent-activity.ts

@@ -9,6 +9,7 @@
 
 import * as path from 'path';
 import type { ProviderSummaryMetadata } from '../shared-types.js';
+import type { RecentSessionBucket, SessionEntry } from '../shared-types.js';
 import type { DaemonState } from './state-store.js';
 import { expandPath } from './workspaces.js';
 import { normalizePersistedSummaryMetadata } from '../providers/summary-metadata.js';
@@ -99,6 +100,121 @@ export function getSessionSeenMarker(state: DaemonState, sessionId: string, prov
     return state.sessionReadMarkers?.[providerKey] || state.sessionReadMarkers?.[sessionId] || '';
 }
 
+export function getSessionNotificationDismissal(state: DaemonState, sessionId: string, providerSessionId?: string | null): string {
+    const providerKey = buildSessionReadStateKey(sessionId, providerSessionId);
+    return state.sessionNotificationDismissals?.[providerKey] || state.sessionNotificationDismissals?.[sessionId] || '';
+}
+
+export function getSessionNotificationUnreadOverride(state: DaemonState, sessionId: string, providerSessionId?: string | null): string {
+    const providerKey = buildSessionReadStateKey(sessionId, providerSessionId);
+    return state.sessionNotificationUnreadOverrides?.[providerKey] || state.sessionNotificationUnreadOverrides?.[sessionId] || '';
+}
+
+export function dismissSessionNotification(
+    state: DaemonState,
+    sessionId: string,
+    notificationId: string,
+    providerSessionId?: string | null,
+): DaemonState {
+    const dismissalId = String(notificationId || '').trim();
+    if (!dismissalId) return state;
+    const dismissalKeys = Array.from(new Set([
+        sessionId,
+        buildSessionReadStateKey(sessionId, providerSessionId),
+    ].filter(Boolean)));
+    const nextSessionNotificationDismissals = { ...(state.sessionNotificationDismissals || {}) };
+    const nextSessionNotificationUnreadOverrides = { ...(state.sessionNotificationUnreadOverrides || {}) };
+    for (const key of dismissalKeys) {
+        nextSessionNotificationDismissals[key] = dismissalId;
+        delete nextSessionNotificationUnreadOverrides[key];
+    }
+    return {
+        ...state,
+        sessionNotificationDismissals: nextSessionNotificationDismissals,
+        sessionNotificationUnreadOverrides: nextSessionNotificationUnreadOverrides,
+    };
+}
+
+export function markSessionNotificationUnread(
+    state: DaemonState,
+    sessionId: string,
+    notificationId: string,
+    providerSessionId?: string | null,
+): DaemonState {
+    const unreadId = String(notificationId || '').trim();
+    if (!unreadId) return state;
+    const unreadKeys = Array.from(new Set([
+        sessionId,
+        buildSessionReadStateKey(sessionId, providerSessionId),
+    ].filter(Boolean)));
+    const nextSessionNotificationDismissals = { ...(state.sessionNotificationDismissals || {}) };
+    const nextSessionNotificationUnreadOverrides = { ...(state.sessionNotificationUnreadOverrides || {}) };
+    for (const key of unreadKeys) {
+        nextSessionNotificationUnreadOverrides[key] = unreadId;
+        delete nextSessionNotificationDismissals[key];
+    }
+    return {
+        ...state,
+        sessionNotificationDismissals: nextSessionNotificationDismissals,
+        sessionNotificationUnreadOverrides: nextSessionNotificationUnreadOverrides,
+    };
+}
+
+export function getSessionNotificationTargetValue(session: Pick<SessionEntry, 'id' | 'providerSessionId'>): string {
+    const providerSessionId = typeof session.providerSessionId === 'string' ? session.providerSessionId.trim() : '';
+    return providerSessionId || session.id;
+}
+
+export function getSessionCurrentNotificationId(session: Pick<SessionEntry, 'id' | 'providerSessionId' | 'inboxBucket' | 'unread' | 'lastMessageHash' | 'lastMessageAt' | 'lastUpdated' | 'status'>): string {
+    const inboxBucket = session.inboxBucket || 'idle';
+    const isNeedsAttention = inboxBucket === 'needs_attention' || session.status === 'waiting_approval';
+    const isTaskComplete = inboxBucket === 'task_complete' && !!session.unread;
+    const type = isNeedsAttention ? 'needs_attention' : isTaskComplete ? 'task_complete' : '';
+    if (!type) return '';
+    const target = getSessionNotificationTargetValue(session);
+    const lastMessageHash = typeof session.lastMessageHash === 'string' ? session.lastMessageHash : '';
+    const timestamp = Number(session.lastMessageAt || session.lastUpdated || 0);
+    return [type, target, lastMessageHash, String(timestamp)].join('|');
+}
+
+export function applySessionNotificationOverlay(
+    session: Pick<SessionEntry, 'id' | 'providerSessionId' | 'inboxBucket' | 'unread' | 'lastMessageHash' | 'lastMessageAt' | 'lastUpdated' | 'status'>,
+    overlay: { dismissedNotificationId?: string | null; unreadNotificationId?: string | null },
+): { unread: boolean; inboxBucket: RecentSessionBucket } {
+    const currentNotificationId = getSessionCurrentNotificationId(session);
+    const taskCompleteNotificationId = (() => {
+        const target = getSessionNotificationTargetValue(session);
+        const lastMessageHash = typeof session.lastMessageHash === 'string' ? session.lastMessageHash : '';
+        const timestamp = Number(session.lastMessageAt || session.lastUpdated || 0);
+        if (!target || !lastMessageHash || !timestamp) return '';
+        return ['task_complete', target, lastMessageHash, String(timestamp)].join('|');
+    })();
+    const dismissedNotificationId = typeof overlay.dismissedNotificationId === 'string' ? overlay.dismissedNotificationId.trim() : '';
+    const unreadNotificationId = typeof overlay.unreadNotificationId === 'string' ? overlay.unreadNotificationId.trim() : '';
+    if (
+        unreadNotificationId
+        && (currentNotificationId === unreadNotificationId || taskCompleteNotificationId === unreadNotificationId)
+    ) {
+        const forcedInboxBucket = session.inboxBucket === 'needs_attention' || session.status === 'waiting_approval'
+            ? 'needs_attention'
+            : 'task_complete';
+        return {
+            unread: true,
+            inboxBucket: forcedInboxBucket,
+        };
+    }
+    if (!currentNotificationId || !dismissedNotificationId || currentNotificationId !== dismissedNotificationId) {
+        return {
+            unread: !!session.unread,
+            inboxBucket: session.inboxBucket || 'idle',
+        };
+    }
+    return {
+        unread: false,
+        inboxBucket: 'idle',
+    };
+}
+
 export function markSessionSeen(
     state: DaemonState,
     sessionId: string,
@@ -115,13 +231,19 @@ export function markSessionSeen(
     ].filter(Boolean)));
     const nextSessionReads = { ...prev };
     const nextSessionReadMarkers = { ...prevMarkers };
+    const nextSessionNotificationDismissals = { ...(state.sessionNotificationDismissals || {}) };
+    const nextSessionNotificationUnreadOverrides = { ...(state.sessionNotificationUnreadOverrides || {}) };
     for (const key of readKeys) {
         nextSessionReads[key] = Math.max(prev[key] || 0, seenAt);
         if (nextMarker) nextSessionReadMarkers[key] = nextMarker;
+        delete nextSessionNotificationDismissals[key];
+        delete nextSessionNotificationUnreadOverrides[key];
     }
     return {
         ...state,
         sessionReads: nextSessionReads,
         sessionReadMarkers: nextMarker ? nextSessionReadMarkers : prevMarkers,
+        sessionNotificationDismissals: nextSessionNotificationDismissals,
+        sessionNotificationUnreadOverrides: nextSessionNotificationUnreadOverrides,
     };
 }