adhdev 0.8.63 → 0.8.66

package/dist/index.js

@@ -974,6 +974,51 @@ var init_host_memory = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/status/chat-tail-hot-sessions.ts
+function parseMessageTimestamp(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string") {
+    const parsed = Date.parse(value);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return 0;
+}
+function classifyHotChatSessionsForSubscriptionFlush(sessions, previousHotSessionIds, options = {}) {
+  const now = options.now ?? Date.now();
+  const recentMessageGraceMs = Math.max(
+    0,
+    Number.isFinite(options.recentMessageGraceMs) ? Number(options.recentMessageGraceMs) : DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS
+  );
+  const activeStatuses = options.activeStatuses ?? DEFAULT_ACTIVE_CHAT_POLL_STATUSES;
+  const active = /* @__PURE__ */ new Set();
+  for (const session of sessions) {
+    const sessionId = typeof session?.id === "string" ? session.id : "";
+    if (!sessionId) continue;
+    const status = String(session?.status || "").toLowerCase();
+    const lastMessageAt = parseMessageTimestamp(session?.lastMessageAt);
+    const recentlyUpdated = lastMessageAt > 0 && now - lastMessageAt <= recentMessageGraceMs;
+    if (activeStatuses.has(status) || recentlyUpdated) {
+      active.add(sessionId);
+    }
+  }
+  const finalizing = new Set(
+    Array.from(previousHotSessionIds).filter((sessionId) => !active.has(sessionId))
+  );
+  return { active, finalizing };
+}
+var DEFAULT_ACTIVE_CHAT_POLL_STATUSES, DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS;
+var init_chat_tail_hot_sessions = __esm({
+  "../../oss/packages/daemon-core/src/status/chat-tail-hot-sessions.ts"() {
+    "use strict";
+    DEFAULT_ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
+      "generating",
+      "waiting_approval",
+      "starting"
+    ]);
+    DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS = 8e3;
+  }
+});
+
 // ../../oss/packages/daemon-core/src/logging/logger.ts
 function setLogLevel(level) {
   currentLevel = level;
@@ -2839,19 +2884,75 @@ var init_status_monitor = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/providers/chat-message-normalization.ts
+function canonicalizeKindHint(value) {
+  return value.trim().toLowerCase().replace(/[\s-]+/g, "_");
+}
+function resolveBuiltinOrAliasKind(kind) {
+  if (typeof kind !== "string") return null;
+  const normalizedKind = canonicalizeKindHint(kind);
+  if (!normalizedKind) return null;
+  if (KNOWN_CHAT_MESSAGE_KINDS.has(normalizedKind)) return normalizedKind;
+  return CHAT_MESSAGE_KIND_ALIASES[normalizedKind] || null;
+}
+function inferHintKind(value) {
+  const direct = resolveBuiltinOrAliasKind(value);
+  if (direct) return direct;
+  if (typeof value !== "string") return null;
+  const normalized = canonicalizeKindHint(value);
+  if (!normalized) return null;
+  if (/thought|thinking|reasoning/.test(normalized)) return "thought";
+  if (/tool/.test(normalized)) return "tool";
+  if (/terminal|command|shell|console/.test(normalized)) return "terminal";
+  return null;
+}
+function inferKindFromToolCalls(message) {
+  const toolCalls = Array.isArray(message?.toolCalls) ? message.toolCalls : [];
+  if (toolCalls.length === 0) return null;
+  if (toolCalls.some((toolCall) => toolCall?.kind === "think")) return "thought";
+  if (toolCalls.some((toolCall) => toolCall?.kind === "execute")) return "terminal";
+  if (toolCalls.some((toolCall) => Array.isArray(toolCall?.content) && toolCall.content.some((entry) => entry?.type === "terminal"))) {
+    return "terminal";
+  }
+  return "tool";
+}
+function inferMissingChatMessageKind(message) {
+  const role = typeof message?.role === "string" ? message.role.trim().toLowerCase() : "";
+  if (role === "system") return "system";
+  const meta3 = message?.meta && typeof message.meta === "object" ? message.meta : void 0;
+  const hintCandidates = [
+    message?._sub,
+    message?._type,
+    meta3?.label,
+    typeof message?.senderName === "string" ? message.senderName : void 0
+  ];
+  for (const candidate of hintCandidates) {
+    const inferred = inferHintKind(candidate);
+    if (inferred) return inferred;
+  }
+  const inferredFromToolCalls = inferKindFromToolCalls(message);
+  if (inferredFromToolCalls) return inferredFromToolCalls;
+  return null;
+}
 function isBuiltinChatMessageKind(kind) {
-  return typeof kind === "string" && KNOWN_CHAT_MESSAGE_KINDS.has(kind.trim().toLowerCase());
+  return resolveBuiltinOrAliasKind(kind) !== null;
 }
 function normalizeChatMessageKind(kind, role) {
-  const normalizedKind = typeof kind === "string" ? kind.trim().toLowerCase() : "";
-  if (normalizedKind && KNOWN_CHAT_MESSAGE_KINDS.has(normalizedKind)) return normalizedKind;
+  const resolvedKind = resolveBuiltinOrAliasKind(kind);
+  if (resolvedKind) return resolvedKind;
   const normalizedRole = typeof role === "string" ? role.trim().toLowerCase() : "";
   return normalizedRole === "system" ? "system" : "standard";
 }
+function resolveChatMessageKind(message) {
+  const explicitKind = resolveBuiltinOrAliasKind(message?.kind);
+  if (explicitKind) return explicitKind;
+  const inferredKind = inferMissingChatMessageKind(message);
+  if (inferredKind) return inferredKind;
+  return normalizeChatMessageKind(message?.kind, message?.role);
+}
 function buildChatMessage(message) {
   return {
     ...message,
-    kind: normalizeChatMessageKind(message?.kind, message?.role)
+    kind: resolveChatMessageKind(message)
   };
 }
 function buildSystemChatMessage(message) {
@@ -2874,6 +2975,24 @@ function buildAssistantChatMessage(message) {
     kind: message?.kind || "standard"
   });
 }
+function buildThoughtChatMessage(message) {
+  return buildAssistantChatMessage({
+    ...message,
+    kind: message?.kind || "thought"
+  });
+}
+function buildToolChatMessage(message) {
+  return buildAssistantChatMessage({
+    ...message,
+    kind: message?.kind || "tool"
+  });
+}
+function buildTerminalChatMessage(message) {
+  return buildAssistantChatMessage({
+    ...message,
+    kind: message?.kind || "terminal"
+  });
+}
 function buildUserChatMessage(message) {
   return buildChatMessage({
     ...message,
@@ -2887,12 +3006,30 @@ function normalizeChatMessage(message) {
 function normalizeChatMessages(messages) {
   return (Array.isArray(messages) ? messages : []).map((message) => normalizeChatMessage(message));
 }
-var BUILTIN_CHAT_MESSAGE_KINDS, KNOWN_CHAT_MESSAGE_KINDS;
+var BUILTIN_CHAT_MESSAGE_KINDS, KNOWN_CHAT_MESSAGE_KINDS, CHAT_MESSAGE_KIND_ALIASES;
 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);
+    CHAT_MESSAGE_KIND_ALIASES = {
+      text: "standard",
+      message: "standard",
+      assistant: "standard",
+      thinking: "thought",
+      think: "thought",
+      reasoning: "thought",
+      reason: "thought",
+      toolcall: "tool",
+      tool_call: "tool",
+      tooluse: "tool",
+      tool_use: "tool",
+      action: "tool",
+      command: "terminal",
+      cmd: "terminal",
+      shell: "terminal",
+      console: "terminal"
+    };
   }
 });
 
