@adhdev/daemon-core 0.8.60 → 0.8.62

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

@@ -10,7 +10,7 @@ import * as path from 'path';
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import { createRequire } from 'node:module';
-import { normalizeInputEnvelope, type ProviderModule } from './contracts.js';
+import { normalizeInputEnvelope, type ProviderModule, flattenContent } from './contracts.js';
 import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext } from './provider-instance.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { CliProviderModule } from '../cli-adapters/provider-cli-adapter.js';
@@ -19,10 +19,11 @@ import { StatusMonitor } from './status-monitor.js';
 import { ChatHistoryWriter, readChatHistory } from '../config/chat-history.js';
 import { LOG } from '../logging/logger.js';
 import type { ChatMessage } from '../types.js';
-import { normalizeProviderEffects } from './control-effects.js';
+import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from './control-effects.js';
 import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
 import { getCliScriptCommand, parseCliScriptResult } from './cli-script-results.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
+import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages } from './chat-message-normalization.js';
 
 let CachedDatabaseSync: (new (path: string, options?: { readOnly?: boolean }) => {
     prepare(sql: string): { get(...params: Array<string | number>): unknown };
@@ -628,8 +629,8 @@ export class CliProviderInstance implements ProviderInstance {
             this.appliedEffectKeys.add(effectKey);
 
             if (effect.persist !== false) {
-                const persisted = this.getPersistedEffectContent(effect);
-                if (persisted) this.appendRuntimeSystemMessage(persisted, effectKey);
+                const persistedMessage = buildPersistedProviderEffectMessage(effect);
+                if (persistedMessage) this.appendRuntimeMessage(persistedMessage, effectKey);
             }
 
             if (effect.type === 'message' && effect.message) {
@@ -772,43 +773,55 @@ export class CliProviderInstance implements ProviderInstance {
     }
 
     private appendRuntimeSystemMessage(content: string, dedupKey: string, receivedAt = Date.now()): void {
-        const normalizedContent = String(content || '').trim();
-        if (!normalizedContent) return;
+        this.appendRuntimeMessage(buildRuntimeSystemChatMessage({
+            content,
+            receivedAt,
+            timestamp: receivedAt,
+        }), dedupKey);
+    }
+
+    private appendRuntimeMessage(message: ChatMessage, dedupKey: string): void {
+        const normalizedMessage = buildChatMessage({
+            ...message,
+            receivedAt: typeof message.receivedAt === 'number' ? message.receivedAt : (message.timestamp || Date.now()),
+            timestamp: typeof message.timestamp === 'number' ? message.timestamp : (message.receivedAt || Date.now()),
+        } as ChatMessage);
+        const normalizedContent = typeof normalizedMessage.content === 'string'
+            ? normalizedMessage.content.trim()
+            : flattenContent(normalizedMessage.content).trim();
+        if (!normalizedContent && (!Array.isArray(normalizedMessage.content) || normalizedMessage.content.length === 0)) return;
         if (this.runtimeMessages.some((entry) => entry.key === dedupKey)) return;
 
         this.runtimeMessages.push({
             key: dedupKey,
-            message: {
-                role: 'system',
-                senderName: 'System',
-                content: normalizedContent,
-                receivedAt,
-                timestamp: receivedAt,
-            },
+            message: normalizedMessage,
         });
         if (this.runtimeMessages.length > 50) {
             this.runtimeMessages = this.runtimeMessages.slice(-50);
         }
 
-        this.historyWriter.appendNewMessages(
-            this.type,
-            [{
-                role: 'system',
-                senderName: 'System',
-                content: normalizedContent,
-                receivedAt,
-                historyDedupKey: dedupKey,
-            }],
-            this.adapter.getScriptParsedStatus?.()?.title || this.workingDir.split('/').filter(Boolean).pop() || 'session',
-            this.instanceId,
-            this.providerSessionId,
-        );
+        if (normalizedContent) {
+            this.historyWriter.appendNewMessages(
+                this.type,
+                [{
+                    role: normalizedMessage.role,
+                    senderName: normalizedMessage.senderName,
+                    kind: normalizedMessage.kind,
+                    content: normalizedContent,
+                    receivedAt: normalizedMessage.receivedAt || normalizedMessage.timestamp,
+                    historyDedupKey: dedupKey,
+                }],
+                this.adapter.getScriptParsedStatus?.()?.title || this.workingDir.split('/').filter(Boolean).pop() || 'session',
+                this.instanceId,
+                this.providerSessionId,
+            );
+        }
     }
 
     private mergeConversationMessages(parsedMessages: any[]): ChatMessage[] {
-        if (this.runtimeMessages.length === 0) return parsedMessages;
+        if (this.runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
 
-        return [...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)]
+        return normalizeChatMessages([...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)]
             .map((message, index) => ({ message, index }))
             .sort((a, b) => {
                 const aTime = a.message.receivedAt || a.message.timestamp || 0;
@@ -816,7 +829,7 @@ export class CliProviderInstance implements ProviderInstance {
                 if (aTime !== bTime) return aTime - bTime;
                 return a.index - b.index;
             })
-            .map((entry) => entry.message);
+            .map((entry) => entry.message));
     }
 
     private formatApprovalRequestMessage(modalMessage?: string, buttons?: string[]): string {

package/src/providers/contracts.ts

@@ -10,6 +10,7 @@
 // ─── readChat() return value ───────────────────────────
 
 import type { ProviderSummaryMetadata } from '../shared-types.js';
+import type { ChatMessageKind } from './chat-message-normalization.js';
 
 export interface ReadChatResult {
   messages: ChatMessage[];
@@ -70,7 +71,7 @@ export interface ModalInfo {
 export interface ProviderEffectMessage {
   role?: 'system' | 'assistant' | 'user';
   content: string | MessagePart[];
-  kind?: string;
+  kind?: ChatMessageKind;
   senderName?: string;
 }
 
@@ -89,6 +90,9 @@ export interface ProviderEffectNotification {
   channels?: ProviderNotificationChannel[];
   preferenceKey?: ProviderNotificationPreferenceKey;
   bubbleContent?: string | MessagePart[];
+  bubbleKind?: ChatMessageKind;
+  bubbleRole?: 'system' | 'assistant' | 'user';
+  bubbleSenderName?: string;
 }
 
 export interface ProviderEffect {

package/src/providers/control-effects.ts

@@ -6,6 +6,9 @@ import type {
     ProviderControlOption,
     ProviderEffect,
 } from './contracts.js';
+import { flattenContent } from './contracts.js';
+import type { ChatMessage } from '../types.js';
+import { buildChatMessage, buildRuntimeSystemChatMessage } from './chat-message-normalization.js';
 
 export type ProviderControlValue = string | number | boolean;
 
@@ -97,6 +100,15 @@ export function normalizeProviderEffects(data: any): ProviderEffect[] {
                     bubbleContent: typeof raw.notification.bubbleContent === 'string' || Array.isArray(raw.notification.bubbleContent)
                         ? raw.notification.bubbleContent
                         : undefined,
+                    bubbleKind: typeof raw.notification.bubbleKind === 'string'
+                        ? raw.notification.bubbleKind
+                        : undefined,
+                    bubbleRole: raw.notification.bubbleRole === 'assistant' || raw.notification.bubbleRole === 'user'
+                        ? raw.notification.bubbleRole
+                        : (raw.notification.bubbleRole === 'system' ? 'system' : undefined),
+                    bubbleSenderName: typeof raw.notification.bubbleSenderName === 'string'
+                        ? raw.notification.bubbleSenderName
+                        : undefined,
                 },
             });
         }
@@ -105,6 +117,59 @@ export function normalizeProviderEffects(data: any): ProviderEffect[] {
     return effects;
 }
 
+export function buildPersistedProviderEffectMessage(effect: ProviderEffect | null | undefined): ChatMessage | null {
+    if (!effect) return null;
+
+    if (effect.type === 'message' && effect.message) {
+        const role = effect.message.role === 'assistant' || effect.message.role === 'user'
+            ? effect.message.role
+            : 'system';
+        if (role === 'system') {
+            return buildRuntimeSystemChatMessage({
+                content: effect.message.content,
+                kind: effect.message.kind,
+                senderName: effect.message.senderName,
+            });
+        }
+        return buildChatMessage({
+            role,
+            content: effect.message.content,
+            kind: effect.message.kind,
+            senderName: effect.message.senderName,
+        } as ChatMessage);
+    }
+
+    if (effect.type === 'notification' && effect.notification) {
+        const bubbleContent = effect.notification.bubbleContent
+            ?? formatNotificationBubbleFallback(effect.notification.title, effect.notification.body);
+        const flattened = typeof bubbleContent === 'string' ? bubbleContent.trim() : flattenContent(bubbleContent).trim();
+        if (!flattened && (!Array.isArray(bubbleContent) || bubbleContent.length === 0)) return null;
+
+        const role = effect.notification.bubbleRole === 'assistant' || effect.notification.bubbleRole === 'user'
+            ? effect.notification.bubbleRole
+            : 'system';
+        if (role === 'system') {
+            return buildRuntimeSystemChatMessage({
+                content: bubbleContent,
+                kind: effect.notification.bubbleKind,
+                senderName: effect.notification.bubbleSenderName,
+            });
+        }
+        return buildChatMessage({
+            role,
+            content: bubbleContent,
+            kind: effect.notification.bubbleKind,
+            senderName: effect.notification.bubbleSenderName,
+        } as ChatMessage);
+    }
+
+    if (effect.type === 'toast' && effect.toast?.message) {
+        return buildRuntimeSystemChatMessage({ content: effect.toast.message });
+    }
+
+    return null;
+}
+
 export function normalizeControlListResult(data: any): ControlListResult {
     if (data && typeof data === 'object' && Array.isArray(data.options)) {
         return {
@@ -196,3 +261,10 @@ function normalizeControlValue(value: any): ProviderControlValue {
     }
     return String(value);
 }
+
+function formatNotificationBubbleFallback(title: string | undefined, body: string): string {
+    const cleanTitle = typeof title === 'string' ? title.trim() : '';
+    const cleanBody = String(body || '').trim();
+    if (cleanTitle && cleanBody) return `${cleanTitle}\n${cleanBody}`;
+    return cleanTitle || cleanBody;
+}

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

@@ -5,13 +5,14 @@
  * CDP webview discovery + agent stream collection moved here.
  */
 
-import type { ProviderModule } from './contracts.js';
+import { flattenContent, type ProviderModule } from './contracts.js';
 import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext } from './provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
-import { normalizeProviderEffects } from './control-effects.js';
+import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from './control-effects.js';
 import { ChatHistoryWriter } from '../config/chat-history.js';
 import type { ChatMessage } from '../types.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
+import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages } from './chat-message-normalization.js';
 
 export class ExtensionProviderInstance implements ProviderInstance {
     readonly type: string;
@@ -259,8 +260,8 @@ export class ExtensionProviderInstance implements ProviderInstance {
             this.appliedEffectKeys.add(effectKey);
 
             if (effect.persist !== false) {
-                const persisted = this.getPersistedEffectContent(effect);
-                if (persisted) this.appendRuntimeSystemMessage(persisted, effectKey);
+                const persistedMessage = buildPersistedProviderEffectMessage(effect);
+                if (persistedMessage) this.appendRuntimeMessage(persistedMessage, effectKey);
             }
 
             if (effect.type === 'message' && effect.message) {
@@ -299,36 +300,47 @@ export class ExtensionProviderInstance implements ProviderInstance {
     }
 
     private appendRuntimeSystemMessage(content: string, dedupKey: string, receivedAt = Date.now()): void {
-        const normalizedContent = String(content || '').trim();
-        if (!normalizedContent) return;
+        this.appendRuntimeMessage(buildRuntimeSystemChatMessage({
+            content,
+            receivedAt,
+            timestamp: receivedAt,
+        }), dedupKey);
+    }
+
+    private appendRuntimeMessage(message: ChatMessage, dedupKey: string): void {
+        const normalizedMessage = buildChatMessage({
+            ...message,
+            receivedAt: typeof message.receivedAt === 'number' ? message.receivedAt : (message.timestamp || Date.now()),
+            timestamp: typeof message.timestamp === 'number' ? message.timestamp : (message.receivedAt || Date.now()),
+        } as ChatMessage);
+        const normalizedContent = typeof normalizedMessage.content === 'string'
+            ? normalizedMessage.content.trim()
+            : flattenContent(normalizedMessage.content).trim();
+        if (!normalizedContent && (!Array.isArray(normalizedMessage.content) || normalizedMessage.content.length === 0)) return;
         if (this.runtimeMessages.some((entry) => entry.key === dedupKey)) return;
 
         this.runtimeMessages.push({
             key: dedupKey,
-            message: {
-                role: 'system',
-                senderName: 'System',
-                content: normalizedContent,
-                receivedAt,
-                timestamp: receivedAt,
-            },
+            message: normalizedMessage,
         });
         if (this.runtimeMessages.length > 50) this.runtimeMessages = this.runtimeMessages.slice(-50);
 
-        this.historyWriter.appendNewMessages(
-            this.type,
-            [{
-                role: 'system',
-                senderName: 'System',
-                content: normalizedContent,
-                kind: 'system',
-                receivedAt,
-                historyDedupKey: dedupKey,
-            }],
-            this.chatTitle || this.agentName || this.provider.name,
-            this.instanceId,
-            this.chatId || this.instanceId,
-        );
+        if (normalizedContent) {
+            this.historyWriter.appendNewMessages(
+                this.type,
+                [{
+                    role: normalizedMessage.role,
+                    senderName: normalizedMessage.senderName,
+                    kind: normalizedMessage.kind,
+                    content: normalizedContent,
+                    receivedAt: normalizedMessage.receivedAt || normalizedMessage.timestamp,
+                    historyDedupKey: dedupKey,
+                }],
+                this.chatTitle || this.agentName || this.provider.name,
+                this.instanceId,
+                this.chatId || this.instanceId,
+            );
+        }
     }
 
     /**
@@ -348,12 +360,12 @@ export class ExtensionProviderInstance implements ProviderInstance {
         }
 
         this.prevMessageHashes = nextHashes;
-        return messages;
+        return normalizeChatMessages(messages);
     }
 
     private mergeConversationMessages(messages: any[]): ChatMessage[] {
-        if (this.runtimeMessages.length === 0) return messages;
-        return [...messages, ...this.runtimeMessages.map((entry) => entry.message)]
+        if (this.runtimeMessages.length === 0) return normalizeChatMessages(messages);
+        return normalizeChatMessages([...messages, ...this.runtimeMessages.map((entry) => entry.message)]
             .map((message, index) => ({ message, index }))
             .sort((a, b) => {
                 const aTime = a.message.receivedAt || a.message.timestamp || 0;
@@ -361,7 +373,7 @@ export class ExtensionProviderInstance implements ProviderInstance {
                 if (aTime !== bTime) return aTime - bTime;
                 return a.index - b.index;
             })
-            .map((entry) => entry.message);
+            .map((entry) => entry.message));
     }
 
     private getPersistedEffectContent(effect: { type: string; message?: { content?: unknown }; toast?: { message?: string }; notification?: { title?: string; body?: string; bubbleContent?: unknown } }): string | null {

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

@@ -11,16 +11,17 @@
 
 import * as os from 'os';
 import * as crypto from 'crypto';
-import type { ProviderModule } from './contracts.js';
+import { flattenContent, type ProviderModule } from './contracts.js';
 import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext } from './provider-instance.js';
 import { ExtensionProviderInstance } from './extension-provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
 import { ChatHistoryWriter } from '../config/chat-history.js';
 import { LOG } from '../logging/logger.js';
-import { normalizeProviderEffects } from './control-effects.js';
+import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from './control-effects.js';
 import type { ChatMessage } from '../types.js';
 import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
+import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages } from './chat-message-normalization.js';
 
 type ReadChatModal = {
     message?: string;
@@ -497,8 +498,8 @@ export class IdeProviderInstance implements ProviderInstance {
             this.appliedEffectKeys.add(effectKey);
 
             if (effect.persist !== false) {
-                const persisted = this.getPersistedEffectContent(effect);
-                if (persisted) this.appendRuntimeSystemMessage(persisted, effectKey);
+                const persistedMessage = buildPersistedProviderEffectMessage(effect);
+                if (persistedMessage) this.appendRuntimeMessage(persistedMessage, effectKey);
             }
 
             if (effect.type === 'message' && effect.message) {
@@ -537,8 +538,23 @@ export class IdeProviderInstance implements ProviderInstance {
     }
 
     private appendRuntimeSystemMessage(content: string, dedupKey: string, receivedAt = Date.now()): void {
-        const normalizedContent = String(content || '').trim();
-        if (!normalizedContent) return;
+        this.appendRuntimeMessage(buildRuntimeSystemChatMessage({
+            content,
+            receivedAt,
+            timestamp: receivedAt,
+        }), dedupKey);
+    }
+
+    private appendRuntimeMessage(message: ChatMessage, dedupKey: string): void {
+        const normalizedMessage = buildChatMessage({
+            ...message,
+            receivedAt: typeof message.receivedAt === 'number' ? message.receivedAt : (message.timestamp || Date.now()),
+            timestamp: typeof message.timestamp === 'number' ? message.timestamp : (message.receivedAt || Date.now()),
+        } as ChatMessage);
+        const normalizedContent = typeof normalizedMessage.content === 'string'
+            ? normalizedMessage.content.trim()
+            : flattenContent(normalizedMessage.content).trim();
+        if (!normalizedContent && (!Array.isArray(normalizedMessage.content) || normalizedMessage.content.length === 0)) return;
         if (this.runtimeMessages.some((entry) => entry.key === dedupKey)) return;
         if (!this.cachedChat) {
             this.cachedChat = {
@@ -553,35 +569,31 @@ export class IdeProviderInstance implements ProviderInstance {
 
         this.runtimeMessages.push({
             key: dedupKey,
-            message: {
-                role: 'system',
-                senderName: 'System',
-                content: normalizedContent,
-                receivedAt,
-                timestamp: receivedAt,
-            },
+            message: normalizedMessage,
         });
         if (this.runtimeMessages.length > 50) this.runtimeMessages = this.runtimeMessages.slice(-50);
 
-        this.historyWriter.appendNewMessages(
-            this.type,
-            [{
-                role: 'system',
-                senderName: 'System',
-                content: normalizedContent,
-                kind: 'system',
-                receivedAt,
-                historyDedupKey: dedupKey,
-            }],
-            this.cachedChat?.title || this.provider.name,
-            this.instanceId,
-            this.cachedChat?.id || this.instanceId,
-        );
+        if (normalizedContent) {
+            this.historyWriter.appendNewMessages(
+                this.type,
+                [{
+                    role: normalizedMessage.role,
+                    senderName: normalizedMessage.senderName,
+                    kind: normalizedMessage.kind,
+                    content: normalizedContent,
+                    receivedAt: normalizedMessage.receivedAt || normalizedMessage.timestamp,
+                    historyDedupKey: dedupKey,
+                }],
+                this.cachedChat?.title || this.provider.name,
+                this.instanceId,
+                this.cachedChat?.id || this.instanceId,
+            );
+        }
     }
 
     private mergeConversationMessages(messages: any[]): ChatMessage[] {
-        if (this.runtimeMessages.length === 0) return messages;
-        return [...messages, ...this.runtimeMessages.map((entry) => entry.message)]
+        if (this.runtimeMessages.length === 0) return normalizeChatMessages(messages);
+        return normalizeChatMessages([...messages, ...this.runtimeMessages.map((entry) => entry.message)]
             .map((message, index) => ({ message, index }))
             .sort((a, b) => {
                 const aTime = a.message.receivedAt || a.message.timestamp || 0;
@@ -589,7 +601,7 @@ export class IdeProviderInstance implements ProviderInstance {
                 if (aTime !== bTime) return aTime - bTime;
                 return a.index - b.index;
             })
-            .map((entry) => entry.message);
+            .map((entry) => entry.message));
     }
 
     private getPersistedEffectContent(effect: { type: string; message?: { content?: unknown }; toast?: { message?: string }; notification?: { title?: string; body?: string; bubbleContent?: unknown } }): string | null {

package/src/types.ts

@@ -5,6 +5,7 @@
  * When modifying this file, also update interface contracts in AGENT_PROTOCOL.md.
  */
 import type { StatusReportPayload, AvailableProviderInfo } from './shared-types.js';
+import type { ChatMessageKind } from './providers/chat-message-normalization.js';
 
 // ── Daemon Status ──
 
@@ -29,7 +30,7 @@ export interface ChatMessage {
   role: string;       // 'user' | 'assistant' | 'system' | 'human'
   /** Plain text (legacy) or canonical message parts */
   content: string | MessagePart[];
-  kind?: string;      // 'standard' | 'thought' | 'tool' | 'terminal' | 'system'
+  kind?: ChatMessageKind;      // built-ins: standard | thought | tool | terminal | system; custom kinds allowed
   id?: string;
   index?: number;
   timestamp?: number;