@adhdev/daemon-standalone 0.8.59 → 0.8.61

package/dist/index.js

@@ -28313,6 +28313,63 @@ var require_dist2 = __commonJS({
         LOG_PATH = path6.join(LOG_DIR, `daemon-${getDateStr()}.log`);
       }
     });
+    function isBuiltinChatMessageKind(kind) {
+      return typeof kind === "string" && KNOWN_CHAT_MESSAGE_KINDS.has(kind.trim().toLowerCase());
+    }
+    function normalizeChatMessageKind(kind, role) {
+      const normalizedKind = typeof kind === "string" ? kind.trim().toLowerCase() : "";
+      if (normalizedKind && KNOWN_CHAT_MESSAGE_KINDS.has(normalizedKind)) return normalizedKind;
+      const normalizedRole = typeof role === "string" ? role.trim().toLowerCase() : "";
+      return normalizedRole === "system" ? "system" : "standard";
+    }
+    function buildChatMessage(message) {
+      return {
+        ...message,
+        kind: normalizeChatMessageKind(message?.kind, message?.role)
+      };
+    }
+    function buildSystemChatMessage(message) {
+      return buildChatMessage({
+        ...message,
+        role: "system",
+        kind: message?.kind || "system"
+      });
+    }
+    function buildRuntimeSystemChatMessage(message) {
+      return buildSystemChatMessage({
+        ...message,
+        senderName: typeof message?.senderName === "string" && message.senderName.trim() ? message.senderName : "System"
+      });
+    }
+    function buildAssistantChatMessage(message) {
+      return buildChatMessage({
+        ...message,
+        role: "assistant",
+        kind: message?.kind || "standard"
+      });
+    }
+    function buildUserChatMessage(message) {
+      return buildChatMessage({
+        ...message,
+        role: "user",
+        kind: message?.kind || "standard"
+      });
+    }
+    function normalizeChatMessage(message) {
+      return buildChatMessage(message);
+    }
+    function normalizeChatMessages(messages) {
+      return (Array.isArray(messages) ? messages : []).map((message) => normalizeChatMessage(message));
+    }
+    var BUILTIN_CHAT_MESSAGE_KINDS;
+    var KNOWN_CHAT_MESSAGE_KINDS;
+    var init_chat_message_normalization = __esm2({
+      "src/providers/chat-message-normalization.ts"() {
+        "use strict";
+        BUILTIN_CHAT_MESSAGE_KINDS = ["standard", "thought", "tool", "terminal", "system"];
+        KNOWN_CHAT_MESSAGE_KINDS = new Set(BUILTIN_CHAT_MESSAGE_KINDS);
+      }
+    });
     function isModuleNotFoundError(error48, ref) {
       if (!(error48 instanceof Error)) return false;
       const message = error48.message || "";
@@ -29160,6 +29217,7 @@ var require_dist2 = __commonJS({
         init_terminal_screen();
         init_pty_transport();
         init_provider_cli_shared();
+        init_chat_message_normalization();
         init_provider_cli_parse();
         init_provider_cli_config();
         init_provider_cli_runtime();
@@ -29270,6 +29328,7 @@ var require_dist2 = __commonJS({
           static MAX_TRACE_ENTRIES = 250;
           providerResolutionMeta;
           static IDLE_FINISH_CONFIRM_MS = 2e3;
+          static HERMES_IDLE_FINISH_CONFIRM_MS = 5e3;
           static STATUS_ACTIVITY_HOLD_MS = 2e3;
           static FINISH_RETRY_DELAY_MS = 300;
           static MAX_FINISH_RETRIES = 2;
@@ -29277,6 +29336,12 @@ var require_dist2 = __commonJS({
             this.messages = [...this.committedMessages];
             this.structuredMessages = [...this.committedMessages];
           }
+          getIdleFinishConfirmMs() {
+            return this.cliType === "hermes-cli" ? _ProviderCliAdapter.HERMES_IDLE_FINISH_CONFIRM_MS : _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS;
+          }
+          getStatusActivityHoldMs() {
+            return this.cliType === "hermes-cli" ? _ProviderCliAdapter.HERMES_IDLE_FINISH_CONFIRM_MS : _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS;
+          }
           setStatus(status, trigger) {
             const prev = this.currentStatus;
             if (prev === status) return;
@@ -29299,6 +29364,7 @@ var require_dist2 = __commonJS({
           }
           armIdleFinishCandidate(assistantLength) {
             const now = Date.now();
+            const idleFinishConfirmMs = this.getIdleFinishConfirmMs();
             this.idleFinishCandidate = {
               armedAt: now,
               lastOutputAt: this.lastOutputAt,
@@ -29307,7 +29373,7 @@ var require_dist2 = __commonJS({
               assistantLength
             };
             this.recordTrace("idle_candidate_armed", {
-              confirmMs: _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS,
+              confirmMs: idleFinishConfirmMs,
               candidate: this.idleFinishCandidate,
               ...buildCliTraceParseSnapshot({
                 accumulatedBuffer: this.accumulatedBuffer,
@@ -29322,7 +29388,7 @@ var require_dist2 = __commonJS({
               this.settleTimer = null;
               this.settledBuffer = this.recentOutputBuffer;
               this.evaluateSettled();
-            }, _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS);
+            }, idleFinishConfirmMs);
           }
           recordTrace(type, payload = {}) {
             const entry = {
@@ -29701,7 +29767,8 @@ var require_dist2 = __commonJS({
           hasRecentInteractiveActivity(now) {
             const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
             const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : Number.MAX_SAFE_INTEGER;
-            return quietForMs < _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS || screenStableMs < _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS;
+            const holdMs = this.getStatusActivityHoldMs();
+            return quietForMs < holdMs || screenStableMs < holdMs;
           }
           getStartupConfirmationModal(screenText) {
             const text = sanitizeTerminalText(String(screenText || ""));
@@ -29853,6 +29920,7 @@ var require_dist2 = __commonJS({
               clearPendingScriptStatus();
             }
             const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
+            const statusActivityHoldMs = this.getStatusActivityHoldMs();
             const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity;
             if (shouldHoldGenerating) {
               this.clearIdleFinishCandidate("hold_generating_recent_activity");
@@ -29868,7 +29936,7 @@ var require_dist2 = __commonJS({
                 recentInteractiveActivity,
                 lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
                 lastScreenChangeAt: this.lastScreenChangeAt,
-                holdMs: _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS,
+                holdMs: statusActivityHoldMs,
                 ...buildCliTraceParseSnapshot({
                   accumulatedBuffer: this.accumulatedBuffer,
                   accumulatedRawBuffer: this.accumulatedRawBuffer,
@@ -29957,11 +30025,12 @@ var require_dist2 = __commonJS({
                 const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
                 const hasAssistantTurn = !!lastParsedAssistant;
                 const assistantLength = lastParsedAssistant?.content?.length || 0;
-                const idleQuietThresholdMs = Math.max(2e3, this.timeouts.outputSettle);
-                const idleStableThresholdMs = 2e3;
+                const idleFinishConfirmMs = this.getIdleFinishConfirmMs();
+                const idleQuietThresholdMs = Math.max(idleFinishConfirmMs, this.timeouts.outputSettle);
+                const idleStableThresholdMs = idleFinishConfirmMs;
                 const idleReady = visibleIdlePrompt && !modal && hasAssistantTurn && quietForMs >= idleQuietThresholdMs && screenStableMs >= idleStableThresholdMs;
                 const candidate = this.idleFinishCandidate;
-                const candidateQuiet = !!candidate && candidate.responseEpoch === this.responseEpoch && candidate.lastOutputAt === this.lastOutputAt && candidate.lastScreenChangeAt === this.lastScreenChangeAt && assistantLength >= candidate.assistantLength && now - candidate.armedAt >= _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS;
+                const candidateQuiet = !!candidate && candidate.responseEpoch === this.responseEpoch && candidate.lastOutputAt === this.lastOutputAt && candidate.lastScreenChangeAt === this.lastScreenChangeAt && assistantLength >= candidate.assistantLength && now - candidate.armedAt >= idleFinishConfirmMs;
                 const canFinishImmediately = idleReady && candidateQuiet;
                 this.recordTrace("idle_decision", {
                   visibleIdlePrompt,
@@ -29973,7 +30042,7 @@ var require_dist2 = __commonJS({
                   idleQuietThresholdMs,
                   idleStableThresholdMs,
                   idleReady,
-                  idleFinishConfirmMs: _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS,
+                  idleFinishConfirmMs,
                   idleFinishCandidate: candidate,
                   candidateQuiet,
                   canFinishImmediately,
@@ -30206,11 +30275,10 @@ var require_dist2 = __commonJS({
             );
             const shouldPreferCommittedMessages = !this.currentTurnScope && this.currentStatus === "idle" && !this.activeModal;
             if (parsed && Array.isArray(parsed.messages)) {
-              const hydratedMessages = shouldPreferCommittedMessages ? this.committedMessages.map((message, index) => ({
+              const hydratedMessages = shouldPreferCommittedMessages ? this.committedMessages.map((message, index) => buildChatMessage({
                 ...message,
                 id: message.id || `msg_${index}`,
                 index: typeof message.index === "number" ? message.index : index,
-                kind: message.kind || "standard",
                 receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
               })) : hydrateCliParsedMessages(parsed.messages, {
                 committedMessages: this.committedMessages,
@@ -30231,13 +30299,11 @@ var require_dist2 = __commonJS({
               id: "cli_session",
               status: this.currentStatus,
               title: this.cliName,
-              messages: messages.slice(-50).map((message, index) => ({
-                id: `msg_${index}`,
-                role: message.role,
-                content: message.content,
-                timestamp: message.timestamp,
-                index,
-                kind: "standard"
+              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
               })),
               activeModal: this.activeModal
             };
@@ -30860,6 +30926,7 @@ ${data.message || ""}`.trim();
     __export2(index_exports, {
       AcpProviderInstance: () => AcpProviderInstance,
       AgentStreamPoller: () => AgentStreamPoller,
+      BUILTIN_CHAT_MESSAGE_KINDS: () => BUILTIN_CHAT_MESSAGE_KINDS,
       CdpDomHandlers: () => CdpDomHandlers,
       CliProviderInstance: () => CliProviderInstance,
       DAEMON_WS_PATH: () => DAEMON_WS_PATH,
@@ -30884,9 +30951,14 @@ ${data.message || ""}`.trim();
       SessionHostPtyTransportFactory: () => SessionHostPtyTransportFactory2,
       VersionArchive: () => VersionArchive,
       appendRecentActivity: () => appendRecentActivity,
+      buildAssistantChatMessage: () => buildAssistantChatMessage,
+      buildChatMessage: () => buildChatMessage,
       buildMachineInfo: () => buildMachineInfo2,
+      buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
       buildSessionEntries: () => buildSessionEntries,
       buildStatusSnapshot: () => buildStatusSnapshot2,
+      buildSystemChatMessage: () => buildSystemChatMessage,
+      buildUserChatMessage: () => buildUserChatMessage,
       clearDebugTrace: () => clearDebugTrace,
       configureDebugTraceStore: () => configureDebugTraceStore,
       connectCdpManager: () => connectCdpManager,
@@ -30918,6 +30990,7 @@ ${data.message || ""}`.trim();
       initDaemonComponents: () => initDaemonComponents2,
       installExtensions: () => installExtensions,
       installGlobalInterceptor: () => installGlobalInterceptor,
+      isBuiltinChatMessageKind: () => isBuiltinChatMessageKind,
       isCdpConnected: () => isCdpConnected,
       isExtensionInstalled: () => isExtensionInstalled,
       isIdeRunning: () => isIdeRunning,
@@ -30936,6 +31009,9 @@ ${data.message || ""}`.trim();
       markSetupComplete: () => markSetupComplete,
       maybeRunDaemonUpgradeHelperFromEnv: () => maybeRunDaemonUpgradeHelperFromEnv2,
       normalizeActiveChatData: () => normalizeActiveChatData,
+      normalizeChatMessage: () => normalizeChatMessage,
+      normalizeChatMessageKind: () => normalizeChatMessageKind,
+      normalizeChatMessages: () => normalizeChatMessages,
       normalizeInputEnvelope: () => normalizeInputEnvelope,
       normalizeManagedStatus: () => normalizeManagedStatus,
       normalizeMessageParts: () => normalizeMessageParts,
@@ -32917,6 +32993,215 @@ ${data.message || ""}`.trim();
       }
     };
     var crypto2 = __toESM2(require("crypto"));
+    function normalizeInputEnvelope(input) {
+      const normalized = normalizeInputEnvelopePayload(input);
+      const textFallback = normalized.textFallback ?? flattenInputParts(normalized.parts);
+      return {
+        parts: normalized.parts,
+        textFallback,
+        ...normalized.metadata ? { metadata: normalized.metadata } : {}
+      };
+    }
+    function normalizeMessageParts(content) {
+      if (typeof content === "string") return [{ type: "text", text: content }];
+      if (!Array.isArray(content)) {
+        if (content && typeof content === "object" && typeof content.text === "string") {
+          return [{ type: "text", text: String(content.text) }];
+        }
+        return [];
+      }
+      const parts = [];
+      for (const raw of content) {
+        if (typeof raw === "string") {
+          parts.push({ type: "text", text: raw });
+          continue;
+        }
+        if (!raw || typeof raw !== "object") continue;
+        const part = normalizeMessagePartObject(raw);
+        if (part) parts.push(part);
+      }
+      return parts;
+    }
+    function flattenMessageParts(parts) {
+      return parts.map((part) => {
+        if (part.type === "text") return part.text;
+        if (part.type === "resource") return part.resource.text || "";
+        return "";
+      }).filter((value) => value.length > 0).join("\n");
+    }
+    function normalizeInputEnvelopePayload(input) {
+      if (typeof input === "string") {
+        return { parts: [{ type: "text", text: input }], textFallback: input };
+      }
+      if (!input || typeof input !== "object") {
+        return { parts: [], textFallback: "" };
+      }
+      const record2 = input;
+      const nestedInput = record2.input;
+      if (nestedInput && typeof nestedInput === "object") {
+        const nested = nestedInput;
+        return {
+          parts: normalizeInputParts(nested.parts ?? nested.prompt),
+          textFallback: typeof nested.textFallback === "string" ? nested.textFallback : void 0,
+          metadata: normalizeInputMetadata(nested.metadata)
+        };
+      }
+      const directText = typeof record2.text === "string" ? record2.text : typeof record2.message === "string" ? record2.message : void 0;
+      if (directText !== void 0) {
+        return { parts: [{ type: "text", text: directText }], textFallback: directText };
+      }
+      const directParts = normalizeInputParts(record2.parts ?? record2.prompt);
+      return {
+        parts: directParts,
+        textFallback: typeof record2.textFallback === "string" ? record2.textFallback : void 0,
+        metadata: normalizeInputMetadata(record2.metadata)
+      };
+    }
+    function normalizeInputMetadata(value) {
+      if (!value || typeof value !== "object") return void 0;
+      const record2 = value;
+      const metadata = {};
+      if (record2.source === "dashboard" || record2.source === "shortcut_api" || record2.source === "provider_script" || record2.source === "session_replay") {
+        metadata.source = record2.source;
+      }
+      if (typeof record2.clientTimestamp === "number" && Number.isFinite(record2.clientTimestamp)) {
+        metadata.clientTimestamp = record2.clientTimestamp;
+      }
+      return Object.keys(metadata).length > 0 ? metadata : void 0;
+    }
+    function normalizeInputParts(value) {
+      if (!Array.isArray(value)) return [];
+      const parts = [];
+      for (const raw of value) {
+        if (typeof raw === "string") {
+          parts.push({ type: "text", text: raw });
+          continue;
+        }
+        if (!raw || typeof raw !== "object") continue;
+        const part = normalizeInputPartObject(raw);
+        if (part) parts.push(part);
+      }
+      return parts;
+    }
+    function normalizeInputPartObject(raw) {
+      const type = raw.type;
+      if (type === "text" && typeof raw.text === "string") {
+        return { type, text: raw.text };
+      }
+      if (type === "image" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.alt === "string" ? { alt: raw.alt } : {}
+        };
+      }
+      if (type === "audio" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+        };
+      }
+      if (type === "video" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
+        };
+      }
+      if (type === "resource" && typeof raw.uri === "string") {
+        return {
+          type,
+          uri: raw.uri,
+          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+          ...typeof raw.name === "string" ? { name: raw.name } : {},
+          ...typeof raw.text === "string" ? { text: raw.text } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {}
+        };
+      }
+      if (type === "resource_link" && typeof raw.uri === "string") {
+        return {
+          type: "resource",
+          uri: raw.uri,
+          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+          ...typeof raw.name === "string" ? { name: raw.name } : {}
+        };
+      }
+      return null;
+    }
+    function normalizeMessagePartObject(raw) {
+      const type = raw.type;
+      if (type === "text" && typeof raw.text === "string") {
+        return { type, text: raw.text };
+      }
+      if (type === "image" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {}
+        };
+      }
+      if (type === "audio" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+        };
+      }
+      if (type === "video" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
+        };
+      }
+      if (type === "resource_link" && typeof raw.uri === "string" && typeof raw.name === "string") {
+        return {
+          type,
+          uri: raw.uri,
+          name: raw.name,
+          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+          ...typeof raw.size === "number" ? { size: raw.size } : {}
+        };
+      }
+      if (type === "resource" && raw.resource && typeof raw.resource === "object") {
+        const resource = raw.resource;
+        if (typeof resource.uri !== "string") return null;
+        return {
+          type,
+          resource: {
+            uri: resource.uri,
+            ...typeof resource.mimeType === "string" || resource.mimeType === null ? { mimeType: resource.mimeType } : {},
+            ...typeof resource.text === "string" ? { text: resource.text } : {},
+            ...typeof resource.blob === "string" ? { blob: resource.blob } : {}
+          }
+        };
+      }
+      return null;
+    }
+    function flattenInputParts(parts) {
+      return parts.map((part) => {
+        if (part.type === "text") return part.text;
+        if (part.type === "audio") return part.transcript || "";
+        if (part.type === "resource") return part.text || "";
+        return "";
+      }).filter((value) => value.length > 0).join("\n");
+    }
+    function flattenContent(content) {
+      if (typeof content === "string") return content;
+      return flattenMessageParts(normalizeMessageParts(content));
+    }
     var DEFAULT_MONITOR_CONFIG = {
       approvalAlert: true,
       longGeneratingAlert: true,
@@ -33027,6 +33312,7 @@ ${data.message || ""}`.trim();
         }
       }
     };
+    init_chat_message_normalization();
     function extractProviderControlValues(controls, data) {
       if (!data || typeof data !== "object") return void 0;
       const values = {};
@@ -33094,13 +33380,58 @@ ${data.message || ""}`.trim();
               level: raw.notification.level === "success" || raw.notification.level === "warning" ? raw.notification.level : "info",
               channels: Array.isArray(raw.notification.channels) ? raw.notification.channels.filter((channel) => channel === "bubble" || channel === "toast" || channel === "browser") : void 0,
               preferenceKey: raw.notification.preferenceKey === "disconnect" || raw.notification.preferenceKey === "completion" || raw.notification.preferenceKey === "approval" || raw.notification.preferenceKey === "browser" ? raw.notification.preferenceKey : void 0,
-              bubbleContent: typeof raw.notification.bubbleContent === "string" || Array.isArray(raw.notification.bubbleContent) ? raw.notification.bubbleContent : void 0
+              bubbleContent: typeof raw.notification.bubbleContent === "string" || Array.isArray(raw.notification.bubbleContent) ? raw.notification.bubbleContent : void 0,
+              bubbleKind: typeof raw.notification.bubbleKind === "string" ? raw.notification.bubbleKind : void 0,
+              bubbleRole: raw.notification.bubbleRole === "assistant" || raw.notification.bubbleRole === "user" ? raw.notification.bubbleRole : raw.notification.bubbleRole === "system" ? "system" : void 0,
+              bubbleSenderName: typeof raw.notification.bubbleSenderName === "string" ? raw.notification.bubbleSenderName : void 0
             }
           });
         }
       }
       return effects;
     }
+    function buildPersistedProviderEffectMessage(effect) {
+      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
+        });
+      }
+      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
+        });
+      }
+      if (effect.type === "toast" && effect.toast?.message) {
+        return buildRuntimeSystemChatMessage({ content: effect.toast.message });
+      }
+      return null;
+    }
     function normalizeControlListResult(data) {
       if (data && typeof data === "object" && Array.isArray(data.options)) {
         return {
@@ -33167,9 +33498,17 @@ ${data.message || ""}`.trim();
       }
       return String(value);
     }
+    function formatNotificationBubbleFallback(title, body) {
+      const cleanTitle = typeof title === "string" ? title.trim() : "";
+      const cleanBody = String(body || "").trim();
+      if (cleanTitle && cleanBody) return `${cleanTitle}
+${cleanBody}`;
+      return cleanTitle || cleanBody;
+    }
     var fs32 = __toESM2(require("fs"));
     var path7 = __toESM2(require("path"));
     var os52 = __toESM2(require("os"));
+    init_chat_message_normalization();
     var HISTORY_DIR = path7.join(os52.homedir(), ".adhdev", "history");
     var RETAIN_DAYS = 30;
     var CODEX_STARTER_PROMPT_RE = /^(?:[›❯]\s*)?(?:Find and fix a bug in @filename|Improve documentation in @filename|Write tests for @filename|Explain this codebase|Summarize recent commits|Implement \{feature\}|Use \/skills(?: to list available skills)?|Run \/review on my current changes)$/i;
@@ -33375,11 +33714,11 @@ ${data.message || ""}`.trim();
         this.appendNewMessages(
           agentType,
           [{
-            role: "system",
-            kind: "system",
-            content,
-            receivedAt: options.receivedAt,
-            senderName: options.senderName,
+            ...buildRuntimeSystemChatMessage({
+              content,
+              receivedAt: options.receivedAt,
+              senderName: options.senderName
+            }),
             historyDedupKey: options.dedupKey
           }],
           options.sessionTitle,
@@ -33730,6 +34069,7 @@ ${data.message || ""}`.trim();
         })
       };
     }
+    init_chat_message_normalization();
     var ExtensionProviderInstance = class {
       type;
       category = "extension";
@@ -33936,8 +34276,8 @@ ${data.message || ""}`.trim();
           if (this.appliedEffectKeys.has(effectKey)) continue;
           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) {
             this.pushEvent({
@@ -33972,34 +34312,42 @@ ${data.message || ""}`.trim();
         }
       }
       appendRuntimeSystemMessage(content, dedupKey, receivedAt = Date.now()) {
-        const normalizedContent = String(content || "").trim();
-        if (!normalizedContent) return;
+        this.appendRuntimeMessage(buildRuntimeSystemChatMessage({
+          content,
+          receivedAt,
+          timestamp: receivedAt
+        }), dedupKey);
+      }
+      appendRuntimeMessage(message, dedupKey) {
+        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()
+        });
+        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
+          );
+        }
       }
       /**
        * Assign stable receivedAt to extension messages.
@@ -34016,16 +34364,16 @@ ${data.message || ""}`.trim();
           nextHashes.set(hash2, msg.receivedAt);
         }
         this.prevMessageHashes = nextHashes;
-        return messages;
+        return normalizeChatMessages(messages);
       }
       mergeConversationMessages(messages) {
-        if (this.runtimeMessages.length === 0) return messages;
-        return [...messages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
+        if (this.runtimeMessages.length === 0) return normalizeChatMessages(messages);
+        return normalizeChatMessages([...messages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
           const aTime = a.message.receivedAt || a.message.timestamp || 0;
           const bTime = b2.message.receivedAt || b2.message.timestamp || 0;
           if (aTime !== bTime) return aTime - bTime;
           return a.index - b2.index;
-        }).map((entry) => entry.message);
+        }).map((entry) => entry.message));
       }
       getPersistedEffectContent(effect) {
         if (effect.type === "message") {
@@ -34133,6 +34481,7 @@ ${effect.notification.body || ""}`.trim();
       if (cleanMessage) lines.push(cleanMessage);
       return lines.join("\n");
     }
+    init_chat_message_normalization();
     var IdeProviderInstance = class {
       type;
       category = "ide";
@@ -34513,8 +34862,8 @@ ${effect.notification.body || ""}`.trim();
           if (this.appliedEffectKeys.has(effectKey)) continue;
           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) {
             this.pushEvent({
@@ -34549,8 +34898,20 @@ ${effect.notification.body || ""}`.trim();
         }
       }
       appendRuntimeSystemMessage(content, dedupKey, receivedAt = Date.now()) {
-        const normalizedContent = String(content || "").trim();
-        if (!normalizedContent) return;
+        this.appendRuntimeMessage(buildRuntimeSystemChatMessage({
+          content,
+          receivedAt,
+          timestamp: receivedAt
+        }), dedupKey);
+      }
+      appendRuntimeMessage(message, dedupKey) {
+        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()
+        });
+        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 = {
@@ -34564,38 +34925,34 @@ ${effect.notification.body || ""}`.trim();
         }
         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
+          );
+        }
       }
       mergeConversationMessages(messages) {
-        if (this.runtimeMessages.length === 0) return messages;
-        return [...messages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
+        if (this.runtimeMessages.length === 0) return normalizeChatMessages(messages);
+        return normalizeChatMessages([...messages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
           const aTime = a.message.receivedAt || a.message.timestamp || 0;
           const bTime = b2.message.receivedAt || b2.message.timestamp || 0;
           if (aTime !== bTime) return aTime - bTime;
           return a.index - b2.index;
-        }).map((entry) => entry.message);
+        }).map((entry) => entry.message));
       }
       getPersistedEffectContent(effect) {
         if (effect.type === "message") {
@@ -35483,215 +35840,6 @@ ${effect.notification.body || ""}`.trim();
       }
     }
     init_logger();
-    function normalizeInputEnvelope(input) {
-      const normalized = normalizeInputEnvelopePayload(input);
-      const textFallback = normalized.textFallback ?? flattenInputParts(normalized.parts);
-      return {
-        parts: normalized.parts,
-        textFallback,
-        ...normalized.metadata ? { metadata: normalized.metadata } : {}
-      };
-    }
-    function normalizeMessageParts(content) {
-      if (typeof content === "string") return [{ type: "text", text: content }];
-      if (!Array.isArray(content)) {
-        if (content && typeof content === "object" && typeof content.text === "string") {
-          return [{ type: "text", text: String(content.text) }];
-        }
-        return [];
-      }
-      const parts = [];
-      for (const raw of content) {
-        if (typeof raw === "string") {
-          parts.push({ type: "text", text: raw });
-          continue;
-        }
-        if (!raw || typeof raw !== "object") continue;
-        const part = normalizeMessagePartObject(raw);
-        if (part) parts.push(part);
-      }
-      return parts;
-    }
-    function flattenMessageParts(parts) {
-      return parts.map((part) => {
-        if (part.type === "text") return part.text;
-        if (part.type === "resource") return part.resource.text || "";
-        return "";
-      }).filter((value) => value.length > 0).join("\n");
-    }
-    function normalizeInputEnvelopePayload(input) {
-      if (typeof input === "string") {
-        return { parts: [{ type: "text", text: input }], textFallback: input };
-      }
-      if (!input || typeof input !== "object") {
-        return { parts: [], textFallback: "" };
-      }
-      const record2 = input;
-      const nestedInput = record2.input;
-      if (nestedInput && typeof nestedInput === "object") {
-        const nested = nestedInput;
-        return {
-          parts: normalizeInputParts(nested.parts ?? nested.prompt),
-          textFallback: typeof nested.textFallback === "string" ? nested.textFallback : void 0,
-          metadata: normalizeInputMetadata(nested.metadata)
-        };
-      }
-      const directText = typeof record2.text === "string" ? record2.text : typeof record2.message === "string" ? record2.message : void 0;
-      if (directText !== void 0) {
-        return { parts: [{ type: "text", text: directText }], textFallback: directText };
-      }
-      const directParts = normalizeInputParts(record2.parts ?? record2.prompt);
-      return {
-        parts: directParts,
-        textFallback: typeof record2.textFallback === "string" ? record2.textFallback : void 0,
-        metadata: normalizeInputMetadata(record2.metadata)
-      };
-    }
-    function normalizeInputMetadata(value) {
-      if (!value || typeof value !== "object") return void 0;
-      const record2 = value;
-      const metadata = {};
-      if (record2.source === "dashboard" || record2.source === "shortcut_api" || record2.source === "provider_script" || record2.source === "session_replay") {
-        metadata.source = record2.source;
-      }
-      if (typeof record2.clientTimestamp === "number" && Number.isFinite(record2.clientTimestamp)) {
-        metadata.clientTimestamp = record2.clientTimestamp;
-      }
-      return Object.keys(metadata).length > 0 ? metadata : void 0;
-    }
-    function normalizeInputParts(value) {
-      if (!Array.isArray(value)) return [];
-      const parts = [];
-      for (const raw of value) {
-        if (typeof raw === "string") {
-          parts.push({ type: "text", text: raw });
-          continue;
-        }
-        if (!raw || typeof raw !== "object") continue;
-        const part = normalizeInputPartObject(raw);
-        if (part) parts.push(part);
-      }
-      return parts;
-    }
-    function normalizeInputPartObject(raw) {
-      const type = raw.type;
-      if (type === "text" && typeof raw.text === "string") {
-        return { type, text: raw.text };
-      }
-      if (type === "image" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.alt === "string" ? { alt: raw.alt } : {}
-        };
-      }
-      if (type === "audio" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
-        };
-      }
-      if (type === "video" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
-        };
-      }
-      if (type === "resource" && typeof raw.uri === "string") {
-        return {
-          type,
-          uri: raw.uri,
-          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
-          ...typeof raw.name === "string" ? { name: raw.name } : {},
-          ...typeof raw.text === "string" ? { text: raw.text } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {}
-        };
-      }
-      if (type === "resource_link" && typeof raw.uri === "string") {
-        return {
-          type: "resource",
-          uri: raw.uri,
-          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
-          ...typeof raw.name === "string" ? { name: raw.name } : {}
-        };
-      }
-      return null;
-    }
-    function normalizeMessagePartObject(raw) {
-      const type = raw.type;
-      if (type === "text" && typeof raw.text === "string") {
-        return { type, text: raw.text };
-      }
-      if (type === "image" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {}
-        };
-      }
-      if (type === "audio" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
-        };
-      }
-      if (type === "video" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
-        };
-      }
-      if (type === "resource_link" && typeof raw.uri === "string" && typeof raw.name === "string") {
-        return {
-          type,
-          uri: raw.uri,
-          name: raw.name,
-          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
-          ...typeof raw.size === "number" ? { size: raw.size } : {}
-        };
-      }
-      if (type === "resource" && raw.resource && typeof raw.resource === "object") {
-        const resource = raw.resource;
-        if (typeof resource.uri !== "string") return null;
-        return {
-          type,
-          resource: {
-            uri: resource.uri,
-            ...typeof resource.mimeType === "string" || resource.mimeType === null ? { mimeType: resource.mimeType } : {},
-            ...typeof resource.text === "string" ? { text: resource.text } : {},
-            ...typeof resource.blob === "string" ? { blob: resource.blob } : {}
-          }
-        };
-      }
-      return null;
-    }
-    function flattenInputParts(parts) {
-      return parts.map((part) => {
-        if (part.type === "text") return part.text;
-        if (part.type === "audio") return part.transcript || "";
-        if (part.type === "resource") return part.text || "";
-        return "";
-      }).filter((value) => value.length > 0).join("\n");
-    }
-    function flattenContent(content) {
-      if (typeof content === "string") return content;
-      return flattenMessageParts(normalizeMessageParts(content));
-    }
     init_logger();
     var NORMAL_TRACE_BUFFER_SIZE = 200;
     var DEV_TRACE_BUFFER_SIZE = 1e3;
@@ -35815,6 +35963,7 @@ ${effect.notification.body || ""}`.trim();
     function createInteractionId(prefix = "ix") {
       return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
     }
+    init_chat_message_normalization();
     var RECENT_SEND_WINDOW_MS = 1200;
     var recentSendByTarget = /* @__PURE__ */ new Map();
     function hashSignatureParts2(parts) {
@@ -35944,7 +36093,7 @@ ${effect.notification.body || ""}`.trim();
     }
     function normalizeReadChatMessages(payload) {
       const messages = Array.isArray(payload.messages) ? payload.messages : [];
-      return messages;
+      return normalizeChatMessages(messages);
     }
     function deriveHistoryDedupKey(message) {
       const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
@@ -38274,6 +38423,7 @@ ${effect.notification.body || ""}`.trim();
     var import_node_module = require("module");
     init_provider_cli_adapter();
     init_logger();
+    init_chat_message_normalization();
     var CachedDatabaseSync = null;
     function getDatabaseSync() {
       if (CachedDatabaseSync) return CachedDatabaseSync;
@@ -38768,8 +38918,8 @@ ${effect.notification.body || ""}`.trim();
           if (this.appliedEffectKeys.has(effectKey)) continue;
           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) {
             const content = typeof effect.message.content === "string" ? effect.message.content : JSON.stringify(effect.message.content);
@@ -38893,44 +39043,53 @@ ${effect.notification.body || ""}`.trim();
         );
       }
       appendRuntimeSystemMessage(content, dedupKey, receivedAt = Date.now()) {
-        const normalizedContent = String(content || "").trim();
-        if (!normalizedContent) return;
+        this.appendRuntimeMessage(buildRuntimeSystemChatMessage({
+          content,
+          receivedAt,
+          timestamp: receivedAt
+        }), dedupKey);
+      }
+      appendRuntimeMessage(message, dedupKey) {
+        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()
+        });
+        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
+          );
+        }
       }
       mergeConversationMessages(parsedMessages) {
-        if (this.runtimeMessages.length === 0) return parsedMessages;
-        return [...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
+        if (this.runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
+        return normalizeChatMessages([...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
           const aTime = a.message.receivedAt || a.message.timestamp || 0;
           const bTime = b2.message.receivedAt || b2.message.timestamp || 0;
           if (aTime !== bTime) return aTime - bTime;
           return a.index - b2.index;
-        }).map((entry) => entry.message);
+        }).map((entry) => entry.message));
       }
       formatApprovalRequestMessage(modalMessage, buttons) {
         const lines = ["Approval requested"];
@@ -38999,6 +39158,7 @@ ${effect.notification.body || ""}`.trim();
     var import_stream = require("stream");
     var import_child_process5 = require("child_process");
     var import_sdk = (init_acp(), __toCommonJS(acp_exports));
+    init_chat_message_normalization();
     init_logger();
     function getPromptCapabilityFlags(agentCapabilities) {
       const prompt = agentCapabilities?.promptCapabilities || {};
@@ -39164,24 +39324,21 @@ ${effect.notification.body || ""}`.trim();
       }
       getState() {
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
-        const recentMessages = this.messages.slice(-50).map((m) => {
+        const recentMessages = normalizeChatMessages(this.messages.slice(-50).map((m) => {
           const content = this.truncateContent(m.content);
-          return {
-            role: m.role,
-            content,
-            timestamp: m.timestamp,
-            toolCalls: m.toolCalls
-          };
-        });
+          return buildChatMessage({
+            ...m,
+            content
+          });
+        }));
         if (this.currentStatus === "generating" && (this.partialContent || this.partialBlocks.length > 0)) {
           const blocks = this.buildPartialBlocks();
           if (blocks.length > 0) {
-            recentMessages.push({
-              role: "assistant",
+            recentMessages.push(buildAssistantChatMessage({
               content: blocks,
               timestamp: Date.now(),
               toolCalls: this.turnToolCalls.length > 0 ? [...this.turnToolCalls] : void 0
-            });
+            }));
           }
         }
         return {
@@ -39194,7 +39351,7 @@ ${effect.notification.body || ""}`.trim();
             id: this.sessionId || `${this.type}_${this.workingDir}`,
             title: `${this.provider.name} \xB7 ${dirName}`,
             status: this.currentStatus,
-            messages: recentMessages,
+            messages: normalizeChatMessages(recentMessages),
             activeModal: this.currentStatus === "waiting_approval" ? {
               message: this.activeToolCalls.find((t) => t.status === "running")?.name || "Permission requested",
               buttons: ["Approve", "Reject"]
@@ -39726,11 +39883,10 @@ ${effect.notification.body || ""}`.trim();
           if (b2.type === "resource") return { type: "resource", resource: b2.resource };
           return { type: "text", text: flattenContent([b2]) };
         }) : [{ type: "text", text }];
-        this.messages.push({
-          role: "user",
+        this.messages.push(buildUserChatMessage({
           content: contentBlocks && contentBlocks.length > 0 ? contentBlocks : text,
           timestamp: Date.now()
-        });
+        }));
         this.currentStatus = "generating";
         this.partialContent = "";
         this.partialBlocks = [];
@@ -39900,11 +40056,11 @@ ${effect.notification.body || ""}`.trim();
             content = m.content.filter((p) => p.type === "text").map((p) => p.text || "").join("\n");
           }
           if (content.trim()) {
-            this.messages.push({
+            this.messages.push(buildChatMessage({
               role: m.role || "assistant",
               content: content.trim(),
               timestamp: Date.now()
-            });
+            }));
             this.partialContent = "";
           }
         }
@@ -39980,12 +40136,11 @@ ${effect.notification.body || ""}`.trim();
           return b2;
         }).filter((b2) => b2.type !== "text" || b2.type === "text" && b2.text.trim());
         if (finalBlocks.length > 0) {
-          this.messages.push({
-            role: "assistant",
+          this.messages.push(buildAssistantChatMessage({
             content: finalBlocks.length === 1 && finalBlocks[0].type === "text" ? finalBlocks[0].text : finalBlocks,
             timestamp: Date.now(),
             toolCalls: this.turnToolCalls.length > 0 ? [...this.turnToolCalls] : void 0
-          });
+          }));
         }
         this.partialContent = "";
         this.partialBlocks = [];
@@ -40045,11 +40200,10 @@ ${effect.notification.body || ""}`.trim();
       appendSystemMessage(content, timestamp = Date.now()) {
         const normalizedContent = String(content || "").trim();
         if (!normalizedContent) return;
-        this.messages.push({
-          role: "system",
+        this.messages.push(buildRuntimeSystemChatMessage({
           content: normalizedContent,
           timestamp
-        });
+        }));
         if (this.messages.length > 200) {
           this.messages = this.messages.slice(-100);
         }
@@ -44678,6 +44832,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     };
     init_logger();
+    init_chat_message_normalization();
     var AgentStreamPoller = class {
       deps;
       timer = null;
@@ -44833,12 +44988,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
                         type: "message",
                         id: effectId,
                         persist: true,
-                        message: {
-                          role: "system",
-                          senderName: "System",
-                          kind: "system",
+                        message: buildRuntimeSystemChatMessage({
                           content: formatAutoApprovalMessage(stream.activeModal?.message, buttonLabel)
-                        }
+                        })
                       }
                     ]
                   };
@@ -45080,6 +45232,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         this.eventListeners = [];
       }
     };
+    init_chat_message_normalization();
     var fs10 = __toESM2(require("fs"));
     var path18 = __toESM2(require("path"));
     var os18 = __toESM2(require("os"));