@adhdev/daemon-core 0.8.60 → 0.8.62

package/dist/index.js

@@ -458,6 +458,64 @@ var init_logger = __esm({
   }
 });
 
+// src/providers/chat-message-normalization.ts
+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, KNOWN_CHAT_MESSAGE_KINDS;
+var init_chat_message_normalization = __esm({
+  "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);
+  }
+});
+
 // src/cli-adapters/terminal-backends/ghostty-vt-backend.ts
 function isModuleNotFoundError(error, ref) {
   if (!(error instanceof Error)) return false;
@@ -1108,6 +1166,7 @@ function buildCliParseInput(options) {
     terminalScreenText,
     baseMessages,
     partialResponse,
+    isWaitingForResponse,
     scope,
     runtimeSettings
   } = options;
@@ -1125,6 +1184,7 @@ function buildCliParseInput(options) {
     recentScreen: buildCliScreenSnapshot(recentBuffer),
     messages: [...baseMessages],
     partialResponse,
+    isWaitingForResponse,
     promptText: scope?.prompt || "",
     settings: { ...runtimeSettings }
   };
@@ -1310,6 +1370,7 @@ var init_provider_cli_adapter = __esm({
     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();
@@ -1862,6 +1923,18 @@ var init_provider_cli_adapter = __esm({
         const holdMs = this.getStatusActivityHoldMs();
         return quietForMs < holdMs || screenStableMs < holdMs;
       }
+      shouldDeferIdleTimeoutFinish() {
+        if (!this.isWaitingForResponse || this.currentStatus === "waiting_approval") {
+          return false;
+        }
+        const latestStatus = this.runDetectStatus(this.recentOutputBuffer) || this.currentStatus;
+        if (latestStatus === "generating") {
+          this.settledBuffer = this.recentOutputBuffer;
+          this.evaluateSettled();
+          return true;
+        }
+        return false;
+      }
       getStartupConfirmationModal(screenText) {
         const text = sanitizeTerminalText(String(screenText || ""));
         if (!text.trim()) return null;
@@ -2020,6 +2093,7 @@ var init_provider_cli_adapter = __esm({
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
           this.idleTimeout = setTimeout(() => {
             if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+              if (this.shouldDeferIdleTimeoutFinish()) return;
               this.finishResponse();
             }
           }, this.timeouts.generatingIdle);
@@ -2055,6 +2129,7 @@ var init_provider_cli_adapter = __esm({
               if (this.idleTimeout) clearTimeout(this.idleTimeout);
               this.idleTimeout = setTimeout(() => {
                 if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+                  if (this.shouldDeferIdleTimeoutFinish()) return;
                   this.finishResponse();
                 }
               }, this.timeouts.generatingIdle);
@@ -2097,7 +2172,10 @@ var init_provider_cli_adapter = __esm({
           this.setStatus("generating", "script_detect");
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
           this.idleTimeout = setTimeout(() => {
-            if (this.isWaitingForResponse) this.finishResponse();
+            if (this.isWaitingForResponse) {
+              if (this.shouldDeferIdleTimeoutFinish()) return;
+              this.finishResponse();
+            }
           }, this.timeouts.generatingIdle);
           this.onStatusChange?.();
           return;
@@ -2165,6 +2243,7 @@ var init_provider_cli_adapter = __esm({
             if (this.idleTimeout) clearTimeout(this.idleTimeout);
             this.idleTimeout = setTimeout(() => {
               if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+                if (this.shouldDeferIdleTimeoutFinish()) return;
                 this.clearIdleFinishCandidate("idle_timeout_finish");
                 this.finishResponse();
               }
@@ -2303,6 +2382,7 @@ var init_provider_cli_adapter = __esm({
             tail: text.slice(-500),
             screenText,
             rawBuffer: this.accumulatedRawBuffer,
+            isWaitingForResponse: this.isWaitingForResponse,
             screen: buildCliScreenSnapshot(screenText),
             tailScreen: buildCliScreenSnapshot(text.slice(-500))
           });
@@ -2367,11 +2447,10 @@ var init_provider_cli_adapter = __esm({
         );
         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,
@@ -2392,13 +2471,11 @@ var init_provider_cli_adapter = __esm({
           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
         };
@@ -2415,6 +2492,7 @@ var init_provider_cli_adapter = __esm({
           terminalScreenText: this.terminalScreen.getText(),
           baseMessages: this.committedMessages,
           partialResponse: this.responseBuffer,
+          isWaitingForResponse: this.isWaitingForResponse,
           scope: this.currentTurnScope,
           runtimeSettings: this.runtimeSettings
         });
@@ -2433,6 +2511,7 @@ var init_provider_cli_adapter = __esm({
             terminalScreenText: this.terminalScreen.getText(),
             baseMessages,
             partialResponse,
+            isWaitingForResponse: this.isWaitingForResponse,
             scope,
             runtimeSettings: this.runtimeSettings
           });
@@ -3023,6 +3102,7 @@ var index_exports = {};
 __export(index_exports, {
   AcpProviderInstance: () => AcpProviderInstance,
   AgentStreamPoller: () => AgentStreamPoller,
+  BUILTIN_CHAT_MESSAGE_KINDS: () => BUILTIN_CHAT_MESSAGE_KINDS,
   CdpDomHandlers: () => CdpDomHandlers,
   CliProviderInstance: () => CliProviderInstance,
   DAEMON_WS_PATH: () => DAEMON_WS_PATH,
@@ -3047,9 +3127,14 @@ __export(index_exports, {
   SessionHostPtyTransportFactory: () => SessionHostPtyTransportFactory,
   VersionArchive: () => VersionArchive,
   appendRecentActivity: () => appendRecentActivity,
+  buildAssistantChatMessage: () => buildAssistantChatMessage,
+  buildChatMessage: () => buildChatMessage,
   buildMachineInfo: () => buildMachineInfo,
+  buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
   buildSessionEntries: () => buildSessionEntries,
   buildStatusSnapshot: () => buildStatusSnapshot,
+  buildSystemChatMessage: () => buildSystemChatMessage,
+  buildUserChatMessage: () => buildUserChatMessage,
   clearDebugTrace: () => clearDebugTrace,
   configureDebugTraceStore: () => configureDebugTraceStore,
   connectCdpManager: () => connectCdpManager,
@@ -3081,6 +3166,7 @@ __export(index_exports, {
   initDaemonComponents: () => initDaemonComponents,
   installExtensions: () => installExtensions,
   installGlobalInterceptor: () => installGlobalInterceptor,
+  isBuiltinChatMessageKind: () => isBuiltinChatMessageKind,
   isCdpConnected: () => isCdpConnected,
   isExtensionInstalled: () => isExtensionInstalled,
   isIdeRunning: () => isIdeRunning,
@@ -3099,6 +3185,9 @@ __export(index_exports, {
   markSetupComplete: () => markSetupComplete,
   maybeRunDaemonUpgradeHelperFromEnv: () => maybeRunDaemonUpgradeHelperFromEnv,
   normalizeActiveChatData: () => normalizeActiveChatData,
+  normalizeChatMessage: () => normalizeChatMessage,
+  normalizeChatMessageKind: () => normalizeChatMessageKind,
+  normalizeChatMessages: () => normalizeChatMessages,
   normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
   normalizeMessageParts: () => normalizeMessageParts,
@@ -5105,6 +5194,219 @@ var CdpDomHandlers = class {
 // src/providers/ide-provider-instance.ts
 var crypto2 = __toESM(require("crypto"));
 
+// src/providers/io-contracts.ts
+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 record = input;
+  const nestedInput = record.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 record.text === "string" ? record.text : typeof record.message === "string" ? record.message : void 0;
+  if (directText !== void 0) {
+    return { parts: [{ type: "text", text: directText }], textFallback: directText };
+  }
+  const directParts = normalizeInputParts(record.parts ?? record.prompt);
+  return {
+    parts: directParts,
+    textFallback: typeof record.textFallback === "string" ? record.textFallback : void 0,
+    metadata: normalizeInputMetadata(record.metadata)
+  };
+}
+function normalizeInputMetadata(value) {
+  if (!value || typeof value !== "object") return void 0;
+  const record = value;
+  const metadata = {};
+  if (record.source === "dashboard" || record.source === "shortcut_api" || record.source === "provider_script" || record.source === "session_replay") {
+    metadata.source = record.source;
+  }
+  if (typeof record.clientTimestamp === "number" && Number.isFinite(record.clientTimestamp)) {
+    metadata.clientTimestamp = record.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");
+}
+
+// src/providers/contracts.ts
+function flattenContent(content) {
+  if (typeof content === "string") return content;
+  return flattenMessageParts(normalizeMessageParts(content));
+}
+
 // src/providers/status-monitor.ts
 var DEFAULT_MONITOR_CONFIG = {
   approvalAlert: true,
@@ -5218,6 +5520,7 @@ var StatusMonitor = class {
 };
 
 // src/providers/control-effects.ts
+init_chat_message_normalization();
 function extractProviderControlValues(controls, data) {
   if (!data || typeof data !== "object") return void 0;
   const values = {};
@@ -5285,13 +5588,58 @@ function normalizeProviderEffects(data) {
           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 {
@@ -5358,11 +5706,19 @@ function normalizeControlValue(value) {
   }
   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;
+}
 
 // src/config/chat-history.ts
 var fs3 = __toESM(require("fs"));
 var path7 = __toESM(require("path"));
 var os5 = __toESM(require("os"));
+init_chat_message_normalization();
 var HISTORY_DIR = path7.join(os5.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;
@@ -5568,11 +5924,11 @@ var ChatHistoryWriter = class {
     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,
@@ -5927,6 +6283,7 @@ function resolveProviderStateSurface(params) {
 }
 
 // src/providers/extension-provider-instance.ts
+init_chat_message_normalization();
 var ExtensionProviderInstance = class {
   type;
   category = "extension";
@@ -6133,8 +6490,8 @@ var ExtensionProviderInstance = class {
       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({
@@ -6169,34 +6526,42 @@ var ExtensionProviderInstance = class {
     }
   }
   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.
@@ -6213,16 +6578,16 @@ var ExtensionProviderInstance = class {
       nextHashes.set(hash, 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, b) => {
+    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;
       const bTime = b.message.receivedAt || b.message.timestamp || 0;
       if (aTime !== bTime) return aTime - bTime;
       return a.index - b.index;
-    }).map((entry) => entry.message);
+    }).map((entry) => entry.message));
   }
   getPersistedEffectContent(effect) {
     if (effect.type === "message") {
@@ -6336,6 +6701,7 @@ function formatAutoApprovalMessage(modalMessage, buttonLabel) {
 }
 
 // src/providers/ide-provider-instance.ts
+init_chat_message_normalization();
 var IdeProviderInstance = class {
   type;
   category = "ide";
@@ -6716,8 +7082,8 @@ var IdeProviderInstance = class {
       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({
@@ -6752,8 +7118,20 @@ var IdeProviderInstance = class {
     }
   }
   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 = {
@@ -6766,39 +7144,35 @@ var IdeProviderInstance = class {
       };
     }
     this.runtimeMessages.push({
-      key: dedupKey,
-      message: {
-        role: "system",
-        senderName: "System",
-        content: normalizedContent,
-        receivedAt,
-        timestamp: receivedAt
-      }
+      key: dedupKey,
+      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, b) => {
+    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;
       const bTime = b.message.receivedAt || b.message.timestamp || 0;
       if (aTime !== bTime) return aTime - bTime;
       return a.index - b.index;
-    }).map((entry) => entry.message);
+    }).map((entry) => entry.message));
   }
   getPersistedEffectContent(effect) {
     if (effect.type === "message") {
@@ -7701,219 +8075,6 @@ function reconcileIdeRuntimeSessions(instanceManager, sessionRegistry) {
 // src/commands/handler.ts
 init_logger();
 
-// src/providers/io-contracts.ts
-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 record = input;
-  const nestedInput = record.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 record.text === "string" ? record.text : typeof record.message === "string" ? record.message : void 0;
-  if (directText !== void 0) {
-    return { parts: [{ type: "text", text: directText }], textFallback: directText };
-  }
-  const directParts = normalizeInputParts(record.parts ?? record.prompt);
-  return {
-    parts: directParts,
-    textFallback: typeof record.textFallback === "string" ? record.textFallback : void 0,
-    metadata: normalizeInputMetadata(record.metadata)
-  };
-}
-function normalizeInputMetadata(value) {
-  if (!value || typeof value !== "object") return void 0;
-  const record = value;
-  const metadata = {};
-  if (record.source === "dashboard" || record.source === "shortcut_api" || record.source === "provider_script" || record.source === "session_replay") {
-    metadata.source = record.source;
-  }
-  if (typeof record.clientTimestamp === "number" && Number.isFinite(record.clientTimestamp)) {
-    metadata.clientTimestamp = record.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");
-}
-
-// src/providers/contracts.ts
-function flattenContent(content) {
-  if (typeof content === "string") return content;
-  return flattenMessageParts(normalizeMessageParts(content));
-}
-
 // src/commands/chat-commands.ts
 init_logger();
 
@@ -8044,6 +8205,7 @@ function createInteractionId(prefix = "ix") {
 }
 
 // src/commands/chat-commands.ts
+init_chat_message_normalization();
 var RECENT_SEND_WINDOW_MS = 1200;
 var recentSendByTarget = /* @__PURE__ */ new Map();
 function hashSignatureParts(parts) {
@@ -8173,7 +8335,7 @@ function normalizeReadChatCursor(args) {
 }
 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() : "";
@@ -10521,6 +10683,7 @@ var fs5 = __toESM(require("fs"));
 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;
@@ -11015,8 +11178,8 @@ var CliProviderInstance = class {
       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);
@@ -11140,44 +11303,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, b) => {
+    if (this.runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
+    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;
       const bTime = b.message.receivedAt || b.message.timestamp || 0;
       if (aTime !== bTime) return aTime - bTime;
       return a.index - b.index;
-    }).map((entry) => entry.message);
+    }).map((entry) => entry.message));
   }
   formatApprovalRequestMessage(modalMessage, buttons) {
     const lines = ["Approval requested"];
@@ -11248,6 +11420,7 @@ var path12 = __toESM(require("path"));
 var import_stream = require("stream");
 var import_child_process5 = require("child_process");
 var import_sdk = require("@agentclientprotocol/sdk");
+init_chat_message_normalization();
 init_logger();
 function getPromptCapabilityFlags(agentCapabilities) {
   const prompt = agentCapabilities?.promptCapabilities || {};
@@ -11413,24 +11586,21 @@ var AcpProviderInstance = class {
   }
   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 {
@@ -11443,7 +11613,7 @@ var AcpProviderInstance = class {
         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"]
@@ -11975,11 +12145,10 @@ var AcpProviderInstance = class {
       if (b.type === "resource") return { type: "resource", resource: b.resource };
       return { type: "text", text: flattenContent([b]) };
     }) : [{ 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 = [];
@@ -12149,11 +12318,11 @@ var AcpProviderInstance = class {
         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 = "";
       }
     }
@@ -12229,12 +12398,11 @@ var AcpProviderInstance = class {
       return b;
     }).filter((b) => b.type !== "text" || b.type === "text" && b.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 = [];
@@ -12294,11 +12462,10 @@ var AcpProviderInstance = class {
   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);
     }
@@ -16969,6 +17136,7 @@ var DaemonAgentStreamManager = class {
 
 // src/agent-stream/poller.ts
 init_logger();
+init_chat_message_normalization();
 var AgentStreamPoller = class {
   deps;
   timer = null;
@@ -17124,12 +17292,9 @@ var AgentStreamPoller = class {
                     type: "message",
                     id: effectId,
                     persist: true,
-                    message: {
-                      role: "system",
-                      senderName: "System",
-                      kind: "system",
+                    message: buildRuntimeSystemChatMessage({
                       content: formatAutoApprovalMessage(stream.activeModal?.message, buttonLabel)
-                    }
+                    })
                   }
                 ]
               };
@@ -17376,6 +17541,9 @@ var ProviderInstanceManager = class {
   }
 };
 
+// src/index.ts
+init_chat_message_normalization();
+
 // src/providers/version-archive.ts
 var fs10 = __toESM(require("fs"));
 var path18 = __toESM(require("path"));
@@ -23651,6 +23819,7 @@ async function shutdownDaemonComponents(components) {
 0 && (module.exports = {
   AcpProviderInstance,
   AgentStreamPoller,
+  BUILTIN_CHAT_MESSAGE_KINDS,
   CdpDomHandlers,
   CliProviderInstance,
   DAEMON_WS_PATH,
@@ -23675,9 +23844,14 @@ async function shutdownDaemonComponents(components) {
   SessionHostPtyTransportFactory,
   VersionArchive,
   appendRecentActivity,
+  buildAssistantChatMessage,
+  buildChatMessage,
   buildMachineInfo,
+  buildRuntimeSystemChatMessage,
   buildSessionEntries,
   buildStatusSnapshot,
+  buildSystemChatMessage,
+  buildUserChatMessage,
   clearDebugTrace,
   configureDebugTraceStore,
   connectCdpManager,
@@ -23709,6 +23883,7 @@ async function shutdownDaemonComponents(components) {
   initDaemonComponents,
   installExtensions,
   installGlobalInterceptor,
+  isBuiltinChatMessageKind,
   isCdpConnected,
   isExtensionInstalled,
   isIdeRunning,
@@ -23727,6 +23902,9 @@ async function shutdownDaemonComponents(components) {
   markSetupComplete,
   maybeRunDaemonUpgradeHelperFromEnv,
   normalizeActiveChatData,
+  normalizeChatMessage,
+  normalizeChatMessageKind,
+  normalizeChatMessages,
   normalizeInputEnvelope,
   normalizeManagedStatus,
   normalizeMessageParts,