@@ -3017,38 +3154,37 @@ function buildPersistedProviderEffectMessage(effect) {
   return null;
 }
 function normalizeControlListResult(data) {
-  if (data && typeof data === "object" && Array.isArray(data.options)) {
-    return {
-      options: normalizeControlOptions(data.options),
-      ...isScalarControlValue(data.currentValue) ? { currentValue: data.currentValue } : {},
-      ...typeof data.error === "string" ? { error: data.error } : {}
-    };
+  if (!data || typeof data !== "object" || !Array.isArray(data.options)) {
+    throw new Error("Provider control list results must use the typed shape { options, currentValue?, error? }");
   }
-  const rawOptions = Array.isArray(data?.models) ? data.models : Array.isArray(data?.modes) ? data.modes : Array.isArray(data?.options) ? data.options : [];
-  const options = normalizeControlOptions(rawOptions);
   return {
-    options,
-    ...isScalarControlValue(data?.current) ? { currentValue: data.current } : {},
-    ...isScalarControlValue(data?.currentValue) ? { currentValue: data.currentValue } : {},
-    ...typeof data?.error === "string" ? { error: data.error } : {}
+    options: normalizeControlOptions(data.options),
+    ...isScalarControlValue(data.currentValue) ? { currentValue: data.currentValue } : {},
+    ...typeof data.error === "string" ? { error: data.error } : {}
   };
 }
 function normalizeControlSetResult(data) {
-  const currentValue = isScalarControlValue(data?.currentValue) ? data.currentValue : isScalarControlValue(data?.value) ? data.value : void 0;
+  if (!data || typeof data !== "object" || typeof data.ok !== "boolean") {
+    throw new Error("Provider control set results must use the typed shape { ok, currentValue?, effects?, error? }");
+  }
+  const currentValue = isScalarControlValue(data.currentValue) ? data.currentValue : isScalarControlValue(data.value) ? data.value : void 0;
   return {
-    ok: data?.ok === true || data?.success === true,
+    ok: data.ok,
     ...currentValue !== void 0 ? { currentValue } : {},
-    ...Array.isArray(data?.effects) ? { effects: normalizeProviderEffects(data) } : {},
-    ...typeof data?.error === "string" ? { error: data.error } : {}
+    ...Array.isArray(data.effects) ? { effects: normalizeProviderEffects(data) } : {},
+    ...typeof data.error === "string" ? { error: data.error } : {}
   };
 }
 function normalizeControlInvokeResult(data) {
-  const currentValue = isScalarControlValue(data?.currentValue) ? data.currentValue : isScalarControlValue(data?.value) ? data.value : void 0;
+  if (!data || typeof data !== "object" || typeof data.ok !== "boolean") {
+    throw new Error("Provider control invoke results must use the typed shape { ok, currentValue?, effects?, error? }");
+  }
+  const currentValue = isScalarControlValue(data.currentValue) ? data.currentValue : isScalarControlValue(data.value) ? data.value : void 0;
   return {
-    ok: data?.ok === true || data?.success === true,
+    ok: data.ok,
     ...currentValue !== void 0 ? { currentValue } : {},
-    ...Array.isArray(data?.effects) ? { effects: normalizeProviderEffects(data) } : {},
-    ...typeof data?.error === "string" ? { error: data.error } : {}
+    ...Array.isArray(data.effects) ? { effects: normalizeProviderEffects(data) } : {},
+    ...typeof data.error === "string" ? { error: data.error } : {}
   };
 }
 function normalizeControlOptions(options) {
@@ -3968,19 +4104,37 @@ var init_extension_provider_instance = __esm({
           );
         }
       }
+      buildSyntheticTurnKey(message, occurrence) {
+        const role = typeof message?.role === "string" ? message.role : "";
+        const kind = typeof message?.kind === "string" ? message.kind : "";
+        const senderName = typeof message?.senderName === "string" ? message.senderName : "";
+        const content = flattenContent(message?.content).replace(/\s+/g, " ").trim().slice(0, 500);
+        return `${role}|${kind}|${senderName}|${content}|${occurrence}`;
+      }
       /**
-       * Assign stable receivedAt to extension messages.
-       * Same pattern as IdeProviderInstance.readChat() prevByHash —
-       * preserves first-seen timestamp across polling cycles.
+       * Assign stable receivedAt / synthetic _turnKey to extension messages.
+       * Same transcript should keep the same identity across polling cycles and
+       * stream resets, while repeated identical text later in the transcript still
+       * produces a distinct completion marker via the occurrence suffix.
        */
       assignReceivedAt(messages) {
         const now = Date.now();
         const nextHashes = /* @__PURE__ */ new Map();
+        const occurrenceByBaseKey = /* @__PURE__ */ new Map();
         for (const msg of messages) {
-          const hash2 = `${msg.role}:${(msg.content || "").slice(0, 100)}`;
-          const prevTime = this.prevMessageHashes.get(hash2);
+          const explicitTurnKey = typeof msg?._turnKey === "string" && msg._turnKey.trim() ? msg._turnKey.trim() : "";
+          const explicitId = typeof msg?.id === "string" && msg.id.trim() ? `id:${msg.id.trim()}` : "";
+          const explicitIndex = typeof msg?.index === "number" && Number.isFinite(msg.index) ? `idx:${msg.index}` : "";
+          const baseKey = explicitTurnKey || explicitId || explicitIndex || `${msg?.role || ""}:${flattenContent(msg?.content || "").slice(0, 500)}`;
+          const occurrence = (occurrenceByBaseKey.get(baseKey) || 0) + 1;
+          occurrenceByBaseKey.set(baseKey, occurrence);
+          const syntheticTurnKey = explicitTurnKey || explicitId || explicitIndex || this.buildSyntheticTurnKey(msg, occurrence);
+          if (!explicitTurnKey && !explicitId && !explicitIndex) {
+            msg._turnKey = syntheticTurnKey;
+          }
+          const prevTime = this.prevMessageHashes.get(syntheticTurnKey);
           msg.receivedAt = prevTime || now;
-          nextHashes.set(hash2, msg.receivedAt);
+          nextHashes.set(syntheticTurnKey, msg.receivedAt);
         }
         this.prevMessageHashes = nextHashes;
         return normalizeChatMessages(messages);
@@ -4057,6 +4211,128 @@ ${effect.notification.body || ""}`.trim();
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/read-chat-contract.ts
+function isPlainObject3(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function isFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value);
+}
+function validateStatus(status, source) {
+  if (typeof status !== "string" || !VALID_STATUSES.includes(status)) {
+    throw new Error(`${source}: status must be one of ${VALID_STATUSES.join(", ")}`);
+  }
+  return status;
+}
+function validateRole(role, source, index) {
+  if (typeof role !== "string" || !VALID_ROLES.includes(role)) {
+    throw new Error(`${source}: messages[${index}].role must be one of ${VALID_ROLES.join(", ")}`);
+  }
+  return role;
+}
+function validateMessageContent(content, source, index) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) return normalizeMessageParts(content);
+  throw new Error(`${source}: messages[${index}].content must be a string or structured content array`);
+}
+function validateMessage(message, source, index) {
+  if (!isPlainObject3(message)) {
+    throw new Error(`${source}: messages[${index}] must be an object`);
+  }
+  const normalized = {
+    role: validateRole(message.role, source, index),
+    content: validateMessageContent(message.content, source, index)
+  };
+  if (typeof message.kind === "string") normalized.kind = message.kind;
+  if (typeof message.id === "string") normalized.id = message.id;
+  if (isFiniteNumber(message.index)) normalized.index = message.index;
+  if (isFiniteNumber(message.timestamp)) normalized.timestamp = message.timestamp;
+  if (isFiniteNumber(message.receivedAt)) normalized.receivedAt = message.receivedAt;
+  if (Array.isArray(message.toolCalls)) normalized.toolCalls = message.toolCalls;
+  if (isPlainObject3(message.meta)) normalized.meta = message.meta;
+  if (typeof message.senderName === "string") normalized.senderName = message.senderName;
+  if (typeof message._type === "string") normalized._type = message._type;
+  if (typeof message._sub === "string") normalized._sub = message._sub;
+  return normalized;
+}
+function validateModal(activeModal, status, source) {
+  if (activeModal == null) {
+    if (status === "waiting_approval") {
+      throw new Error(`${source}: waiting_approval status requires activeModal with buttons`);
+    }
+    return activeModal === null ? null : void 0;
+  }
+  if (!isPlainObject3(activeModal)) {
+    throw new Error(`${source}: activeModal must be an object when provided`);
+  }
+  if (typeof activeModal.message !== "string") {
+    throw new Error(`${source}: activeModal.message must be a string`);
+  }
+  if (!Array.isArray(activeModal.buttons) || activeModal.buttons.some((button) => typeof button !== "string" || !button.trim())) {
+    throw new Error(`${source}: activeModal.buttons must be a non-empty string array`);
+  }
+  const normalized = {
+    message: activeModal.message,
+    buttons: activeModal.buttons.map((button) => button.trim())
+  };
+  if (isFiniteNumber(activeModal.width)) normalized.width = activeModal.width;
+  if (isFiniteNumber(activeModal.height)) normalized.height = activeModal.height;
+  return normalized;
+}
+function validateControlValues(controlValues, source) {
+  if (controlValues === void 0) return void 0;
+  if (!isPlainObject3(controlValues)) {
+    throw new Error(`${source}: controlValues must be an object when provided`);
+  }
+  const normalized = {};
+  for (const [key, value] of Object.entries(controlValues)) {
+    if (typeof value !== "string" && typeof value !== "number" && typeof value !== "boolean") {
+      throw new Error(`${source}: controlValues.${key} must be string, number, or boolean`);
+    }
+    normalized[key] = value;
+  }
+  return normalized;
+}
+function validateReadChatResultPayload(raw, source = "read_chat") {
+  if (!isPlainObject3(raw)) {
+    throw new Error(`${source}: payload must be an object`);
+  }
+  const status = validateStatus(raw.status, source);
+  if (!Array.isArray(raw.messages)) {
+    throw new Error(`${source}: messages must be an array`);
+  }
+  const messages = raw.messages.map((message, index) => validateMessage(message, source, index));
+  const activeModal = validateModal(raw.activeModal, status, source);
+  const controlValues = validateControlValues(raw.controlValues, source);
+  const normalized = {
+    status,
+    messages
+  };
+  if (activeModal !== void 0) normalized.activeModal = activeModal;
+  if (typeof raw.id === "string") normalized.id = raw.id;
+  if (typeof raw.title === "string") normalized.title = raw.title;
+  if (typeof raw.agentType === "string") normalized.agentType = raw.agentType;
+  if (typeof raw.agentName === "string") normalized.agentName = raw.agentName;
+  if (typeof raw.extensionId === "string") normalized.extensionId = raw.extensionId;
+  if (typeof raw.inputContent === "string") normalized.inputContent = raw.inputContent;
+  if (typeof raw.isVisible === "boolean") normalized.isVisible = raw.isVisible;
+  if (typeof raw.isWelcomeScreen === "boolean") normalized.isWelcomeScreen = raw.isWelcomeScreen;
+  if (controlValues) normalized.controlValues = controlValues;
+  if (raw.summaryMetadata !== void 0) normalized.summaryMetadata = raw.summaryMetadata;
+  if (Array.isArray(raw.effects)) normalized.effects = raw.effects;
+  if (typeof raw.providerSessionId === "string") normalized.providerSessionId = raw.providerSessionId;
+  return normalized;
+}
+var VALID_STATUSES, VALID_ROLES;
+var init_read_chat_contract = __esm({
+  "../../oss/packages/daemon-core/src/providers/read-chat-contract.ts"() {
+    "use strict";
+    init_contracts();
+    VALID_STATUSES = ["idle", "generating", "waiting_approval", "error", "panel_hidden", "streaming", "long_generating"];
+    VALID_ROLES = ["user", "assistant", "system", "human"];
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/approval-utils.ts
 function normalizeApprovalLabel(value) {
   return String(value || "").toLowerCase().replace(/[^\p{L}\p{N}]+/gu, " ").trim();
@@ -4122,6 +4398,7 @@ var init_ide_provider_instance = __esm({
     init_chat_history();
     init_logger();
     init_control_effects();
+    init_read_chat_contract();
     init_approval_utils();
     init_provider_patch_state();
     init_chat_message_normalization();
@@ -4356,7 +4633,7 @@ var init_ide_provider_instance = __esm({
             }
           }
           if (!raw || typeof raw !== "object") return;
-          const chat = raw;
+          const chat = validateReadChatResultPayload(raw, `${this.type} readChat`);
           let { activeModal } = chat;
           if (activeModal) {
             const w = activeModal.width ?? Infinity;
@@ -4377,11 +4654,13 @@ var init_ide_provider_instance = __esm({
             if (pm.receivedAt) prevByHash.set(h, pm.receivedAt);
           }
           const now = Date.now();
-          const messages = chat.messages || [];
-          for (const msg of messages) {
+          const rawMessages = chat.messages || [];
+          for (const msg of rawMessages) {
             const h = `${msg.role}:${(msg.content || "").slice(0, 100)}`;
             msg.receivedAt = prevByHash.get(h) || now;
           }
+          chat.messages = normalizeChatMessages(rawMessages);
+          const messages = chat.messages || [];
           if (messages.length > 0) {
             const hiddenKinds = /* @__PURE__ */ new Set();
             if (this.settings.showThinking === false) hiddenKinds.add("thought");
@@ -5541,6 +5820,67 @@ var init_reconcile = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/provider-input-support.ts
+function getProviderLabel(provider) {
+  return provider?.name || provider?.type || "This provider";
+}
+function hasNonEmptyFallbackText(input) {
+  return typeof input.textFallback === "string" && input.textFallback.trim().length > 0;
+}
+function getRequestedInputMediaTypes(input) {
+  const types = /* @__PURE__ */ new Set();
+  if (hasNonEmptyFallbackText(input) && !input.parts.some((part) => part.type === "text")) {
+    types.add("text");
+  }
+  for (const part of input.parts) {
+    if (VALID_INPUT_MEDIA_TYPES.has(part.type)) {
+      types.add(part.type);
+    }
+  }
+  return Array.from(types);
+}
+function getEffectiveSemanticPartCount(input) {
+  let count = input.parts.length;
+  if (hasNonEmptyFallbackText(input) && !input.parts.some((part) => part.type === "text")) {
+    count += 1;
+  }
+  return count;
+}
+function assertTextOnlyInput(provider, input) {
+  const unsupported = getRequestedInputMediaTypes(input).filter((type) => type !== "text");
+  if (unsupported.length === 0) return;
+  const label = getProviderLabel(provider);
+  const suffix = unsupported.length === 1 ? "" : "s";
+  throw new Error(`${label} only supports text input; unsupported input type${suffix}: ${unsupported.join(", ")}`);
+}
+function getDeclaredProviderInputSupport(provider) {
+  const rawMediaTypes = Array.isArray(provider?.capabilities?.input?.mediaTypes) ? provider?.capabilities?.input?.mediaTypes.filter((type) => VALID_INPUT_MEDIA_TYPES.has(type)) : [];
+  return {
+    multipart: provider?.capabilities?.input?.multipart === true,
+    mediaTypes: new Set(rawMediaTypes.length > 0 ? rawMediaTypes : ["text"])
+  };
+}
+function assertProviderSupportsDeclaredInput(provider, input) {
+  const label = getProviderLabel(provider);
+  const support = getDeclaredProviderInputSupport(provider);
+  const requestedTypes = getRequestedInputMediaTypes(input);
+  const unsupported = requestedTypes.filter((type) => !support.mediaTypes.has(type));
+  if (unsupported.length > 0) {
+    const suffix = unsupported.length === 1 ? "" : "s";
+    throw new Error(`${label} does not support input type${suffix}: ${unsupported.join(", ")}`);
+  }
+  if (getEffectiveSemanticPartCount(input) > 1 && !support.multipart) {
+    throw new Error(`${label} does not support multipart input`);
+  }
+}
+var VALID_INPUT_MEDIA_TYPES;
+var init_provider_input_support = __esm({
+  "../../oss/packages/daemon-core/src/providers/provider-input-support.ts"() {
+    "use strict";
+    VALID_INPUT_MEDIA_TYPES = /* @__PURE__ */ new Set(["text", "image", "audio", "video", "resource"]);
+  }
+});
+
 // ../../oss/packages/daemon-core/src/logging/debug-config.ts
 function normalizeCategories(categories) {
   if (!Array.isArray(categories)) return [];
@@ -5730,10 +6070,15 @@ function isCliLikeTransport(transport) {
 function isExtensionTransport(transport) {
   return transport === "cdp-webview";
 }
-function buildRecentSendKey(h, args, provider, text) {
+function buildRecentSendKey(h, args, provider, signature) {
   const transport = getTargetTransport(h, provider) || "unknown";
   const target = args?.targetSessionId || args?.agentType || h.currentSession?.providerType || h.currentProviderType || h.currentManagerKey || "unknown";
-  return `${transport}:${target}:${text.trim()}`;
+  return `${transport}:${target}:${signature.trim()}`;
+}
+function buildSendInputSignature(input) {
+  const text = typeof input.textFallback === "string" ? input.textFallback.trim() : "";
+  if (text) return text;
+  return JSON.stringify(input.parts || []);
 }
 function getSendChatInputEnvelope(args) {
   return normalizeInputEnvelope(args?.input ? { input: args.input } : args);
@@ -5886,14 +6231,20 @@ function computeReadChatSync(messages, cursor) {
   };
 }
 function buildReadChatCommandResult(payload, args) {
-  const messages = normalizeReadChatMessages(payload);
+  let validatedPayload;
+  try {
+    validatedPayload = validateReadChatResultPayload(payload, "read_chat command result");
+  } catch (error48) {
+    return { success: false, error: error48?.message || String(error48) };
+  }
+  const messages = normalizeReadChatMessages(validatedPayload);
   const cursor = normalizeReadChatCursor(args);
   if (!cursor.knownMessageCount && !cursor.lastMessageSignature && cursor.tailLimit > 0 && messages.length > cursor.tailLimit) {
     const tailMessages = messages.slice(-cursor.tailLimit);
     const lastMessageSignature = getChatMessageSignature(tailMessages[tailMessages.length - 1]);
     return {
       success: true,
-      ...payload,
+      ...validatedPayload,
       messages: tailMessages,
       syncMode: "full",
       replaceFrom: 0,
@@ -5904,7 +6255,7 @@ function buildReadChatCommandResult(payload, args) {
   const sync = computeReadChatSync(messages, cursor);
   return {
     success: true,
-    ...payload,
+    ...validatedPayload,
     messages: sync.messages,
     syncMode: sync.syncMode,
     replaceFrom: sync.replaceFrom,
@@ -5983,12 +6334,18 @@ async function handleReadChat(h, args) {
     const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
       _log(`${transport} adapter: ${adapter.cliType}`);
-      const status = adapter.getStatus();
+      const parsedStatus = typeof adapter.getScriptParsedStatus === "function" ? parseMaybeJson(adapter.getScriptParsedStatus()) : null;
+      const parsedRecord = parsedStatus && typeof parsedStatus === "object" ? parsedStatus : null;
+      const status = parsedRecord || adapter.getStatus();
+      const title = typeof parsedRecord?.title === "string" ? parsedRecord.title : void 0;
+      const providerSessionId = typeof parsedRecord?.providerSessionId === "string" ? parsedRecord.providerSessionId : void 0;
       if (status) {
         return buildReadChatCommandResult({
           messages: status.messages || [],
           status: status.status,
-          activeModal: status.activeModal
+          activeModal: status.activeModal,
+          ...title ? { title } : {},
+          ...providerSessionId ? { providerSessionId } : {}
         }, args);
       }
     }
@@ -6006,25 +6363,26 @@ async function handleReadChat(h, args) {
           }
         }
         if (parsed && typeof parsed === "object") {
-          _log(`Extension OK: ${parsed.messages?.length || 0} msgs`);
+          const validated = validateReadChatResultPayload(parsed, "extension read_chat");
+          _log(`Extension OK: ${validated.messages?.length || 0} msgs`);
           traceProviderEvent(args, "provider", "extension.read_chat.success", {
             h,
             provider,
             payload: {
               method: "evaluateProviderScript",
               result: evalResult.result,
-              parsed,
-              messageCount: Array.isArray(parsed.messages) ? parsed.messages.length : 0
+              parsed: validated,
+              messageCount: Array.isArray(validated.messages) ? validated.messages.length : 0
             }
           });
           h.historyWriter.appendNewMessages(
             provider?.type || "unknown_extension",
-            toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
-            parsed.title,
+            toHistoryPersistedMessages(normalizeReadChatMessages(validated)),
+            validated.title,
             args?.targetSessionId,
             historySessionId
           );
-          return buildReadChatCommandResult(parsed, args);
+          return buildReadChatCommandResult(validated, args);
         }
       }
     } catch (e) {
@@ -6079,15 +6437,16 @@ async function handleReadChat(h, args) {
           }
         }
         if (parsed && typeof parsed === "object") {
-          _log(`Webview OK: ${parsed.messages?.length || 0} msgs`);
+          const validated = validateReadChatResultPayload(parsed, "webview read_chat");
+          _log(`Webview OK: ${validated.messages?.length || 0} msgs`);
           h.historyWriter.appendNewMessages(
             provider?.type || getCurrentProviderType(h, "unknown_webview"),
-            toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
-            parsed.title,
+            toHistoryPersistedMessages(normalizeReadChatMessages(validated)),
+            validated.title,
             args?.targetSessionId,
             historySessionId
           );
-          return buildReadChatCommandResult(parsed, args);
+          return buildReadChatCommandResult(validated, args);
         }
       }
     } catch (e) {
@@ -6108,25 +6467,26 @@ async function handleReadChat(h, args) {
           }
         }
         if (parsed && typeof parsed === "object" && parsed.messages?.length > 0) {
-          _log(`OK: ${parsed.messages?.length} msgs`);
+          const validated = validateReadChatResultPayload(parsed, "ide read_chat");
+          _log(`OK: ${validated.messages?.length} msgs`);
           traceProviderEvent(args, "provider", "ide.read_chat.success", {
             h,
             provider,
             payload: {
               method: "evaluate",
               result: evalResult.result,
-              parsed,
-              messageCount: Array.isArray(parsed.messages) ? parsed.messages.length : 0
+              parsed: validated,
+              messageCount: Array.isArray(validated.messages) ? validated.messages.length : 0
             }
           });
           h.historyWriter.appendNewMessages(
             provider?.type || getCurrentProviderType(h, "unknown_ide"),
-            toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
-            parsed.title,
+            toHistoryPersistedMessages(normalizeReadChatMessages(validated)),
+            validated.title,
             args?.targetSessionId,
             historySessionId
           );
-          return buildReadChatCommandResult(parsed, args);
+          return buildReadChatCommandResult(validated, args);
         }
       }
     } catch (e) {
@@ -6144,11 +6504,12 @@ async function handleReadChat(h, args) {
 async function handleSendChat(h, args) {
   const input = getSendChatInputEnvelope(args);
   const text = input.textFallback;
-  if (!text) return { success: false, error: "text required" };
+  const hasInput = input.parts.length > 0 || typeof text === "string" && text.trim().length > 0;
+  if (!hasInput) return { success: false, error: "input required" };
   const _log = (msg) => LOG.debug("Command", `[send_chat] ${msg}`);
   const provider = h.getProvider(args?.agentType);
   const transport = getTargetTransport(h, provider);
-  const dedupeKey = buildRecentSendKey(h, args, provider, text);
+  const dedupeKey = buildRecentSendKey(h, args, provider, buildSendInputSignature(input));
   const _logSendSuccess = (method, targetAgent) => {
     return { success: true, sent: true, method, targetAgent };
   };
@@ -6156,11 +6517,26 @@ async function handleSendChat(h, args) {
     _log(`Suppressed duplicate send for ${dedupeKey}`);
     return { success: true, sent: false, deduplicated: true };
   }
-  if (isCliLikeTransport(transport)) {
+  if (transport === "acp") {
+    const target = getTargetInstance(h, args);
+    if (!target || target.category !== "acp") {
+      return { success: false, error: `ACP instance not found for ${provider?.type || args?.agentType || "unknown"}` };
+    }
+    try {
+      assertProviderSupportsDeclaredInput(provider, input);
+      target.onEvent("send_message", { input });
+      return _logSendSuccess("acp-instance", target.type);
+    } catch (e) {
+      return { success: false, error: `acp send failed: ${e.message}` };
+    }
+  }
+  if (transport === "pty") {
     const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
       _log(`${transport} adapter: ${adapter.cliType}`);
       try {
+        assertTextOnlyInput(provider, input);
+        if (!text) return { success: false, error: "text required for PTY send" };
         await adapter.sendMessage(text);
         return _logSendSuccess(`${transport}-adapter`, adapter.cliType);
       } catch (e) {
@@ -6168,6 +6544,8 @@ async function handleSendChat(h, args) {
       }
     }
   }
+  assertTextOnlyInput(provider, input);
+  if (!text) return { success: false, error: "text required" };
   if (isExtensionTransport(transport)) {
     _log(`Extension: ${provider?.type || "unknown_extension"}`);
     try {
@@ -6783,6 +7161,8 @@ var init_chat_commands = __esm({
   "../../oss/packages/daemon-core/src/commands/chat-commands.ts"() {
     "use strict";
     init_contracts();
+    init_provider_input_support();
+    init_read_chat_contract();
     init_chat_history();
     init_logger();
     init_debug_trace();
@@ -7357,14 +7737,14 @@ function normalizeProviderScriptArgs(args, scriptName) {
 }
 function buildControlScriptResult(scriptName, payload) {
   if (!payload || typeof payload !== "object") return {};
-  if (Array.isArray(payload.options) || Array.isArray(payload.models) || Array.isArray(payload.modes)) {
+  if (Array.isArray(payload.options)) {
     return { controlResult: normalizeControlListResult(payload) };
   }
   const looksLikeValueMutation = /^set|^change/i.test(scriptName) || payload.currentValue !== void 0 || payload.value !== void 0;
   if (looksLikeValueMutation) {
     return { controlResult: normalizeControlSetResult(payload) };
   }
-  if (payload.ok !== void 0 || payload.success !== void 0 || Array.isArray(payload.effects)) {
+  if (payload.ok !== void 0 || Array.isArray(payload.effects) || typeof payload.error === "string") {
     return { controlResult: normalizeControlInvokeResult(payload) };
   }
   return {};
@@ -9772,6 +10152,7 @@ var init_provider_cli_adapter = __esm({
     init_pty_transport();
     init_provider_cli_shared();
     init_chat_message_normalization();
+    init_read_chat_contract();
     init_provider_cli_parse();
     init_provider_cli_config();
     init_provider_cli_runtime();
@@ -10917,6 +11298,9 @@ var init_provider_cli_adapter = __esm({
             runtimeSettings: this.runtimeSettings
           });
           const parsed = this.cliScripts.parseOutput(input);
+          if (parsed && typeof parsed === "object") {
+            Object.assign(parsed, validateReadChatResultPayload(parsed, `${this.cliType} parseOutput`));
+          }
           const refinedStatus = this.refineDetectedStatus(typeof parsed?.status === "string" ? parsed.status : null, input.recentBuffer, input.screenText);
           if (parsed && refinedStatus && parsed.status !== refinedStatus) {
             parsed.status = refinedStatus;
@@ -11553,6 +11937,7 @@ var init_cli_provider_instance = __esm({
     fs5 = __toESM(require("fs"));
     import_node_module = require("module");
     init_contracts();
+    init_provider_input_support();
     init_provider_cli_adapter();
     init_status_monitor();
     init_chat_history();
@@ -11813,6 +12198,7 @@ var init_cli_provider_instance = __esm({
       onEvent(event, data) {
         if (event === "send_message") {
           const input = normalizeInputEnvelope(data);
+          assertTextOnlyInput(this.provider, input);
           if (input.textFallback) {
             void this.adapter.sendMessage(input.textFallback).catch((e) => {
               LOG.warn("CLI", `[${this.type}] send_message failed: ${e?.message || e}`);
@@ -12368,7 +12754,7 @@ __export(util_exports, {
   getSizableOrigin: () => getSizableOrigin,
   hexToUint8Array: () => hexToUint8Array,
   isObject: () => isObject,
-  isPlainObject: () => isPlainObject3,
+  isPlainObject: () => isPlainObject4,
   issue: () => issue,
   joinValues: () => joinValues,
   jsonStringifyReplacer: () => jsonStringifyReplacer,
@@ -12504,10 +12890,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path30) {
-  if (!path30)
+function getElementAtPath(obj, path29) {
+  if (!path29)
     return obj;
-  return path30.reduce((acc, key) => acc?.[key], obj);
+  return path29.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -12537,7 +12923,7 @@ function slugify(input) {
 function isObject(data) {
   return typeof data === "object" && data !== null && !Array.isArray(data);
 }
-function isPlainObject3(o) {
+function isPlainObject4(o) {
   if (isObject(o) === false)
     return false;
   const ctor = o.constructor;
@@ -12554,7 +12940,7 @@ function isPlainObject3(o) {
   return true;
 }
 function shallowClone(o) {
-  if (isPlainObject3(o))
+  if (isPlainObject4(o))
     return { ...o };
   if (Array.isArray(o))
     return [...o];
@@ -12690,7 +13076,7 @@ function omit(schema, mask2) {
   return clone(schema, def);
 }
 function extend(schema, shape) {
-  if (!isPlainObject3(shape)) {
+  if (!isPlainObject4(shape)) {
     throw new Error("Invalid input to extend: expected a plain object");
   }
   const checks = schema._zod.def.checks;
@@ -12713,7 +13099,7 @@ function extend(schema, shape) {
   return clone(schema, def);
 }
 function safeExtend(schema, shape) {
-  if (!isPlainObject3(shape)) {
+  if (!isPlainObject4(shape)) {
     throw new Error("Invalid input to safeExtend: expected a plain object");
   }
   const def = mergeDefs(schema._zod.def, {
@@ -12819,11 +13205,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path30, issues) {
+function prefixIssues(path29, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path30);
+    iss.path.unshift(path29);
     return iss;
   });
 }
@@ -13066,7 +13452,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path30 = []) => {
+  const processError = (error49, path29 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -13076,7 +13462,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path30, ...issue2.path];
+        const fullpath = [...path29, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -13108,8 +13494,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path30 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path30) {
+  const path29 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path29) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -14196,7 +14582,7 @@ function mergeValues(a, b) {
   if (a instanceof Date && b instanceof Date && +a === +b) {
     return { valid: true, data: a };
   }
-  if (isPlainObject3(a) && isPlainObject3(b)) {
+  if (isPlainObject4(a) && isPlainObject4(b)) {
     const bKeys = Object.keys(b);
     const sharedKeys = Object.keys(a).filter((key) => bKeys.indexOf(key) !== -1);
     const newObj = { ...a, ...b };
@@ -15391,7 +15777,7 @@ var init_schemas = __esm({
       $ZodType.init(inst, def);
       inst._zod.parse = (payload, ctx) => {
         const input = payload.value;
-        if (!isPlainObject3(input)) {
+        if (!isPlainObject4(input)) {
           payload.issues.push({
             expected: "record",
             code: "invalid_type",
@@ -25873,13 +26259,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path30 = ref.slice(1).split("/").filter(Boolean);
-  if (path30.length === 0) {
+  const path29 = ref.slice(1).split("/").filter(Boolean);
+  if (path29.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path30[0] === defsKey) {
-    const key = path30[1];
+  if (path29[0] === defsKey) {
+    const key = path29[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -28561,25 +28947,6 @@ function getPromptCapabilityFlags(agentCapabilities) {
     embeddedContext: prompt2.embeddedContext === true
   };
 }
-function getResourceNameFromUri(uri, fallback2) {
-  try {
-    if (uri.startsWith("file://")) {
-      return path12.basename(new URL(uri).pathname) || fallback2;
-    }
-    return path12.basename(uri) || fallback2;
-  } catch {
-    return fallback2;
-  }
-}
-function inputPartToResourceLink(part, fallbackName) {
-  if (!part.uri) return null;
-  return {
-    type: "resource_link",
-    uri: part.uri,
-    name: getResourceNameFromUri(part.uri, fallbackName),
-    ...part.mimeType ? { mimeType: part.mimeType } : {}
-  };
-}
 function appendPromptText(promptParts, text) {
   const normalized = typeof text === "string" ? text.trim() : "";
   if (!normalized) return;
@@ -28596,67 +28963,72 @@ function buildAcpPromptParts(input, agentCapabilities) {
       continue;
     }
     if (part.type === "image") {
-      if (caps.image && part.data) {
-        promptParts.push({
-          type: "image",
-          data: part.data,
-          mimeType: part.mimeType,
-          ...part.uri ? { uri: part.uri } : {}
-        });
-        continue;
+      if (!caps.image) {
+        throw new Error("ACP agent does not support input type: image");
+      }
+      if (!part.data) {
+        throw new Error("ACP image input requires inline image data");
       }
-      const fallback2 = inputPartToResourceLink(part, "image");
-      if (fallback2) promptParts.push(fallback2);
-      appendPromptText(promptParts, part.alt || (!part.uri ? `Attached image (${part.mimeType})` : void 0));
+      promptParts.push({
+        type: "image",
+        data: part.data,
+        mimeType: part.mimeType,
+        ...part.uri ? { uri: part.uri } : {}
+      });
       continue;
     }
     if (part.type === "audio") {
-      if (caps.audio && part.data) {
-        promptParts.push({
-          type: "audio",
-          data: part.data,
-          mimeType: part.mimeType
-        });
-        continue;
+      if (!caps.audio) {
+        throw new Error("ACP agent does not support input type: audio");
+      }
+      if (!part.data) {
+        throw new Error("ACP audio input requires inline audio data");
       }
-      const fallback2 = inputPartToResourceLink(part, "audio");
-      if (fallback2) promptParts.push(fallback2);
-      appendPromptText(promptParts, part.transcript || (!part.uri ? `Attached audio (${part.mimeType})` : void 0));
+      promptParts.push({
+        type: "audio",
+        data: part.data,
+        mimeType: part.mimeType
+      });
       continue;
     }
     if (part.type === "resource") {
-      if (caps.embeddedContext && (part.text || part.data)) {
+      if (!caps.embeddedContext) {
+        throw new Error("ACP agent does not support input type: resource");
+      }
+      if (part.text) {
         promptParts.push({
           type: "resource",
-          resource: part.text ? { uri: part.uri, text: part.text, mimeType: part.mimeType ?? null } : { uri: part.uri, blob: part.data || "", mimeType: part.mimeType ?? null }
+          resource: { uri: part.uri, text: part.text, mimeType: part.mimeType ?? null }
         });
         continue;
       }
-      const fallback2 = inputPartToResourceLink(part, part.name || "resource");
-      if (fallback2) promptParts.push(fallback2);
-      appendPromptText(promptParts, part.text || (!part.uri && part.name ? part.name : void 0));
-      continue;
+      if (part.data) {
+        promptParts.push({
+          type: "resource",
+          resource: { uri: part.uri, blob: part.data, mimeType: part.mimeType ?? null }
+        });
+        continue;
+      }
+      throw new Error("ACP resource input requires embedded text or binary data");
     }
     if (part.type === "video") {
-      const fallback2 = inputPartToResourceLink(part, "video");
-      if (fallback2) promptParts.push(fallback2);
-      appendPromptText(promptParts, !part.uri ? `Attached video (${part.mimeType})` : void 0);
+      throw new Error("ACP agent does not support input type: video");
     }
   }
   if (!promptParts.some((part) => part.type === "text") && input.textFallback) {
-    promptParts.unshift({ type: "text", text: input.textFallback });
+    appendPromptText(promptParts, input.textFallback);
   }
   return promptParts;
 }
-var path12, import_stream, import_child_process5, AcpProviderInstance;
+var import_stream, import_child_process5, AcpProviderInstance;
 var init_acp_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/acp-provider-instance.ts"() {
     "use strict";
-    path12 = __toESM(require("path"));
     import_stream = require("stream");
     import_child_process5 = require("child_process");
     init_acp();
     init_contracts();
+    init_provider_input_support();
     init_status_monitor();
     init_summary_metadata();
     init_chat_message_normalization();
@@ -28692,6 +29064,7 @@ var init_acp_provider_instance = __esm({
       activeToolCalls = [];
       stopReason = null;
       partialContent = "";
+      partialThoughtContent = "";
       /** Rich content blocks accumulated during streaming */
       partialBlocks = [];
       /** Tool calls collected during current turn */
@@ -28737,6 +29110,10 @@ var init_acp_provider_instance = __esm({
             content
           });
         }));
+        if (this.currentStatus === "generating") {
+          const partialThoughtMessage = this.buildPartialThoughtMessage(Date.now());
+          if (partialThoughtMessage) recentMessages.push(partialThoughtMessage);
+        }
         if (this.currentStatus === "generating" && (this.partialContent || this.partialBlocks.length > 0)) {
           const blocks = this.buildPartialBlocks();
           if (blocks.length > 0) {
@@ -28783,6 +29160,7 @@ var init_acp_provider_instance = __esm({
       onEvent(event, data) {
         if (event === "send_message") {
           const input = normalizeInputEnvelope(data);
+          assertProviderSupportsDeclaredInput(this.provider, input);
           const promptParts = buildAcpPromptParts(input, this.agentCapabilities);
           this.sendPrompt(input.textFallback, promptParts.length > 0 ? promptParts : void 0).catch(
             (e) => this.log.warn(`[${this.type}] sendPrompt error: ${e?.message}`)
@@ -29295,6 +29673,7 @@ var init_acp_provider_instance = __esm({
         }));
         this.currentStatus = "generating";
         this.partialContent = "";
+        this.partialThoughtContent = "";
         this.partialBlocks = [];
         this.turnToolCalls = [];
         this.detectStatusTransition();
@@ -29377,7 +29756,14 @@ var init_acp_provider_instance = __esm({
             this.currentStatus = "generating";
             break;
           }
-          case "agent_thought_chunk":
+          case "agent_thought_chunk": {
+            const content = update.content;
+            if (content?.type === "text" && typeof content.text === "string") {
+              this.partialThoughtContent += content.text;
+            }
+            this.currentStatus = "generating";
+            break;
+          }
           case "user_message_chunk": {
             break;
           }
@@ -29532,8 +29918,82 @@ var init_acp_provider_instance = __esm({
         blocks.push(...this.partialBlocks);
         return blocks;
       }
+      buildPartialThoughtMessage(timestamp = Date.now()) {
+        const content = this.partialThoughtContent.trim();
+        if (!content) return null;
+        return buildThoughtChatMessage({
+          content,
+          timestamp,
+          meta: {
+            label: "Thought",
+            isRunning: this.currentStatus === "generating"
+          }
+        });
+      }
+      buildToolCallBubbleKind(toolCall) {
+        if (toolCall.kind === "think") return "thought";
+        if (toolCall.kind === "execute") return "terminal";
+        if (Array.isArray(toolCall.content) && toolCall.content.some((entry) => entry?.type === "terminal")) return "terminal";
+        return "tool";
+      }
+      summarizeToolCallBubbleContent(toolCall) {
+        const rawOutput = typeof toolCall.rawOutput === "string" ? toolCall.rawOutput.trim() : toolCall.rawOutput != null ? JSON.stringify(toolCall.rawOutput) : "";
+        if (rawOutput) return rawOutput;
+        const contentText = Array.isArray(toolCall.content) ? toolCall.content.map((entry) => {
+          if (!entry || typeof entry !== "object") return "";
+          if (entry.type === "content") return flattenContent([entry.content]).trim();
+          if (entry.type === "diff") return `${entry.path}
+${entry.newText || ""}`.trim();
+          if (entry.type === "terminal") return `Terminal: ${entry.terminalId || ""}`.trim();
+          return "";
+        }).filter(Boolean).join("\n\n").trim() : "";
+        if (contentText) return contentText;
+        const rawInput = typeof toolCall.rawInput === "string" ? toolCall.rawInput.trim() : toolCall.rawInput != null ? JSON.stringify(toolCall.rawInput) : "";
+        if (rawInput) {
+          return toolCall.title ? `${toolCall.title}
+${rawInput}` : rawInput;
+        }
+        return toolCall.title || "";
+      }
+      buildTurnToolCallMessages(timestamp = Date.now()) {
+        return this.turnToolCalls.map((toolCall) => {
+          const content = this.summarizeToolCallBubbleContent(toolCall);
+          if (!content) return null;
+          const isRunning = toolCall.status === "pending" || toolCall.status === "in_progress";
+          const label = toolCall.title || void 0;
+          const kind = this.buildToolCallBubbleKind(toolCall);
+          if (kind === "thought") {
+            return buildThoughtChatMessage({
+              content,
+              timestamp,
+              meta: { label: label || "Thought", isRunning }
+            });
+          }
+          if (kind === "terminal") {
+            return buildTerminalChatMessage({
+              content,
+              timestamp,
+              meta: { label: label || "Ran command", isRunning }
+            });
+          }
+          return buildToolChatMessage({
+            content,
+            timestamp,
+            meta: { label: label || "Tool call", isRunning }
+          });
+        }).filter(Boolean);
+      }
       /** Finalize streaming content into an assistant message */
       finalizeAssistantMessage() {
+        const timestamp = Date.now();
+        const thoughtMessage = this.buildPartialThoughtMessage(timestamp);
+        if (thoughtMessage) {
+          this.messages.push(thoughtMessage);
+        }
+        const toolCallMessages = this.buildTurnToolCallMessages(timestamp);
+        if (toolCallMessages.length > 0) {
+          this.messages.push(...toolCallMessages);
+        }
         const blocks = this.buildPartialBlocks();
         const finalBlocks = blocks.map((b) => {
           if (b.type === "text" && b.text.endsWith("...")) {
@@ -29549,6 +30009,7 @@ var init_acp_provider_instance = __esm({
           }));
         }
         this.partialContent = "";
+        this.partialThoughtContent = "";
         this.partialBlocks = [];
         this.turnToolCalls = [];
       }
@@ -29759,12 +30220,12 @@ function resolveCliSessionBinding(provider, normalizedType, cliArgs, requestedRe
     launchMode: "new"
   };
 }
-var os14, path13, crypto4, chalkModule, chalkApi, DaemonCliManager;
+var os14, path12, crypto4, chalkModule, chalkApi, DaemonCliManager;
 var init_cli_manager = __esm({
   "../../oss/packages/daemon-core/src/commands/cli-manager.ts"() {
     "use strict";
     os14 = __toESM(require("os"));
-    path13 = __toESM(require("path"));
+    path12 = __toESM(require("path"));
     crypto4 = __toESM(require("crypto"));
     init_source();
     init_provider_cli_adapter();
@@ -29778,6 +30239,7 @@ var init_cli_manager = __esm({
     init_cli_provider_instance();
     init_acp_provider_instance();
     init_contracts();
+    init_provider_input_support();
     init_logger();
     init_hosted_runtime_restore();
     chalkModule = source_default;
@@ -29924,7 +30386,7 @@ var init_cli_manager = __esm({
       async startSession(cliType, workingDir, cliArgs, initialModel, options) {
         const trimmed = (workingDir || "").trim();
         if (!trimmed) throw new Error("working directory required");
-        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os14.homedir()) : path13.resolve(trimmed);
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os14.homedir()) : path12.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
         const provider = this.providerLoader.getByAlias(cliType);
         const key = crypto4.randomUUID();
@@ -30383,6 +30845,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
             const { adapter, key } = found;
             if (action === "send_chat") {
               const input = normalizeInputEnvelope(args?.input ? { input: args.input } : args);
+              const provider = this.providerLoader.resolve(agentType) || this.providerLoader.getMeta(agentType);
+              if (provider?.category === "acp") {
+                assertProviderSupportsDeclaredInput(provider, input);
+              } else {
+                assertTextOnlyInput(provider, input);
+              }
               const message = input.textFallback;
               if (!message) throw new Error("message required for send_chat");
               await adapter.sendMessage(message);
@@ -30507,7 +30975,7 @@ var init_readdirp = __esm({
         this._directoryFilter = normalizeFilter(opts.directoryFilter);
         const statMethod = opts.lstat ? import_promises.lstat : import_promises.stat;
         if (wantBigintFsStats) {
-          this._stat = (path30) => statMethod(path30, { bigint: true });
+          this._stat = (path29) => statMethod(path29, { bigint: true });
         } else {
           this._stat = statMethod;
         }
@@ -30532,8 +31000,8 @@ var init_readdirp = __esm({
             const par = this.parent;
             const fil = par && par.files;
             if (fil && fil.length > 0) {
-              const { path: path30, depth } = par;
-              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path30));
+              const { path: path29, depth } = par;
+              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path29));
               const awaited = await Promise.all(slice);
               for (const entry of awaited) {
                 if (!entry)
@@ -30573,21 +31041,21 @@ var init_readdirp = __esm({
           this.reading = false;
         }
       }
-      async _exploreDir(path30, depth) {
+      async _exploreDir(path29, depth) {
         let files;
         try {
-          files = await (0, import_promises.readdir)(path30, this._rdOptions);
+          files = await (0, import_promises.readdir)(path29, this._rdOptions);
         } catch (error48) {
           this._onError(error48);
         }
-        return { files, depth, path: path30 };
+        return { files, depth, path: path29 };
       }
-      async _formatEntry(dirent, path30) {
+      async _formatEntry(dirent, path29) {
         let entry;
-        const basename9 = this._isDirent ? dirent.name : dirent;
+        const basename8 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path30, basename9));
-          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename9 };
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path29, basename8));
+          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename8 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
           this._onError(err);
@@ -30643,16 +31111,16 @@ var init_readdirp = __esm({
 });
 
 // ../../oss/packages/daemon-core/node_modules/chokidar/handler.js
-function createFsWatchInstance(path30, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path29, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path30);
-    emitRaw(rawEvent, evPath, { watchedPath: path30 });
-    if (evPath && path30 !== evPath) {
-      fsWatchBroadcast(sp.resolve(path30, evPath), KEY_LISTENERS, sp.join(path30, evPath));
+    listener(path29);
+    emitRaw(rawEvent, evPath, { watchedPath: path29 });
+    if (evPath && path29 !== evPath) {
+      fsWatchBroadcast(sp.resolve(path29, evPath), KEY_LISTENERS, sp.join(path29, evPath));
     }
   };
   try {
-    return (0, import_node_fs.watch)(path30, {
+    return (0, import_node_fs.watch)(path29, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error48) {
@@ -31001,12 +31469,12 @@ var init_handler2 = __esm({
         listener(val1, val2, val3);
       });
     };
-    setFsWatchListener = (path30, fullPath, options, handlers) => {
+    setFsWatchListener = (path29, fullPath, options, handlers) => {
       const { listener, errHandler, rawEmitter } = handlers;
       let cont = FsWatchInstances.get(fullPath);
       let watcher;
       if (!options.persistent) {
-        watcher = createFsWatchInstance(path30, options, listener, errHandler, rawEmitter);
+        watcher = createFsWatchInstance(path29, options, listener, errHandler, rawEmitter);
         if (!watcher)
           return;
         return watcher.close.bind(watcher);
@@ -31017,7 +31485,7 @@ var init_handler2 = __esm({
         addAndConvert(cont, KEY_RAW, rawEmitter);
       } else {
         watcher = createFsWatchInstance(
-          path30,
+          path29,
           options,
           fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
           errHandler,
@@ -31032,7 +31500,7 @@ var init_handler2 = __esm({
             cont.watcherUnusable = true;
           if (isWindows && error48.code === "EPERM") {
             try {
-              const fd = await (0, import_promises2.open)(path30, "r");
+              const fd = await (0, import_promises2.open)(path29, "r");
               await fd.close();
               broadcastErr(error48);
             } catch (err) {
@@ -31063,7 +31531,7 @@ var init_handler2 = __esm({
       };
     };
     FsWatchFileInstances = /* @__PURE__ */ new Map();
-    setFsWatchFileListener = (path30, fullPath, options, handlers) => {
+    setFsWatchFileListener = (path29, fullPath, options, handlers) => {
       const { listener, rawEmitter } = handlers;
       let cont = FsWatchFileInstances.get(fullPath);
       const copts = cont && cont.options;
@@ -31085,7 +31553,7 @@ var init_handler2 = __esm({
             });
             const currmtime = curr.mtimeMs;
             if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-              foreach(cont.listeners, (listener2) => listener2(path30, curr));
+              foreach(cont.listeners, (listener2) => listener2(path29, curr));
             }
           })
         };
@@ -31115,13 +31583,13 @@ var init_handler2 = __esm({
        * @param listener on fs change
        * @returns closer for the watcher instance
        */
-      _watchWithNodeFs(path30, listener) {
+      _watchWithNodeFs(path29, listener) {
         const opts = this.fsw.options;
-        const directory = sp.dirname(path30);
-        const basename9 = sp.basename(path30);
+        const directory = sp.dirname(path29);
+        const basename8 = sp.basename(path29);
         const parent = this.fsw._getWatchedDir(directory);
-        parent.add(basename9);
-        const absolutePath = sp.resolve(path30);
+        parent.add(basename8);
+        const absolutePath = sp.resolve(path29);
         const options = {
           persistent: opts.persistent
         };
@@ -31130,13 +31598,13 @@ var init_handler2 = __esm({
         let closer;
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
-          options.interval = enableBin && isBinaryPath(basename9) ? opts.binaryInterval : opts.interval;
-          closer = setFsWatchFileListener(path30, absolutePath, options, {
+          options.interval = enableBin && isBinaryPath(basename8) ? opts.binaryInterval : opts.interval;
+          closer = setFsWatchFileListener(path29, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
           });
         } else {
-          closer = setFsWatchListener(path30, absolutePath, options, {
+          closer = setFsWatchListener(path29, absolutePath, options, {
             listener,
             errHandler: this._boundHandleError,
             rawEmitter: this.fsw._emitRaw
@@ -31153,12 +31621,12 @@ var init_handler2 = __esm({
           return;
         }
         const dirname9 = sp.dirname(file2);
-        const basename9 = sp.basename(file2);
+        const basename8 = sp.basename(file2);
         const parent = this.fsw._getWatchedDir(dirname9);
         let prevStats = stats;
-        if (parent.has(basename9))
+        if (parent.has(basename8))
           return;
-        const listener = async (path30, newStats) => {
+        const listener = async (path29, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
             return;
           if (!newStats || newStats.mtimeMs === 0) {
@@ -31172,18 +31640,18 @@ var init_handler2 = __esm({
                 this.fsw._emit(EV.CHANGE, file2, newStats2);
               }
               if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-                this.fsw._closeFile(path30);
+                this.fsw._closeFile(path29);
                 prevStats = newStats2;
                 const closer2 = this._watchWithNodeFs(file2, listener);
                 if (closer2)
-                  this.fsw._addPathCloser(path30, closer2);
+                  this.fsw._addPathCloser(path29, closer2);
               } else {
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname9, basename9);
+              this.fsw._remove(dirname9, basename8);
             }
-          } else if (parent.has(basename9)) {
+          } else if (parent.has(basename8)) {
             const at = newStats.atimeMs;
             const mt = newStats.mtimeMs;
             if (!at || at <= mt || mt !== prevStats.mtimeMs) {
@@ -31208,7 +31676,7 @@ var init_handler2 = __esm({
        * @param item basename of this item
        * @returns true if no more processing is needed for this entry.
        */
-      async _handleSymlink(entry, directory, path30, item) {
+      async _handleSymlink(entry, directory, path29, item) {
         if (this.fsw.closed) {
           return;
         }
@@ -31218,7 +31686,7 @@ var init_handler2 = __esm({
           this.fsw._incrReadyCount();
           let linkPath;
           try {
-            linkPath = await (0, import_promises2.realpath)(path30);
+            linkPath = await (0, import_promises2.realpath)(path29);
           } catch (e) {
             this.fsw._emitReady();
             return true;
@@ -31228,12 +31696,12 @@ var init_handler2 = __esm({
           if (dir.has(item)) {
             if (this.fsw._symlinkPaths.get(full) !== linkPath) {
               this.fsw._symlinkPaths.set(full, linkPath);
-              this.fsw._emit(EV.CHANGE, path30, entry.stats);
+              this.fsw._emit(EV.CHANGE, path29, entry.stats);
             }
           } else {
             dir.add(item);
             this.fsw._symlinkPaths.set(full, linkPath);
-            this.fsw._emit(EV.ADD, path30, entry.stats);
+            this.fsw._emit(EV.ADD, path29, entry.stats);
           }
           this.fsw._emitReady();
           return true;
@@ -31263,9 +31731,9 @@ var init_handler2 = __esm({
             return;
           }
           const item = entry.path;
-          let path30 = sp.join(directory, item);
+          let path29 = sp.join(directory, item);
           current.add(item);
-          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path30, item)) {
+          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path29, item)) {
             return;
           }
           if (this.fsw.closed) {
@@ -31274,8 +31742,8 @@ var init_handler2 = __esm({
           }
           if (item === target || !target && !previous.has(item)) {
             this.fsw._incrReadyCount();
-            path30 = sp.join(dir, sp.relative(dir, path30));
-            this._addToNodeFs(path30, initialAdd, wh, depth + 1);
+            path29 = sp.join(dir, sp.relative(dir, path29));
+            this._addToNodeFs(path29, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
         return new Promise((resolve15, reject) => {
@@ -31344,13 +31812,13 @@ var init_handler2 = __esm({
        * @param depth Child path actually targeted for watch
        * @param target Child path actually targeted for watch
        */
-      async _addToNodeFs(path30, initialAdd, priorWh, depth, target) {
+      async _addToNodeFs(path29, initialAdd, priorWh, depth, target) {
         const ready = this.fsw._emitReady;
-        if (this.fsw._isIgnored(path30) || this.fsw.closed) {
+        if (this.fsw._isIgnored(path29) || this.fsw.closed) {
           ready();
           return false;
         }
-        const wh = this.fsw._getWatchHelpers(path30);
+        const wh = this.fsw._getWatchHelpers(path29);
         if (priorWh) {
           wh.filterPath = (entry) => priorWh.filterPath(entry);
           wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -31366,8 +31834,8 @@ var init_handler2 = __esm({
           const follow = this.fsw.options.followSymlinks;
           let closer;
           if (stats.isDirectory()) {
-            const absPath = sp.resolve(path30);
-            const targetPath = follow ? await (0, import_promises2.realpath)(path30) : path30;
+            const absPath = sp.resolve(path29);
+            const targetPath = follow ? await (0, import_promises2.realpath)(path29) : path29;
             if (this.fsw.closed)
               return;
             closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -31377,29 +31845,29 @@ var init_handler2 = __esm({
               this.fsw._symlinkPaths.set(absPath, targetPath);
             }
           } else if (stats.isSymbolicLink()) {
-            const targetPath = follow ? await (0, import_promises2.realpath)(path30) : path30;
+            const targetPath = follow ? await (0, import_promises2.realpath)(path29) : path29;
             if (this.fsw.closed)
               return;
             const parent = sp.dirname(wh.watchPath);
             this.fsw._getWatchedDir(parent).add(wh.watchPath);
             this.fsw._emit(EV.ADD, wh.watchPath, stats);
-            closer = await this._handleDir(parent, stats, initialAdd, depth, path30, wh, targetPath);
+            closer = await this._handleDir(parent, stats, initialAdd, depth, path29, wh, targetPath);
             if (this.fsw.closed)
               return;
             if (targetPath !== void 0) {
-              this.fsw._symlinkPaths.set(sp.resolve(path30), targetPath);
+              this.fsw._symlinkPaths.set(sp.resolve(path29), targetPath);
             }
           } else {
             closer = this._handleFile(wh.watchPath, stats, initialAdd);
           }
           ready();
           if (closer)
-            this.fsw._addPathCloser(path30, closer);
+            this.fsw._addPathCloser(path29, closer);
           return false;
         } catch (error48) {
           if (this.fsw._handleError(error48)) {
             ready();
-            return path30;
+            return path29;
           }
         }
       }
@@ -31434,24 +31902,24 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path30) {
-  if (typeof path30 !== "string")
+function normalizePath(path29) {
+  if (typeof path29 !== "string")
     throw new Error("string expected");
-  path30 = sp2.normalize(path30);
-  path30 = path30.replace(/\\/g, "/");
+  path29 = sp2.normalize(path29);
+  path29 = path29.replace(/\\/g, "/");
   let prepend = false;
-  if (path30.startsWith("//"))
+  if (path29.startsWith("//"))
     prepend = true;
-  path30 = path30.replace(DOUBLE_SLASH_RE, "/");
+  path29 = path29.replace(DOUBLE_SLASH_RE, "/");
   if (prepend)
-    path30 = "/" + path30;
-  return path30;
+    path29 = "/" + path29;
+  return path29;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path30 = normalizePath(testString);
+  const path29 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path30, stats)) {
+    if (pattern(path29, stats)) {
       return true;
     }
   }
@@ -31514,19 +31982,19 @@ var init_chokidar = __esm({
       }
       return str;
     };
-    normalizePathToUnix = (path30) => toUnix(sp2.normalize(toUnix(path30)));
-    normalizeIgnored = (cwd = "") => (path30) => {
-      if (typeof path30 === "string") {
-        return normalizePathToUnix(sp2.isAbsolute(path30) ? path30 : sp2.join(cwd, path30));
+    normalizePathToUnix = (path29) => toUnix(sp2.normalize(toUnix(path29)));
+    normalizeIgnored = (cwd = "") => (path29) => {
+      if (typeof path29 === "string") {
+        return normalizePathToUnix(sp2.isAbsolute(path29) ? path29 : sp2.join(cwd, path29));
       } else {
-        return path30;
+        return path29;
       }
     };
-    getAbsolutePath = (path30, cwd) => {
-      if (sp2.isAbsolute(path30)) {
-        return path30;
+    getAbsolutePath = (path29, cwd) => {
+      if (sp2.isAbsolute(path29)) {
+        return path29;
       }
-      return sp2.join(cwd, path30);
+      return sp2.join(cwd, path29);
     };
     EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
     DirEntry = class {
@@ -31591,10 +32059,10 @@ var init_chokidar = __esm({
       dirParts;
       followSymlinks;
       statMethod;
-      constructor(path30, follow, fsw) {
+      constructor(path29, follow, fsw) {
         this.fsw = fsw;
-        const watchPath = path30;
-        this.path = path30 = path30.replace(REPLACER_RE, "");
+        const watchPath = path29;
+        this.path = path29 = path29.replace(REPLACER_RE, "");
         this.watchPath = watchPath;
         this.fullWatchPath = sp2.resolve(watchPath);
         this.dirParts = [];
@@ -31734,20 +32202,20 @@ var init_chokidar = __esm({
         this._closePromise = void 0;
         let paths = unifyPaths(paths_);
         if (cwd) {
-          paths = paths.map((path30) => {
-            const absPath = getAbsolutePath(path30, cwd);
+          paths = paths.map((path29) => {
+            const absPath = getAbsolutePath(path29, cwd);
             return absPath;
           });
         }
-        paths.forEach((path30) => {
-          this._removeIgnoredPath(path30);
+        paths.forEach((path29) => {
+          this._removeIgnoredPath(path29);
         });
         this._userIgnored = void 0;
         if (!this._readyCount)
           this._readyCount = 0;
         this._readyCount += paths.length;
-        Promise.all(paths.map(async (path30) => {
-          const res = await this._nodeFsHandler._addToNodeFs(path30, !_internal, void 0, 0, _origAdd);
+        Promise.all(paths.map(async (path29) => {
+          const res = await this._nodeFsHandler._addToNodeFs(path29, !_internal, void 0, 0, _origAdd);
           if (res)
             this._emitReady();
           return res;
@@ -31769,17 +32237,17 @@ var init_chokidar = __esm({
           return this;
         const paths = unifyPaths(paths_);
         const { cwd } = this.options;
-        paths.forEach((path30) => {
-          if (!sp2.isAbsolute(path30) && !this._closers.has(path30)) {
+        paths.forEach((path29) => {
+          if (!sp2.isAbsolute(path29) && !this._closers.has(path29)) {
             if (cwd)
-              path30 = sp2.join(cwd, path30);
-            path30 = sp2.resolve(path30);
+              path29 = sp2.join(cwd, path29);
+            path29 = sp2.resolve(path29);
           }
-          this._closePath(path30);
-          this._addIgnoredPath(path30);
-          if (this._watched.has(path30)) {
+          this._closePath(path29);
+          this._addIgnoredPath(path29);
+          if (this._watched.has(path29)) {
             this._addIgnoredPath({
-              path: path30,
+              path: path29,
               recursive: true
             });
           }
@@ -31843,38 +32311,38 @@ var init_chokidar = __esm({
        * @param stats arguments to be passed with event
        * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
        */
-      async _emit(event, path30, stats) {
+      async _emit(event, path29, stats) {
         if (this.closed)
           return;
         const opts = this.options;
         if (isWindows)
-          path30 = sp2.normalize(path30);
+          path29 = sp2.normalize(path29);
         if (opts.cwd)
-          path30 = sp2.relative(opts.cwd, path30);
-        const args = [path30];
+          path29 = sp2.relative(opts.cwd, path29);
+        const args = [path29];
         if (stats != null)
           args.push(stats);
         const awf = opts.awaitWriteFinish;
         let pw;
-        if (awf && (pw = this._pendingWrites.get(path30))) {
+        if (awf && (pw = this._pendingWrites.get(path29))) {
           pw.lastChange = /* @__PURE__ */ new Date();
           return this;
         }
         if (opts.atomic) {
           if (event === EVENTS.UNLINK) {
-            this._pendingUnlinks.set(path30, [event, ...args]);
+            this._pendingUnlinks.set(path29, [event, ...args]);
             setTimeout(() => {
-              this._pendingUnlinks.forEach((entry, path31) => {
+              this._pendingUnlinks.forEach((entry, path30) => {
                 this.emit(...entry);
                 this.emit(EVENTS.ALL, ...entry);
-                this._pendingUnlinks.delete(path31);
+                this._pendingUnlinks.delete(path30);
               });
             }, typeof opts.atomic === "number" ? opts.atomic : 100);
             return this;
           }
-          if (event === EVENTS.ADD && this._pendingUnlinks.has(path30)) {
+          if (event === EVENTS.ADD && this._pendingUnlinks.has(path29)) {
             event = EVENTS.CHANGE;
-            this._pendingUnlinks.delete(path30);
+            this._pendingUnlinks.delete(path29);
           }
         }
         if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -31892,16 +32360,16 @@ var init_chokidar = __esm({
               this.emitWithAll(event, args);
             }
           };
-          this._awaitWriteFinish(path30, awf.stabilityThreshold, event, awfEmit);
+          this._awaitWriteFinish(path29, awf.stabilityThreshold, event, awfEmit);
           return this;
         }
         if (event === EVENTS.CHANGE) {
-          const isThrottled = !this._throttle(EVENTS.CHANGE, path30, 50);
+          const isThrottled = !this._throttle(EVENTS.CHANGE, path29, 50);
           if (isThrottled)
             return this;
         }
         if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-          const fullPath = opts.cwd ? sp2.join(opts.cwd, path30) : path30;
+          const fullPath = opts.cwd ? sp2.join(opts.cwd, path29) : path29;
           let stats2;
           try {
             stats2 = await (0, import_promises3.stat)(fullPath);
@@ -31932,23 +32400,23 @@ var init_chokidar = __esm({
        * @param timeout duration of time to suppress duplicate actions
        * @returns tracking object or false if action should be suppressed
        */
-      _throttle(actionType, path30, timeout) {
+      _throttle(actionType, path29, timeout) {
         if (!this._throttled.has(actionType)) {
           this._throttled.set(actionType, /* @__PURE__ */ new Map());
         }
         const action = this._throttled.get(actionType);
         if (!action)
           throw new Error("invalid throttle");
-        const actionPath = action.get(path30);
+        const actionPath = action.get(path29);
         if (actionPath) {
           actionPath.count++;
           return false;
         }
         let timeoutObject;
         const clear = () => {
-          const item = action.get(path30);
+          const item = action.get(path29);
           const count = item ? item.count : 0;
-          action.delete(path30);
+          action.delete(path29);
           clearTimeout(timeoutObject);
           if (item)
             clearTimeout(item.timeoutObject);
@@ -31956,7 +32424,7 @@ var init_chokidar = __esm({
         };
         timeoutObject = setTimeout(clear, timeout);
         const thr = { timeoutObject, clear, count: 0 };
-        action.set(path30, thr);
+        action.set(path29, thr);
         return thr;
       }
       _incrReadyCount() {
@@ -31970,44 +32438,44 @@ var init_chokidar = __esm({
        * @param event
        * @param awfEmit Callback to be called when ready for event to be emitted.
        */
-      _awaitWriteFinish(path30, threshold, event, awfEmit) {
+      _awaitWriteFinish(path29, threshold, event, awfEmit) {
         const awf = this.options.awaitWriteFinish;
         if (typeof awf !== "object")
           return;
         const pollInterval = awf.pollInterval;
         let timeoutHandler;
-        let fullPath = path30;
-        if (this.options.cwd && !sp2.isAbsolute(path30)) {
-          fullPath = sp2.join(this.options.cwd, path30);
+        let fullPath = path29;
+        if (this.options.cwd && !sp2.isAbsolute(path29)) {
+          fullPath = sp2.join(this.options.cwd, path29);
         }
         const now = /* @__PURE__ */ new Date();
         const writes = this._pendingWrites;
         function awaitWriteFinishFn(prevStat) {
           (0, import_node_fs2.stat)(fullPath, (err, curStat) => {
-            if (err || !writes.has(path30)) {
+            if (err || !writes.has(path29)) {
               if (err && err.code !== "ENOENT")
                 awfEmit(err);
               return;
             }
             const now2 = Number(/* @__PURE__ */ new Date());
             if (prevStat && curStat.size !== prevStat.size) {
-              writes.get(path30).lastChange = now2;
+              writes.get(path29).lastChange = now2;
             }
-            const pw = writes.get(path30);
+            const pw = writes.get(path29);
             const df = now2 - pw.lastChange;
             if (df >= threshold) {
-              writes.delete(path30);
+              writes.delete(path29);
               awfEmit(void 0, curStat);
             } else {
               timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
             }
           });
         }
-        if (!writes.has(path30)) {
-          writes.set(path30, {
+        if (!writes.has(path29)) {
+          writes.set(path29, {
             lastChange: now,
             cancelWait: () => {
-              writes.delete(path30);
+              writes.delete(path29);
               clearTimeout(timeoutHandler);
               return event;
             }
@@ -32018,8 +32486,8 @@ var init_chokidar = __esm({
       /**
        * Determines whether user has asked to ignore this path.
        */
-      _isIgnored(path30, stats) {
-        if (this.options.atomic && DOT_RE.test(path30))
+      _isIgnored(path29, stats) {
+        if (this.options.atomic && DOT_RE.test(path29))
           return true;
         if (!this._userIgnored) {
           const { cwd } = this.options;
@@ -32029,17 +32497,17 @@ var init_chokidar = __esm({
           const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
           this._userIgnored = anymatch(list, void 0);
         }
-        return this._userIgnored(path30, stats);
+        return this._userIgnored(path29, stats);
       }
-      _isntIgnored(path30, stat4) {
-        return !this._isIgnored(path30, stat4);
+      _isntIgnored(path29, stat4) {
+        return !this._isIgnored(path29, stat4);
       }
       /**
        * Provides a set of common helpers and properties relating to symlink handling.
        * @param path file or directory pattern being watched
        */
-      _getWatchHelpers(path30) {
-        return new WatchHelper(path30, this.options.followSymlinks, this);
+      _getWatchHelpers(path29) {
+        return new WatchHelper(path29, this.options.followSymlinks, this);
       }
       // Directory helpers
       // -----------------
@@ -32071,63 +32539,63 @@ var init_chokidar = __esm({
        * @param item      base path of item/directory
        */
       _remove(directory, item, isDirectory) {
-        const path30 = sp2.join(directory, item);
-        const fullPath = sp2.resolve(path30);
-        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path30) || this._watched.has(fullPath);
-        if (!this._throttle("remove", path30, 100))
+        const path29 = sp2.join(directory, item);
+        const fullPath = sp2.resolve(path29);
+        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path29) || this._watched.has(fullPath);
+        if (!this._throttle("remove", path29, 100))
           return;
         if (!isDirectory && this._watched.size === 1) {
           this.add(directory, item, true);
         }
-        const wp = this._getWatchedDir(path30);
+        const wp = this._getWatchedDir(path29);
         const nestedDirectoryChildren = wp.getChildren();
-        nestedDirectoryChildren.forEach((nested) => this._remove(path30, nested));
+        nestedDirectoryChildren.forEach((nested) => this._remove(path29, nested));
         const parent = this._getWatchedDir(directory);
         const wasTracked = parent.has(item);
         parent.remove(item);
         if (this._symlinkPaths.has(fullPath)) {
           this._symlinkPaths.delete(fullPath);
         }
-        let relPath = path30;
+        let relPath = path29;
         if (this.options.cwd)
-          relPath = sp2.relative(this.options.cwd, path30);
+          relPath = sp2.relative(this.options.cwd, path29);
         if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
           const event = this._pendingWrites.get(relPath).cancelWait();
           if (event === EVENTS.ADD)
             return;
         }
-        this._watched.delete(path30);
+        this._watched.delete(path29);
         this._watched.delete(fullPath);
         const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-        if (wasTracked && !this._isIgnored(path30))
-          this._emit(eventName, path30);
-        this._closePath(path30);
+        if (wasTracked && !this._isIgnored(path29))
+          this._emit(eventName, path29);
+        this._closePath(path29);
       }
       /**
        * Closes all watchers for a path
        */
-      _closePath(path30) {
-        this._closeFile(path30);
-        const dir = sp2.dirname(path30);
-        this._getWatchedDir(dir).remove(sp2.basename(path30));
+      _closePath(path29) {
+        this._closeFile(path29);
+        const dir = sp2.dirname(path29);
+        this._getWatchedDir(dir).remove(sp2.basename(path29));
       }
       /**
        * Closes only file-specific watchers
        */
-      _closeFile(path30) {
-        const closers = this._closers.get(path30);
+      _closeFile(path29) {
+        const closers = this._closers.get(path29);
         if (!closers)
           return;
         closers.forEach((closer) => closer());
-        this._closers.delete(path30);
+        this._closers.delete(path29);
       }
-      _addPathCloser(path30, closer) {
+      _addPathCloser(path29, closer) {
         if (!closer)
           return;
-        let list = this._closers.get(path30);
+        let list = this._closers.get(path29);
         if (!list) {
           list = [];
-          this._closers.set(path30, list);
+          this._closers.set(path29, list);
         }
         list.push(closer);
       }
@@ -32176,6 +32644,7 @@ function validateProviderDefinition(raw) {
     warnings.push("disableUpstream is deprecated in provider definitions; use machine-level provider source policy instead");
   }
   const category = provider.category;
+  const controls = Array.isArray(provider.controls) ? provider.controls : [];
   if (category === "cli" || category === "acp") {
     const spawn6 = provider.spawn;
     const command = spawn6 && typeof spawn6 === "object" ? spawn6.command : void 0;
@@ -32193,11 +32662,61 @@ function validateProviderDefinition(raw) {
   if (category === "extension" && !provider.extensionId) {
     warnings.push("Extension providers should have extensionId");
   }
-  for (const control of Array.isArray(provider.controls) ? provider.controls : []) {
+  validateCapabilities(provider, controls, errors);
+  for (const control of controls) {
     validateControl(control, errors);
   }
   return { errors, warnings };
 }
+function validateCapabilities(provider, controls, errors) {
+  const capabilities = provider.capabilities;
+  if (provider.contractVersion === 2) {
+    if (!capabilities || typeof capabilities !== "object") {
+      errors.push("contractVersion 2 providers must declare capabilities");
+      return;
+    }
+  }
+  if (!capabilities || typeof capabilities !== "object") {
+    return;
+  }
+  const input = capabilities.input;
+  if (!input || typeof input !== "object") {
+    errors.push("capabilities.input is required");
+  } else {
+    if (typeof input.multipart !== "boolean") {
+      errors.push("capabilities.input.multipart must be boolean");
+    }
+    if (!Array.isArray(input.mediaTypes) || input.mediaTypes.length === 0) {
+      errors.push("capabilities.input.mediaTypes must be a non-empty array");
+    } else if (input.mediaTypes.some((type) => typeof type !== "string" || !VALID_CAPABILITY_MEDIA_TYPES.has(type))) {
+      errors.push(`capabilities.input.mediaTypes must only include: ${Array.from(VALID_CAPABILITY_MEDIA_TYPES).join(", ")}`);
+    }
+  }
+  const output = capabilities.output;
+  if (!output || typeof output !== "object") {
+    errors.push("capabilities.output is required");
+  } else {
+    if (typeof output.richContent !== "boolean") {
+      errors.push("capabilities.output.richContent must be boolean");
+    }
+    if (!Array.isArray(output.mediaTypes) || output.mediaTypes.length === 0) {
+      errors.push("capabilities.output.mediaTypes must be a non-empty array");
+    } else if (output.mediaTypes.some((type) => typeof type !== "string" || !VALID_CAPABILITY_MEDIA_TYPES.has(type))) {
+      errors.push(`capabilities.output.mediaTypes must only include: ${Array.from(VALID_CAPABILITY_MEDIA_TYPES).join(", ")}`);
+    }
+  }
+  const controlCapabilities = capabilities.controls;
+  if (!controlCapabilities || typeof controlCapabilities !== "object") {
+    errors.push("capabilities.controls is required");
+    return;
+  }
+  if (typeof controlCapabilities.typedResults !== "boolean") {
+    errors.push("capabilities.controls.typedResults must be boolean");
+  }
+  if (controls.length > 0 && controlCapabilities.typedResults !== true) {
+    errors.push("providers declaring controls must set capabilities.controls.typedResults=true");
+  }
+}
 function validateControl(control, errors) {
   if (!control || typeof control !== "object") {
     errors.push("controls: each control must be an object");
@@ -32229,10 +32748,11 @@ function validateControl(control, errors) {
     errors.push(`${prefix}: readFrom must be a non-empty string when provided`);
   }
 }
-var KNOWN_PROVIDER_FIELDS, VALUE_CONTROL_TYPES;
+var VALID_CAPABILITY_MEDIA_TYPES, KNOWN_PROVIDER_FIELDS, VALUE_CONTROL_TYPES;
 var init_provider_schema = __esm({
   "../../oss/packages/daemon-core/src/providers/provider-schema.ts"() {
     "use strict";
+    VALID_CAPABILITY_MEDIA_TYPES = /* @__PURE__ */ new Set(["text", "image", "audio", "video", "resource"]);
     KNOWN_PROVIDER_FIELDS = /* @__PURE__ */ new Set([
       "type",
       "name",
@@ -32283,6 +32803,7 @@ var init_provider_schema = __esm({
       "sendDelayMs",
       "sendKey",
       "submitStrategy",
+      "timeouts",
       "disableUpstream"
     ]);
     VALUE_CONTROL_TYPES = /* @__PURE__ */ new Set(["select", "toggle", "cycle", "slider"]);
@@ -32290,12 +32811,12 @@ var init_provider_schema = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/providers/provider-loader.ts
-var fs6, path14, os15, ProviderLoader;
+var fs6, path13, os15, ProviderLoader;
 var init_provider_loader = __esm({
   "../../oss/packages/daemon-core/src/providers/provider-loader.ts"() {
     "use strict";
     fs6 = __toESM(require("fs"));
-    path14 = __toESM(require("path"));
+    path13 = __toESM(require("path"));
     os15 = __toESM(require("os"));
     init_chokidar();
     init_ide_detector();
@@ -32322,9 +32843,9 @@ var init_provider_loader = __esm({
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-        this.defaultProvidersDir = path14.join(os15.homedir(), ".adhdev", "providers");
+        this.defaultProvidersDir = path13.join(os15.homedir(), ".adhdev", "providers");
         this.userDir = this.defaultProvidersDir;
-        this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+        this.upstreamDir = path13.join(this.defaultProvidersDir, ".upstream");
         this.disableUpstream = false;
         this.applySourceConfig({
           userDir: options?.userDir,
@@ -32372,7 +32893,7 @@ var init_provider_loader = __esm({
         }
         this.sourceMode = nextSourceMode;
         this.userDir = this.explicitProviderDir || this.defaultProvidersDir;
-        this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+        this.upstreamDir = path13.join(this.defaultProvidersDir, ".upstream");
         this.disableUpstream = this.sourceMode === "no-upstream";
         if (this.explicitProviderDir) {
           this.log(`Config 'providerDir' applied: ${this.userDir}`);
@@ -32386,7 +32907,7 @@ var init_provider_loader = __esm({
       * Canonical provider directory shape for a given root.
       */
       getProviderDir(root, category, type) {
-        return path14.join(root, category, type);
+        return path13.join(root, category, type);
       }
       /**
       * Canonical user override directory for a provider.
@@ -32413,7 +32934,7 @@ var init_provider_loader = __esm({
       resolveProviderFile(type, ...segments) {
         const dir = this.findProviderDirInternal(type);
         if (!dir) return null;
-        return path14.join(dir, ...segments);
+        return path13.join(dir, ...segments);
       }
       /**
       * Load all providers (3-tier priority)
@@ -32452,7 +32973,7 @@ var init_provider_loader = __esm({
         if (!fs6.existsSync(this.upstreamDir)) return false;
         try {
           return fs6.readdirSync(this.upstreamDir).some(
-            (d) => fs6.statSync(path14.join(this.upstreamDir, d)).isDirectory()
+            (d) => fs6.statSync(path13.join(this.upstreamDir, d)).isDirectory()
           );
         } catch {
           return false;
@@ -32767,8 +33288,8 @@ var init_provider_loader = __esm({
                   resolved._resolvedScriptDir = entry.scriptDir;
                   resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
                   if (providerDir) {
-                    const fullDir = path14.join(providerDir, entry.scriptDir);
-                    resolved._resolvedScriptsPath = fs6.existsSync(path14.join(fullDir, "scripts.js")) ? path14.join(fullDir, "scripts.js") : fullDir;
+                    const fullDir = path13.join(providerDir, entry.scriptDir);
+                    resolved._resolvedScriptsPath = fs6.existsSync(path13.join(fullDir, "scripts.js")) ? path13.join(fullDir, "scripts.js") : fullDir;
                   }
                   matched = true;
                 }
@@ -32783,8 +33304,8 @@ var init_provider_loader = __esm({
                 resolved._resolvedScriptDir = base.defaultScriptDir;
                 resolved._resolvedScriptsSource = "defaultScriptDir:version_miss";
                 if (providerDir) {
-                  const fullDir = path14.join(providerDir, base.defaultScriptDir);
-                  resolved._resolvedScriptsPath = fs6.existsSync(path14.join(fullDir, "scripts.js")) ? path14.join(fullDir, "scripts.js") : fullDir;
+                  const fullDir = path13.join(providerDir, base.defaultScriptDir);
+                  resolved._resolvedScriptsPath = fs6.existsSync(path13.join(fullDir, "scripts.js")) ? path13.join(fullDir, "scripts.js") : fullDir;
                 }
               }
               resolved._versionWarning = `Version ${currentVersion} not in compatibility matrix. Using default scripts.`;
@@ -32801,8 +33322,8 @@ var init_provider_loader = __esm({
                   resolved._resolvedScriptDir = dirOverride;
                   resolved._resolvedScriptsSource = `versions:${range}`;
                   if (providerDir) {
-                    const fullDir = path14.join(providerDir, dirOverride);
-                    resolved._resolvedScriptsPath = fs6.existsSync(path14.join(fullDir, "scripts.js")) ? path14.join(fullDir, "scripts.js") : fullDir;
+                    const fullDir = path13.join(providerDir, dirOverride);
+                    resolved._resolvedScriptsPath = fs6.existsSync(path13.join(fullDir, "scripts.js")) ? path13.join(fullDir, "scripts.js") : fullDir;
                   }
                 }
               } else if (override.scripts) {
@@ -32818,8 +33339,8 @@ var init_provider_loader = __esm({
             resolved._resolvedScriptDir = base.defaultScriptDir;
             resolved._resolvedScriptsSource = "defaultScriptDir:no_version";
             if (providerDir) {
-              const fullDir = path14.join(providerDir, base.defaultScriptDir);
-              resolved._resolvedScriptsPath = fs6.existsSync(path14.join(fullDir, "scripts.js")) ? path14.join(fullDir, "scripts.js") : fullDir;
+              const fullDir = path13.join(providerDir, base.defaultScriptDir);
+              resolved._resolvedScriptsPath = fs6.existsSync(path13.join(fullDir, "scripts.js")) ? path13.join(fullDir, "scripts.js") : fullDir;
             }
           }
         }
@@ -32844,14 +33365,14 @@ var init_provider_loader = __esm({
           this.log(`  [loadScriptsFromDir] ${type}: providerDir not found`);
           return null;
         }
-        const dir = path14.join(providerDir, scriptDir);
+        const dir = path13.join(providerDir, scriptDir);
         if (!fs6.existsSync(dir)) {
           this.log(`  [loadScriptsFromDir] ${type}: dir not found: ${dir}`);
           return null;
         }
         const cached2 = this.scriptsCache.get(dir);
         if (cached2) return cached2;
-        const scriptsJs = path14.join(dir, "scripts.js");
+        const scriptsJs = path13.join(dir, "scripts.js");
         if (fs6.existsSync(scriptsJs)) {
           try {
             delete require.cache[require.resolve(scriptsJs)];
@@ -32893,7 +33414,7 @@ var init_provider_loader = __esm({
                 return;
               }
               if (filePath.endsWith(".js") || filePath.endsWith(".json")) {
-                this.log(`File changed: ${path14.basename(filePath)}, reloading...`);
+                this.log(`File changed: ${path13.basename(filePath)}, reloading...`);
                 this.reload();
               }
             };
@@ -32948,7 +33469,7 @@ var init_provider_loader = __esm({
         }
         const https = require("https");
         const { execSync: execSync7 } = require("child_process");
-        const metaPath = path14.join(this.upstreamDir, _ProviderLoader.META_FILE);
+        const metaPath = path13.join(this.upstreamDir, _ProviderLoader.META_FILE);
         let prevEtag = "";
         let prevTimestamp = 0;
         try {
@@ -33008,17 +33529,17 @@ var init_provider_loader = __esm({
             return { updated: false };
           }
           this.log("Downloading latest providers from GitHub...");
-          const tmpTar = path14.join(os15.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-          const tmpExtract = path14.join(os15.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+          const tmpTar = path13.join(os15.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+          const tmpExtract = path13.join(os15.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
           await this.downloadFile(_ProviderLoader.GITHUB_TARBALL_URL, tmpTar);
           fs6.mkdirSync(tmpExtract, { recursive: true });
           execSync7(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
           const extracted = fs6.readdirSync(tmpExtract);
           const rootDir = extracted.find(
-            (d) => fs6.statSync(path14.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
+            (d) => fs6.statSync(path13.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
           );
           if (!rootDir) throw new Error("Unexpected tarball structure");
-          const sourceDir = path14.join(tmpExtract, rootDir);
+          const sourceDir = path13.join(tmpExtract, rootDir);
           const backupDir = this.upstreamDir + ".bak";
           if (fs6.existsSync(this.upstreamDir)) {
             if (fs6.existsSync(backupDir)) fs6.rmSync(backupDir, { recursive: true, force: true });
@@ -33093,8 +33614,8 @@ var init_provider_loader = __esm({
       copyDirRecursive(src, dest) {
         fs6.mkdirSync(dest, { recursive: true });
         for (const entry of fs6.readdirSync(src, { withFileTypes: true })) {
-          const srcPath = path14.join(src, entry.name);
-          const destPath = path14.join(dest, entry.name);
+          const srcPath = path13.join(src, entry.name);
+          const destPath = path13.join(dest, entry.name);
           if (entry.isDirectory()) {
             this.copyDirRecursive(srcPath, destPath);
           } else {
@@ -33105,7 +33626,7 @@ var init_provider_loader = __esm({
       /** .meta.json save */
       writeMeta(metaPath, etag, timestamp) {
         try {
-          fs6.mkdirSync(path14.dirname(metaPath), { recursive: true });
+          fs6.mkdirSync(path13.dirname(metaPath), { recursive: true });
           fs6.writeFileSync(metaPath, JSON.stringify({
             etag,
             timestamp,
@@ -33122,7 +33643,7 @@ var init_provider_loader = __esm({
         const scan = (d) => {
           try {
             for (const entry of fs6.readdirSync(d, { withFileTypes: true })) {
-              if (entry.isDirectory()) scan(path14.join(d, entry.name));
+              if (entry.isDirectory()) scan(path13.join(d, entry.name));
               else if (entry.name === "provider.json") count++;
             }
           } catch {
@@ -33307,17 +33828,17 @@ var init_provider_loader = __esm({
         for (const root of searchRoots) {
           if (!fs6.existsSync(root)) continue;
           const candidate = this.getProviderDir(root, cat, type);
-          if (fs6.existsSync(path14.join(candidate, "provider.json"))) return candidate;
-          const catDir = path14.join(root, cat);
+          if (fs6.existsSync(path13.join(candidate, "provider.json"))) return candidate;
+          const catDir = path13.join(root, cat);
           if (fs6.existsSync(catDir)) {
             try {
               for (const entry of fs6.readdirSync(catDir, { withFileTypes: true })) {
                 if (!entry.isDirectory()) continue;
-                const jsonPath = path14.join(catDir, entry.name, "provider.json");
+                const jsonPath = path13.join(catDir, entry.name, "provider.json");
                 if (fs6.existsSync(jsonPath)) {
                   try {
                     const data = JSON.parse(fs6.readFileSync(jsonPath, "utf-8"));
-                    if (data.type === type) return path14.join(catDir, entry.name);
+                    if (data.type === type) return path13.join(catDir, entry.name);
                   } catch {
                   }
                 }
@@ -33334,7 +33855,7 @@ var init_provider_loader = __esm({
        * (template substitution is NOT applied here — scripts.js handles that)
        */
       buildScriptWrappersFromDir(dir) {
-        const scriptsJs = path14.join(dir, "scripts.js");
+        const scriptsJs = path13.join(dir, "scripts.js");
         if (fs6.existsSync(scriptsJs)) {
           try {
             delete require.cache[require.resolve(scriptsJs)];
@@ -33348,7 +33869,7 @@ var init_provider_loader = __esm({
           for (const file2 of fs6.readdirSync(dir)) {
             if (!file2.endsWith(".js")) continue;
             const scriptName = toCamel(file2.replace(".js", ""));
-            const filePath = path14.join(dir, file2);
+            const filePath = path13.join(dir, file2);
             result[scriptName] = (...args) => {
               try {
                 let content = fs6.readFileSync(filePath, "utf-8");
@@ -33408,7 +33929,7 @@ var init_provider_loader = __esm({
           }
           const hasJson = entries.some((e) => e.name === "provider.json");
           if (hasJson) {
-            const jsonPath = path14.join(d, "provider.json");
+            const jsonPath = path13.join(d, "provider.json");
             try {
               const raw = fs6.readFileSync(jsonPath, "utf-8");
               const mod = JSON.parse(raw);
@@ -33429,7 +33950,7 @@ var init_provider_loader = __esm({
                 this.log(`\u26A0 Invalid provider at ${jsonPath}: ${validation.errors.join("; ")}`);
               } else {
                 const hasCompatibility = Array.isArray(normalizedProvider.compatibility);
-                const scriptsPath = path14.join(d, "scripts.js");
+                const scriptsPath = path13.join(d, "scripts.js");
                 if (!hasCompatibility && fs6.existsSync(scriptsPath)) {
                   try {
                     delete require.cache[require.resolve(scriptsPath)];
@@ -33455,7 +33976,7 @@ var init_provider_loader = __esm({
               if (!entry.isDirectory()) continue;
               if (entry.name.startsWith("_") || entry.name.startsWith(".")) continue;
               if (excludeDirs && d === dir && excludeDirs.includes(entry.name)) continue;
-              scan(path14.join(d, entry.name));
+              scan(path13.join(d, entry.name));
             }
           }
         };
@@ -33714,8 +34235,8 @@ function detectCurrentWorkspace(ideId) {
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
-        const storagePath = path15.join(
-          process.env.APPDATA || path15.join(os16.homedir(), "AppData", "Roaming"),
+        const storagePath = path14.join(
+          process.env.APPDATA || path14.join(os16.homedir(), "AppData", "Roaming"),
           appName,
           "storage.json"
         );
@@ -33886,14 +34407,14 @@ async function launchLinux(ide, port, workspace, newWindow) {
 function getAvailableIdeIds() {
   return getProviderLoader().getAvailableIdeTypes();
 }
-var import_child_process6, net2, os16, path15, _providerLoader;
+var import_child_process6, net2, os16, path14, _providerLoader;
 var init_launch = __esm({
   "../../oss/packages/daemon-core/src/launch.ts"() {
     "use strict";
     import_child_process6 = require("child_process");
     net2 = __toESM(require("net"));
     os16 = __toESM(require("os"));
-    path15 = __toESM(require("path"));
+    path14 = __toESM(require("path"));
     init_ide_detector();
     init_provider_loader();
     _providerLoader = null;
@@ -33924,7 +34445,7 @@ function checkRotation() {
   const today = getDateStr2();
   if (today !== currentDate2) {
     currentDate2 = today;
-    currentFile = path16.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+    currentFile = path15.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
     cleanOldFiles();
   }
 }
@@ -33938,7 +34459,7 @@ function cleanOldFiles() {
       const dateMatch = file2.match(/commands-(\d{4}-\d{2}-\d{2})/);
       if (dateMatch && dateMatch[1] < cutoffStr) {
         try {
-          fs7.unlinkSync(path16.join(LOG_DIR2, file2));
+          fs7.unlinkSync(path15.join(LOG_DIR2, file2));
         } catch {
         }
       }
@@ -34007,14 +34528,14 @@ function getRecentCommands(count = 50) {
     return [];
   }
 }
-var fs7, path16, os17, LOG_DIR2, MAX_FILE_SIZE, MAX_DAYS, SENSITIVE_KEYS, currentDate2, currentFile, writeCount2, SKIP_COMMANDS;
+var fs7, path15, os17, LOG_DIR2, MAX_FILE_SIZE, MAX_DAYS, SENSITIVE_KEYS, currentDate2, currentFile, writeCount2, SKIP_COMMANDS;
 var init_command_log = __esm({
   "../../oss/packages/daemon-core/src/logging/command-log.ts"() {
     "use strict";
     fs7 = __toESM(require("fs"));
-    path16 = __toESM(require("path"));
+    path15 = __toESM(require("path"));
     os17 = __toESM(require("os"));
-    LOG_DIR2 = process.platform === "win32" ? path16.join(process.env.LOCALAPPDATA || process.env.APPDATA || path16.join(os17.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path16.join(os17.homedir(), "Library", "Logs", "adhdev") : path16.join(os17.homedir(), ".local", "share", "adhdev", "logs");
+    LOG_DIR2 = process.platform === "win32" ? path15.join(process.env.LOCALAPPDATA || process.env.APPDATA || path15.join(os17.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path15.join(os17.homedir(), "Library", "Logs", "adhdev") : path15.join(os17.homedir(), ".local", "share", "adhdev", "logs");
     MAX_FILE_SIZE = 5 * 1024 * 1024;
     MAX_DAYS = 7;
     try {
@@ -34033,7 +34554,7 @@ var init_command_log = __esm({
       "text"
     ]);
     currentDate2 = getDateStr2();
-    currentFile = path16.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+    currentFile = path15.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
     writeCount2 = 0;
     SKIP_COMMANDS = /* @__PURE__ */ new Set([
       "heartbeat",
@@ -34187,6 +34708,9 @@ function parseMessageTime(value) {
   }
   return 0;
 }
+function getMessageEventTime(message) {
+  return parseMessageTime(message?.receivedAt) || parseMessageTime(message?.timestamp) || 0;
+}
 function stringifyPreviewContent(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) {
@@ -34231,7 +34755,7 @@ function getLastDisplayMessage(session) {
     return {
       role,
       preview,
-      receivedAt: parseMessageTime(candidate?.receivedAt),
+      receivedAt: getMessageEventTime(candidate),
       hash: simplePreviewHash(`${role}:${preview}`)
     };
   }
@@ -34240,7 +34764,7 @@ function getLastDisplayMessage(session) {
 function getSessionMessageUpdatedAt(session) {
   const lastMessage = session.activeChat?.messages?.at?.(-1);
   if (!lastMessage) return 0;
-  return parseMessageTime(lastMessage.receivedAt) || 0;
+  return getMessageEventTime(lastMessage);
 }
 function getSessionCompletionMarker(session) {
   const lastMessage = session.activeChat?.messages?.at?.(-1);
@@ -34250,7 +34774,7 @@ function getSessionCompletionMarker(session) {
   if (typeof lastMessage._turnKey === "string" && lastMessage._turnKey) return `turn:${lastMessage._turnKey}`;
   if (typeof lastMessage.id === "string" && lastMessage.id) return `id:${lastMessage.id}`;
   if (typeof lastMessage.index === "number" && Number.isFinite(lastMessage.index)) return `idx:${lastMessage.index}`;
-  const timestamp = parseMessageTime(lastMessage.receivedAt);
+  const timestamp = getMessageEventTime(lastMessage);
   return timestamp > 0 ? `ts:${timestamp}` : "";
 }
 function getSessionLastUsedAt(session) {
@@ -34390,9 +34914,9 @@ var init_snapshot = __esm({
 // ../../oss/packages/daemon-core/src/commands/upgrade-helper.ts
 function getUpgradeLogPath() {
   const home = os19.homedir();
-  const dir = path17.join(home, ".adhdev");
+  const dir = path16.join(home, ".adhdev");
   fs8.mkdirSync(dir, { recursive: true });
-  return path17.join(dir, "daemon-upgrade.log");
+  return path16.join(dir, "daemon-upgrade.log");
 }
 function appendUpgradeLog(message) {
   const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${message}
@@ -34432,7 +34956,7 @@ async function waitForPidExit(pid, timeoutMs) {
   }
 }
 function stopSessionHostProcesses(appName) {
-  const pidFile = path17.join(os19.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  const pidFile = path16.join(os19.homedir(), ".adhdev", `${appName}-session-host.pid`);
   try {
     if (fs8.existsSync(pidFile)) {
       const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
@@ -34461,7 +34985,7 @@ function stopSessionHostProcesses(appName) {
   }
 }
 function removeDaemonPidFile() {
-  const pidFile = path17.join(os19.homedir(), ".adhdev", "daemon.pid");
+  const pidFile = path16.join(os19.homedir(), ".adhdev", "daemon.pid");
   try {
     fs8.unlinkSync(pidFile);
   } catch {
@@ -34472,7 +34996,7 @@ function cleanupStaleGlobalInstallDirs(pkgName) {
   const npmRoot = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["root", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
   if (!npmRoot) return;
   const npmPrefix = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["prefix", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
-  const binDir = process.platform === "win32" ? npmPrefix : path17.join(npmPrefix, "bin");
+  const binDir = process.platform === "win32" ? npmPrefix : path16.join(npmPrefix, "bin");
   const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
   const binNames = /* @__PURE__ */ new Set([packageBaseName]);
   if (pkgName === "@adhdev/daemon-standalone") {
@@ -34480,25 +35004,25 @@ function cleanupStaleGlobalInstallDirs(pkgName) {
   }
   if (pkgName.startsWith("@")) {
     const [scope, name] = pkgName.split("/");
-    const scopeDir = path17.join(npmRoot, scope);
+    const scopeDir = path16.join(npmRoot, scope);
     if (!fs8.existsSync(scopeDir)) return;
     for (const entry of fs8.readdirSync(scopeDir)) {
       if (!entry.startsWith(`.${name}-`)) continue;
-      fs8.rmSync(path17.join(scopeDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale scoped staging dir: ${path17.join(scopeDir, entry)}`);
+      fs8.rmSync(path16.join(scopeDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale scoped staging dir: ${path16.join(scopeDir, entry)}`);
     }
   } else {
     for (const entry of fs8.readdirSync(npmRoot)) {
       if (!entry.startsWith(`.${pkgName}-`)) continue;
-      fs8.rmSync(path17.join(npmRoot, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale staging dir: ${path17.join(npmRoot, entry)}`);
+      fs8.rmSync(path16.join(npmRoot, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale staging dir: ${path16.join(npmRoot, entry)}`);
     }
   }
   if (fs8.existsSync(binDir)) {
     for (const entry of fs8.readdirSync(binDir)) {
       if (![...binNames].some((name) => entry.startsWith(`.${name}-`))) continue;
-      fs8.rmSync(path17.join(binDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale bin staging entry: ${path17.join(binDir, entry)}`);
+      fs8.rmSync(path16.join(binDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale bin staging entry: ${path16.join(binDir, entry)}`);
     }
   }
 }
@@ -34573,7 +35097,7 @@ async function maybeRunDaemonUpgradeHelperFromEnv() {
     process.exit(1);
   }
 }
-var import_child_process7, import_child_process8, fs8, os19, path17, UPGRADE_HELPER_ENV;
+var import_child_process7, import_child_process8, fs8, os19, path16, UPGRADE_HELPER_ENV;
 var init_upgrade_helper = __esm({
   "../../oss/packages/daemon-core/src/commands/upgrade-helper.ts"() {
     "use strict";
@@ -34581,7 +35105,7 @@ var init_upgrade_helper = __esm({
     import_child_process8 = require("child_process");
     fs8 = __toESM(require("fs"));
     os19 = __toESM(require("os"));
-    path17 = __toESM(require("path"));
+    path16 = __toESM(require("path"));
     UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
   }
 });
@@ -35582,7 +36106,9 @@ var init_provider_adapter = __esm({
   "../../oss/packages/daemon-core/src/agent-stream/provider-adapter.ts"() {
     "use strict";
     init_control_effects();
+    init_read_chat_contract();
     init_provider_patch_state();
+    init_chat_message_normalization();
     ProviderStreamAdapter = class {
       agentType;
       agentName;
@@ -35687,26 +36213,29 @@ var init_provider_adapter = __esm({
             }
             return state2;
           }
+          const validated = validateReadChatResultPayload(data, `${this.agentType} readChat`);
+          const validatedStatus = validated.status;
+          const streamStatus = validatedStatus === "generating" || validatedStatus === "long_generating" ? "streaming" : validatedStatus;
           const state = {
             agentType: this.agentType,
             agentName: this.agentName,
             extensionId: this.extensionId,
-            status: data.status || "idle",
-            messages: data.messages || [],
-            inputContent: data.inputContent || "",
-            activeModal: data.activeModal
+            status: streamStatus,
+            messages: normalizeChatMessages(validated.messages),
+            inputContent: typeof validated.inputContent === "string" ? validated.inputContent : "",
+            ...validated.activeModal ? { activeModal: validated.activeModal } : {}
           };
-          if (typeof data.title === "string" && data.title.trim()) {
-            state.title = data.title.trim();
+          if (typeof validated.title === "string" && validated.title.trim()) {
+            state.title = validated.title.trim();
           }
-          const controlValues = extractProviderControlValues(this.provider.controls, data);
+          const controlValues = extractProviderControlValues(this.provider.controls, validated);
           const surface = resolveProviderStateSurface({
             controlValues,
-            summaryMetadata: data.summaryMetadata
+            summaryMetadata: validated.summaryMetadata
           });
           if (surface.controlValues) state.controlValues = surface.controlValues;
           if (surface.summaryMetadata) state.summaryMetadata = surface.summaryMetadata;
-          const effects = normalizeProviderEffects(data);
+          const effects = normalizeProviderEffects(validated);
           if (effects.length > 0) state.effects = effects;
           if (state.messages.length > 0) {
             this.lastSuccessState = state;
@@ -36643,7 +37172,7 @@ function checkPathExists2(paths) {
   for (const p of paths) {
     if (p.includes("*")) {
       const home = os20.homedir();
-      const resolved = p.replace(/\*/g, home.split(path18.sep).pop() || "");
+      const resolved = p.replace(/\*/g, home.split(path17.sep).pop() || "");
       if (fs10.existsSync(resolved)) return resolved;
     } else {
       if (fs10.existsSync(p)) return p;
@@ -36653,7 +37182,7 @@ function checkPathExists2(paths) {
 }
 function getMacAppVersion(appPath) {
   if ((0, import_os3.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
-  const plistPath = path18.join(appPath, "Contents", "Info.plist");
+  const plistPath = path17.join(appPath, "Contents", "Info.plist");
   if (!fs10.existsSync(plistPath)) return null;
   const raw = runCommand(`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${plistPath}"`);
   return raw || null;
@@ -36679,7 +37208,7 @@ async function detectAllVersions(loader, archive) {
       const cliBin = provider.cli ? findBinary2(provider.cli) : null;
       let resolvedBin = cliBin;
       if (!resolvedBin && appPath && currentOs === "darwin") {
-        const bundled = path18.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
+        const bundled = path17.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
         if (provider.cli && fs10.existsSync(bundled)) resolvedBin = bundled;
       }
       info.installed = !!(appPath || resolvedBin);
@@ -36716,16 +37245,16 @@ async function detectAllVersions(loader, archive) {
   }
   return results;
 }
-var fs10, path18, os20, import_child_process9, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
+var fs10, path17, os20, import_child_process9, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
 var init_version_archive = __esm({
   "../../oss/packages/daemon-core/src/providers/version-archive.ts"() {
     "use strict";
     fs10 = __toESM(require("fs"));
-    path18 = __toESM(require("path"));
+    path17 = __toESM(require("path"));
     os20 = __toESM(require("os"));
     import_child_process9 = require("child_process");
     import_os3 = require("os");
-    ARCHIVE_PATH = path18.join(os20.homedir(), ".adhdev", "version-history.json");
+    ARCHIVE_PATH = path17.join(os20.homedir(), ".adhdev", "version-history.json");
     MAX_ENTRIES_PER_PROVIDER = 20;
     VersionArchive = class {
       history = {};
@@ -36772,7 +37301,7 @@ var init_version_archive = __esm({
       }
       save() {
         try {
-          fs10.mkdirSync(path18.dirname(ARCHIVE_PATH), { recursive: true });
+          fs10.mkdirSync(path17.dirname(ARCHIVE_PATH), { recursive: true });
           fs10.writeFileSync(ARCHIVE_PATH, JSON.stringify(this.history, null, 2));
         } catch {
         }
@@ -37300,17 +37829,17 @@ async function handleScriptHints(ctx, type, _req, res) {
     return;
   }
   let scriptsPath = "";
-  const directScripts = path19.join(dir, "scripts.js");
+  const directScripts = path18.join(dir, "scripts.js");
   if (fs11.existsSync(directScripts)) {
     scriptsPath = directScripts;
   } else {
-    const scriptsDir = path19.join(dir, "scripts");
+    const scriptsDir = path18.join(dir, "scripts");
     if (fs11.existsSync(scriptsDir)) {
       const versions = fs11.readdirSync(scriptsDir).filter((d) => {
-        return fs11.statSync(path19.join(scriptsDir, d)).isDirectory();
+        return fs11.statSync(path18.join(scriptsDir, d)).isDirectory();
       }).sort().reverse();
       for (const ver of versions) {
-        const p = path19.join(scriptsDir, ver, "scripts.js");
+        const p = path18.join(scriptsDir, ver, "scripts.js");
         if (fs11.existsSync(p)) {
           scriptsPath = p;
           break;
@@ -38136,12 +38665,12 @@ async function handleDomContext(ctx, type, req, res) {
     ctx.json(res, 500, { error: `DOM context collection failed: ${e.message}` });
   }
 }
-var fs11, path19;
+var fs11, path18;
 var init_dev_cdp_handlers = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-cdp-handlers.ts"() {
     "use strict";
     fs11 = __toESM(require("fs"));
-    path19 = __toESM(require("path"));
+    path18 = __toESM(require("path"));
     init_logger();
   }
 });
@@ -38156,11 +38685,11 @@ function getCliFixtureDir(ctx, type) {
   if (!providerDir) {
     throw new Error(`Provider directory not found for '${type}'`);
   }
-  return path20.join(providerDir, "fixtures");
+  return path19.join(providerDir, "fixtures");
 }
 function readCliFixture(ctx, type, name) {
   const fixtureDir = getCliFixtureDir(ctx, type);
-  const filePath = path20.join(fixtureDir, `${name}.json`);
+  const filePath = path19.join(fixtureDir, `${name}.json`);
   if (!fs12.existsSync(filePath)) {
     throw new Error(`Fixture not found: ${filePath}`);
   }
@@ -38927,7 +39456,7 @@ async function handleCliFixtureCapture(ctx, req, res) {
       },
       notes: typeof body?.notes === "string" ? body.notes : void 0
     };
-    const filePath = path20.join(fixtureDir, `${name}.json`);
+    const filePath = path19.join(fixtureDir, `${name}.json`);
     fs12.writeFileSync(filePath, JSON.stringify(fixture, null, 2));
     ctx.json(res, 200, {
       saved: true,
@@ -38951,7 +39480,7 @@ async function handleCliFixtureList(ctx, type, _req, res) {
       return;
     }
     const fixtures = fs12.readdirSync(fixtureDir).filter((file2) => file2.endsWith(".json")).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" })).map((file2) => {
-      const fullPath = path20.join(fixtureDir, file2);
+      const fullPath = path19.join(fixtureDir, file2);
       try {
         const raw = JSON.parse(fs12.readFileSync(fullPath, "utf-8"));
         return {
@@ -39084,12 +39613,12 @@ async function handleCliRaw(ctx, req, res) {
     ctx.json(res, 500, { error: `Raw send failed: ${e.message}` });
   }
 }
-var fs12, path20;
+var fs12, path19;
 var init_dev_cli_debug = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-cli-debug.ts"() {
     "use strict";
     fs12 = __toESM(require("fs"));
-    path20 = __toESM(require("path"));
+    path19 = __toESM(require("path"));
   }
 });
 
@@ -39149,22 +39678,22 @@ function getLatestScriptVersionDir(scriptsDir) {
   if (!fs13.existsSync(scriptsDir)) return null;
   const versions = fs13.readdirSync(scriptsDir).filter((d) => {
     try {
-      return fs13.statSync(path21.join(scriptsDir, d)).isDirectory();
+      return fs13.statSync(path20.join(scriptsDir, d)).isDirectory();
     } catch {
       return false;
     }
   }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
   if (versions.length === 0) return null;
-  return path21.join(scriptsDir, versions[0]);
+  return path20.join(scriptsDir, versions[0]);
 }
 function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
-  const canonicalUserDir = path21.resolve(ctx.providerLoader.getUserProviderDir(category, type));
-  const desiredDir = requestedDir ? path21.resolve(requestedDir) : canonicalUserDir;
-  const upstreamRoot = path21.resolve(ctx.providerLoader.getUpstreamDir());
-  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path21.sep}`)) {
+  const canonicalUserDir = path20.resolve(ctx.providerLoader.getUserProviderDir(category, type));
+  const desiredDir = requestedDir ? path20.resolve(requestedDir) : canonicalUserDir;
+  const upstreamRoot = path20.resolve(ctx.providerLoader.getUpstreamDir());
+  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path20.sep}`)) {
     return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
   }
-  if (path21.basename(desiredDir) !== type) {
+  if (path20.basename(desiredDir) !== type) {
     return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
   }
   const sourceDir = ctx.findProviderDir(type);
@@ -39172,11 +39701,11 @@ function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
     return { dir: null, reason: `Provider source directory not found for '${type}'` };
   }
   if (!fs13.existsSync(desiredDir)) {
-    fs13.mkdirSync(path21.dirname(desiredDir), { recursive: true });
+    fs13.mkdirSync(path20.dirname(desiredDir), { recursive: true });
     fs13.cpSync(sourceDir, desiredDir, { recursive: true });
     ctx.log(`Auto-implement writable copy created: ${desiredDir}`);
   }
-  const providerJson = path21.join(desiredDir, "provider.json");
+  const providerJson = path20.join(desiredDir, "provider.json");
   if (!fs13.existsSync(providerJson)) {
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
@@ -39187,13 +39716,13 @@ function loadAutoImplReferenceScripts(ctx, referenceType) {
   const refDir = ctx.findProviderDir(referenceType);
   if (!refDir || !fs13.existsSync(refDir)) return {};
   const referenceScripts = {};
-  const scriptsDir = path21.join(refDir, "scripts");
+  const scriptsDir = path20.join(refDir, "scripts");
   const latestDir = getLatestScriptVersionDir(scriptsDir);
   if (!latestDir) return referenceScripts;
   for (const file2 of fs13.readdirSync(latestDir)) {
     if (!file2.endsWith(".js")) continue;
     try {
-      referenceScripts[file2] = fs13.readFileSync(path21.join(latestDir, file2), "utf-8");
+      referenceScripts[file2] = fs13.readFileSync(path20.join(latestDir, file2), "utf-8");
     } catch {
     }
   }
@@ -39301,9 +39830,9 @@ async function handleAutoImplement(ctx, type, req, res) {
     });
     const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
     const prompt2 = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-    const tmpDir = path21.join(os21.tmpdir(), "adhdev-autoimpl");
+    const tmpDir = path20.join(os21.tmpdir(), "adhdev-autoimpl");
     if (!fs13.existsSync(tmpDir)) fs13.mkdirSync(tmpDir, { recursive: true });
-    const promptFile = path21.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
+    const promptFile = path20.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
     fs13.writeFileSync(promptFile, prompt2, "utf-8");
     ctx.log(`Auto-implement prompt written to ${promptFile} (${prompt2.length} chars)`);
     const agentProvider = ctx.providerLoader.resolve(agent) || ctx.providerLoader.getMeta(agent);
@@ -39740,7 +40269,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     setMode: "set_mode.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path21.join(providerDir, "scripts");
+  const scriptsDir = path20.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -39751,7 +40280,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     for (const file2 of fs13.readdirSync(latestScriptsDir)) {
       if (file2.endsWith(".js") && targetFileNames.has(file2)) {
         try {
-          const content = fs13.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+          const content = fs13.readFileSync(path20.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -39768,7 +40297,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
       for (const file2 of refFiles) {
         try {
-          const content = fs13.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+          const content = fs13.readFileSync(path20.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -39809,10 +40338,10 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
     }
   }
-  const docsDir = path21.join(providerDir, "../../docs");
+  const docsDir = path20.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path21.join(docsDir, name);
+      const p = path20.join(docsDir, name);
       if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
     } catch {
     }
@@ -40049,7 +40578,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
     parseApproval: "parse_approval.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path21.join(providerDir, "scripts");
+  const scriptsDir = path20.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -40061,7 +40590,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       if (!file2.endsWith(".js")) continue;
       if (!targetFileNames.has(file2)) continue;
       try {
-        const content = fs13.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+        const content = fs13.readFileSync(path20.join(latestScriptsDir, file2), "utf-8");
         lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
         lines.push("```javascript");
         lines.push(content);
@@ -40077,7 +40606,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
       for (const file2 of refFiles) {
         try {
-          const content = fs13.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+          const content = fs13.readFileSync(path20.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -40110,10 +40639,10 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
     }
   }
-  const docsDir = path21.join(providerDir, "../../docs");
+  const docsDir = path20.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path21.join(docsDir, name);
+      const p = path20.join(docsDir, name);
       if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
     } catch {
     }
@@ -40425,12 +40954,12 @@ data: ${JSON.stringify(msg.data)}
     }
   }
 }
-var fs13, path21, os21;
+var fs13, path20, os21;
 var init_dev_auto_implement = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-auto-implement.ts"() {
     "use strict";
     fs13 = __toESM(require("fs"));
-    path21 = __toESM(require("path"));
+    path20 = __toESM(require("path"));
     os21 = __toESM(require("os"));
     init_dev_server();
     init_dev_cli_debug();
@@ -40470,13 +40999,13 @@ function toProviderListEntry(provider) {
   }
   return base;
 }
-var http2, fs14, path23, DEV_SERVER_PORT, DevServer;
+var http2, fs14, path21, DEV_SERVER_PORT, DevServer;
 var init_dev_server = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-server.ts"() {
     "use strict";
     http2 = __toESM(require("http"));
     fs14 = __toESM(require("fs"));
-    path23 = __toESM(require("path"));
+    path21 = __toESM(require("path"));
     init_provider_schema();
     init_config();
     init_provider_source_config();
@@ -40588,8 +41117,8 @@ var init_dev_server = __esm({
       }
       getEndpointList() {
         return this.routes.map((r) => {
-          const path30 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-          return `${r.method.padEnd(5)} ${path30}`;
+          const path29 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path29}`;
         });
       }
       async start(port = DEV_SERVER_PORT) {
@@ -40870,12 +41399,12 @@ var init_dev_server = __esm({
       // ─── DevConsole SPA ───
       getConsoleDistDir() {
         const candidates = [
-          path23.resolve(__dirname, "../../web-devconsole/dist"),
-          path23.resolve(__dirname, "../../../web-devconsole/dist"),
-          path23.join(process.cwd(), "packages/web-devconsole/dist")
+          path21.resolve(__dirname, "../../web-devconsole/dist"),
+          path21.resolve(__dirname, "../../../web-devconsole/dist"),
+          path21.join(process.cwd(), "packages/web-devconsole/dist")
         ];
         for (const dir of candidates) {
-          if (fs14.existsSync(path23.join(dir, "index.html"))) return dir;
+          if (fs14.existsSync(path21.join(dir, "index.html"))) return dir;
         }
         return null;
       }
@@ -40885,7 +41414,7 @@ var init_dev_server = __esm({
           this.json(res, 500, { error: "DevConsole not found. Run: npm run build -w packages/web-devconsole" });
           return;
         }
-        const htmlPath = path23.join(distDir, "index.html");
+        const htmlPath = path21.join(distDir, "index.html");
         try {
           const html = fs14.readFileSync(htmlPath, "utf-8");
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -40910,15 +41439,15 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: "Not found" });
           return;
         }
-        const safePath = path23.normalize(pathname).replace(/^\.\.\//, "");
-        const filePath = path23.join(distDir, safePath);
+        const safePath = path21.normalize(pathname).replace(/^\.\.\//, "");
+        const filePath = path21.join(distDir, safePath);
         if (!filePath.startsWith(distDir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
         }
         try {
           const content = fs14.readFileSync(filePath);
-          const ext = path23.extname(filePath);
+          const ext = path21.extname(filePath);
           const contentType = _DevServer.MIME_MAP[ext] || "application/octet-stream";
           res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "public, max-age=31536000, immutable" });
           res.end(content);
@@ -41031,9 +41560,9 @@ var init_dev_server = __esm({
               const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
               if (entry.isDirectory()) {
                 files.push({ path: rel, size: 0, type: "dir" });
-                scan(path23.join(d, entry.name), rel);
+                scan(path21.join(d, entry.name), rel);
               } else {
-                const stat4 = fs14.statSync(path23.join(d, entry.name));
+                const stat4 = fs14.statSync(path21.join(d, entry.name));
                 files.push({ path: rel, size: stat4.size, type: "file" });
               }
             }
@@ -41056,7 +41585,7 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path23.resolve(dir, path23.normalize(filePath));
+        const fullPath = path21.resolve(dir, path21.normalize(filePath));
         if (!fullPath.startsWith(dir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
@@ -41081,14 +41610,14 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path23.resolve(dir, path23.normalize(filePath));
+        const fullPath = path21.resolve(dir, path21.normalize(filePath));
         if (!fullPath.startsWith(dir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
         }
         try {
           if (fs14.existsSync(fullPath)) fs14.copyFileSync(fullPath, fullPath + ".bak");
-          fs14.mkdirSync(path23.dirname(fullPath), { recursive: true });
+          fs14.mkdirSync(path21.dirname(fullPath), { recursive: true });
           fs14.writeFileSync(fullPath, content, "utf-8");
           this.log(`File saved: ${fullPath} (${content.length} chars)`);
           this.providerLoader.reload();
@@ -41105,7 +41634,7 @@ var init_dev_server = __esm({
           return;
         }
         for (const name of ["scripts.js", "provider.json"]) {
-          const p = path23.join(dir, name);
+          const p = path21.join(dir, name);
           if (fs14.existsSync(p)) {
             const source = fs14.readFileSync(p, "utf-8");
             this.json(res, 200, { type, path: p, source, lines: source.split("\n").length });
@@ -41126,8 +41655,8 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const target = fs14.existsSync(path23.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
-        const targetPath = path23.join(dir, target);
+        const target = fs14.existsSync(path21.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
+        const targetPath = path21.join(dir, target);
         try {
           if (fs14.existsSync(targetPath)) fs14.copyFileSync(targetPath, targetPath + ".bak");
           fs14.writeFileSync(targetPath, source, "utf-8");
@@ -41274,7 +41803,7 @@ var init_dev_server = __esm({
         }
         let targetDir;
         targetDir = this.providerLoader.getUserProviderDir(category, type);
-        const jsonPath = path23.join(targetDir, "provider.json");
+        const jsonPath = path21.join(targetDir, "provider.json");
         if (fs14.existsSync(jsonPath)) {
           this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
           return;
@@ -41286,8 +41815,8 @@ var init_dev_server = __esm({
           const createdFiles = ["provider.json"];
           if (result.files) {
             for (const [relPath, content] of Object.entries(result.files)) {
-              const fullPath = path23.join(targetDir, relPath);
-              fs14.mkdirSync(path23.dirname(fullPath), { recursive: true });
+              const fullPath = path21.join(targetDir, relPath);
+              fs14.mkdirSync(path21.dirname(fullPath), { recursive: true });
               fs14.writeFileSync(fullPath, content, "utf-8");
               createdFiles.push(relPath);
             }
@@ -41340,22 +41869,22 @@ var init_dev_server = __esm({
         if (!fs14.existsSync(scriptsDir)) return null;
         const versions = fs14.readdirSync(scriptsDir).filter((d) => {
           try {
-            return fs14.statSync(path23.join(scriptsDir, d)).isDirectory();
+            return fs14.statSync(path21.join(scriptsDir, d)).isDirectory();
           } catch {
             return false;
           }
         }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
         if (versions.length === 0) return null;
-        return path23.join(scriptsDir, versions[0]);
+        return path21.join(scriptsDir, versions[0]);
       }
       resolveAutoImplWritableProviderDir(category, type, requestedDir) {
-        const canonicalUserDir = path23.resolve(this.providerLoader.getUserProviderDir(category, type));
-        const desiredDir = requestedDir ? path23.resolve(requestedDir) : canonicalUserDir;
-        const upstreamRoot = path23.resolve(this.providerLoader.getUpstreamDir());
-        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path23.sep}`)) {
+        const canonicalUserDir = path21.resolve(this.providerLoader.getUserProviderDir(category, type));
+        const desiredDir = requestedDir ? path21.resolve(requestedDir) : canonicalUserDir;
+        const upstreamRoot = path21.resolve(this.providerLoader.getUpstreamDir());
+        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path21.sep}`)) {
           return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
         }
-        if (path23.basename(desiredDir) !== type) {
+        if (path21.basename(desiredDir) !== type) {
           return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
         }
         const sourceDir = this.findProviderDir(type);
@@ -41363,11 +41892,11 @@ var init_dev_server = __esm({
           return { dir: null, reason: `Provider source directory not found for '${type}'` };
         }
         if (!fs14.existsSync(desiredDir)) {
-          fs14.mkdirSync(path23.dirname(desiredDir), { recursive: true });
+          fs14.mkdirSync(path21.dirname(desiredDir), { recursive: true });
           fs14.cpSync(sourceDir, desiredDir, { recursive: true });
           this.log(`Auto-implement writable copy created: ${desiredDir}`);
         }
-        const providerJson = path23.join(desiredDir, "provider.json");
+        const providerJson = path21.join(desiredDir, "provider.json");
         if (!fs14.existsSync(providerJson)) {
           return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
         }
@@ -41403,7 +41932,7 @@ var init_dev_server = __esm({
           setMode: "set_mode.js"
         };
         const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-        const scriptsDir = path23.join(providerDir, "scripts");
+        const scriptsDir = path21.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -41414,7 +41943,7 @@ var init_dev_server = __esm({
           for (const file2 of fs14.readdirSync(latestScriptsDir)) {
             if (file2.endsWith(".js") && targetFileNames.has(file2)) {
               try {
-                const content = fs14.readFileSync(path23.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -41431,7 +41960,7 @@ var init_dev_server = __esm({
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs14.readFileSync(path23.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -41472,10 +42001,10 @@ var init_dev_server = __esm({
             lines.push("");
           }
         }
-        const docsDir = path23.join(providerDir, "../../docs");
+        const docsDir = path21.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path23.join(docsDir, name);
+            const p = path21.join(docsDir, name);
             if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
           } catch {
           }
@@ -41649,7 +42178,7 @@ var init_dev_server = __esm({
           parseApproval: "parse_approval.js"
         };
         const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-        const scriptsDir = path23.join(providerDir, "scripts");
+        const scriptsDir = path21.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -41661,7 +42190,7 @@ var init_dev_server = __esm({
             if (!file2.endsWith(".js")) continue;
             if (!targetFileNames.has(file2)) continue;
             try {
-              const content = fs14.readFileSync(path23.join(latestScriptsDir, file2), "utf-8");
+              const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
               lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
               lines.push("```javascript");
               lines.push(content);
@@ -41677,7 +42206,7 @@ var init_dev_server = __esm({
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs14.readFileSync(path23.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -41710,10 +42239,10 @@ var init_dev_server = __esm({
             lines.push("");
           }
         }
-        const docsDir = path23.join(providerDir, "../../docs");
+        const docsDir = path21.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path23.join(docsDir, name);
+            const p = path21.join(docsDir, name);
             if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
           } catch {
           }
@@ -42963,6 +43492,8 @@ __export(src_exports, {
   CdpDomHandlers: () => CdpDomHandlers,
   CliProviderInstance: () => CliProviderInstance,
   DAEMON_WS_PATH: () => DAEMON_WS_PATH,
+  DEFAULT_ACTIVE_CHAT_POLL_STATUSES: () => DEFAULT_ACTIVE_CHAT_POLL_STATUSES,
+  DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS: () => DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS,
   DEFAULT_DAEMON_PORT: () => DEFAULT_DAEMON_PORT,
   DEFAULT_SESSION_HOST_APP_NAME: () => DEFAULT_SESSION_HOST_APP_NAME,
   DEFAULT_STANDALONE_SESSION_HOST_APP_NAME: () => DEFAULT_STANDALONE_SESSION_HOST_APP_NAME,
@@ -42991,7 +43522,11 @@ __export(src_exports, {
   buildSessionEntries: () => buildSessionEntries,
   buildStatusSnapshot: () => buildStatusSnapshot,
   buildSystemChatMessage: () => buildSystemChatMessage,
+  buildTerminalChatMessage: () => buildTerminalChatMessage,
+  buildThoughtChatMessage: () => buildThoughtChatMessage,
+  buildToolChatMessage: () => buildToolChatMessage,
   buildUserChatMessage: () => buildUserChatMessage,
+  classifyHotChatSessionsForSubscriptionFlush: () => classifyHotChatSessionsForSubscriptionFlush,
   clearDebugTrace: () => clearDebugTrace,
   configureDebugTraceStore: () => configureDebugTraceStore,
   connectCdpManager: () => connectCdpManager,
@@ -43058,6 +43593,7 @@ __export(src_exports, {
   resetConfig: () => resetConfig,
   resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
   resetState: () => resetState,
+  resolveChatMessageKind: () => resolveChatMessageKind,
   resolveDebugRuntimeConfig: () => resolveDebugRuntimeConfig,
   resolveSessionHostAppName: () => resolveSessionHostAppName,
   saveConfig: () => saveConfig,
@@ -43084,6 +43620,7 @@ var init_src = __esm({
     init_ide_detector();
     init_cli_detector();
     init_host_memory();
+    init_chat_tail_hot_sessions();
     init_manager();
     init_devtools();
     init_setup();
@@ -44167,12 +44704,12 @@ var init_peer_connection_manager = __esm({
 });
 
 // src/daemon-p2p/index.ts
-var fs15, path24, import_node_module2, esmRequire, DaemonP2PSender;
+var fs15, path23, import_node_module2, esmRequire, DaemonP2PSender;
 var init_daemon_p2p = __esm({
   "src/daemon-p2p/index.ts"() {
     "use strict";
     fs15 = __toESM(require("fs"));
-    path24 = __toESM(require("path"));
+    path23 = __toESM(require("path"));
     import_node_module2 = require("module");
     init_data_channel_router();
     init_screenshot_sender();
@@ -44245,15 +44782,15 @@ ${e?.stack || ""}`);
         const prebuildKey = `${platform13}-${arch4}`;
         try {
           const candidates = [
-            path24.join(__dirname, "node_modules", "node-datachannel"),
-            path24.join(__dirname, "..", "node_modules", "node-datachannel"),
-            path24.join(__dirname, "..", "..", "node_modules", "node-datachannel")
+            path23.join(__dirname, "node_modules", "node-datachannel"),
+            path23.join(__dirname, "..", "node_modules", "node-datachannel"),
+            path23.join(__dirname, "..", "..", "node_modules", "node-datachannel")
           ];
           for (const candidate of candidates) {
-            const prebuildPath = path24.join(candidate, "prebuilds", prebuildKey, "node_datachannel.node");
+            const prebuildPath = path23.join(candidate, "prebuilds", prebuildKey, "node_datachannel.node");
             if (fs15.existsSync(prebuildPath)) {
-              const targetDir = path24.join(candidate, "build", "Release");
-              const targetPath = path24.join(targetDir, "node_datachannel.node");
+              const targetDir = path23.join(candidate, "build", "Release");
+              const targetPath = path23.join(targetDir, "node_datachannel.node");
               fs15.mkdirSync(targetDir, { recursive: true });
               fs15.copyFileSync(prebuildPath, targetPath);
               try {
@@ -44575,16 +45112,16 @@ var require_filesystem = __commonJS({
     var LDD_PATH = "/usr/bin/ldd";
     var SELF_PATH = "/proc/self/exe";
     var MAX_LENGTH = 2048;
-    var readFileSync19 = (path30) => {
-      const fd = fs24.openSync(path30, "r");
+    var readFileSync19 = (path29) => {
+      const fd = fs24.openSync(path29, "r");
       const buffer = Buffer.alloc(MAX_LENGTH);
       const bytesRead = fs24.readSync(fd, buffer, 0, MAX_LENGTH, 0);
       fs24.close(fd, () => {
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile = (path30) => new Promise((resolve15, reject) => {
-      fs24.open(path30, "r", (err, fd) => {
+    var readFile = (path29) => new Promise((resolve15, reject) => {
+      fs24.open(path29, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
@@ -44703,11 +45240,11 @@ var require_detect_libc = __commonJS({
       }
       return null;
     };
-    var familyFromInterpreterPath = (path30) => {
-      if (path30) {
-        if (path30.includes("/ld-musl-")) {
+    var familyFromInterpreterPath = (path29) => {
+      if (path29) {
+        if (path29.includes("/ld-musl-")) {
           return MUSL;
-        } else if (path30.includes("/ld-linux-")) {
+        } else if (path29.includes("/ld-linux-")) {
           return GLIBC;
         }
       }
@@ -44754,8 +45291,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = await readFile(SELF_PATH);
-        const path30 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path30);
+        const path29 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path29);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -44767,8 +45304,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = readFileSync19(SELF_PATH);
-        const path30 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path30);
+        const path29 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path29);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -46487,18 +47024,18 @@ var require_sharp = __commonJS({
       `@img/sharp-${runtimePlatform}/sharp.node`,
       "@img/sharp-wasm32/sharp.node"
     ];
-    var path30;
+    var path29;
     var sharp;
     var errors = [];
-    for (path30 of paths) {
+    for (path29 of paths) {
       try {
-        sharp = require(path30);
+        sharp = require(path29);
         break;
       } catch (err) {
         errors.push(err);
       }
     }
-    if (sharp && path30.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
+    if (sharp && path29.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
       const err = new Error("Prebuilt binaries for linux-x64 require v2 microarchitecture");
       err.code = "Unsupported CPU";
       errors.push(err);
@@ -49407,15 +49944,15 @@ var require_color = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path30 = [graph[toModel].parent, toModel];
+      const path29 = [graph[toModel].parent, toModel];
       let fn = conversions_default[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path30.unshift(graph[cur].parent);
+        path29.unshift(graph[cur].parent);
         fn = link(conversions_default[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path30;
+      fn.conversion = path29;
       return fn;
     }
     function route(fromModel) {
@@ -50032,7 +50569,7 @@ var require_channel = __commonJS({
 var require_output = __commonJS({
   "../../node_modules/sharp/lib/output.js"(exports2, module2) {
     "use strict";
-    var path30 = require("path");
+    var path29 = require("path");
     var is = require_is();
     var sharp = require_sharp();
     var formats = /* @__PURE__ */ new Map([
@@ -50063,9 +50600,9 @@ var require_output = __commonJS({
       let err;
       if (!is.string(fileOut)) {
         err = new Error("Missing output file path");
-      } else if (is.string(this.options.input.file) && path30.resolve(this.options.input.file) === path30.resolve(fileOut)) {
+      } else if (is.string(this.options.input.file) && path29.resolve(this.options.input.file) === path29.resolve(fileOut)) {
         err = new Error("Cannot use same file for input and output");
-      } else if (jp2Regex.test(path30.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
+      } else if (jp2Regex.test(path29.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
         err = errJp2Save();
       }
       if (err) {
@@ -51307,11 +51844,11 @@ function quarantineLegacyStandaloneSessions(options) {
   const homeDir = options.homeDir || os23.homedir();
   const now = options.now || (() => /* @__PURE__ */ new Date());
   const isPidRunning = options.isPidRunning || defaultPidRunning;
-  const runtimesDir = path25.join(homeDir, ".adhdev", "session-host", options.appName, "runtimes");
+  const runtimesDir = path24.join(homeDir, ".adhdev", "session-host", options.appName, "runtimes");
   if (!fs16.existsSync(runtimesDir)) {
     return { movedCount: 0, skippedActiveCount: 0, backupDir: null };
   }
-  const candidates = fs16.readdirSync(runtimesDir).filter((name) => name.endsWith(".json")).map((name) => path25.join(runtimesDir, name));
+  const candidates = fs16.readdirSync(runtimesDir).filter((name) => name.endsWith(".json")).map((name) => path24.join(runtimesDir, name));
   let movedCount = 0;
   let skippedActiveCount = 0;
   let backupDir = null;
@@ -51329,26 +51866,26 @@ function quarantineLegacyStandaloneSessions(options) {
       continue;
     }
     if (!backupDir) {
-      backupDir = path25.join(
+      backupDir = path24.join(
         homeDir,
         ".adhdev",
         "session-host-backups",
         `legacy-standalone-${options.appName}-${formatTimestamp(now())}`
       );
-      fs16.mkdirSync(path25.join(backupDir, "runtimes"), { recursive: true });
+      fs16.mkdirSync(path24.join(backupDir, "runtimes"), { recursive: true });
     }
-    fs16.renameSync(sourcePath, path25.join(backupDir, "runtimes", path25.basename(sourcePath)));
+    fs16.renameSync(sourcePath, path24.join(backupDir, "runtimes", path24.basename(sourcePath)));
     movedCount += 1;
   }
   return { movedCount, skippedActiveCount, backupDir };
 }
-var fs16, os23, path25, LEGACY_STANDALONE_MANAGER_TAG;
+var fs16, os23, path24, LEGACY_STANDALONE_MANAGER_TAG;
 var init_session_host_hygiene = __esm({
   "src/session-host-hygiene.ts"() {
     "use strict";
     fs16 = __toESM(require("fs"));
     os23 = __toESM(require("os"));
-    path25 = __toESM(require("path"));
+    path24 = __toESM(require("path"));
     init_src();
     LEGACY_STANDALONE_MANAGER_TAG = "adhdev-standalone";
   }
@@ -51362,8 +51899,8 @@ function buildSessionHostEnv(baseEnv) {
 }
 function resolveSessionHostEntry() {
   const packagedCandidates = [
-    path26.resolve(__dirname, "../vendor/session-host-daemon/index.js"),
-    path26.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
+    path25.resolve(__dirname, "../vendor/session-host-daemon/index.js"),
+    path25.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
   ];
   for (const candidate of packagedCandidates) {
     if (fs17.existsSync(candidate)) {
@@ -51373,7 +51910,7 @@ function resolveSessionHostEntry() {
   return require.resolve("@adhdev/session-host-daemon");
 }
 function getSessionHostPidFile() {
-  return path26.join(os24.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
+  return path25.join(os24.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
 }
 function killPid2(pid) {
   try {
@@ -51490,9 +52027,9 @@ async function ensureSessionHostReady2() {
   }
   const spawnHost = () => {
     const entry = resolveSessionHostEntry();
-    const logDir = path26.join(os24.homedir(), ".adhdev", "logs");
+    const logDir = path25.join(os24.homedir(), ".adhdev", "logs");
     fs17.mkdirSync(logDir, { recursive: true });
-    const logFd = fs17.openSync(path26.join(logDir, "session-host.log"), "a");
+    const logFd = fs17.openSync(path25.join(logDir, "session-host.log"), "a");
     const child = (0, import_child_process11.spawn)(process.execPath, [entry], {
       detached: true,
       stdio: ["ignore", logFd, logFd],
@@ -51527,14 +52064,14 @@ async function ensureSessionHostReady2() {
 async function listHostedCliRuntimes2(endpoint) {
   return listHostedCliRuntimes(endpoint);
 }
-var import_child_process11, fs17, os24, path26, SESSION_HOST_APP_NAME, SESSION_HOST_START_TIMEOUT_MS;
+var import_child_process11, fs17, os24, path25, SESSION_HOST_APP_NAME, SESSION_HOST_START_TIMEOUT_MS;
 var init_session_host = __esm({
   "src/session-host.ts"() {
     "use strict";
     import_child_process11 = require("child_process");
     fs17 = __toESM(require("fs"));
     os24 = __toESM(require("os"));
-    path26 = __toESM(require("path"));
+    path25 = __toESM(require("path"));
     init_src();
     init_dist();
     init_session_host_hygiene();
@@ -52295,10 +52832,10 @@ function resolveDaemonPort(ref = {}) {
   return Number.isFinite(ref.port) && Number(ref.port) > 0 ? Number(ref.port) : DEFAULT_DAEMON_PORT;
 }
 function getDaemonPidFile(ref = {}) {
-  const dir = path27.join(ref.homeDir || os26.homedir(), ".adhdev");
+  const dir = path26.join(ref.homeDir || os26.homedir(), ".adhdev");
   if (!fs18.existsSync(dir)) fs18.mkdirSync(dir, { recursive: true });
   const port = resolveDaemonPort(ref);
-  return path27.join(dir, port === DEFAULT_DAEMON_PORT ? "daemon.pid" : `daemon-${port}.pid`);
+  return path26.join(dir, port === DEFAULT_DAEMON_PORT ? "daemon.pid" : `daemon-${port}.pid`);
 }
 function writeDaemonPid(pid, ref = {}) {
   const pidFile = getDaemonPidFile(ref);
@@ -52403,7 +52940,7 @@ function stopDaemon(ref = {}) {
     return false;
   }
 }
-var os26, fs18, path27, import_http, import_ws3, pkgVersion, ACTIVE_CHAT_POLL_STATUSES, AdhdevDaemon;
+var os26, fs18, path26, import_http, import_ws3, pkgVersion, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
@@ -52417,17 +52954,13 @@ var init_adhdev_daemon = __esm({
     init_session_host_controller();
     os26 = __toESM(require("os"));
     fs18 = __toESM(require("fs"));
-    path27 = __toESM(require("path"));
+    path26 = __toESM(require("path"));
     import_http = require("http");
     import_ws3 = require("ws");
     init_source2();
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.63" });
-    ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
-      "generating",
-      "waiting_approval",
-      "starting"
-    ]);
+    init_src();
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.66" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -52654,14 +53187,12 @@ var init_adhdev_daemon = __esm({
       }
       getHotChatSessionIdsForP2PFlush() {
         const snapshot = this.buildLiveStatusSnapshot();
-        const active = new Set(
-          snapshot.sessions.filter((session) => ACTIVE_CHAT_POLL_STATUSES.has(String(session.status || "").toLowerCase())).map((session) => session.id)
-        );
-        const finalizing = new Set(
-          Array.from(this.hotP2PChatSessionIds).filter((sessionId) => !active.has(sessionId))
+        const hotSessions = classifyHotChatSessionsForSubscriptionFlush(
+          snapshot.sessions,
+          this.hotP2PChatSessionIds
         );
-        this.hotP2PChatSessionIds = active;
-        return { active, finalizing };
+        this.hotP2PChatSessionIds = hotSessions.active;
+        return hotSessions;
       }
       async flushP2PChatSubscriptions(options = {}) {
         if (!this.p2p?.isConnected || !this.p2p.hasChatSubscriptions()) return;
@@ -64843,15 +65374,15 @@ var require_route = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path30 = [graph[toModel].parent, toModel];
+      const path29 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path30.unshift(graph[cur].parent);
+        path29.unshift(graph[cur].parent);
         fn = link(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path30;
+      fn.conversion = path29;
       return fn;
     }
     module2.exports = function(fromModel) {
@@ -82721,9 +83252,9 @@ var init_prompt = __esm({
     init_utils();
     init_baseUI();
     _ = {
-      set: (obj, path30 = "", value) => {
+      set: (obj, path29 = "", value) => {
         let pointer = obj;
-        path30.split(".").forEach((key, index, arr) => {
+        path29.split(".").forEach((key, index, arr) => {
           if (key === "__proto__" || key === "constructor") return;
           if (index === arr.length - 1) {
             pointer[key] = value;
@@ -82733,8 +83264,8 @@ var init_prompt = __esm({
           pointer = pointer[key];
         });
       },
-      get: (obj, path30 = "", defaultValue) => {
-        const travel = (regexp) => String.prototype.split.call(path30, regexp).filter(Boolean).reduce(
+      get: (obj, path29 = "", defaultValue) => {
+        const travel = (regexp) => String.prototype.split.call(path29, regexp).filter(Boolean).reduce(
           // @ts-expect-error implicit any on res[key]
           (res, key) => res !== null && res !== void 0 ? res[key] : res,
           obj