@adhdev/daemon-core 0.8.102 → 0.9.1

package/dist/shared-types.d.ts

@@ -13,6 +13,9 @@ export type { ProviderErrorReason } from './providers/provider-instance.js';
 import type { ActiveChatData as _ActiveChatData, ProviderErrorReason as _ProviderErrorReason } from './providers/provider-instance.js';
 import type { WorkspaceEntry } from './config/workspaces.js';
 import type { ProviderResumeCapability } from './providers/contracts.js';
+export interface SessionActiveChatData extends Omit<_ActiveChatData, 'messages'> {
+    messages?: _ActiveChatData['messages'];
+}
 export type { WorkspaceEntry } from './config/workspaces.js';
 /** Agent stream snapshot carried by flattened UI entries. */
 export interface AgentSessionStream {
@@ -251,7 +254,7 @@ export interface SessionEntry {
     runtimeRestoredFromStorage?: boolean;
     runtimeRecoveryState?: string | null;
     resume?: ProviderResumeCapability;
-    activeChat: _ActiveChatData | null;
+    activeChat: SessionActiveChatData | null;
     capabilities?: SessionCapability[];
     cdpConnected?: boolean;
     /** Dynamic control current values (generic key-value) */

package/dist/status/normalize.d.ts

@@ -1,4 +1,5 @@
 import type { ActiveChatData } from '../providers/provider-instance.js';
+import type { SessionActiveChatData } from '../shared-types.js';
 export type ManagedStatus = 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting' | 'panel_hidden' | 'not_monitored' | 'disconnected';
 export interface NormalizeActiveChatOptions {
     includeMessages?: boolean;
@@ -21,4 +22,4 @@ export declare function isManagedStatusWaiting(status?: string | null, opts?: {
         buttons?: unknown[] | null;
     } | null;
 }): boolean;
-export declare function normalizeActiveChatData<T extends ActiveChatData | null | undefined>(activeChat: T, options?: NormalizeActiveChatOptions): T;
+export declare function normalizeActiveChatData<T extends ActiveChatData | null | undefined>(activeChat: T, options?: NormalizeActiveChatOptions): T extends null | undefined ? T : SessionActiveChatData;

package/dist/status/normalize.js

@@ -140,10 +140,13 @@ function normalizeActiveChatData(activeChat, options = FULL_STATUS_ACTIVE_CHAT_O
     ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,
     ...options
   };
-  return {
-    ...activeChat,
+  const {
+    messages: _messages,
+    ...rest
+  } = activeChat;
+  const normalized = {
+    ...rest,
     status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),
-    messages: trimMessagesForStatus(activeChat.messages, resolvedOptions),
     activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {
       message: truncateString(activeChat.activeModal.message || "", STATUS_MODAL_MESSAGE_LIMIT),
       buttons: (activeChat.activeModal.buttons || []).map(
@@ -152,6 +155,10 @@ function normalizeActiveChatData(activeChat, options = FULL_STATUS_ACTIVE_CHAT_O
     } : null,
     inputContent: resolvedOptions.includeInputContent && activeChat.inputContent ? truncateString(activeChat.inputContent, 2 * 1024) : void 0
   };
+  if (resolvedOptions.includeMessages) {
+    normalized.messages = trimMessagesForStatus(activeChat.messages, resolvedOptions);
+  }
+  return normalized;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/status/normalize.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/status/normalize.ts"],"sourcesContent":["import type { ActiveChatData } from '../providers/provider-instance.js';\n\nexport type ManagedStatus =\n    | 'idle'\n    | 'generating'\n    | 'waiting_approval'\n    | 'error'\n    | 'stopped'\n    | 'starting'\n    | 'panel_hidden'\n    | 'not_monitored'\n    | 'disconnected';\n\nconst WORKING_STATUSES = new Set([\n    'generating',\n    'streaming',\n    'loading',\n    'loading_reference',\n    'thinking',\n    'active',\n]);\n\nexport interface NormalizeActiveChatOptions {\n    includeMessages?: boolean;\n    includeInputContent?: boolean;\n    includeActiveModal?: boolean;\n    messageLimit?: number;\n    totalBytesLimit?: number;\n    stringLimit?: number;\n    fallbackStringLimit?: number;\n}\n\n// Full snapshots are still capped, but can carry recent chat context for API/inspection use.\nconst FULL_STATUS_ACTIVE_CHAT_OPTIONS: Required<NormalizeActiveChatOptions> = {\n    includeMessages: true,\n    includeInputContent: true,\n    includeActiveModal: true,\n    messageLimit: 60,\n    totalBytesLimit: 96 * 1024,\n    stringLimit: 4 * 1024,\n    fallbackStringLimit: 1024,\n};\n\n// Live/metadata snapshots only need routing + UI summary. Current chat text is loaded\n// on demand via `read_chat`, and older history via `chat_history`.\nexport const LIVE_STATUS_ACTIVE_CHAT_OPTIONS: Required<NormalizeActiveChatOptions> = {\n    includeMessages: false,\n    includeInputContent: false,\n    includeActiveModal: false,\n    messageLimit: 0,\n    totalBytesLimit: 0,\n    stringLimit: 512,\n    fallbackStringLimit: 256,\n};\n\nconst STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;\nconst STATUS_MODAL_BUTTON_LIMIT = 120;\n\nfunction truncateString(value: string, maxChars: number): string {\n    if (value.length <= maxChars) return value;\n    if (maxChars <= 12) return value.slice(0, Math.max(0, maxChars));\n    return `${value.slice(0, maxChars - 12)}...[truncated]`;\n}\n\nfunction truncateStringTail(value: string, maxChars: number): string {\n    if (value.length <= maxChars) return value;\n    if (maxChars <= 12) return value.slice(value.length - Math.max(0, maxChars));\n    return `...[truncated]${value.slice(value.length - (maxChars - 12))}`;\n}\n\nfunction trimStructuredStrings(value: unknown, maxChars: number): unknown {\n    if (typeof value === 'string') return truncateString(value, maxChars);\n    if (Array.isArray(value)) return value.map((item) => trimStructuredStrings(item, maxChars));\n    if (!value || typeof value !== 'object') return value;\n    return Object.fromEntries(\n        Object.entries(value).map(([key, nested]) => [key, trimStructuredStrings(nested, maxChars)]),\n    );\n}\n\nfunction estimateBytes(value: unknown): number {\n    try {\n        return JSON.stringify(value).length;\n    } catch {\n        return String(value ?? '').length;\n    }\n}\n\nfunction trimMessageForStatus(message: unknown, stringLimit: number): unknown {\n    if (!message || typeof message !== 'object') return message;\n    return trimStructuredStrings(message, stringLimit);\n}\n\n/**\n * Collapse timestamp / createdAt into receivedAt so downstream consumers\n * only ever need to read a single canonical time field.\n */\nfunction normalizeMessageTime(message: unknown): unknown {\n    if (!message || typeof message !== 'object') return message;\n    const msg = message as Record<string, unknown>;\n    if (msg.receivedAt == null) {\n        const fallback = msg.timestamp ?? msg.createdAt;\n        if (fallback != null) {\n            const ts = typeof fallback === 'string' ? Date.parse(fallback as string) : Number(fallback);\n            if (Number.isFinite(ts) && ts > 0) msg.receivedAt = ts;\n        }\n    }\n    return msg;\n}\n\nfunction trimMessagesForStatus(\n    messages: unknown[] | null | undefined,\n    options: Required<NormalizeActiveChatOptions>,\n): unknown[] {\n    if (!options.includeMessages || options.messageLimit <= 0 || options.totalBytesLimit <= 0) return [];\n    if (!Array.isArray(messages) || messages.length === 0) return [];\n\n    const recent = messages.slice(-options.messageLimit);\n    const kept: unknown[] = [];\n    let totalBytes = 0;\n\n    for (let i = recent.length - 1; i >= 0; i -= 1) {\n        let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.stringLimit));\n        let size = estimateBytes(normalized);\n\n        if (size > options.totalBytesLimit) {\n            normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.fallbackStringLimit));\n            size = estimateBytes(normalized);\n        }\n\n        if (kept.length > 0 && (totalBytes + size) > options.totalBytesLimit) {\n            continue;\n        }\n\n        kept.push(normalized);\n        totalBytes += size;\n    }\n\n    return kept.reverse();\n}\n\nfunction hasApprovalButtons(activeModal?: { buttons?: unknown[] | null } | null): boolean {\n    return (activeModal?.buttons?.length ?? 0) > 0;\n}\n\nexport function normalizeManagedStatus(\n    status?: string | null,\n    opts?: { activeModal?: { buttons?: unknown[] | null } | null },\n): ManagedStatus {\n    if (hasApprovalButtons(opts?.activeModal)) return 'waiting_approval';\n\n    const normalized = String(status || 'idle').trim().toLowerCase();\n    if (normalized === 'waiting_approval') return 'waiting_approval';\n    if (WORKING_STATUSES.has(normalized)) return 'generating';\n    if (normalized === 'error') return 'error';\n    if (normalized === 'stopped') return 'stopped';\n    if (normalized === 'starting') return 'starting';\n    if (normalized === 'panel_hidden') return 'panel_hidden';\n    if (normalized === 'not_monitored') return 'not_monitored';\n    if (normalized === 'disconnected') return 'disconnected';\n    return 'idle';\n}\n\nexport function isManagedStatusWorking(status?: string | null): boolean {\n    return normalizeManagedStatus(status) === 'generating';\n}\n\nexport function isManagedStatusWaiting(\n    status?: string | null,\n    opts?: { activeModal?: { buttons?: unknown[] | null } | null },\n): boolean {\n    return normalizeManagedStatus(status, opts) === 'waiting_approval';\n}\n\nexport function normalizeActiveChatData<T extends ActiveChatData | null | undefined>(\n    activeChat: T,\n    options: NormalizeActiveChatOptions = FULL_STATUS_ACTIVE_CHAT_OPTIONS,\n): T {\n    if (!activeChat) return activeChat;\n    const resolvedOptions: Required<NormalizeActiveChatOptions> = {\n        ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,\n        ...options,\n    };\n    return {\n        ...activeChat,\n        status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),\n        messages: trimMessagesForStatus(activeChat.messages, resolvedOptions) as T extends { messages: infer M } ? M : never,\n        activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {\n            message: truncateString(activeChat.activeModal.message || '', STATUS_MODAL_MESSAGE_LIMIT),\n            buttons: (activeChat.activeModal.buttons || []).map((button) =>\n                truncateString(String(button || ''), STATUS_MODAL_BUTTON_LIMIT)\n            ),\n        } : null,\n        inputContent: resolvedOptions.includeInputContent && activeChat.inputContent\n            ? truncateString(activeChat.inputContent, 2 * 1024)\n            : undefined,\n    } as T;\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/status/normalize.ts"],"sourcesContent":["import type { ActiveChatData } from '../providers/provider-instance.js';\nimport type { SessionActiveChatData } from '../shared-types.js';\n\nexport type ManagedStatus =\n    | 'idle'\n    | 'generating'\n    | 'waiting_approval'\n    | 'error'\n    | 'stopped'\n    | 'starting'\n    | 'panel_hidden'\n    | 'not_monitored'\n    | 'disconnected';\n\nconst WORKING_STATUSES = new Set([\n    'generating',\n    'streaming',\n    'loading',\n    'loading_reference',\n    'thinking',\n    'active',\n]);\n\nexport interface NormalizeActiveChatOptions {\n    includeMessages?: boolean;\n    includeInputContent?: boolean;\n    includeActiveModal?: boolean;\n    messageLimit?: number;\n    totalBytesLimit?: number;\n    stringLimit?: number;\n    fallbackStringLimit?: number;\n}\n\n// Full snapshots are still capped, but can carry recent chat context for API/inspection use.\nconst FULL_STATUS_ACTIVE_CHAT_OPTIONS: Required<NormalizeActiveChatOptions> = {\n    includeMessages: true,\n    includeInputContent: true,\n    includeActiveModal: true,\n    messageLimit: 60,\n    totalBytesLimit: 96 * 1024,\n    stringLimit: 4 * 1024,\n    fallbackStringLimit: 1024,\n};\n\n// Live/metadata snapshots only need routing + UI summary. Current chat text is loaded\n// on demand via `read_chat`, and older history via `chat_history`.\nexport const LIVE_STATUS_ACTIVE_CHAT_OPTIONS: Required<NormalizeActiveChatOptions> = {\n    includeMessages: false,\n    includeInputContent: false,\n    includeActiveModal: false,\n    messageLimit: 0,\n    totalBytesLimit: 0,\n    stringLimit: 512,\n    fallbackStringLimit: 256,\n};\n\nconst STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;\nconst STATUS_MODAL_BUTTON_LIMIT = 120;\n\nfunction truncateString(value: string, maxChars: number): string {\n    if (value.length <= maxChars) return value;\n    if (maxChars <= 12) return value.slice(0, Math.max(0, maxChars));\n    return `${value.slice(0, maxChars - 12)}...[truncated]`;\n}\n\nfunction truncateStringTail(value: string, maxChars: number): string {\n    if (value.length <= maxChars) return value;\n    if (maxChars <= 12) return value.slice(value.length - Math.max(0, maxChars));\n    return `...[truncated]${value.slice(value.length - (maxChars - 12))}`;\n}\n\nfunction trimStructuredStrings(value: unknown, maxChars: number): unknown {\n    if (typeof value === 'string') return truncateString(value, maxChars);\n    if (Array.isArray(value)) return value.map((item) => trimStructuredStrings(item, maxChars));\n    if (!value || typeof value !== 'object') return value;\n    return Object.fromEntries(\n        Object.entries(value).map(([key, nested]) => [key, trimStructuredStrings(nested, maxChars)]),\n    );\n}\n\nfunction estimateBytes(value: unknown): number {\n    try {\n        return JSON.stringify(value).length;\n    } catch {\n        return String(value ?? '').length;\n    }\n}\n\nfunction trimMessageForStatus(message: unknown, stringLimit: number): unknown {\n    if (!message || typeof message !== 'object') return message;\n    return trimStructuredStrings(message, stringLimit);\n}\n\n/**\n * Collapse timestamp / createdAt into receivedAt so downstream consumers\n * only ever need to read a single canonical time field.\n */\nfunction normalizeMessageTime(message: unknown): unknown {\n    if (!message || typeof message !== 'object') return message;\n    const msg = message as Record<string, unknown>;\n    if (msg.receivedAt == null) {\n        const fallback = msg.timestamp ?? msg.createdAt;\n        if (fallback != null) {\n            const ts = typeof fallback === 'string' ? Date.parse(fallback as string) : Number(fallback);\n            if (Number.isFinite(ts) && ts > 0) msg.receivedAt = ts;\n        }\n    }\n    return msg;\n}\n\nfunction trimMessagesForStatus(\n    messages: unknown[] | null | undefined,\n    options: Required<NormalizeActiveChatOptions>,\n): unknown[] {\n    if (!options.includeMessages || options.messageLimit <= 0 || options.totalBytesLimit <= 0) return [];\n    if (!Array.isArray(messages) || messages.length === 0) return [];\n\n    const recent = messages.slice(-options.messageLimit);\n    const kept: unknown[] = [];\n    let totalBytes = 0;\n\n    for (let i = recent.length - 1; i >= 0; i -= 1) {\n        let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.stringLimit));\n        let size = estimateBytes(normalized);\n\n        if (size > options.totalBytesLimit) {\n            normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.fallbackStringLimit));\n            size = estimateBytes(normalized);\n        }\n\n        if (kept.length > 0 && (totalBytes + size) > options.totalBytesLimit) {\n            continue;\n        }\n\n        kept.push(normalized);\n        totalBytes += size;\n    }\n\n    return kept.reverse();\n}\n\nfunction hasApprovalButtons(activeModal?: { buttons?: unknown[] | null } | null): boolean {\n    return (activeModal?.buttons?.length ?? 0) > 0;\n}\n\nexport function normalizeManagedStatus(\n    status?: string | null,\n    opts?: { activeModal?: { buttons?: unknown[] | null } | null },\n): ManagedStatus {\n    if (hasApprovalButtons(opts?.activeModal)) return 'waiting_approval';\n\n    const normalized = String(status || 'idle').trim().toLowerCase();\n    if (normalized === 'waiting_approval') return 'waiting_approval';\n    if (WORKING_STATUSES.has(normalized)) return 'generating';\n    if (normalized === 'error') return 'error';\n    if (normalized === 'stopped') return 'stopped';\n    if (normalized === 'starting') return 'starting';\n    if (normalized === 'panel_hidden') return 'panel_hidden';\n    if (normalized === 'not_monitored') return 'not_monitored';\n    if (normalized === 'disconnected') return 'disconnected';\n    return 'idle';\n}\n\nexport function isManagedStatusWorking(status?: string | null): boolean {\n    return normalizeManagedStatus(status) === 'generating';\n}\n\nexport function isManagedStatusWaiting(\n    status?: string | null,\n    opts?: { activeModal?: { buttons?: unknown[] | null } | null },\n): boolean {\n    return normalizeManagedStatus(status, opts) === 'waiting_approval';\n}\n\nexport function normalizeActiveChatData<T extends ActiveChatData | null | undefined>(\n    activeChat: T,\n    options: NormalizeActiveChatOptions = FULL_STATUS_ACTIVE_CHAT_OPTIONS,\n): T extends null | undefined ? T : SessionActiveChatData {\n    if (!activeChat) return activeChat as T extends null | undefined ? T : SessionActiveChatData;\n    const resolvedOptions: Required<NormalizeActiveChatOptions> = {\n        ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,\n        ...options,\n    };\n    const {\n        messages: _messages,\n        ...rest\n    } = activeChat;\n    const normalized: SessionActiveChatData = {\n        ...rest,\n        status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),\n        activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {\n            message: truncateString(activeChat.activeModal.message || '', STATUS_MODAL_MESSAGE_LIMIT),\n            buttons: (activeChat.activeModal.buttons || []).map((button) =>\n                truncateString(String(button || ''), STATUS_MODAL_BUTTON_LIMIT)\n            ),\n        } : null,\n        inputContent: resolvedOptions.includeInputContent && activeChat.inputContent\n            ? truncateString(activeChat.inputContent, 2 * 1024)\n            : undefined,\n    };\n    if (resolvedOptions.includeMessages) {\n        normalized.messages = trimMessagesForStatus(activeChat.messages, resolvedOptions) as SessionActiveChatData['messages'];\n    }\n    return normalized as T extends null | undefined ? T : SessionActiveChatData;\n}\n"],"mappings":"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","names":[]}

package/dist/status/normalize.mjs

@@ -112,10 +112,13 @@ function normalizeActiveChatData(activeChat, options = FULL_STATUS_ACTIVE_CHAT_O
     ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,
     ...options
   };
-  return {
-    ...activeChat,
+  const {
+    messages: _messages,
+    ...rest
+  } = activeChat;
+  const normalized = {
+    ...rest,
     status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),
-    messages: trimMessagesForStatus(activeChat.messages, resolvedOptions),
     activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {
       message: truncateString(activeChat.activeModal.message || "", STATUS_MODAL_MESSAGE_LIMIT),
       buttons: (activeChat.activeModal.buttons || []).map(
@@ -124,6 +127,10 @@ function normalizeActiveChatData(activeChat, options = FULL_STATUS_ACTIVE_CHAT_O
     } : null,
     inputContent: resolvedOptions.includeInputContent && activeChat.inputContent ? truncateString(activeChat.inputContent, 2 * 1024) : void 0
   };
+  if (resolvedOptions.includeMessages) {
+    normalized.messages = trimMessagesForStatus(activeChat.messages, resolvedOptions);
+  }
+  return normalized;
 }
 export {
   LIVE_STATUS_ACTIVE_CHAT_OPTIONS,

package/dist/status/normalize.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/status/normalize.ts"],"sourcesContent":["import type { ActiveChatData } from '../providers/provider-instance.js';\n\nexport type ManagedStatus =\n    | 'idle'\n    | 'generating'\n    | 'waiting_approval'\n    | 'error'\n    | 'stopped'\n    | 'starting'\n    | 'panel_hidden'\n    | 'not_monitored'\n    | 'disconnected';\n\nconst WORKING_STATUSES = new Set([\n    'generating',\n    'streaming',\n    'loading',\n    'loading_reference',\n    'thinking',\n    'active',\n]);\n\nexport interface NormalizeActiveChatOptions {\n    includeMessages?: boolean;\n    includeInputContent?: boolean;\n    includeActiveModal?: boolean;\n    messageLimit?: number;\n    totalBytesLimit?: number;\n    stringLimit?: number;\n    fallbackStringLimit?: number;\n}\n\n// Full snapshots are still capped, but can carry recent chat context for API/inspection use.\nconst FULL_STATUS_ACTIVE_CHAT_OPTIONS: Required<NormalizeActiveChatOptions> = {\n    includeMessages: true,\n    includeInputContent: true,\n    includeActiveModal: true,\n    messageLimit: 60,\n    totalBytesLimit: 96 * 1024,\n    stringLimit: 4 * 1024,\n    fallbackStringLimit: 1024,\n};\n\n// Live/metadata snapshots only need routing + UI summary. Current chat text is loaded\n// on demand via `read_chat`, and older history via `chat_history`.\nexport const LIVE_STATUS_ACTIVE_CHAT_OPTIONS: Required<NormalizeActiveChatOptions> = {\n    includeMessages: false,\n    includeInputContent: false,\n    includeActiveModal: false,\n    messageLimit: 0,\n    totalBytesLimit: 0,\n    stringLimit: 512,\n    fallbackStringLimit: 256,\n};\n\nconst STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;\nconst STATUS_MODAL_BUTTON_LIMIT = 120;\n\nfunction truncateString(value: string, maxChars: number): string {\n    if (value.length <= maxChars) return value;\n    if (maxChars <= 12) return value.slice(0, Math.max(0, maxChars));\n    return `${value.slice(0, maxChars - 12)}...[truncated]`;\n}\n\nfunction truncateStringTail(value: string, maxChars: number): string {\n    if (value.length <= maxChars) return value;\n    if (maxChars <= 12) return value.slice(value.length - Math.max(0, maxChars));\n    return `...[truncated]${value.slice(value.length - (maxChars - 12))}`;\n}\n\nfunction trimStructuredStrings(value: unknown, maxChars: number): unknown {\n    if (typeof value === 'string') return truncateString(value, maxChars);\n    if (Array.isArray(value)) return value.map((item) => trimStructuredStrings(item, maxChars));\n    if (!value || typeof value !== 'object') return value;\n    return Object.fromEntries(\n        Object.entries(value).map(([key, nested]) => [key, trimStructuredStrings(nested, maxChars)]),\n    );\n}\n\nfunction estimateBytes(value: unknown): number {\n    try {\n        return JSON.stringify(value).length;\n    } catch {\n        return String(value ?? '').length;\n    }\n}\n\nfunction trimMessageForStatus(message: unknown, stringLimit: number): unknown {\n    if (!message || typeof message !== 'object') return message;\n    return trimStructuredStrings(message, stringLimit);\n}\n\n/**\n * Collapse timestamp / createdAt into receivedAt so downstream consumers\n * only ever need to read a single canonical time field.\n */\nfunction normalizeMessageTime(message: unknown): unknown {\n    if (!message || typeof message !== 'object') return message;\n    const msg = message as Record<string, unknown>;\n    if (msg.receivedAt == null) {\n        const fallback = msg.timestamp ?? msg.createdAt;\n        if (fallback != null) {\n            const ts = typeof fallback === 'string' ? Date.parse(fallback as string) : Number(fallback);\n            if (Number.isFinite(ts) && ts > 0) msg.receivedAt = ts;\n        }\n    }\n    return msg;\n}\n\nfunction trimMessagesForStatus(\n    messages: unknown[] | null | undefined,\n    options: Required<NormalizeActiveChatOptions>,\n): unknown[] {\n    if (!options.includeMessages || options.messageLimit <= 0 || options.totalBytesLimit <= 0) return [];\n    if (!Array.isArray(messages) || messages.length === 0) return [];\n\n    const recent = messages.slice(-options.messageLimit);\n    const kept: unknown[] = [];\n    let totalBytes = 0;\n\n    for (let i = recent.length - 1; i >= 0; i -= 1) {\n        let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.stringLimit));\n        let size = estimateBytes(normalized);\n\n        if (size > options.totalBytesLimit) {\n            normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.fallbackStringLimit));\n            size = estimateBytes(normalized);\n        }\n\n        if (kept.length > 0 && (totalBytes + size) > options.totalBytesLimit) {\n            continue;\n        }\n\n        kept.push(normalized);\n        totalBytes += size;\n    }\n\n    return kept.reverse();\n}\n\nfunction hasApprovalButtons(activeModal?: { buttons?: unknown[] | null } | null): boolean {\n    return (activeModal?.buttons?.length ?? 0) > 0;\n}\n\nexport function normalizeManagedStatus(\n    status?: string | null,\n    opts?: { activeModal?: { buttons?: unknown[] | null } | null },\n): ManagedStatus {\n    if (hasApprovalButtons(opts?.activeModal)) return 'waiting_approval';\n\n    const normalized = String(status || 'idle').trim().toLowerCase();\n    if (normalized === 'waiting_approval') return 'waiting_approval';\n    if (WORKING_STATUSES.has(normalized)) return 'generating';\n    if (normalized === 'error') return 'error';\n    if (normalized === 'stopped') return 'stopped';\n    if (normalized === 'starting') return 'starting';\n    if (normalized === 'panel_hidden') return 'panel_hidden';\n    if (normalized === 'not_monitored') return 'not_monitored';\n    if (normalized === 'disconnected') return 'disconnected';\n    return 'idle';\n}\n\nexport function isManagedStatusWorking(status?: string | null): boolean {\n    return normalizeManagedStatus(status) === 'generating';\n}\n\nexport function isManagedStatusWaiting(\n    status?: string | null,\n    opts?: { activeModal?: { buttons?: unknown[] | null } | null },\n): boolean {\n    return normalizeManagedStatus(status, opts) === 'waiting_approval';\n}\n\nexport function normalizeActiveChatData<T extends ActiveChatData | null | undefined>(\n    activeChat: T,\n    options: NormalizeActiveChatOptions = FULL_STATUS_ACTIVE_CHAT_OPTIONS,\n): T {\n    if (!activeChat) return activeChat;\n    const resolvedOptions: Required<NormalizeActiveChatOptions> = {\n        ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,\n        ...options,\n    };\n    return {\n        ...activeChat,\n        status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),\n        messages: trimMessagesForStatus(activeChat.messages, resolvedOptions) as T extends { messages: infer M } ? M : never,\n        activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {\n            message: truncateString(activeChat.activeModal.message || '', STATUS_MODAL_MESSAGE_LIMIT),\n            buttons: (activeChat.activeModal.buttons || []).map((button) =>\n                truncateString(String(button || ''), STATUS_MODAL_BUTTON_LIMIT)\n            ),\n        } : null,\n        inputContent: resolvedOptions.includeInputContent && activeChat.inputContent\n            ? truncateString(activeChat.inputContent, 2 * 1024)\n            : undefined,\n    } as T;\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/status/normalize.ts"],"sourcesContent":["import type { ActiveChatData } from '../providers/provider-instance.js';\nimport type { SessionActiveChatData } from '../shared-types.js';\n\nexport type ManagedStatus =\n    | 'idle'\n    | 'generating'\n    | 'waiting_approval'\n    | 'error'\n    | 'stopped'\n    | 'starting'\n    | 'panel_hidden'\n    | 'not_monitored'\n    | 'disconnected';\n\nconst WORKING_STATUSES = new Set([\n    'generating',\n    'streaming',\n    'loading',\n    'loading_reference',\n    'thinking',\n    'active',\n]);\n\nexport interface NormalizeActiveChatOptions {\n    includeMessages?: boolean;\n    includeInputContent?: boolean;\n    includeActiveModal?: boolean;\n    messageLimit?: number;\n    totalBytesLimit?: number;\n    stringLimit?: number;\n    fallbackStringLimit?: number;\n}\n\n// Full snapshots are still capped, but can carry recent chat context for API/inspection use.\nconst FULL_STATUS_ACTIVE_CHAT_OPTIONS: Required<NormalizeActiveChatOptions> = {\n    includeMessages: true,\n    includeInputContent: true,\n    includeActiveModal: true,\n    messageLimit: 60,\n    totalBytesLimit: 96 * 1024,\n    stringLimit: 4 * 1024,\n    fallbackStringLimit: 1024,\n};\n\n// Live/metadata snapshots only need routing + UI summary. Current chat text is loaded\n// on demand via `read_chat`, and older history via `chat_history`.\nexport const LIVE_STATUS_ACTIVE_CHAT_OPTIONS: Required<NormalizeActiveChatOptions> = {\n    includeMessages: false,\n    includeInputContent: false,\n    includeActiveModal: false,\n    messageLimit: 0,\n    totalBytesLimit: 0,\n    stringLimit: 512,\n    fallbackStringLimit: 256,\n};\n\nconst STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;\nconst STATUS_MODAL_BUTTON_LIMIT = 120;\n\nfunction truncateString(value: string, maxChars: number): string {\n    if (value.length <= maxChars) return value;\n    if (maxChars <= 12) return value.slice(0, Math.max(0, maxChars));\n    return `${value.slice(0, maxChars - 12)}...[truncated]`;\n}\n\nfunction truncateStringTail(value: string, maxChars: number): string {\n    if (value.length <= maxChars) return value;\n    if (maxChars <= 12) return value.slice(value.length - Math.max(0, maxChars));\n    return `...[truncated]${value.slice(value.length - (maxChars - 12))}`;\n}\n\nfunction trimStructuredStrings(value: unknown, maxChars: number): unknown {\n    if (typeof value === 'string') return truncateString(value, maxChars);\n    if (Array.isArray(value)) return value.map((item) => trimStructuredStrings(item, maxChars));\n    if (!value || typeof value !== 'object') return value;\n    return Object.fromEntries(\n        Object.entries(value).map(([key, nested]) => [key, trimStructuredStrings(nested, maxChars)]),\n    );\n}\n\nfunction estimateBytes(value: unknown): number {\n    try {\n        return JSON.stringify(value).length;\n    } catch {\n        return String(value ?? '').length;\n    }\n}\n\nfunction trimMessageForStatus(message: unknown, stringLimit: number): unknown {\n    if (!message || typeof message !== 'object') return message;\n    return trimStructuredStrings(message, stringLimit);\n}\n\n/**\n * Collapse timestamp / createdAt into receivedAt so downstream consumers\n * only ever need to read a single canonical time field.\n */\nfunction normalizeMessageTime(message: unknown): unknown {\n    if (!message || typeof message !== 'object') return message;\n    const msg = message as Record<string, unknown>;\n    if (msg.receivedAt == null) {\n        const fallback = msg.timestamp ?? msg.createdAt;\n        if (fallback != null) {\n            const ts = typeof fallback === 'string' ? Date.parse(fallback as string) : Number(fallback);\n            if (Number.isFinite(ts) && ts > 0) msg.receivedAt = ts;\n        }\n    }\n    return msg;\n}\n\nfunction trimMessagesForStatus(\n    messages: unknown[] | null | undefined,\n    options: Required<NormalizeActiveChatOptions>,\n): unknown[] {\n    if (!options.includeMessages || options.messageLimit <= 0 || options.totalBytesLimit <= 0) return [];\n    if (!Array.isArray(messages) || messages.length === 0) return [];\n\n    const recent = messages.slice(-options.messageLimit);\n    const kept: unknown[] = [];\n    let totalBytes = 0;\n\n    for (let i = recent.length - 1; i >= 0; i -= 1) {\n        let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.stringLimit));\n        let size = estimateBytes(normalized);\n\n        if (size > options.totalBytesLimit) {\n            normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.fallbackStringLimit));\n            size = estimateBytes(normalized);\n        }\n\n        if (kept.length > 0 && (totalBytes + size) > options.totalBytesLimit) {\n            continue;\n        }\n\n        kept.push(normalized);\n        totalBytes += size;\n    }\n\n    return kept.reverse();\n}\n\nfunction hasApprovalButtons(activeModal?: { buttons?: unknown[] | null } | null): boolean {\n    return (activeModal?.buttons?.length ?? 0) > 0;\n}\n\nexport function normalizeManagedStatus(\n    status?: string | null,\n    opts?: { activeModal?: { buttons?: unknown[] | null } | null },\n): ManagedStatus {\n    if (hasApprovalButtons(opts?.activeModal)) return 'waiting_approval';\n\n    const normalized = String(status || 'idle').trim().toLowerCase();\n    if (normalized === 'waiting_approval') return 'waiting_approval';\n    if (WORKING_STATUSES.has(normalized)) return 'generating';\n    if (normalized === 'error') return 'error';\n    if (normalized === 'stopped') return 'stopped';\n    if (normalized === 'starting') return 'starting';\n    if (normalized === 'panel_hidden') return 'panel_hidden';\n    if (normalized === 'not_monitored') return 'not_monitored';\n    if (normalized === 'disconnected') return 'disconnected';\n    return 'idle';\n}\n\nexport function isManagedStatusWorking(status?: string | null): boolean {\n    return normalizeManagedStatus(status) === 'generating';\n}\n\nexport function isManagedStatusWaiting(\n    status?: string | null,\n    opts?: { activeModal?: { buttons?: unknown[] | null } | null },\n): boolean {\n    return normalizeManagedStatus(status, opts) === 'waiting_approval';\n}\n\nexport function normalizeActiveChatData<T extends ActiveChatData | null | undefined>(\n    activeChat: T,\n    options: NormalizeActiveChatOptions = FULL_STATUS_ACTIVE_CHAT_OPTIONS,\n): T extends null | undefined ? T : SessionActiveChatData {\n    if (!activeChat) return activeChat as T extends null | undefined ? T : SessionActiveChatData;\n    const resolvedOptions: Required<NormalizeActiveChatOptions> = {\n        ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,\n        ...options,\n    };\n    const {\n        messages: _messages,\n        ...rest\n    } = activeChat;\n    const normalized: SessionActiveChatData = {\n        ...rest,\n        status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),\n        activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {\n            message: truncateString(activeChat.activeModal.message || '', STATUS_MODAL_MESSAGE_LIMIT),\n            buttons: (activeChat.activeModal.buttons || []).map((button) =>\n                truncateString(String(button || ''), STATUS_MODAL_BUTTON_LIMIT)\n            ),\n        } : null,\n        inputContent: resolvedOptions.includeInputContent && activeChat.inputContent\n            ? truncateString(activeChat.inputContent, 2 * 1024)\n            : undefined,\n    };\n    if (resolvedOptions.includeMessages) {\n        normalized.messages = trimMessagesForStatus(activeChat.messages, resolvedOptions) as SessionActiveChatData['messages'];\n    }\n    return normalized as T extends null | undefined ? T : SessionActiveChatData;\n}\n"],"mappings":"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","names":[]}

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

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

@@ -636,6 +636,10 @@ export class ProviderCliAdapter implements CliAdapter {
             this.activeModal = startupModal;
             this.setStatus('waiting_approval', `startup_ready:${trigger}`);
         } else {
+            if (this.currentStatus === 'waiting_approval' || this.activeModal) {
+                this.lastApprovalResolvedAt = Date.now();
+            }
+            this.activeModal = null;
             this.setStatus('idle', `startup_ready:${trigger}`);
         }
         LOG.info(
@@ -1529,6 +1533,42 @@ export class ProviderCliAdapter implements CliAdapter {
         return this.currentStatus;
     }
 
+    private suppressStaleParsedApproval(
+        parsed: any,
+        recentBuffer: string,
+        screenText: string,
+    ): any {
+        const actionableParsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons)
+            && parsed.activeModal.buttons.some((button: any) => typeof button === 'string' && button.trim())
+            ? parsed.activeModal
+            : null;
+        if (!parsed || parsed?.status !== 'waiting_approval' || !actionableParsedModal) {
+            return parsed;
+        }
+
+        const inApprovalCooldown = this.lastApprovalResolvedAt > 0
+            && (Date.now() - this.lastApprovalResolvedAt) < this.timeouts.approvalCooldown;
+        if (!inApprovalCooldown) {
+            return parsed;
+        }
+
+        const startupModal = this.getStartupConfirmationModal(screenText || '');
+        const visibleModal = this.runParseApproval(recentBuffer) || startupModal;
+        if (visibleModal) {
+            return parsed;
+        }
+
+        const detectedStatus = this.runDetectStatus(recentBuffer);
+        const fallbackStatus = detectedStatus && detectedStatus !== 'waiting_approval'
+            ? detectedStatus
+            : ((this.isWaitingForResponse || this.currentTurnScope) ? 'generating' : (this.currentStatus === 'waiting_approval' ? 'idle' : this.currentStatus));
+        return {
+            ...parsed,
+            status: fallbackStatus,
+            activeModal: null,
+        };
+    }
+
  // ─── Public API (CliAdapter) ───────────────────
 
     getStatus(): CliSessionStatus {
@@ -1820,15 +1860,16 @@ export class ProviderCliAdapter implements CliAdapter {
             if (parsed && refinedStatus && parsed.status !== refinedStatus) {
                 parsed.status = refinedStatus;
             }
+            const normalizedParsed = this.suppressStaleParsedApproval(parsed, input.recentBuffer, input.screenText);
             const promptForTrim = scope?.prompt || getLastUserPromptText(baseMessages);
-            if (parsed && Array.isArray(parsed.messages) && promptForTrim) {
-                const lastAssistant = [...parsed.messages].reverse().find((message: any) => message?.role === 'assistant' && typeof message.content === 'string');
+            if (normalizedParsed && Array.isArray(normalizedParsed.messages) && promptForTrim) {
+                const lastAssistant = [...normalizedParsed.messages].reverse().find((message: any) => message?.role === 'assistant' && typeof message.content === 'string');
                 if (lastAssistant) {
                     lastAssistant.content = trimPromptEchoPrefix(lastAssistant.content, promptForTrim);
                 }
             }
             this.parseErrorMessage = null;
-            return parsed;
+            return normalizedParsed;
         } catch (e: any) {
             const message = e?.message || String(e);
             this.parseErrorMessage = message;

package/src/index.ts

@@ -71,6 +71,7 @@ export type {
   ProviderState,
   ProviderStatus,
   ProviderErrorReason,
+  SessionActiveChatData,
   ActiveChatData,
   IdeProviderState,
   CliProviderState,

package/src/shared-types.d.ts

@@ -13,6 +13,9 @@ export type { ProviderErrorReason } from './providers/provider-instance.js';
 import type { ActiveChatData as _ActiveChatData, ProviderErrorReason as _ProviderErrorReason } from './providers/provider-instance.js';
 import type { WorkspaceEntry } from './config/workspaces.js';
 import type { ProviderResumeCapability } from './providers/contracts.js';
+export interface SessionActiveChatData extends Omit<_ActiveChatData, 'messages'> {
+    messages?: _ActiveChatData['messages'];
+}
 export type { WorkspaceEntry } from './config/workspaces.js';
 /** Agent stream snapshot carried by flattened UI entries. */
 export interface AgentSessionStream {
@@ -179,7 +182,7 @@ export interface SessionEntry {
     runtimeWriteOwner?: RuntimeWriteOwner | null;
     runtimeAttachedClients?: RuntimeAttachedClient[];
     resume?: ProviderResumeCapability;
-    activeChat: _ActiveChatData | null;
+    activeChat: SessionActiveChatData | null;
     capabilities?: SessionCapability[];
     cdpConnected?: boolean;
     /** Dynamic control current values (generic key-value) */

package/src/shared-types.ts

@@ -45,6 +45,10 @@ import type { ActiveChatData as _ActiveChatData, ProviderErrorReason as _Provide
 import type { WorkspaceEntry } from './config/workspaces.js';
 import type { ProviderResumeCapability } from './providers/contracts.js';
 
+export interface SessionActiveChatData extends Omit<_ActiveChatData, 'messages'> {
+    messages?: _ActiveChatData['messages'];
+}
+
 // Re-export WorkspaceEntry for downstream consumers
 export type { WorkspaceEntry } from './config/workspaces.js';
 
@@ -320,7 +324,7 @@ export interface SessionEntry {
     runtimeRestoredFromStorage?: boolean;
     runtimeRecoveryState?: string | null;
     resume?: ProviderResumeCapability;
-    activeChat: _ActiveChatData | null;
+    activeChat: SessionActiveChatData | null;
     capabilities?: SessionCapability[];
     cdpConnected?: boolean;
     /** Dynamic control current values (generic key-value) */

package/src/status/normalize.ts

@@ -1,4 +1,5 @@
 import type { ActiveChatData } from '../providers/provider-instance.js';
+import type { SessionActiveChatData } from '../shared-types.js';
 
 export type ManagedStatus =
     | 'idle'
@@ -174,16 +175,19 @@ export function isManagedStatusWaiting(
 export function normalizeActiveChatData<T extends ActiveChatData | null | undefined>(
     activeChat: T,
     options: NormalizeActiveChatOptions = FULL_STATUS_ACTIVE_CHAT_OPTIONS,
-): T {
-    if (!activeChat) return activeChat;
+): T extends null | undefined ? T : SessionActiveChatData {
+    if (!activeChat) return activeChat as T extends null | undefined ? T : SessionActiveChatData;
     const resolvedOptions: Required<NormalizeActiveChatOptions> = {
         ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,
         ...options,
     };
-    return {
-        ...activeChat,
+    const {
+        messages: _messages,
+        ...rest
+    } = activeChat;
+    const normalized: SessionActiveChatData = {
+        ...rest,
         status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),
-        messages: trimMessagesForStatus(activeChat.messages, resolvedOptions) as T extends { messages: infer M } ? M : never,
         activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {
             message: truncateString(activeChat.activeModal.message || '', STATUS_MODAL_MESSAGE_LIMIT),
             buttons: (activeChat.activeModal.buttons || []).map((button) =>
@@ -193,5 +197,9 @@ export function normalizeActiveChatData<T extends ActiveChatData | null | undefi
         inputContent: resolvedOptions.includeInputContent && activeChat.inputContent
             ? truncateString(activeChat.inputContent, 2 * 1024)
             : undefined,
-    } as T;
+    };
+    if (resolvedOptions.includeMessages) {
+        normalized.messages = trimMessagesForStatus(activeChat.messages, resolvedOptions) as SessionActiveChatData['messages'];
+    }
+    return normalized as T extends null | undefined ? T : SessionActiveChatData;
 }