adhdev 0.8.60 → 0.8.63

package/dist/index.js

@@ -2495,6 +2495,231 @@ var init_devtools = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/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 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");
+}
+var init_io_contracts = __esm({
+  "../../oss/packages/daemon-core/src/providers/io-contracts.ts"() {
+    "use strict";
+  }
+});
+
+// ../../oss/packages/daemon-core/src/providers/contracts.ts
+function flattenContent(content) {
+  if (typeof content === "string") return content;
+  return flattenMessageParts(normalizeMessageParts(content));
+}
+var init_contracts = __esm({
+  "../../oss/packages/daemon-core/src/providers/contracts.ts"() {
+    "use strict";
+    init_io_contracts();
+    init_io_contracts();
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/status-monitor.ts
 var DEFAULT_MONITOR_CONFIG, StatusMonitor;
 var init_status_monitor = __esm({
@@ -2613,6 +2838,64 @@ var init_status_monitor = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/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({
+  "../../oss/packages/daemon-core/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);
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/control-effects.ts
 function extractProviderControlValues(controls, data) {
   if (!data || typeof data !== "object") return void 0;
@@ -2681,13 +2964,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 {
@@ -2754,9 +3082,18 @@ 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;
+}
 var init_control_effects = __esm({
   "../../oss/packages/daemon-core/src/providers/control-effects.ts"() {
     "use strict";
+    init_contracts();
+    init_chat_message_normalization();
   }
 });
 
@@ -2944,6 +3281,7 @@ var init_chat_history = __esm({
     fs3 = __toESM(require("fs"));
     path7 = __toESM(require("path"));
     os5 = __toESM(require("os"));
+    init_chat_message_normalization();
     HISTORY_DIR = path7.join(os5.homedir(), ".adhdev", "history");
     RETAIN_DAYS = 30;
     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;
@@ -3093,11 +3431,11 @@ var init_chat_history = __esm({
         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,
@@ -3345,10 +3683,12 @@ var ExtensionProviderInstance;
 var init_extension_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/extension-provider-instance.ts"() {
     "use strict";
+    init_contracts();
     init_status_monitor();
     init_control_effects();
     init_chat_history();
     init_provider_patch_state();
+    init_chat_message_normalization();
     ExtensionProviderInstance = class {
       type;
       category = "extension";
@@ -3555,8 +3895,8 @@ var init_extension_provider_instance = __esm({
           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({
@@ -3591,34 +3931,42 @@ var init_extension_provider_instance = __esm({
         }
       }
       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.
@@ -3635,16 +3983,16 @@ var init_extension_provider_instance = __esm({
           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, 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") {
@@ -3768,6 +4116,7 @@ var init_ide_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/ide-provider-instance.ts"() {
     "use strict";
     crypto2 = __toESM(require("crypto"));
+    init_contracts();
     init_extension_provider_instance();
     init_status_monitor();
     init_chat_history();
@@ -3775,6 +4124,7 @@ var init_ide_provider_instance = __esm({
     init_control_effects();
     init_approval_utils();
     init_provider_patch_state();
+    init_chat_message_normalization();
     IdeProviderInstance = class {
       type;
       category = "ide";
@@ -4155,8 +4505,8 @@ var init_ide_provider_instance = __esm({
           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({
@@ -4191,8 +4541,20 @@ var init_ide_provider_instance = __esm({
         }
       }
       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 = {
@@ -4206,38 +4568,34 @@ var init_ide_provider_instance = __esm({
         }
         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, 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") {
@@ -5183,231 +5541,6 @@ var init_reconcile = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/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 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");
-}
-var init_io_contracts = __esm({
-  "../../oss/packages/daemon-core/src/providers/io-contracts.ts"() {
-    "use strict";
-  }
-});
-
-// ../../oss/packages/daemon-core/src/providers/contracts.ts
-function flattenContent(content) {
-  if (typeof content === "string") return content;
-  return flattenMessageParts(normalizeMessageParts(content));
-}
-var init_contracts = __esm({
-  "../../oss/packages/daemon-core/src/providers/contracts.ts"() {
-    "use strict";
-    init_io_contracts();
-    init_io_contracts();
-  }
-});
-
 // ../../oss/packages/daemon-core/src/logging/debug-config.ts
 function normalizeCategories(categories) {
   if (!Array.isArray(categories)) return [];
@@ -5675,7 +5808,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() : "";
@@ -6653,6 +6786,7 @@ var init_chat_commands = __esm({
     init_chat_history();
     init_logger();
     init_debug_trace();
+    init_chat_message_normalization();
     RECENT_SEND_WINDOW_MS = 1200;
     recentSendByTarget = /* @__PURE__ */ new Map();
   }
@@ -9433,6 +9567,7 @@ function buildCliParseInput(options) {
     terminalScreenText,
     baseMessages,
     partialResponse,
+    isWaitingForResponse,
     scope,
     runtimeSettings
   } = options;
@@ -9450,6 +9585,7 @@ function buildCliParseInput(options) {
     recentScreen: buildCliScreenSnapshot(recentBuffer),
     messages: [...baseMessages],
     partialResponse,
+    isWaitingForResponse,
     promptText: scope?.prompt || "",
     settings: { ...runtimeSettings }
   };
@@ -9635,6 +9771,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();
@@ -10187,6 +10324,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;
@@ -10345,6 +10494,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);
@@ -10380,6 +10530,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);
@@ -10422,7 +10573,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;
@@ -10490,6 +10644,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();
               }
@@ -10628,6 +10783,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))
           });
@@ -10692,11 +10848,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,
@@ -10717,13 +10872,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
         };
@@ -10740,6 +10893,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
         });
@@ -10758,6 +10912,7 @@ var init_provider_cli_adapter = __esm({
             terminalScreenText: this.terminalScreen.getText(),
             baseMessages,
             partialResponse,
+            isWaitingForResponse: this.isWaitingForResponse,
             scope,
             runtimeSettings: this.runtimeSettings
           });
@@ -11406,6 +11561,7 @@ var init_cli_provider_instance = __esm({
     init_approval_utils();
     init_cli_script_results();
     init_provider_patch_state();
+    init_chat_message_normalization();
     CachedDatabaseSync = null;
     CliProviderInstance = class {
       constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
@@ -11856,8 +12012,8 @@ var init_cli_provider_instance = __esm({
           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);
@@ -11981,44 +12137,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"];
@@ -28494,6 +28659,7 @@ var init_acp_provider_instance = __esm({
     init_contracts();
     init_status_monitor();
     init_summary_metadata();
+    init_chat_message_normalization();
     init_logger();
     AcpProviderInstance = class {
       constructor(provider, workingDir, cliArgs = []) {
@@ -28564,24 +28730,21 @@ var init_acp_provider_instance = __esm({
       }
       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 {
@@ -28594,7 +28757,7 @@ var init_acp_provider_instance = __esm({
             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"]
@@ -29126,11 +29289,10 @@ var init_acp_provider_instance = __esm({
           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 = [];
@@ -29300,11 +29462,11 @@ var init_acp_provider_instance = __esm({
             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 = "";
           }
         }
@@ -29380,12 +29542,11 @@ var init_acp_provider_instance = __esm({
           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 = [];
@@ -29445,11 +29606,10 @@ var init_acp_provider_instance = __esm({
       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);
         }
@@ -36002,6 +36162,7 @@ var init_poller = __esm({
     init_reconcile();
     init_logger();
     init_approval_utils();
+    init_chat_message_normalization();
     AgentStreamPoller = class {
       deps;
       timer = null;
@@ -36157,12 +36318,9 @@ var init_poller = __esm({
                         type: "message",
                         id: effectId,
                         persist: true,
-                        message: {
-                          role: "system",
-                          senderName: "System",
-                          kind: "system",
+                        message: buildRuntimeSystemChatMessage({
                           content: formatAutoApprovalMessage(stream.activeModal?.message, buttonLabel)
-                        }
+                        })
                       }
                     ]
                   };
@@ -42801,6 +42959,7 @@ var src_exports = {};
 __export(src_exports, {
   AcpProviderInstance: () => AcpProviderInstance,
   AgentStreamPoller: () => AgentStreamPoller,
+  BUILTIN_CHAT_MESSAGE_KINDS: () => BUILTIN_CHAT_MESSAGE_KINDS,
   CdpDomHandlers: () => CdpDomHandlers,
   CliProviderInstance: () => CliProviderInstance,
   DAEMON_WS_PATH: () => DAEMON_WS_PATH,
@@ -42825,9 +42984,14 @@ __export(src_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,
@@ -42859,6 +43023,7 @@ __export(src_exports, {
   initDaemonComponents: () => initDaemonComponents,
   installExtensions: () => installExtensions,
   installGlobalInterceptor: () => installGlobalInterceptor,
+  isBuiltinChatMessageKind: () => isBuiltinChatMessageKind,
   isCdpConnected: () => isCdpConnected,
   isExtensionInstalled: () => isExtensionInstalled,
   isIdeRunning: () => isIdeRunning,
@@ -42877,6 +43042,9 @@ __export(src_exports, {
   markSetupComplete: () => markSetupComplete,
   maybeRunDaemonUpgradeHelperFromEnv: () => maybeRunDaemonUpgradeHelperFromEnv,
   normalizeActiveChatData: () => normalizeActiveChatData,
+  normalizeChatMessage: () => normalizeChatMessage,
+  normalizeChatMessageKind: () => normalizeChatMessageKind,
+  normalizeChatMessages: () => normalizeChatMessages,
   normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
   normalizeMessageParts: () => normalizeMessageParts,
@@ -42946,6 +43114,7 @@ var init_src = __esm({
     init_acp_provider_instance();
     init_provider_source_config();
     init_io_contracts();
+    init_chat_message_normalization();
     init_version_archive();
     init_dev_server();
     init_provider_cli_adapter();
@@ -52253,7 +52422,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     init_source2();
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.60" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.63" });
     ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
       "generating",
       "waiting_approval",