@adhdev/daemon-standalone 0.9.63 → 0.9.65

package/dist/index.js

@@ -28356,681 +28356,165 @@ var require_dist2 = __commonJS({
         LOG_PATH = path9.join(LOG_DIR, `daemon-${getDateStr()}.log`);
       }
     });
-    function normalizeInputEnvelope(input) {
-      const normalized = normalizeInputEnvelopePayload(input);
-      const textFallback = normalized.textFallback ?? flattenInputParts(normalized.parts);
+    function normalizeCategories(categories) {
+      if (!Array.isArray(categories)) return [];
+      return categories.map((category) => String(category || "").trim()).filter(Boolean);
+    }
+    function resolveDebugRuntimeConfig(options = {}) {
+      const dev = options.dev === true;
       return {
-        parts: normalized.parts,
-        textFallback,
-        ...normalized.metadata ? { metadata: normalized.metadata } : {}
+        logLevel: options.logLevel || (dev ? "debug" : DEFAULT_CONFIG2.logLevel),
+        collectDebugTrace: typeof options.trace === "boolean" ? options.trace : dev,
+        traceContent: options.traceContent === true,
+        traceBufferSize: Number.isFinite(options.traceBufferSize) ? Math.max(10, Math.floor(options.traceBufferSize)) : dev ? DEV_TRACE_BUFFER_SIZE : DEFAULT_CONFIG2.traceBufferSize,
+        traceCategories: normalizeCategories(options.traceCategories)
       };
     }
-    function normalizeMessageParts(content) {
-      if (typeof content === "string") return [{ type: "text", text: content }];
-      if (!Array.isArray(content)) {
-        if (content && typeof content === "object" && typeof content.text === "string") {
-          return [{ type: "text", text: String(content.text) }];
-        }
-        return [];
-      }
-      const parts = [];
-      for (const raw of content) {
-        if (typeof raw === "string") {
-          parts.push({ type: "text", text: raw });
-          continue;
-        }
-        if (!raw || typeof raw !== "object") continue;
-        const part = normalizeMessagePartObject(raw);
-        if (part) parts.push(part);
-      }
-      return parts;
+    function setDebugRuntimeConfig(config2) {
+      currentConfig = {
+        ...config2,
+        traceCategories: normalizeCategories(config2.traceCategories),
+        traceBufferSize: Math.max(10, Math.floor(config2.traceBufferSize || DEFAULT_CONFIG2.traceBufferSize))
+      };
     }
-    function flattenMessageParts(parts) {
-      return parts.map((part) => {
-        if (part.type === "text") return part.text;
-        if (part.type === "resource") return part.resource.text || "";
-        return "";
-      }).filter((value) => value.length > 0).join("\n");
+    function getDebugRuntimeConfig() {
+      return { ...currentConfig, traceCategories: [...currentConfig.traceCategories] };
     }
-    function normalizeInputEnvelopePayload(input) {
-      if (typeof input === "string") {
-        return { parts: [{ type: "text", text: input }], textFallback: input };
-      }
-      if (!input || typeof input !== "object") {
-        return { parts: [], textFallback: "" };
-      }
-      const record2 = input;
-      const nestedInput = record2.input;
-      if (nestedInput && typeof nestedInput === "object") {
-        const nested = nestedInput;
-        return {
-          parts: normalizeInputParts(nested.parts ?? nested.prompt),
-          textFallback: typeof nested.textFallback === "string" ? nested.textFallback : void 0,
-          metadata: normalizeInputMetadata(nested.metadata)
+    function resetDebugRuntimeConfig() {
+      currentConfig = { ...DEFAULT_CONFIG2 };
+    }
+    function shouldCollectTraceCategory(category) {
+      const config2 = currentConfig;
+      if (!config2.collectDebugTrace) return false;
+      if (!category) return true;
+      if (config2.traceCategories.length === 0) return true;
+      return config2.traceCategories.includes(category);
+    }
+    var NORMAL_TRACE_BUFFER_SIZE;
+    var DEV_TRACE_BUFFER_SIZE;
+    var DEFAULT_CONFIG2;
+    var currentConfig;
+    var init_debug_config = __esm2({
+      "src/logging/debug-config.ts"() {
+        "use strict";
+        NORMAL_TRACE_BUFFER_SIZE = 200;
+        DEV_TRACE_BUFFER_SIZE = 1e3;
+        DEFAULT_CONFIG2 = {
+          logLevel: "info",
+          collectDebugTrace: false,
+          traceContent: false,
+          traceBufferSize: NORMAL_TRACE_BUFFER_SIZE,
+          traceCategories: []
         };
+        currentConfig = { ...DEFAULT_CONFIG2 };
       }
-      const directText = typeof record2.text === "string" ? record2.text : typeof record2.message === "string" ? record2.message : void 0;
-      if (directText !== void 0) {
-        return { parts: [{ type: "text", text: directText }], textFallback: directText };
-      }
-      const directParts = normalizeInputParts(record2.parts ?? record2.prompt);
-      return {
-        parts: directParts,
-        textFallback: typeof record2.textFallback === "string" ? record2.textFallback : void 0,
-        metadata: normalizeInputMetadata(record2.metadata)
-      };
+    });
+    function isModuleNotFoundError(error48, ref) {
+      if (!(error48 instanceof Error)) return false;
+      const message = error48.message || "";
+      const code = "code" in error48 ? error48.code : void 0;
+      return code === "MODULE_NOT_FOUND" && message.includes(ref);
     }
-    function normalizeInputMetadata(value) {
-      if (!value || typeof value !== "object") return void 0;
-      const record2 = value;
-      const metadata = {};
-      if (record2.source === "dashboard" || record2.source === "shortcut_api" || record2.source === "provider_script" || record2.source === "session_replay") {
-        metadata.source = record2.source;
-      }
-      if (typeof record2.clientTimestamp === "number" && Number.isFinite(record2.clientTimestamp)) {
-        metadata.clientTimestamp = record2.clientTimestamp;
+    function normalizeBinding(mod, ref) {
+      const binding = mod?.default?.createTerminal ? mod.default : mod?.createTerminal ? mod : null;
+      if (!binding) {
+        throw new Error(`Ghostty VT binding "${ref}" does not export createTerminal()`);
       }
-      return Object.keys(metadata).length > 0 ? metadata : void 0;
+      return binding;
     }
-    function normalizeInputParts(value) {
-      if (!Array.isArray(value)) return [];
-      const parts = [];
-      for (const raw of value) {
-        if (typeof raw === "string") {
-          parts.push({ type: "text", text: raw });
-          continue;
-        }
-        if (!raw || typeof raw !== "object") continue;
-        const part = normalizeInputPartObject(raw);
-        if (part) parts.push(part);
-      }
-      return parts;
+    function getBindingCandidates() {
+      const explicit = process.env.ADHDEV_GHOSTTY_VT_BINDING?.trim();
+      return explicit ? [explicit] : DEFAULT_BINDING_CANDIDATES;
     }
-    function normalizeInputPartObject(raw) {
-      const type = raw.type;
-      if (type === "text" && typeof raw.text === "string") {
-        return { type, text: raw.text };
+    function loadGhosttyVtBinding(required2) {
+      if (cachedBinding !== void 0) {
+        if (!cachedBinding && required2 && cachedBindingError) {
+          throw cachedBindingError;
+        }
+        return cachedBinding;
       }
-      if (type === "image" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.alt === "string" ? { alt: raw.alt } : {}
-        };
+      const errors = [];
+      for (const ref of getBindingCandidates()) {
+        try {
+          const mod = require(ref);
+          cachedBinding = normalizeBinding(mod, ref);
+          cachedBindingError = null;
+          return cachedBinding;
+        } catch (error48) {
+          if (isModuleNotFoundError(error48, ref)) {
+            errors.push(`${ref}: module not found`);
+            continue;
+          }
+          const message = error48 instanceof Error ? error48.message : String(error48);
+          errors.push(`${ref}: ${message}`);
+        }
       }
-      if (type === "audio" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+      cachedBinding = null;
+      cachedBindingError = new Error(
+        `ghostty-vt backend requested but no binding is available (${errors.join("; ") || "no candidates tried"})`
+      );
+      if (required2) throw cachedBindingError;
+      return null;
+    }
+    function resolveTerminalBackendPreference() {
+      const raw = process.env.ADHDEV_TERMINAL_BACKEND?.trim().toLowerCase();
+      if (raw === "ghostty-vt" || raw === "xterm" || raw === "auto") return raw;
+      return "auto";
+    }
+    function isGhosttyVtBackendAvailable() {
+      return !!loadGhosttyVtBinding(false);
+    }
+    var DEFAULT_BINDING_CANDIDATES;
+    var cachedBinding;
+    var cachedBindingError;
+    var GhosttyVtTerminalBackend;
+    var init_ghostty_vt_backend = __esm2({
+      "src/cli-adapters/terminal-backends/ghostty-vt-backend.ts"() {
+        "use strict";
+        DEFAULT_BINDING_CANDIDATES = [
+          "@adhdev/ghostty-vt-node"
+        ];
+        cachedBindingError = null;
+        GhosttyVtTerminalBackend = class {
+          kind = "ghostty-vt";
+          terminal;
+          constructor(options) {
+            const binding = loadGhosttyVtBinding(true);
+            if (!binding) {
+              throw new Error("ghostty-vt backend requested but no binding is available");
+            }
+            this.terminal = binding.createTerminal({
+              cols: Math.max(1, options.cols | 0),
+              rows: Math.max(1, options.rows | 0),
+              scrollback: Math.max(0, options.scrollback | 0)
+            });
+          }
+          resize(rows, cols) {
+            this.terminal.resize(Math.max(1, cols | 0), Math.max(1, rows | 0));
+          }
+          write(data) {
+            if (!data) return;
+            this.terminal.write(data);
+          }
+          getText() {
+            return this.terminal.formatPlainText({ trim: true }) || "";
+          }
+          getCursorPosition() {
+            return this.terminal.getCursorPosition();
+          }
+          dispose() {
+            this.terminal.dispose();
+          }
         };
       }
-      if (type === "video" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
-        };
-      }
-      if (type === "resource" && typeof raw.uri === "string") {
-        return {
-          type,
-          uri: raw.uri,
-          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
-          ...typeof raw.name === "string" ? { name: raw.name } : {},
-          ...typeof raw.text === "string" ? { text: raw.text } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {}
-        };
-      }
-      if (type === "resource_link" && typeof raw.uri === "string") {
-        return {
-          type: "resource",
-          uri: raw.uri,
-          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
-          ...typeof raw.name === "string" ? { name: raw.name } : {}
-        };
-      }
-      return null;
-    }
-    function normalizeMessagePartObject(raw) {
-      const type = raw.type;
-      if (type === "text" && typeof raw.text === "string") {
-        return { type, text: raw.text };
-      }
-      if (type === "image" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {}
-        };
-      }
-      if (type === "audio" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
-        };
-      }
-      if (type === "video" && typeof raw.mimeType === "string") {
-        return {
-          type,
-          mimeType: raw.mimeType,
-          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
-          ...typeof raw.data === "string" ? { data: raw.data } : {},
-          ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
-        };
-      }
-      if (type === "resource_link" && typeof raw.uri === "string" && typeof raw.name === "string") {
-        return {
-          type,
-          uri: raw.uri,
-          name: raw.name,
-          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
-          ...typeof raw.size === "number" ? { size: raw.size } : {}
-        };
-      }
-      if (type === "resource" && raw.resource && typeof raw.resource === "object") {
-        const resource = raw.resource;
-        if (typeof resource.uri !== "string") return null;
-        return {
-          type,
-          resource: {
-            uri: resource.uri,
-            ...typeof resource.mimeType === "string" || resource.mimeType === null ? { mimeType: resource.mimeType } : {},
-            ...typeof resource.text === "string" ? { text: resource.text } : {},
-            ...typeof resource.blob === "string" ? { blob: resource.blob } : {}
-          }
-        };
-      }
-      return null;
-    }
-    function flattenInputParts(parts) {
-      return parts.map((part) => {
-        if (part.type === "text") return part.text;
-        if (part.type === "audio") return part.transcript || "";
-        if (part.type === "resource") return part.text || "";
-        return "";
-      }).filter((value) => value.length > 0).join("\n");
-    }
-    var init_io_contracts = __esm2({
-      "src/providers/io-contracts.ts"() {
-        "use strict";
-      }
-    });
-    function flattenContent(content) {
-      if (typeof content === "string") return content;
-      return flattenMessageParts(normalizeMessageParts(content));
-    }
-    var init_contracts = __esm2({
-      "src/providers/contracts.ts"() {
-        "use strict";
-        init_io_contracts();
-        init_io_contracts();
-      }
-    });
-    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 resolveBuiltinOrAliasKind(kind) !== null;
-    }
-    function normalizeChatMessageKind(kind, role) {
-      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: resolveChatMessageKind(message)
-      };
-    }
-    function buildSystemChatMessage(message) {
-      return buildChatMessage({
-        ...message,
-        role: "system",
-        kind: message?.kind || "system"
-      });
-    }
-    function buildRuntimeSystemChatMessage(message) {
-      return buildSystemChatMessage({
-        ...message,
-        senderName: typeof message?.senderName === "string" && message.senderName.trim() ? message.senderName : "System"
-      });
-    }
-    function buildAssistantChatMessage(message) {
-      return buildChatMessage({
-        ...message,
-        role: "assistant",
-        kind: message?.kind || "standard"
-      });
-    }
-    function 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,
-        role: "user",
-        kind: message?.kind || "standard"
-      });
-    }
-    function normalizeChatMessage(message) {
-      return buildChatMessage(message);
-    }
-    function normalizeChatMessages(messages) {
-      return (Array.isArray(messages) ? messages : []).map((message) => normalizeChatMessage(message));
-    }
-    var BUILTIN_CHAT_MESSAGE_KINDS;
-    var KNOWN_CHAT_MESSAGE_KINDS;
-    var CHAT_MESSAGE_KIND_ALIASES;
-    var init_chat_message_normalization = __esm2({
-      "src/providers/chat-message-normalization.ts"() {
-        "use strict";
-        BUILTIN_CHAT_MESSAGE_KINDS = ["standard", "thought", "tool", "terminal", "system"];
-        KNOWN_CHAT_MESSAGE_KINDS = new Set(BUILTIN_CHAT_MESSAGE_KINDS);
-        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"
-        };
-      }
-    });
-    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 validateBubbleState(state, source, index) {
-      if (typeof state !== "string" || !VALID_BUBBLE_STATES.includes(state)) {
-        throw new Error(`${source}: messages[${index}].bubbleState must be one of ${VALID_BUBBLE_STATES.join(", ")}`);
-      }
-      return state;
-    }
-    function validateTurnStatus(turnStatus, source) {
-      if (typeof turnStatus !== "string" || !VALID_TURN_STATUSES.includes(turnStatus)) {
-        throw new Error(`${source}: turnStatus must be one of ${VALID_TURN_STATUSES.join(", ")}`);
-      }
-      return turnStatus;
-    }
-    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 (typeof message.bubbleId === "string") normalized.bubbleId = message.bubbleId;
-      if (typeof message.providerUnitKey === "string") normalized.providerUnitKey = message.providerUnitKey;
-      if (message.bubbleState !== void 0) normalized.bubbleState = validateBubbleState(message.bubbleState, source, index);
-      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 (typeof message._turnKey === "string") normalized._turnKey = message._turnKey;
-      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.currentTurnId === "string") normalized.currentTurnId = raw.currentTurnId;
-      if (raw.turnStatus !== void 0) normalized.turnStatus = validateTurnStatus(raw.turnStatus, source);
-      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;
-      if (raw.transcriptAuthority === "provider" || raw.transcriptAuthority === "daemon") normalized.transcriptAuthority = raw.transcriptAuthority;
-      if (raw.coverage === "full" || raw.coverage === "tail" || raw.coverage === "current-turn") normalized.coverage = raw.coverage;
-      return normalized;
-    }
-    var VALID_STATUSES;
-    var VALID_ROLES;
-    var VALID_BUBBLE_STATES;
-    var VALID_TURN_STATUSES;
-    var init_read_chat_contract = __esm2({
-      "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"];
-        VALID_BUBBLE_STATES = ["draft", "streaming", "final", "removed"];
-        VALID_TURN_STATUSES = ["open", "waiting_approval", "complete", "error"];
-      }
-    });
-    function normalizeCategories(categories) {
-      if (!Array.isArray(categories)) return [];
-      return categories.map((category) => String(category || "").trim()).filter(Boolean);
-    }
-    function resolveDebugRuntimeConfig(options = {}) {
-      const dev = options.dev === true;
-      return {
-        logLevel: options.logLevel || (dev ? "debug" : DEFAULT_CONFIG2.logLevel),
-        collectDebugTrace: typeof options.trace === "boolean" ? options.trace : dev,
-        traceContent: options.traceContent === true,
-        traceBufferSize: Number.isFinite(options.traceBufferSize) ? Math.max(10, Math.floor(options.traceBufferSize)) : dev ? DEV_TRACE_BUFFER_SIZE : DEFAULT_CONFIG2.traceBufferSize,
-        traceCategories: normalizeCategories(options.traceCategories)
-      };
-    }
-    function setDebugRuntimeConfig(config2) {
-      currentConfig = {
-        ...config2,
-        traceCategories: normalizeCategories(config2.traceCategories),
-        traceBufferSize: Math.max(10, Math.floor(config2.traceBufferSize || DEFAULT_CONFIG2.traceBufferSize))
-      };
-    }
-    function getDebugRuntimeConfig() {
-      return { ...currentConfig, traceCategories: [...currentConfig.traceCategories] };
-    }
-    function resetDebugRuntimeConfig() {
-      currentConfig = { ...DEFAULT_CONFIG2 };
-    }
-    function shouldCollectTraceCategory(category) {
-      const config2 = currentConfig;
-      if (!config2.collectDebugTrace) return false;
-      if (!category) return true;
-      if (config2.traceCategories.length === 0) return true;
-      return config2.traceCategories.includes(category);
-    }
-    var NORMAL_TRACE_BUFFER_SIZE;
-    var DEV_TRACE_BUFFER_SIZE;
-    var DEFAULT_CONFIG2;
-    var currentConfig;
-    var init_debug_config = __esm2({
-      "src/logging/debug-config.ts"() {
-        "use strict";
-        NORMAL_TRACE_BUFFER_SIZE = 200;
-        DEV_TRACE_BUFFER_SIZE = 1e3;
-        DEFAULT_CONFIG2 = {
-          logLevel: "info",
-          collectDebugTrace: false,
-          traceContent: false,
-          traceBufferSize: NORMAL_TRACE_BUFFER_SIZE,
-          traceCategories: []
-        };
-        currentConfig = { ...DEFAULT_CONFIG2 };
-      }
-    });
-    function isModuleNotFoundError(error48, ref) {
-      if (!(error48 instanceof Error)) return false;
-      const message = error48.message || "";
-      const code = "code" in error48 ? error48.code : void 0;
-      return code === "MODULE_NOT_FOUND" && message.includes(ref);
-    }
-    function normalizeBinding(mod, ref) {
-      const binding = mod?.default?.createTerminal ? mod.default : mod?.createTerminal ? mod : null;
-      if (!binding) {
-        throw new Error(`Ghostty VT binding "${ref}" does not export createTerminal()`);
-      }
-      return binding;
-    }
-    function getBindingCandidates() {
-      const explicit = process.env.ADHDEV_GHOSTTY_VT_BINDING?.trim();
-      return explicit ? [explicit] : DEFAULT_BINDING_CANDIDATES;
-    }
-    function loadGhosttyVtBinding(required2) {
-      if (cachedBinding !== void 0) {
-        if (!cachedBinding && required2 && cachedBindingError) {
-          throw cachedBindingError;
-        }
-        return cachedBinding;
-      }
-      const errors = [];
-      for (const ref of getBindingCandidates()) {
-        try {
-          const mod = require(ref);
-          cachedBinding = normalizeBinding(mod, ref);
-          cachedBindingError = null;
-          return cachedBinding;
-        } catch (error48) {
-          if (isModuleNotFoundError(error48, ref)) {
-            errors.push(`${ref}: module not found`);
-            continue;
-          }
-          const message = error48 instanceof Error ? error48.message : String(error48);
-          errors.push(`${ref}: ${message}`);
-        }
-      }
-      cachedBinding = null;
-      cachedBindingError = new Error(
-        `ghostty-vt backend requested but no binding is available (${errors.join("; ") || "no candidates tried"})`
-      );
-      if (required2) throw cachedBindingError;
-      return null;
-    }
-    function resolveTerminalBackendPreference() {
-      const raw = process.env.ADHDEV_TERMINAL_BACKEND?.trim().toLowerCase();
-      if (raw === "ghostty-vt" || raw === "xterm" || raw === "auto") return raw;
-      return "auto";
-    }
-    function isGhosttyVtBackendAvailable() {
-      return !!loadGhosttyVtBinding(false);
-    }
-    var DEFAULT_BINDING_CANDIDATES;
-    var cachedBinding;
-    var cachedBindingError;
-    var GhosttyVtTerminalBackend;
-    var init_ghostty_vt_backend = __esm2({
-      "src/cli-adapters/terminal-backends/ghostty-vt-backend.ts"() {
-        "use strict";
-        DEFAULT_BINDING_CANDIDATES = [
-          "@adhdev/ghostty-vt-node"
-        ];
-        cachedBindingError = null;
-        GhosttyVtTerminalBackend = class {
-          kind = "ghostty-vt";
-          terminal;
-          constructor(options) {
-            const binding = loadGhosttyVtBinding(true);
-            if (!binding) {
-              throw new Error("ghostty-vt backend requested but no binding is available");
-            }
-            this.terminal = binding.createTerminal({
-              cols: Math.max(1, options.cols | 0),
-              rows: Math.max(1, options.rows | 0),
-              scrollback: Math.max(0, options.scrollback | 0)
-            });
-          }
-          resize(rows, cols) {
-            this.terminal.resize(Math.max(1, cols | 0), Math.max(1, rows | 0));
-          }
-          write(data) {
-            if (!data) return;
-            this.terminal.write(data);
-          }
-          getText() {
-            return this.terminal.formatPlainText({ trim: true }) || "";
-          }
-          getCursorPosition() {
-            return this.terminal.getCursorPosition();
-          }
-          dispose() {
-            this.terminal.dispose();
-          }
-        };
-      }
-    });
-    function loadTerminalCtor() {
-      if (!TerminalCtor) {
-        const mod = (init_xterm(), __toCommonJS(xterm_exports));
-        TerminalCtor = mod.Terminal || mod.default?.Terminal || mod.default;
-        if (!TerminalCtor) {
-          throw new Error("@xterm/xterm Terminal export not found");
-        }
+    });
+    function loadTerminalCtor() {
+      if (!TerminalCtor) {
+        const mod = (init_xterm(), __toCommonJS(xterm_exports));
+        TerminalCtor = mod.Terminal || mod.default?.Terminal || mod.default;
+        if (!TerminalCtor) {
+          throw new Error("@xterm/xterm Terminal export not found");
+        }
       }
       return TerminalCtor;
     }
@@ -29425,73 +28909,12 @@ var require_dist2 = __commonJS({
       if (tokens.length === 0) return false;
       const required2 = Math.min(tokens.length, 3);
       const matched = tokens.filter(
-        (token) => normalizedScreen.includes(token) || compactScreen.includes(compactPromptText(token))
-      ).length;
-      return matched >= required2;
-    }
-    function normalizeScreenSnapshot(text) {
-      return sanitizeTerminalText(String(text || "")).replace(/\s+/g, " ").trim();
-    }
-    function shouldReflowComparableMessageLines(lines) {
-      return Array.isArray(lines) && lines.length > 1 && lines.slice(0, -1).every((line) => String(line || "").trim().length >= 48) && !lines.some((line) => /^```/.test(line)) && !lines.some((line) => /^\|/.test(line)) && !lines.some((line) => /^\s*(?:[-*+] |\d+\.\s)/.test(line));
-    }
-    function joinComparableMessageLines(lines) {
-      return lines.reduce((acc, line) => {
-        const next = String(line || "").trim();
-        if (!next) return acc;
-        if (!acc) return next;
-        if (/[,\d]$/.test(acc) && /^\d/.test(next)) {
-          return `${acc}${next}`;
-        }
-        if (/[A-Za-z]$/.test(acc) && /^\d/.test(next)) {
-          return `${acc}${next}`;
-        }
-        const fragmentMatch = acc.match(/([A-Za-z]{1,4})$/);
-        const fragment = fragmentMatch ? fragmentMatch[1].toLowerCase() : "";
-        if (/^[a-z]/.test(next) && fragment && !COMMON_COMPARABLE_WRAP_WORDS.has(fragment)) {
-          return `${acc}${next}`;
-        }
-        return `${acc} ${next}`;
-      }, "").replace(/\s+([,.;:!?])/g, "$1").replace(/(\d)\s+,/g, "$1,").replace(/\s+/g, " ").trim();
-    }
-    function normalizeComparableMessageContent(text) {
-      const lines = String(text || "").split(/\r\n|\n|\r/g).map((line) => line.trim()).filter(Boolean);
-      if (lines.length === 0) return "";
-      if (shouldReflowComparableMessageLines(lines)) {
-        return joinComparableMessageLines(lines);
-      }
-      return lines.join(" ").replace(/\s+/g, " ").trim();
-    }
-    function trimPromptEchoPrefix(text, promptText) {
-      const prompt = normalizeComparableMessageContent(String(promptText || ""));
-      if (!prompt) return String(text || "");
-      const lines = String(text || "").split(/\r\n|\n|\r/g);
-      let dropCount = 0;
-      for (let index = 0; index < Math.min(lines.length, 6); index += 1) {
-        const fragment = normalizeComparableMessageContent(lines[index].replace(/^[.…]+\s*/, ""));
-        if (!fragment) {
-          if (dropCount === index) dropCount = index + 1;
-          continue;
-        }
-        const fragmentWordCount = fragment ? fragment.split(/\s+/).filter(Boolean).length : 0;
-        const canBePromptEcho = fragment.length >= 16 || fragmentWordCount >= 4;
-        if (canBePromptEcho && prompt.includes(fragment)) {
-          dropCount = index + 1;
-          continue;
-        }
-        break;
-      }
-      return lines.slice(dropCount).join("\n").trim();
+        (token) => normalizedScreen.includes(token) || compactScreen.includes(compactPromptText(token))
+      ).length;
+      return matched >= required2;
     }
-    function getLastUserPromptText(messages) {
-      const items = Array.isArray(messages) ? messages : [];
-      for (let index = items.length - 1; index >= 0; index -= 1) {
-        const message = items[index];
-        if (message?.role === "user" && typeof message.content === "string" && message.content.trim()) {
-          return message.content;
-        }
-      }
-      return "";
+    function normalizeScreenSnapshot(text) {
+      return sanitizeTerminalText(String(text || "")).replace(/\s+/g, " ").trim();
     }
     function parsePatternEntry(x) {
       if (x instanceof RegExp) return x;
@@ -29523,7 +28946,6 @@ var require_dist2 = __commonJS({
     var path13;
     var import_child_process4;
     var buildCliSpawnEnv;
-    var COMMON_COMPARABLE_WRAP_WORDS;
     var init_provider_cli_shared = __esm2({
       "src/cli-adapters/provider-cli-shared.ts"() {
         "use strict";
@@ -29532,32 +28954,6 @@ var require_dist2 = __commonJS({
         import_child_process4 = require("child_process");
         init_spawn_env();
         buildCliSpawnEnv = import_session_host_core3.sanitizeSpawnEnv;
-        COMMON_COMPARABLE_WRAP_WORDS = /* @__PURE__ */ new Set([
-          "a",
-          "an",
-          "and",
-          "as",
-          "at",
-          "but",
-          "by",
-          "for",
-          "from",
-          "in",
-          "into",
-          "is",
-          "it",
-          "of",
-          "on",
-          "or",
-          "that",
-          "the",
-          "their",
-          "then",
-          "this",
-          "to",
-          "was",
-          "with"
-        ]);
       }
     });
     function sliceFromOffset(text, start) {
@@ -29566,169 +28962,8 @@ var require_dist2 = __commonJS({
       if (start >= text.length) return "";
       return text.slice(start);
     }
-    function hydrateCliParsedMessages(parsedMessages, options) {
-      const { committedMessages, scope, lastOutputAt } = options;
-      const referenceMessages = [...committedMessages];
-      const referenceComparables = new Array(referenceMessages.length);
-      const usedReferenceIndexes = /* @__PURE__ */ new Set();
-      const now = options.now ?? Date.now();
-      let exactReferenceIndexesByKey = null;
-      const exactReferenceCursorByKey = /* @__PURE__ */ new Map();
-      const hasFiniteTimestamp = (message) => typeof message?.timestamp === "number" && Number.isFinite(message.timestamp);
-      const getReferenceComparable = (index) => {
-        if (typeof referenceComparables[index] === "string") return referenceComparables[index] || "";
-        const comparable = normalizeComparableMessageContent(referenceMessages[index]?.content || "");
-        referenceComparables[index] = comparable;
-        return comparable;
-      };
-      const messagesShareStableIdentity = (parsed, reference) => {
-        if (!parsed || !reference) return false;
-        const parsedId = typeof parsed.id === "string" ? parsed.id.trim() : "";
-        const referenceId = typeof reference.id === "string" ? reference.id.trim() : "";
-        if (parsedId && referenceId && parsedId === referenceId) return true;
-        return typeof parsed.index === "number" && Number.isFinite(parsed.index) && typeof reference.index === "number" && Number.isFinite(reference.index) && parsed.index === reference.index;
-      };
-      const exactReferenceKey = (role, comparable) => `${role}\0${comparable}`;
-      const ensureExactReferenceIndex = () => {
-        if (exactReferenceIndexesByKey) return exactReferenceIndexesByKey;
-        const byKey = /* @__PURE__ */ new Map();
-        for (let i = 0; i < referenceMessages.length; i++) {
-          const candidate = referenceMessages[i];
-          if (!candidate || candidate.role !== "user" && candidate.role !== "assistant" || !hasFiniteTimestamp(candidate)) continue;
-          const comparable = getReferenceComparable(i);
-          if (!comparable) continue;
-          const key = exactReferenceKey(candidate.role, comparable);
-          const indexes = byKey.get(key);
-          if (indexes) {
-            indexes.push(i);
-          } else {
-            byKey.set(key, [i]);
-          }
-        }
-        exactReferenceIndexesByKey = byKey;
-        return byKey;
-      };
-      const takeExactReferenceTimestamp = (role, normalizedContent) => {
-        const key = exactReferenceKey(role, normalizedContent);
-        const indexes = ensureExactReferenceIndex().get(key);
-        if (!indexes) return void 0;
-        let cursor = exactReferenceCursorByKey.get(key) || 0;
-        while (cursor < indexes.length) {
-          const candidateIndex = indexes[cursor];
-          cursor += 1;
-          if (usedReferenceIndexes.has(candidateIndex)) continue;
-          const candidate = referenceMessages[candidateIndex];
-          if (!candidate || candidate.role !== role || !hasFiniteTimestamp(candidate)) continue;
-          usedReferenceIndexes.add(candidateIndex);
-          exactReferenceCursorByKey.set(key, cursor);
-          return candidate.timestamp;
-        }
-        exactReferenceCursorByKey.set(key, cursor);
-        return void 0;
-      };
-      const findReferenceTimestamp = (message, role, content, parsedIndex) => {
-        const sameIndex = referenceMessages[parsedIndex];
-        if (sameIndex && !usedReferenceIndexes.has(parsedIndex) && sameIndex.role === role && hasFiniteTimestamp(sameIndex) && messagesShareStableIdentity(message, sameIndex)) {
-          usedReferenceIndexes.add(parsedIndex);
-          return sameIndex.timestamp;
-        }
-        const normalizedContent = normalizeComparableMessageContent(content);
-        if (!normalizedContent) return void 0;
-        if (sameIndex && !usedReferenceIndexes.has(parsedIndex) && sameIndex.role === role && getReferenceComparable(parsedIndex) === normalizedContent && hasFiniteTimestamp(sameIndex)) {
-          usedReferenceIndexes.add(parsedIndex);
-          return sameIndex.timestamp;
-        }
-        const exactTimestamp = takeExactReferenceTimestamp(role, normalizedContent);
-        if (typeof exactTimestamp === "number") return exactTimestamp;
-        for (let i = 0; i < referenceMessages.length; i++) {
-          if (usedReferenceIndexes.has(i)) continue;
-          const candidate = referenceMessages[i];
-          if (!candidate || candidate.role !== role) continue;
-          const candidateContent = getReferenceComparable(i);
-          if (!candidateContent) continue;
-          const fuzzyMatch = candidateContent.includes(normalizedContent) || normalizedContent.includes(candidateContent);
-          if (!fuzzyMatch) continue;
-          if (hasFiniteTimestamp(candidate)) {
-            usedReferenceIndexes.add(i);
-            return candidate.timestamp;
-          }
-        }
-        return void 0;
-      };
-      return parsedMessages.filter((message) => message && (message.role === "user" || message.role === "assistant")).map((message, index) => {
-        const role = message.role;
-        const content = typeof message.content === "string" ? message.content : String(message.content || "");
-        const parsedTimestamp = typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : void 0;
-        const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(message, role, content, index);
-        const fallbackTimestamp = role === "user" ? scope?.startedAt || now : lastOutputAt || scope?.startedAt || now;
-        const timestamp = referenceTimestamp ?? fallbackTimestamp;
-        return {
-          ...message,
-          role,
-          content,
-          timestamp,
-          receivedAt: typeof message.receivedAt === "number" && Number.isFinite(message.receivedAt) ? message.receivedAt : timestamp
-        };
-      });
-    }
-    function chooseMoreComparableCliMessage(left, right, leftComparable = normalizeComparableMessageContent(left.content || ""), rightComparable = normalizeComparableMessageContent(right.content || "")) {
-      if (leftComparable && leftComparable === rightComparable) {
-        const leftNewlines = String(left.content || "").split(/\r\n|\n|\r/g).length - 1;
-        const rightNewlines = String(right.content || "").split(/\r\n|\n|\r/g).length - 1;
-        return rightNewlines < leftNewlines ? right : left;
-      }
-      return rightComparable.length > leftComparable.length ? right : left;
-    }
-    function dedupeConsecutiveComparableCliMessages(messages) {
-      const deduped = [];
-      for (const message of messages) {
-        const current = {
-          ...message,
-          content: typeof message.content === "string" ? message.content : String(message.content || "")
-        };
-        const currentComparable = normalizeComparableMessageContent(current.content || "");
-        const previous = deduped[deduped.length - 1];
-        if (!previous) {
-          deduped.push({ message: current, comparable: currentComparable });
-          continue;
-        }
-        const sameRole = previous.message.role === current.role;
-        const sameKind = (previous.message.kind || "standard") === (current.kind || "standard");
-        const sameSender = (previous.message.senderName || "") === (current.senderName || "");
-        const comparableMatch = previous.comparable && previous.comparable === currentComparable;
-        if (sameRole && sameKind && sameSender && comparableMatch) {
-          const selected = chooseMoreComparableCliMessage(
-            previous.message,
-            current,
-            previous.comparable,
-            currentComparable
-          );
-          deduped[deduped.length - 1] = {
-            message: selected,
-            comparable: selected === current ? currentComparable : previous.comparable
-          };
-          continue;
-        }
-        deduped.push({ message: current, comparable: currentComparable });
-      }
-      return deduped.map((entry) => entry.message);
-    }
-    function normalizeCliParsedMessages(parsedMessages, options) {
-      return dedupeConsecutiveComparableCliMessages(hydrateCliParsedMessages(parsedMessages, options).map((message) => ({
-        role: message.role,
-        content: message.content,
-        timestamp: message.timestamp,
-        receivedAt: message.receivedAt,
-        kind: message.kind,
-        id: message.id,
-        index: message.index,
-        providerUnitKey: message.providerUnitKey,
-        bubbleId: message.bubbleId,
-        bubbleState: message.bubbleState,
-        _turnKey: message._turnKey,
-        meta: message.meta,
-        senderName: message.senderName
-      })));
+    function normalizeCliParsedMessages(parsedMessages, _options) {
+      return Array.isArray(parsedMessages) ? parsedMessages : [];
     }
     function buildCliParseInput(options) {
       const {
@@ -29934,40 +29169,8 @@ var require_dist2 = __commonJS({
     __export2(provider_cli_adapter_exports, {
       ProviderCliAdapter: () => ProviderCliAdapter,
       appendBoundedText: () => appendBoundedText,
-      normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime,
-      sanitizeCliStandardMessageContent: () => sanitizeCliStandardMessageContent,
-      trimLastAssistantEchoForCliMessages: () => trimLastAssistantEchoForCliMessages
-    });
-    function normalizeComparableTranscriptText(value) {
-      return sanitizeTerminalText(String(value || "")).replace(/\s+/g, " ").trim();
-    }
-    function hasVisibleInterruptPrompt(text) {
-      const interruptCopyPattern = /\bEnter\s+to\s+interrupt\b(?:\s*,?\s*Ctrl\s*(?:\+|-)?\s*C\s+to\s+cancel)?/i;
-      return sanitizeTerminalText(text || "").split(/\r?\n/g).some((line) => {
-        const trimmed = line.trim();
-        if (!interruptCopyPattern.test(trimmed)) return false;
-        return /^(?:[^A-Za-z0-9\s]{1,8}\s+)?[❯›>]\s+/.test(trimmed);
-      });
-    }
-    function parsedTranscriptIsRicherThanCommitted(parsedMessages, committedMessages) {
-      if (!Array.isArray(parsedMessages) || !Array.isArray(committedMessages)) return false;
-      if (parsedMessages.length > committedMessages.length) return true;
-      if (parsedMessages.length !== committedMessages.length) return false;
-      for (let index = 0; index < parsedMessages.length; index += 1) {
-        const parsed = parsedMessages[index];
-        const committed = committedMessages[index];
-        if (!parsed || !committed) return false;
-        if ((parsed.role || "") !== (committed.role || "")) return false;
-        if (parsed.id && committed.id && String(parsed.id) !== String(committed.id)) return false;
-        if (typeof parsed.index === "number" && typeof committed.index === "number" && parsed.index !== committed.index) return false;
-        const parsedText = normalizeComparableTranscriptText(parsed.content);
-        const committedText = normalizeComparableTranscriptText(committed.content);
-        if (!parsedText || !committedText || parsedText === committedText) continue;
-        if (parsedText.length > committedText.length && parsedText.startsWith(committedText)) return true;
-        return false;
-      }
-      return false;
-    }
+      normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
+    });
     function appendBoundedText(current, chunk, maxChars) {
       if (!chunk) return current.length <= maxChars ? current : current.slice(-maxChars);
       if (maxChars <= 0) return "";
@@ -29976,77 +29179,7 @@ var require_dist2 = __commonJS({
       if (current.length <= keepFromCurrent) return current + chunk;
       return current.slice(-keepFromCurrent) + chunk;
     }
-    function isLikelyCommittedActivityPrefixContinuation(line) {
-      const trimmed = String(line || "").trim();
-      if (!trimmed) return false;
-      if (COMMITTED_ACTIVITY_PREFIX_BLOCK_RE.test(trimmed)) return false;
-      if (/\s/.test(trimmed)) return false;
-      if (/[가-힣]/.test(trimmed)) return false;
-      if (trimmed.length > 96) return false;
-      return /^[A-Za-z0-9_./:@+%=-]+$/.test(trimmed);
-    }
-    function parseCommittedActivityPrefixBlock(lines, index) {
-      const first = String(lines[index] || "").trim();
-      if (!COMMITTED_ACTIVITY_PREFIX_BLOCK_RE.test(first)) return null;
-      const parts = [first];
-      let nextIndex = index + 1;
-      while (nextIndex < lines.length && isLikelyCommittedActivityPrefixContinuation(lines[nextIndex])) {
-        parts.push(String(lines[nextIndex] || "").trim());
-        nextIndex += 1;
-      }
-      return { label: parts.join(""), nextIndex };
-    }
-    function sanitizeCliStandardMessageContent(content) {
-      const source = String(content || "").trim();
-      if (!source) return "";
-      const lines = source.split(/\r?\n/);
-      if (lines.length < 4) return source;
-      const counts = /* @__PURE__ */ new Map();
-      for (let index = 0; index < lines.length; index += 1) {
-        const block = parseCommittedActivityPrefixBlock(lines, index);
-        if (!block) continue;
-        counts.set(block.label, (counts.get(block.label) || 0) + 1);
-        index = block.nextIndex - 1;
-      }
-      const repeatedLabels = new Set(
-        Array.from(counts.entries()).filter(([, count]) => count >= 3).map(([label]) => label)
-      );
-      if (repeatedLabels.size === 0) return source;
-      const stripped = [];
-      let removed = 0;
-      for (let index = 0; index < lines.length; index += 1) {
-        const block = parseCommittedActivityPrefixBlock(lines, index);
-        if (block && repeatedLabels.has(block.label)) {
-          removed += 1;
-          index = block.nextIndex - 1;
-          continue;
-        }
-        stripped.push(lines[index]);
-      }
-      const next = stripped.join("\n").replace(/\n{3,}/g, "\n\n").trim();
-      return removed >= 3 && next.length >= 80 ? next : source;
-    }
-    function sanitizeCommittedMessageForDisplay(message) {
-      if (!message || message.role !== "assistant" || (message.kind || "standard") !== "standard") return message;
-      const content = sanitizeCliStandardMessageContent(message.content);
-      if (content === message.content) return message;
-      return { ...message, content };
-    }
-    function trimLastAssistantEchoForCliMessages(messages, prompt) {
-      if (!prompt) return;
-      for (let index = messages.length - 1; index >= 0; index -= 1) {
-        const message = messages[index];
-        if (!message || message.role !== "assistant" || typeof message.content !== "string") continue;
-        if ((message.kind || "standard") !== "standard") continue;
-        message.content = trimPromptEchoPrefix(message.content, prompt);
-        if (!message.content.trim()) {
-          messages.splice(index, 1);
-        }
-        return;
-      }
-    }
     var os11;
-    var COMMITTED_ACTIVITY_PREFIX_BLOCK_RE;
     var ProviderCliAdapter;
     var init_provider_cli_adapter = __esm2({
       "src/cli-adapters/provider-cli-adapter.ts"() {
@@ -30057,13 +29190,10 @@ var require_dist2 = __commonJS({
         init_terminal_screen();
         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();
         init_provider_cli_shared();
-        COMMITTED_ACTIVITY_PREFIX_BLOCK_RE = /^(?:📖|💻|🔎|📚|📋|✏️|📝|🔧|🛠️|⚙️)\s+(.+)$/;
         ProviderCliAdapter = class _ProviderCliAdapter {
           constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
             this.extraArgs = extraArgs;
@@ -30106,11 +29236,6 @@ var require_dist2 = __commonJS({
           provider;
           ptyProcess = null;
           transportFactory;
-          messages = [];
-          committedMessages = [];
-          structuredMessages = [];
-          committedMessagesActivitySignature = "";
-          committedMessagesChangedAt = 0;
           currentStatus = "starting";
           onStatusChange = null;
           responseBuffer = "";
@@ -30190,11 +29315,8 @@ var require_dist2 = __commonJS({
           traceSeq = 0;
           traceSessionId = "";
           parsedStatusCache = null;
-          lastStatusHotPathParseAt = Number.NEGATIVE_INFINITY;
-          static STATUS_HOT_PATH_PARSE_MIN_INTERVAL_MS = 1e3;
           static SCREEN_SNAPSHOT_MIN_INTERVAL_MS = 250;
           static MAX_TRACE_ENTRIES = 250;
-          static PARSE_MESSAGE_TAIL_LIMIT = 100;
           providerResolutionMeta;
           static FINISH_RETRY_DELAY_MS = 300;
           static MAX_FINISH_RETRIES = 2;
@@ -30215,35 +29337,6 @@ var require_dist2 = __commonJS({
           recordBoundedAppendDrop(previousLength, appendedLength, nextLength) {
             return Math.max(0, previousLength + appendedLength - nextLength);
           }
-          buildCommittedMessagesActivitySignature() {
-            const last = this.committedMessages[this.committedMessages.length - 1];
-            return [
-              String(this.committedMessages.length),
-              String(last?.role || ""),
-              String(last?.kind || ""),
-              String(last?.senderName || ""),
-              String(last?.timestamp || ""),
-              String(last?.receivedAt || ""),
-              normalizeComparableMessageContent(last?.content || "").slice(-240)
-            ].join("|");
-          }
-          syncMessageViews() {
-            const signature = this.buildCommittedMessagesActivitySignature();
-            if (signature !== this.committedMessagesActivitySignature) {
-              this.committedMessagesActivitySignature = signature;
-              this.committedMessagesChangedAt = Date.now();
-            }
-            this.messages = [...this.committedMessages];
-            this.structuredMessages = [...this.committedMessages];
-          }
-          getLastCommittedMessageActivityAt() {
-            const last = this.committedMessages[this.committedMessages.length - 1];
-            const messageTime = Math.max(
-              typeof last?.receivedAt === "number" && Number.isFinite(last.receivedAt) ? last.receivedAt : 0,
-              typeof last?.timestamp === "number" && Number.isFinite(last.timestamp) ? last.timestamp : 0
-            );
-            return Math.max(messageTime, this.committedMessagesChangedAt || 0);
-          }
           readTerminalScreenText(now = Date.now()) {
             const screenText = this.terminalScreen.getText() || "";
             this.lastScreenText = screenText;
@@ -30263,7 +29356,7 @@ var require_dist2 = __commonJS({
           }
           getFreshParsedStatusCache() {
             const cached2 = this.parsedStatusCache;
-            if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
+            if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
               return cached2.result;
             }
             return null;
@@ -30274,45 +29367,6 @@ var require_dist2 = __commonJS({
           shouldUseFullProviderTranscriptContext() {
             return this.providerOwnsTranscript() && this.provider.transcriptContext === "full";
           }
-          selectParseBaseMessages(baseMessages) {
-            if (this.shouldUseFullProviderTranscriptContext()) return baseMessages;
-            if (baseMessages.length <= _ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT) return baseMessages;
-            return baseMessages.slice(-_ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT);
-          }
-          messagesShareStableIdentity(left, right) {
-            if (left === right) return true;
-            if (!left || !right) return false;
-            if ((left.role || "") !== (right.role || "")) return false;
-            if (left.id && right.id && String(left.id) === String(right.id)) return true;
-            if (typeof left.index === "number" && typeof right.index === "number" && left.index === right.index) return true;
-            return false;
-          }
-          messagesComparable(left, right) {
-            if (this.messagesShareStableIdentity(left, right)) return true;
-            if (!left || !right) return false;
-            if ((left.role || "") !== (right.role || "")) return false;
-            const leftText = normalizeComparableTranscriptText(left.content);
-            const rightText = normalizeComparableTranscriptText(right.content);
-            return !!leftText && leftText === rightText;
-          }
-          stitchParsedMessagesWithCommittedBase(parsedMessages, fullBaseMessages, parseBaseMessages) {
-            if (!Array.isArray(parsedMessages) || parsedMessages.length === 0) return parsedMessages;
-            if (fullBaseMessages.length <= parseBaseMessages.length) return parsedMessages;
-            const parsedFirst = parsedMessages[0];
-            const fullFirst = fullBaseMessages[0];
-            if (parsedMessages.length >= fullBaseMessages.length && this.messagesComparable(parsedFirst, fullFirst)) {
-              return parsedMessages;
-            }
-            const tailFirst = parseBaseMessages[0];
-            if (tailFirst && this.messagesComparable(parsedFirst, tailFirst)) {
-              const prefixLength = fullBaseMessages.length - parseBaseMessages.length;
-              const prefix = fullBaseMessages.slice(0, prefixLength);
-              const shouldSanitizePrefix = !!this.currentTurnScope || this.currentStatus !== "idle" || !!this.activeModal;
-              const nextPrefix = shouldSanitizePrefix ? prefix.map((message) => sanitizeCommittedMessageForDisplay(message)) : prefix;
-              return [...nextPrefix, ...parsedMessages];
-            }
-            return [...fullBaseMessages, ...parsedMessages];
-          }
           getIdleFinishConfirmMs() {
             return this.timeouts.idleFinishConfirm;
           }
@@ -30765,9 +29819,6 @@ var require_dist2 = __commonJS({
               `[${this.cliType}] Interactive prompt wait timed out after ${maxWaitMs}ms; proceeding with screen=${JSON.stringify(summarizeCliTraceText(finalScreenText, 240)).slice(0, 280)}`
             );
           }
-          trimLastAssistantEcho(messages, prompt) {
-            trimLastAssistantEchoForCliMessages(messages, prompt);
-          }
           clearAllTimers() {
             if (this.responseTimeout) {
               clearTimeout(this.responseTimeout);
@@ -30863,10 +29914,10 @@ var require_dist2 = __commonJS({
             }
             const session = this.runParseSession();
             if (!session) return;
-            const { status, messages, modal, parsedStatus } = session;
+            const { status, messages, parsedStatus } = session;
+            const modal = session.activeModal ?? session.modal ?? null;
             const parsedMessages = normalizeCliParsedMessages(messages, {
-              committedMessages: this.committedMessages,
-              scope: this.currentTurnScope,
+              scope: null,
               lastOutputAt: this.lastOutputAt
             });
             if (this.maybeCommitVisibleIdleTranscript(session, parsedMessages)) return;
@@ -31046,7 +30097,7 @@ var require_dist2 = __commonJS({
             const effectiveScreenText = screenText || this.accumulatedBuffer;
             const noActiveTurn = !this.currentTurnScope;
             const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(effectiveScreenText);
-            const parsedShowsLiveAssistantProgress = parsedStatus === "generating" && !!lastParsedAssistant && parsedMessages.length > this.committedMessages.length;
+            const parsedShowsLiveAssistantProgress = parsedStatus === "generating" && !!lastParsedAssistant;
             if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome && !parsedShowsLiveAssistantProgress) {
               return;
             }
@@ -31203,10 +30254,7 @@ var require_dist2 = __commonJS({
             }
             const visibleAssistant = [...parsedMessages].reverse().find((m) => m.role === "assistant" && m.content.trim());
             if (!visibleAssistant) return false;
-            this.committedMessages = parsedMessages;
-            this.trimLastAssistantEcho(this.committedMessages, this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages));
             this.clearAllTimers();
-            this.syncMessageViews();
             this.responseBuffer = "";
             this.isWaitingForResponse = false;
             this.responseSettleIgnoreUntil = 0;
@@ -31218,37 +30266,34 @@ var require_dist2 = __commonJS({
             this.setStatus("idle", "script_idle_commit");
             this.onStatusChange?.();
             this.recordTrace("script_idle_commit", {
-              messageCount: this.committedMessages.length,
+              messageCount: parsedMessages.length,
               lastAssistant: summarizeCliTraceText(visibleAssistant.content, 320)
             });
             return true;
           }
           commitCurrentTranscript() {
             const parsed = this.parseCurrentTranscript(
-              this.committedMessages,
+              [],
               this.responseBuffer,
               this.currentTurnScope
             );
             if (parsed && Array.isArray(parsed.messages)) {
-              this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
-                committedMessages: this.committedMessages,
-                scope: this.currentTurnScope,
+              const parsedMessages = normalizeCliParsedMessages(parsed.messages, {
+                scope: null,
                 lastOutputAt: this.lastOutputAt
               });
-              this.trimLastAssistantEcho(this.committedMessages, this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages));
-              this.syncMessageViews();
-              const lastAssistant = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
+              const lastAssistant = [...parsedMessages].reverse().find((message) => message.role === "assistant");
               if (this.currentTurnScope) {
                 LOG2.info(
                   "CLI",
-                  `[${this.cliType}] commitCurrentTranscript committedMessages=${this.committedMessages.length} finalLastAssistant=${JSON.stringify(summarizeCliTraceText(lastAssistant?.content || "", 220)).slice(0, 260)}`
+                  `[${this.cliType}] commitCurrentTranscript parserMessages=${parsedMessages.length} finalLastAssistant=${JSON.stringify(summarizeCliTraceText(lastAssistant?.content || "", 220)).slice(0, 260)}`
                 );
               }
               this.recordTrace("commit_transcript", {
                 parsedStatus: parsed.status || null,
-                messageCount: this.committedMessages.length,
+                messageCount: parsedMessages.length,
                 lastAssistant: lastAssistant ? summarizeCliTraceText(lastAssistant.content, 320) : "",
-                messages: summarizeCliTraceMessages(this.committedMessages),
+                messages: summarizeCliTraceMessages(parsedMessages),
                 ...buildCliTraceParseSnapshot({
                   accumulatedBuffer: this.accumulatedBuffer,
                   accumulatedRawBuffer: this.accumulatedRawBuffer,
@@ -31282,63 +30327,31 @@ var require_dist2 = __commonJS({
           }
           // ─── Script Execution ──────────────────────────
           runParseSession() {
-            if (typeof this.cliScripts?.parseSession === "function") {
-              try {
-                const screenText = this.terminalScreen.getText();
-                const tail = this.recentOutputBuffer.slice(-500);
-                const parseBaseMessages = this.selectParseBaseMessages(this.committedMessages);
-                const input = buildCliParseInput({
-                  accumulatedBuffer: this.accumulatedBuffer,
-                  accumulatedRawBuffer: this.accumulatedRawBuffer,
-                  recentOutputBuffer: this.recentOutputBuffer,
-                  terminalScreenText: screenText,
-                  baseMessages: parseBaseMessages,
-                  partialResponse: this.responseBuffer,
-                  isWaitingForResponse: this.isWaitingForResponse,
-                  scope: this.currentTurnScope,
-                  runtimeSettings: this.runtimeSettings
-                });
-                const session = this.cliScripts.parseSession({ ...input, tail, tailScreen: buildCliScreenSnapshot(tail) });
-                if (session && typeof session === "object" && Array.isArray(session.messages)) {
-                  session.messages = this.stitchParsedMessagesWithCommittedBase(
-                    session.messages,
-                    this.committedMessages,
-                    parseBaseMessages
-                  );
-                }
-                this.parseErrorMessage = null;
-                return session && typeof session === "object" ? session : null;
-              } catch (e) {
-                const message = e?.message || String(e);
-                this.parseErrorMessage = message;
-                LOG2.warn("CLI", `[${this.cliType}] parseSession error: ${message}`);
-                return null;
-              }
+            if (typeof this.cliScripts?.parseSession !== "function") {
+              this.parseErrorMessage = `${this.cliType} parseSession unavailable`;
+              return null;
             }
-            if (!this.cliScripts?.detectStatus && !this.cliScripts?.parseOutput) return null;
             try {
-              const tail = this.settledBuffer;
-              const parsedTranscript = this.parseCurrentTranscript(
-                this.committedMessages,
-                this.responseBuffer,
-                this.currentTurnScope
-              );
-              const parsedModal = parsedTranscript?.activeModal && Array.isArray(parsedTranscript.activeModal.buttons) && parsedTranscript.activeModal.buttons.some((b2) => typeof b2 === "string" && b2.trim()) ? parsedTranscript.activeModal : null;
-              const approval = this.runParseApproval(tail);
-              const modal = approval || parsedModal;
-              const rawStatus = this.runDetectStatus(tail);
-              const parsedStatus = typeof parsedTranscript?.status === "string" ? parsedTranscript.status : null;
-              const effectiveStatus = parsedStatus === "waiting_approval" && modal ? "waiting_approval" : rawStatus || parsedStatus || "idle";
-              return {
-                status: effectiveStatus,
-                messages: Array.isArray(parsedTranscript?.messages) ? parsedTranscript.messages : [],
-                modal,
-                parsedStatus
-              };
+              const screenText = this.terminalScreen.getText();
+              const tail = this.recentOutputBuffer.slice(-500);
+              const input = buildCliParseInput({
+                accumulatedBuffer: this.accumulatedBuffer,
+                accumulatedRawBuffer: this.accumulatedRawBuffer,
+                recentOutputBuffer: this.recentOutputBuffer,
+                terminalScreenText: screenText,
+                baseMessages: [],
+                partialResponse: this.responseBuffer,
+                isWaitingForResponse: this.isWaitingForResponse,
+                scope: this.currentTurnScope,
+                runtimeSettings: this.runtimeSettings
+              });
+              const session = this.cliScripts.parseSession({ ...input, tail, tailScreen: buildCliScreenSnapshot(tail) });
+              this.parseErrorMessage = null;
+              return session && typeof session === "object" ? session : null;
             } catch (e) {
               const message = e?.message || String(e);
               this.parseErrorMessage = message;
-              LOG2.warn("CLI", `[${this.cliType}] parseSession fallback error: ${message}`);
+              LOG2.warn("CLI", `[${this.cliType}] parseSession error: ${message}`);
               return null;
             }
           }
@@ -31388,45 +30401,14 @@ var require_dist2 = __commonJS({
             if (this.isWaitingForResponse && this.currentTurnScope && this.currentStatus !== "stopped") return "generating";
             return this.currentStatus;
           }
-          suppressStaleParsedApproval(parsed, recentBuffer, screenText) {
-            const actionableParsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
-            if (!parsed || parsed?.status !== "waiting_approval" || !actionableParsedModal) {
-              return parsed;
-            }
-            const inApprovalCooldown = this.lastApprovalResolvedAt > 0 && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
-            if (!inApprovalCooldown) {
-              return parsed;
-            }
-            const visibleModal = this.runParseApproval(recentBuffer);
-            if (visibleModal) {
-              return parsed;
-            }
-            const detectedStatus = this.runDetectStatus(recentBuffer);
-            const resolvedStatus = detectedStatus && detectedStatus !== "waiting_approval" ? detectedStatus : this.isWaitingForResponse || this.currentTurnScope ? "generating" : this.currentStatus === "waiting_approval" ? "idle" : this.currentStatus;
-            return {
-              ...parsed,
-              status: resolvedStatus,
-              activeModal: null
-            };
-          }
           // ─── Public API (CliAdapter) ───────────────────
           getStatus(options = {}) {
             const allowParse = options.allowParse !== false;
             const startupModal = allowParse && this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
             let effectiveStatus = this.projectEffectiveStatus(startupModal);
             let effectiveModal = startupModal || this.activeModal;
-            if (allowParse && !startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === "function") {
-              let parsed = this.getFreshParsedStatusCache();
-              if (!parsed && effectiveStatus !== "idle") {
-                const now = Date.now();
-                if (now - this.lastStatusHotPathParseAt >= _ProviderCliAdapter.STATUS_HOT_PATH_PARSE_MIN_INTERVAL_MS) {
-                  this.lastStatusHotPathParseAt = now;
-                  try {
-                    parsed = this.getScriptParsedStatus();
-                  } catch {
-                  }
-                }
-              }
+            if (allowParse && !startupModal && !effectiveModal) {
+              const parsed = this.getFreshParsedStatusCache();
               const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
               if (parsed?.status === "waiting_approval" && parsedModal) {
                 effectiveStatus = "waiting_approval";
@@ -31436,7 +30418,7 @@ var require_dist2 = __commonJS({
             const bufferState = this.getBufferState();
             return {
               status: effectiveStatus,
-              messages: [...this.committedMessages],
+              messages: [],
               workingDir: this.workingDir,
               activeModal: effectiveModal,
               errorMessage: this.parseErrorMessage || void 0,
@@ -31444,98 +30426,6 @@ var require_dist2 = __commonJS({
               ...bufferState ? { bufferState } : {}
             };
           }
-          seedCommittedMessages(messages) {
-            const normalized = (Array.isArray(messages) ? messages : []).filter((message) => message && (message.role === "user" || message.role === "assistant")).map((message) => ({
-              role: message.role,
-              content: typeof message.content === "string" ? message.content : String(message.content || ""),
-              timestamp: typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : void 0,
-              receivedAt: typeof message.receivedAt === "number" && Number.isFinite(message.receivedAt) ? message.receivedAt : void 0,
-              kind: typeof message.kind === "string" ? message.kind : void 0,
-              id: typeof message.id === "string" ? message.id : void 0,
-              index: typeof message.index === "number" ? message.index : void 0,
-              providerUnitKey: typeof message.providerUnitKey === "string" ? message.providerUnitKey : void 0,
-              bubbleId: typeof message.bubbleId === "string" ? message.bubbleId : void 0,
-              bubbleState: typeof message.bubbleState === "string" ? message.bubbleState : void 0,
-              _turnKey: typeof message._turnKey === "string" ? message._turnKey : void 0,
-              meta: message.meta && typeof message.meta === "object" ? { ...message.meta } : void 0,
-              senderName: typeof message.senderName === "string" ? message.senderName : void 0
-            }));
-            this.committedMessages = normalized;
-            this.syncMessageViews();
-          }
-          getSharedCommittedPrefixLength(parsedMessages) {
-            const committedMessages = this.committedMessages;
-            const max = Math.min(parsedMessages.length, committedMessages.length);
-            let index = 0;
-            while (index < max && this.messagesShareStableIdentity(parsedMessages[index], committedMessages[index])) {
-              index += 1;
-            }
-            return index;
-          }
-          hydrateCommittedPrefixForParsedStatus(parsedMessages) {
-            const sharedPrefixLength = this.getSharedCommittedPrefixLength(parsedMessages);
-            if (sharedPrefixLength !== this.committedMessages.length) return null;
-            const committedHydratedMessages = this.committedMessages.map((message, index) => {
-              const timestamp = typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : this.lastOutputAt || this.currentTurnScope?.startedAt || Date.now();
-              const contentValue = message.content;
-              return {
-                role: message.role,
-                content: typeof contentValue === "string" ? contentValue : String(contentValue || ""),
-                timestamp,
-                receivedAt: typeof message.receivedAt === "number" && Number.isFinite(message.receivedAt) ? message.receivedAt : timestamp,
-                kind: message.kind,
-                id: message.id || `msg_${index}`,
-                index: typeof message.index === "number" ? message.index : index,
-                providerUnitKey: message.providerUnitKey,
-                bubbleId: message.bubbleId,
-                bubbleState: message.bubbleState,
-                _turnKey: message._turnKey,
-                meta: message.meta,
-                senderName: message.senderName
-              };
-            });
-            const extraMessages = parsedMessages.slice(sharedPrefixLength);
-            if (extraMessages.length === 0) return committedHydratedMessages;
-            const extraHydratedMessages = hydrateCliParsedMessages(extraMessages, {
-              committedMessages: [],
-              scope: this.currentTurnScope,
-              lastOutputAt: this.lastOutputAt
-            }).map((message, offset) => ({
-              ...message,
-              id: message.id || `msg_${sharedPrefixLength + offset}`,
-              index: typeof message.index === "number" ? message.index : sharedPrefixLength + offset
-            }));
-            return [...committedHydratedMessages, ...extraHydratedMessages];
-          }
-          hydrateParsedMessagesForStatus(parsedMessages) {
-            return this.hydrateCommittedPrefixForParsedStatus(parsedMessages) || hydrateCliParsedMessages(parsedMessages, {
-              committedMessages: this.committedMessages,
-              scope: this.currentTurnScope,
-              lastOutputAt: this.lastOutputAt
-            });
-          }
-          buildCommittedChatMessages() {
-            return this.committedMessages.map((message, index) => {
-              const rawContentValue = message.content;
-              const rawContent = typeof rawContentValue === "string" ? rawContentValue : String(rawContentValue || "");
-              const content = message.role === "assistant" && (message.kind || "standard") === "standard" ? sanitizeCliStandardMessageContent(rawContent) : rawContent;
-              return buildChatMessage({
-                role: message.role,
-                content,
-                timestamp: message.timestamp,
-                kind: message.kind,
-                meta: message.meta,
-                senderName: message.senderName,
-                id: message.id || `msg_${index}`,
-                index: typeof message.index === "number" ? message.index : index,
-                providerUnitKey: message.providerUnitKey,
-                bubbleId: message.bubbleId,
-                bubbleState: message.bubbleState,
-                _turnKey: message._turnKey,
-                receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
-              });
-            });
-          }
           /**
            * Script-based full parse — returns ReadChatResult.
            * Called by command handler / dashboard for rich content rendering.
@@ -31543,125 +30433,30 @@ var require_dist2 = __commonJS({
           getScriptParsedStatus() {
             const screenText = this.readTerminalScreenText();
             const cached2 = this.parsedStatusCache;
-            if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === screenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
+            if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === screenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
               return cached2.result;
             }
-            const parsed = this.parseCurrentTranscript(
-              this.committedMessages,
-              this.responseBuffer,
-              this.currentTurnScope,
-              screenText
-            );
-            const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
-            if (parsedModal && parsed?.status === "waiting_approval") {
-              this.activeModal = parsedModal;
-              this.isWaitingForResponse = true;
-              if (this.currentStatus !== "waiting_approval") {
-                this.setStatus("waiting_approval", "parsed_waiting_approval");
-                this.onStatusChange?.();
-              }
+            const parsed = this.runParseSession();
+            if (!parsed || !Array.isArray(parsed.messages)) {
+              throw new Error(this.parseErrorMessage || `${this.cliType} parseSession did not return messages`);
             }
-            if (parsed && Array.isArray(parsed.messages) && this.provider.allowInputDuringGeneration === true) {
-              const hydratedForCommit = normalizeCliParsedMessages(parsed.messages, {
-                committedMessages: this.committedMessages,
-                scope: this.currentTurnScope,
+            const activeModal = parsed.activeModal ?? parsed.modal ?? null;
+            const bufferState = this.getBufferState();
+            const result = {
+              id: parsed.id || "cli_session",
+              status: parsed.status || this.currentStatus,
+              title: parsed.title || this.cliName,
+              messages: normalizeCliParsedMessages(parsed.messages, {
+                scope: null,
                 lastOutputAt: this.lastOutputAt
-              });
-              const fakeSession = {
-                status: parsed.status || "idle",
-                messages: parsed.messages,
-                modal: parsedModal,
-                parsedStatus: parsed.status || null
-              };
-              if (this.maybeCommitVisibleIdleTranscript(fakeSession, hydratedForCommit)) {
-                return this.getScriptParsedStatus();
-              }
-            }
-            const shouldPreferCommittedMessages = !this.currentTurnScope && !this.activeModal && this.currentStatus === "idle";
-            let result;
-            if (parsed && Array.isArray(parsed.messages)) {
-              const parsedHydratedMessages = this.hydrateParsedMessagesForStatus(parsed.messages);
-              const parsedLastAssistant = [...parsedHydratedMessages].reverse().find((message) => message.role === "assistant" && typeof message.content === "string" && message.content.trim());
-              const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, this.committedMessages) && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && this.runDetectStatus(this.recentOutputBuffer) === "idle");
-              if (shouldAdoptParsedIdleReplay) {
-                this.committedMessages = this.getSharedCommittedPrefixLength(parsed.messages) === this.committedMessages.length ? parsedHydratedMessages.map((message) => ({
-                  role: message.role,
-                  content: typeof message.content === "string" ? message.content : String(message.content || ""),
-                  timestamp: message.timestamp,
-                  receivedAt: message.receivedAt,
-                  kind: message.kind,
-                  id: message.id,
-                  index: message.index,
-                  meta: message.meta,
-                  senderName: message.senderName
-                })) : normalizeCliParsedMessages(parsed.messages, {
-                  committedMessages: this.committedMessages,
-                  scope: this.currentTurnScope,
-                  lastOutputAt: this.lastOutputAt
-                });
-                this.syncMessageViews();
-                if (this.currentStatus !== "idle" || this.isWaitingForResponse) {
-                  this.responseBuffer = "";
-                  this.isWaitingForResponse = false;
-                  this.responseSettleIgnoreUntil = 0;
-                  this.submitRetryUsed = false;
-                  this.submitRetryPromptSnippet = "";
-                  this.finishRetryCount = 0;
-                  this.currentTurnScope = null;
-                  this.activeModal = null;
-                  this.setStatus("idle", "parsed_idle_replay_commit");
-                  this.onStatusChange?.();
-                }
-              }
-              const shouldPreferCommittedHistoryReplay = !this.currentTurnScope && !this.activeModal && this.committedMessages.length > parsedHydratedMessages.length;
-              const shouldPreferCommittedIdleReplay = shouldPreferCommittedMessages && !shouldAdoptParsedIdleReplay;
-              const hydratedMessages = shouldPreferCommittedIdleReplay || shouldPreferCommittedHistoryReplay ? this.buildCommittedChatMessages() : parsedHydratedMessages;
-              result = {
-                id: parsed.id || "cli_session",
-                status: parsed.status || this.currentStatus,
-                title: parsed.title || this.cliName,
-                messages: hydratedMessages,
-                activeModal: parsed.activeModal ?? this.activeModal,
-                providerSessionId: typeof parsed.providerSessionId === "string" ? parsed.providerSessionId : void 0,
-                ...this.getBufferState() ? { bufferState: this.getBufferState() } : {},
-                ...this.providerOwnsTranscript() ? { transcriptAuthority: "provider", coverage: this.shouldUseFullProviderTranscriptContext() ? "full" : "tail" } : {}
-              };
-            } else {
-              const messages = [...this.committedMessages];
-              const bufferState = this.getBufferState();
-              result = {
-                id: "cli_session",
-                status: this.currentStatus,
-                title: this.cliName,
-                messages: messages.map((message, index) => buildChatMessage({
-                  ...message,
-                  id: message.id || `msg_${index}`,
-                  index: typeof message.index === "number" ? message.index : index,
-                  receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
-                })),
-                activeModal: this.activeModal,
-                ...bufferState ? { bufferState } : {}
-              };
-            }
-            const hasVisibleAssistantMessage = Array.isArray(result?.messages) && result.messages.some((message) => message?.role === "assistant" && typeof message?.content === "string" && message.content.trim());
-            const shouldClampStaleGeneratingToIdle = result?.status === "generating" && this.currentStatus === "idle" && !this.currentTurnScope && !result?.activeModal && hasVisibleAssistantMessage && !hasVisibleInterruptPrompt(screenText);
-            if (shouldClampStaleGeneratingToIdle) {
-              result = {
-                ...result,
-                status: "idle",
-                messages: Array.isArray(result.messages) ? result.messages.map((message) => {
-                  if (message?.role !== "assistant" || !message?.meta?.streaming) return message;
-                  const nextMeta = { ...message.meta || {} };
-                  delete nextMeta.streaming;
-                  return {
-                    ...message,
-                    ...Object.keys(nextMeta).length > 0 ? { meta: nextMeta } : { meta: void 0 }
-                  };
-                }) : result.messages
-              };
-            }
+              }),
+              activeModal,
+              providerSessionId: typeof parsed.providerSessionId === "string" ? parsed.providerSessionId : void 0,
+              ...bufferState ? { bufferState } : {},
+              ...parsed.transcriptAuthority === "provider" || parsed.transcriptAuthority === "daemon" ? { transcriptAuthority: parsed.transcriptAuthority } : this.providerOwnsTranscript() ? { transcriptAuthority: "provider" } : {},
+              ...parsed.coverage === "full" || parsed.coverage === "tail" || parsed.coverage === "current-turn" ? { coverage: parsed.coverage } : this.providerOwnsTranscript() ? { coverage: this.shouldUseFullProviderTranscriptContext() ? "full" : "tail" } : {}
+            };
             this.parsedStatusCache = {
-              committedMessagesRef: this.committedMessages,
               responseBuffer: this.responseBuffer,
               currentTurnScope: this.currentTurnScope,
               recentOutputBuffer: this.recentOutputBuffer,
@@ -31684,7 +30479,7 @@ var require_dist2 = __commonJS({
               accumulatedRawBuffer: this.accumulatedRawBuffer,
               recentOutputBuffer: this.recentOutputBuffer,
               terminalScreenText: this.terminalScreen.getText(),
-              baseMessages: this.committedMessages,
+              baseMessages: [],
               partialResponse: this.responseBuffer,
               isWaitingForResponse: this.isWaitingForResponse,
               scope: this.currentTurnScope,
@@ -31695,46 +30490,8 @@ var require_dist2 = __commonJS({
               args: args && typeof args === "object" ? { ...args } : {}
             }));
           }
-          parseCurrentTranscript(baseMessages, partialResponse, scope, screenTextOverride) {
-            if (!this.cliScripts?.parseOutput) {
-              this.parseErrorMessage = null;
-              return null;
-            }
-            try {
-              const screenText = typeof screenTextOverride === "string" ? screenTextOverride : this.terminalScreen.getText();
-              const parseBaseMessages = this.selectParseBaseMessages(baseMessages);
-              const input = buildCliParseInput({
-                accumulatedBuffer: this.accumulatedBuffer,
-                accumulatedRawBuffer: this.accumulatedRawBuffer,
-                recentOutputBuffer: this.recentOutputBuffer,
-                terminalScreenText: screenText,
-                baseMessages: parseBaseMessages,
-                partialResponse,
-                isWaitingForResponse: this.isWaitingForResponse,
-                scope,
-                runtimeSettings: this.runtimeSettings
-              });
-              const parsed = this.cliScripts.parseOutput(input);
-              if (parsed && typeof parsed === "object") {
-                Object.assign(parsed, validateReadChatResultPayload(parsed, `${this.cliType} parseOutput`));
-              }
-              const normalizedParsed = this.suppressStaleParsedApproval(parsed, input.recentBuffer, input.screenText);
-              if (normalizedParsed && Array.isArray(normalizedParsed.messages)) {
-                normalizedParsed.messages = this.stitchParsedMessagesWithCommittedBase(
-                  normalizedParsed.messages,
-                  baseMessages,
-                  parseBaseMessages
-                );
-                this.trimLastAssistantEcho(normalizedParsed.messages, scope?.prompt || getLastUserPromptText(baseMessages));
-              }
-              this.parseErrorMessage = null;
-              return normalizedParsed;
-            } catch (e) {
-              const message = e?.message || String(e);
-              this.parseErrorMessage = message;
-              LOG2.warn("CLI", `[${this.cliType}] parseOutput error: ${message}`);
-              throw e;
-            }
+          parseCurrentTranscript(_baseMessages, _partialResponse, _scope, _screenTextOverride) {
+            return this.runParseSession();
           }
           /** Whether this adapter has CLI scripts loaded */
           hasCliScripts() {
@@ -31796,8 +30553,6 @@ var require_dist2 = __commonJS({
           commitSendUserTurn(state) {
             if (state.didCommitUserTurn) return;
             state.didCommitUserTurn = true;
-            this.committedMessages.push({ role: "user", content: state.text, timestamp: Date.now() });
-            this.syncMessageViews();
           }
           armResponseTimeout() {
             if (this.responseTimeout) clearTimeout(this.responseTimeout);
@@ -31989,11 +30744,6 @@ var require_dist2 = __commonJS({
               }
             })() : null;
             const parsedSessionStatus = typeof parsedStatusBeforeSend?.status === "string" ? String(parsedStatusBeforeSend.status) : "";
-            const parsedMessagesBeforeSend = Array.isArray(parsedStatusBeforeSend?.messages) ? parsedStatusBeforeSend.messages.filter((message) => message && (message.role === "user" || message.role === "assistant")) : [];
-            const shouldCommitParsedIdleBeforeSend = !allowInputDuringGeneration && parsedSessionStatus === "idle" && parsedMessagesBeforeSend.length > this.committedMessages.length && parsedMessagesBeforeSend.some((message) => message?.role === "assistant" && typeof message?.content === "string" && message.content.trim());
-            if (shouldCommitParsedIdleBeforeSend) {
-              this.commitCurrentTranscript();
-            }
             if (!allowInputDuringGeneration && (parsedSessionStatus === "generating" || parsedSessionStatus === "long_generating")) {
               throw new Error(`${this.cliName} is still processing the previous prompt`);
             }
@@ -32099,9 +30849,6 @@ var require_dist2 = __commonJS({
               activeModal: this.activeModal,
               parseErrorMessage: this.parseErrorMessage,
               messageCounts: {
-                committed: this.committedMessages.length,
-                structured: this.structuredMessages.length,
-                visible: this.messages.length,
                 parsedCache: Array.isArray(parsedResult?.messages) ? parsedResult.messages.length : void 0
               },
               buffers: {
@@ -32152,8 +30899,7 @@ var require_dist2 = __commonJS({
                 responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
                 responseEpoch: this.responseEpoch,
                 resizeSuppressUntil: this.resizeSuppressUntil,
-                lastApprovalResolvedAt: this.lastApprovalResolvedAt,
-                committedMessagesChangedAt: this.committedMessagesChangedAt
+                lastApprovalResolvedAt: this.lastApprovalResolvedAt
               },
               finish: {
                 idleFinishCandidate: this.idleFinishCandidate,
@@ -32278,8 +31024,6 @@ var require_dist2 = __commonJS({
           }
           clearHistory() {
             this.clearIdleFinishCandidate("clear_history");
-            this.committedMessages = [];
-            this.syncMessageViews();
             this.accumulatedBuffer = "";
             this.accumulatedRawBuffer = "";
             this.currentTurnScope = null;
@@ -32320,7 +31064,7 @@ var require_dist2 = __commonJS({
           }
           resolveModal(buttonIndex) {
             let modal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
-            if (!modal && typeof this.cliScripts?.parseOutput === "function") {
+            if (!modal && typeof this.cliScripts?.parseSession === "function") {
               try {
                 const parsed = this.getScriptParsedStatus();
                 const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
@@ -32387,10 +31131,8 @@ var require_dist2 = __commonJS({
               startupParseGate: this.startupParseGate,
               spawnAt: this.spawnAt,
               workingDir: this.workingDir,
-              messages: this.messages,
-              committedMessages: this.committedMessages,
-              structuredMessages: this.structuredMessages,
-              messageCount: this.committedMessages.length,
+              messages: [],
+              messageCount: 0,
               screenText: screenText.slice(-4e3),
               currentTurnScope: this.currentTurnScope,
               startupBuffer: this.startupBuffer.slice(-4e3),
@@ -32442,7 +31184,7 @@ var require_dist2 = __commonJS({
               lifecycleStatus: this.isWaitingForResponse ? "awaiting_response" : "idle",
               activeModal: this.activeModal,
               currentTurnScope: this.currentTurnScope,
-              messages: summarizeCliTraceMessages(this.committedMessages, 5)
+              messages: []
             };
           }
           getProviderResolutionMeta() {
@@ -36023,173 +34765,380 @@ var require_dist2 = __commonJS({
                         index: i,
                         tag: el.tagName?.toLowerCase(),
                         id: el.id || null,
-                        class: el.className && typeof el.className === 'string' ? el.className.trim().slice(0, 200) : null,
-                        role: el.getAttribute?.('role') || null,
-                        'data-testid': el.getAttribute?.('data-testid') || null,
+                        class: el.className && typeof el.className === 'string' ? el.className.trim().slice(0, 200) : null,
+                        role: el.getAttribute?.('role') || null,
+                        'data-testid': el.getAttribute?.('data-testid') || null,
+                        rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
+                        visible: el.offsetParent !== null || el.offsetWidth > 0,
+                    };
+                    ${content ? `item.text = (el.textContent || '').trim().slice(0, 200);` : ""}
+                    ${content ? `item.value = el.value !== undefined ? String(el.value).slice(0, 200) : undefined;` : ""}
+                    results.push(item);
+                }
+                return JSON.stringify({ total: els.length, results });
+            } catch(e) {
+                return JSON.stringify({ error: e.message });
+            }
+        })()`;
+        try {
+          let raw;
+          if (sessionId) {
+            raw = await this.getCdp().evaluateInSessionFrame(sessionId, expression);
+          } else {
+            raw = await this.getCdp().evaluate(expression, 15e3);
+          }
+          const parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
+          return { success: true, ...parsed, selector };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      }
+      /**
+      * CDP DOM Debug — IDE AI panel specialized analysis
+      * Collect all essential info at once when supporting new IDE
+      * 
+      * args:
+      * ideType?: string — IDE type hint
+      * sessionId?: string — agent webview session ID 
+      */
+      async handleDomDebug(args) {
+        if (!this.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
+        const sessionId = args?.sessionId;
+        const expression = `(() => {
+            const result = {
+                url: location.href,
+                title: document.title,
+                viewport: { w: window.innerWidth, h: window.innerHeight },
+                
+ // Input field info
+                inputs: [],
+ // Textarea info
+                textareas: [],
+ // Contenteditable info
+                editables: [],
+ // Buttons (send, submit etc)
+                buttons: [],
+ // iframes (agent webviews)
+                iframes: [],
+ // role="textbox" info
+                textboxes: [],
+            };
+
+ // Input fields
+            document.querySelectorAll('input[type="text"], input:not([type])').forEach((el, i) => {
+                if (i >= 10) return;
+                result.inputs.push({
+                    tag: 'input',
+                    id: el.id || null,
+                    class: (el.className || '').toString().slice(0, 150),
+                    placeholder: el.getAttribute('placeholder') || null,
+                    name: el.name || null,
+                    value: el.value?.slice(0, 100) || null,
+                    visible: el.offsetParent !== null,
+                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
+                });
+            });
+
+ // textarea
+            document.querySelectorAll('textarea').forEach((el, i) => {
+                if (i >= 10) return;
+                result.textareas.push({
+                    id: el.id || null,
+                    class: (el.className || '').toString().slice(0, 150),
+                    placeholder: el.getAttribute('placeholder') || null,
+                    rows: el.rows,
+                    value: el.value?.slice(0, 100) || null,
+                    visible: el.offsetParent !== null,
+                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
+                });
+            });
+
+ // contenteditable
+            document.querySelectorAll('[contenteditable="true"]').forEach((el, i) => {
+                if (i >= 10) return;
+                result.editables.push({
+                    tag: el.tagName?.toLowerCase(),
+                    id: el.id || null,
+                    class: (el.className || '').toString().slice(0, 150),
+                    role: el.getAttribute('role') || null,
+                    text: (el.textContent || '').trim().slice(0, 100),
+                    visible: el.offsetParent !== null,
+                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
+                });
+            });
+
+ // role="textbox"
+            document.querySelectorAll('[role="textbox"]').forEach((el, i) => {
+                if (i >= 10) return;
+                result.textboxes.push({
+                    tag: el.tagName?.toLowerCase(),
+                    id: el.id || null,
+                    class: (el.className || '').toString().slice(0, 150),
+                    'aria-label': el.getAttribute('aria-label') || null,
+                    text: (el.textContent || '').trim().slice(0, 100),
+                    visible: el.offsetParent !== null,
+                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
+                });
+            });
+
+ // Buttons (send, submit, accept, reject, approve etc)
+            const btnKeywords = /send|submit|accept|reject|approve|deny|cancel|confirm|run|execute|apply/i;
+            document.querySelectorAll('button, [role="button"], input[type="submit"]').forEach((el, i) => {
+                const text = (el.textContent || el.getAttribute('aria-label') || '').trim();
+                if (i < 30 && (text.length < 30 || btnKeywords.test(text))) {
+                    result.buttons.push({
+                        tag: el.tagName?.toLowerCase(),
+                        id: el.id || null,
+                        class: (el.className || '').toString().slice(0, 150),
+                        text: text.slice(0, 80),
+                        'aria-label': el.getAttribute('aria-label') || null,
+                        disabled: el.disabled || el.getAttribute('disabled') !== null,
+                        visible: el.offsetParent !== null,
                         rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
-                        visible: el.offsetParent !== null || el.offsetWidth > 0,
-                    };
-                    ${content ? `item.text = (el.textContent || '').trim().slice(0, 200);` : ""}
-                    ${content ? `item.value = el.value !== undefined ? String(el.value).slice(0, 200) : undefined;` : ""}
-                    results.push(item);
+                    });
                 }
-                return JSON.stringify({ total: els.length, results });
-            } catch(e) {
-                return JSON.stringify({ error: e.message });
-            }
+            });
+
+ // iframes
+            document.querySelectorAll('iframe, webview').forEach((el, i) => {
+                if (i >= 20) return;
+                result.iframes.push({
+                    tag: el.tagName?.toLowerCase(),
+                    id: el.id || null,
+                    class: (el.className || '').toString().slice(0, 150),
+                    src: el.getAttribute('src')?.slice(0, 200) || null,
+                    title: el.getAttribute('title') || null,
+                    visible: el.offsetParent !== null,
+                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
+                });
+            });
+
+            return JSON.stringify(result);
         })()`;
         try {
           let raw;
           if (sessionId) {
             raw = await this.getCdp().evaluateInSessionFrame(sessionId, expression);
           } else {
-            raw = await this.getCdp().evaluate(expression, 15e3);
+            raw = await this.getCdp().evaluate(expression, 3e4);
           }
           const parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
-          return { success: true, ...parsed, selector };
+          return { success: true, ...parsed };
         } catch (e) {
           return { success: false, error: e.message };
         }
       }
-      /**
-      * CDP DOM Debug — IDE AI panel specialized analysis
-      * Collect all essential info at once when supporting new IDE
-      * 
-      * args:
-      * ideType?: string — IDE type hint
-      * sessionId?: string — agent webview session ID 
-      */
-      async handleDomDebug(args) {
-        if (!this.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
-        const sessionId = args?.sessionId;
-        const expression = `(() => {
-            const result = {
-                url: location.href,
-                title: document.title,
-                viewport: { w: window.innerWidth, h: window.innerHeight },
-                
- // Input field info
-                inputs: [],
- // Textarea info
-                textareas: [],
- // Contenteditable info
-                editables: [],
- // Buttons (send, submit etc)
-                buttons: [],
- // iframes (agent webviews)
-                iframes: [],
- // role="textbox" info
-                textboxes: [],
-            };
-
- // Input fields
-            document.querySelectorAll('input[type="text"], input:not([type])').forEach((el, i) => {
-                if (i >= 10) return;
-                result.inputs.push({
-                    tag: 'input',
-                    id: el.id || null,
-                    class: (el.className || '').toString().slice(0, 150),
-                    placeholder: el.getAttribute('placeholder') || null,
-                    name: el.name || null,
-                    value: el.value?.slice(0, 100) || null,
-                    visible: el.offsetParent !== null,
-                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
-                });
-            });
-
- // textarea
-            document.querySelectorAll('textarea').forEach((el, i) => {
-                if (i >= 10) return;
-                result.textareas.push({
-                    id: el.id || null,
-                    class: (el.className || '').toString().slice(0, 150),
-                    placeholder: el.getAttribute('placeholder') || null,
-                    rows: el.rows,
-                    value: el.value?.slice(0, 100) || null,
-                    visible: el.offsetParent !== null,
-                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
-                });
-            });
-
- // contenteditable
-            document.querySelectorAll('[contenteditable="true"]').forEach((el, i) => {
-                if (i >= 10) return;
-                result.editables.push({
-                    tag: el.tagName?.toLowerCase(),
-                    id: el.id || null,
-                    class: (el.className || '').toString().slice(0, 150),
-                    role: el.getAttribute('role') || null,
-                    text: (el.textContent || '').trim().slice(0, 100),
-                    visible: el.offsetParent !== null,
-                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
-                });
-            });
-
- // role="textbox"
-            document.querySelectorAll('[role="textbox"]').forEach((el, i) => {
-                if (i >= 10) return;
-                result.textboxes.push({
-                    tag: el.tagName?.toLowerCase(),
-                    id: el.id || null,
-                    class: (el.className || '').toString().slice(0, 150),
-                    'aria-label': el.getAttribute('aria-label') || null,
-                    text: (el.textContent || '').trim().slice(0, 100),
-                    visible: el.offsetParent !== null,
-                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
-                });
-            });
-
- // Buttons (send, submit, accept, reject, approve etc)
-            const btnKeywords = /send|submit|accept|reject|approve|deny|cancel|confirm|run|execute|apply/i;
-            document.querySelectorAll('button, [role="button"], input[type="submit"]').forEach((el, i) => {
-                const text = (el.textContent || el.getAttribute('aria-label') || '').trim();
-                if (i < 30 && (text.length < 30 || btnKeywords.test(text))) {
-                    result.buttons.push({
-                        tag: el.tagName?.toLowerCase(),
-                        id: el.id || null,
-                        class: (el.className || '').toString().slice(0, 150),
-                        text: text.slice(0, 80),
-                        'aria-label': el.getAttribute('aria-label') || null,
-                        disabled: el.disabled || el.getAttribute('disabled') !== null,
-                        visible: el.offsetParent !== null,
-                        rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
-                    });
-                }
-            });
-
- // iframes
-            document.querySelectorAll('iframe, webview').forEach((el, i) => {
-                if (i >= 20) return;
-                result.iframes.push({
-                    tag: el.tagName?.toLowerCase(),
-                    id: el.id || null,
-                    class: (el.className || '').toString().slice(0, 150),
-                    src: el.getAttribute('src')?.slice(0, 200) || null,
-                    title: el.getAttribute('title') || null,
-                    visible: el.offsetParent !== null,
-                    rect: (() => { try { const r = el.getBoundingClientRect(); return { x: Math.round(r.x), y: Math.round(r.y), w: Math.round(r.width), h: Math.round(r.height) }; } catch { return null; } })(),
-                });
-            });
-
-            return JSON.stringify(result);
-        })()`;
-        try {
-          let raw;
-          if (sessionId) {
-            raw = await this.getCdp().evaluateInSessionFrame(sessionId, expression);
-          } else {
-            raw = await this.getCdp().evaluate(expression, 3e4);
+    };
+    var crypto2 = __toESM2(require("crypto"));
+    function normalizeInputEnvelope(input) {
+      const normalized = normalizeInputEnvelopePayload(input);
+      const textFallback = normalized.textFallback ?? flattenInputParts(normalized.parts);
+      return {
+        parts: normalized.parts,
+        textFallback,
+        ...normalized.metadata ? { metadata: normalized.metadata } : {}
+      };
+    }
+    function normalizeMessageParts(content) {
+      if (typeof content === "string") return [{ type: "text", text: content }];
+      if (!Array.isArray(content)) {
+        if (content && typeof content === "object" && typeof content.text === "string") {
+          return [{ type: "text", text: String(content.text) }];
+        }
+        return [];
+      }
+      const parts = [];
+      for (const raw of content) {
+        if (typeof raw === "string") {
+          parts.push({ type: "text", text: raw });
+          continue;
+        }
+        if (!raw || typeof raw !== "object") continue;
+        const part = normalizeMessagePartObject(raw);
+        if (part) parts.push(part);
+      }
+      return parts;
+    }
+    function flattenMessageParts(parts) {
+      return parts.map((part) => {
+        if (part.type === "text") return part.text;
+        if (part.type === "resource") return part.resource.text || "";
+        return "";
+      }).filter((value) => value.length > 0).join("\n");
+    }
+    function normalizeInputEnvelopePayload(input) {
+      if (typeof input === "string") {
+        return { parts: [{ type: "text", text: input }], textFallback: input };
+      }
+      if (!input || typeof input !== "object") {
+        return { parts: [], textFallback: "" };
+      }
+      const record2 = input;
+      const nestedInput = record2.input;
+      if (nestedInput && typeof nestedInput === "object") {
+        const nested = nestedInput;
+        return {
+          parts: normalizeInputParts(nested.parts ?? nested.prompt),
+          textFallback: typeof nested.textFallback === "string" ? nested.textFallback : void 0,
+          metadata: normalizeInputMetadata(nested.metadata)
+        };
+      }
+      const directText = typeof record2.text === "string" ? record2.text : typeof record2.message === "string" ? record2.message : void 0;
+      if (directText !== void 0) {
+        return { parts: [{ type: "text", text: directText }], textFallback: directText };
+      }
+      const directParts = normalizeInputParts(record2.parts ?? record2.prompt);
+      return {
+        parts: directParts,
+        textFallback: typeof record2.textFallback === "string" ? record2.textFallback : void 0,
+        metadata: normalizeInputMetadata(record2.metadata)
+      };
+    }
+    function normalizeInputMetadata(value) {
+      if (!value || typeof value !== "object") return void 0;
+      const record2 = value;
+      const metadata = {};
+      if (record2.source === "dashboard" || record2.source === "shortcut_api" || record2.source === "provider_script" || record2.source === "session_replay") {
+        metadata.source = record2.source;
+      }
+      if (typeof record2.clientTimestamp === "number" && Number.isFinite(record2.clientTimestamp)) {
+        metadata.clientTimestamp = record2.clientTimestamp;
+      }
+      return Object.keys(metadata).length > 0 ? metadata : void 0;
+    }
+    function normalizeInputParts(value) {
+      if (!Array.isArray(value)) return [];
+      const parts = [];
+      for (const raw of value) {
+        if (typeof raw === "string") {
+          parts.push({ type: "text", text: raw });
+          continue;
+        }
+        if (!raw || typeof raw !== "object") continue;
+        const part = normalizeInputPartObject(raw);
+        if (part) parts.push(part);
+      }
+      return parts;
+    }
+    function normalizeInputPartObject(raw) {
+      const type = raw.type;
+      if (type === "text" && typeof raw.text === "string") {
+        return { type, text: raw.text };
+      }
+      if (type === "image" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.alt === "string" ? { alt: raw.alt } : {}
+        };
+      }
+      if (type === "audio" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+        };
+      }
+      if (type === "video" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
+        };
+      }
+      if (type === "resource" && typeof raw.uri === "string") {
+        return {
+          type,
+          uri: raw.uri,
+          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+          ...typeof raw.name === "string" ? { name: raw.name } : {},
+          ...typeof raw.text === "string" ? { text: raw.text } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {}
+        };
+      }
+      if (type === "resource_link" && typeof raw.uri === "string") {
+        return {
+          type: "resource",
+          uri: raw.uri,
+          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+          ...typeof raw.name === "string" ? { name: raw.name } : {}
+        };
+      }
+      return null;
+    }
+    function normalizeMessagePartObject(raw) {
+      const type = raw.type;
+      if (type === "text" && typeof raw.text === "string") {
+        return { type, text: raw.text };
+      }
+      if (type === "image" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {}
+        };
+      }
+      if (type === "audio" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+        };
+      }
+      if (type === "video" && typeof raw.mimeType === "string") {
+        return {
+          type,
+          mimeType: raw.mimeType,
+          ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+          ...typeof raw.data === "string" ? { data: raw.data } : {},
+          ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
+        };
+      }
+      if (type === "resource_link" && typeof raw.uri === "string" && typeof raw.name === "string") {
+        return {
+          type,
+          uri: raw.uri,
+          name: raw.name,
+          ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+          ...typeof raw.size === "number" ? { size: raw.size } : {}
+        };
+      }
+      if (type === "resource" && raw.resource && typeof raw.resource === "object") {
+        const resource = raw.resource;
+        if (typeof resource.uri !== "string") return null;
+        return {
+          type,
+          resource: {
+            uri: resource.uri,
+            ...typeof resource.mimeType === "string" || resource.mimeType === null ? { mimeType: resource.mimeType } : {},
+            ...typeof resource.text === "string" ? { text: resource.text } : {},
+            ...typeof resource.blob === "string" ? { blob: resource.blob } : {}
           }
-          const parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
-          return { success: true, ...parsed };
-        } catch (e) {
-          return { success: false, error: e.message };
-        }
+        };
       }
-    };
-    var crypto2 = __toESM2(require("crypto"));
-    init_contracts();
-    init_contracts();
+      return null;
+    }
+    function flattenInputParts(parts) {
+      return parts.map((part) => {
+        if (part.type === "text") return part.text;
+        if (part.type === "audio") return part.transcript || "";
+        if (part.type === "resource") return part.text || "";
+        return "";
+      }).filter((value) => value.length > 0).join("\n");
+    }
+    function flattenContent(content) {
+      if (typeof content === "string") return content;
+      return flattenMessageParts(normalizeMessageParts(content));
+    }
     var DEFAULT_MONITOR_CONFIG = {
       approvalAlert: true,
       longGeneratingAlert: true,
@@ -36300,8 +35249,148 @@ var require_dist2 = __commonJS({
         }
       }
     };
-    init_contracts();
-    init_chat_message_normalization();
+    var BUILTIN_CHAT_MESSAGE_KINDS = ["standard", "thought", "tool", "terminal", "system"];
+    var KNOWN_CHAT_MESSAGE_KINDS = new Set(BUILTIN_CHAT_MESSAGE_KINDS);
+    var 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"
+    };
+    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 resolveBuiltinOrAliasKind(kind) !== null;
+    }
+    function normalizeChatMessageKind(kind, role) {
+      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: resolveChatMessageKind(message)
+      };
+    }
+    function buildSystemChatMessage(message) {
+      return buildChatMessage({
+        ...message,
+        role: "system",
+        kind: message?.kind || "system"
+      });
+    }
+    function buildRuntimeSystemChatMessage(message) {
+      return buildSystemChatMessage({
+        ...message,
+        senderName: typeof message?.senderName === "string" && message.senderName.trim() ? message.senderName : "System"
+      });
+    }
+    function buildAssistantChatMessage(message) {
+      return buildChatMessage({
+        ...message,
+        role: "assistant",
+        kind: message?.kind || "standard"
+      });
+    }
+    function 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,
+        role: "user",
+        kind: message?.kind || "standard"
+      });
+    }
+    function normalizeChatMessage(message) {
+      return buildChatMessage(message);
+    }
+    function normalizeChatMessages(messages) {
+      return (Array.isArray(messages) ? messages : []).map((message) => normalizeChatMessage(message));
+    }
     function extractProviderControlValues(controls, data) {
       if (!data || typeof data !== "object") return void 0;
       const values = {};
@@ -36496,7 +35585,6 @@ ${cleanBody}`;
     var fs32 = __toESM2(require("fs"));
     var path10 = __toESM2(require("path"));
     var os52 = __toESM2(require("os"));
-    init_chat_message_normalization();
     var HISTORY_DIR = path10.join(os52.homedir(), ".adhdev", "history");
     var RETAIN_DAYS = 30;
     var SAVED_HISTORY_INDEX_VERSION = 1;
@@ -37772,7 +36860,6 @@ ${cleanBody}`;
         })
       };
     }
-    init_chat_message_normalization();
     var IDE_PROVIDER_SESSION_CAPABILITIES_BASE = [
       "read_chat",
       "send_message",
@@ -38201,7 +37288,141 @@ ${effect.notification.body || ""}`.trim();
       }
     };
     init_logger();
-    init_read_chat_contract();
+    var VALID_STATUSES = ["idle", "generating", "waiting_approval", "error", "panel_hidden", "streaming", "long_generating"];
+    var VALID_ROLES = ["user", "assistant", "system", "human"];
+    var VALID_BUBBLE_STATES = ["draft", "streaming", "final", "removed"];
+    var VALID_TURN_STATUSES = ["open", "waiting_approval", "complete", "error"];
+    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 validateBubbleState(state, source, index) {
+      if (typeof state !== "string" || !VALID_BUBBLE_STATES.includes(state)) {
+        throw new Error(`${source}: messages[${index}].bubbleState must be one of ${VALID_BUBBLE_STATES.join(", ")}`);
+      }
+      return state;
+    }
+    function validateTurnStatus(turnStatus, source) {
+      if (typeof turnStatus !== "string" || !VALID_TURN_STATUSES.includes(turnStatus)) {
+        throw new Error(`${source}: turnStatus must be one of ${VALID_TURN_STATUSES.join(", ")}`);
+      }
+      return turnStatus;
+    }
+    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 (typeof message.bubbleId === "string") normalized.bubbleId = message.bubbleId;
+      if (typeof message.providerUnitKey === "string") normalized.providerUnitKey = message.providerUnitKey;
+      if (message.bubbleState !== void 0) normalized.bubbleState = validateBubbleState(message.bubbleState, source, index);
+      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 (typeof message._turnKey === "string") normalized._turnKey = message._turnKey;
+      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.currentTurnId === "string") normalized.currentTurnId = raw.currentTurnId;
+      if (raw.turnStatus !== void 0) normalized.turnStatus = validateTurnStatus(raw.turnStatus, source);
+      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;
+      if (raw.transcriptAuthority === "provider" || raw.transcriptAuthority === "daemon") normalized.transcriptAuthority = raw.transcriptAuthority;
+      if (raw.coverage === "full" || raw.coverage === "tail" || raw.coverage === "current-turn") normalized.coverage = raw.coverage;
+      return normalized;
+    }
     var DEFAULT_APPROVAL_POSITIVE_HINTS = [
       "yes",
       "allow once",
@@ -38247,7 +37468,6 @@ ${effect.notification.body || ""}`.trim();
       if (cleanMessage) lines.push(cleanMessage);
       return lines.join("\n");
     }
-    init_chat_message_normalization();
     var IdeProviderInstance = class {
       type;
       category = "ide";
@@ -39688,7 +38908,6 @@ ${effect.notification.body || ""}`.trim();
     var os62 = __toESM2(require("os"));
     var path11 = __toESM2(require("path"));
     var import_node_crypto = require("crypto");
-    init_contracts();
     var VALID_INPUT_MEDIA_TYPES = /* @__PURE__ */ new Set(["text", "image", "audio", "video", "resource"]);
     function getProviderLabel(provider) {
       return provider?.name || provider?.type || "This provider";
@@ -39742,7 +38961,6 @@ ${effect.notification.body || ""}`.trim();
         throw new Error(`${label} does not support multipart input`);
       }
     }
-    init_read_chat_contract();
     init_logger();
     init_debug_config();
     function summarizeString(value) {
@@ -39866,10 +39084,6 @@ ${effect.notification.body || ""}`.trim();
         payload.historySessionId || "",
         payload.status,
         payload.title || "",
-        payload.syncMode,
-        String(payload.replaceFrom),
-        String(payload.totalMessages),
-        payload.lastMessageSignature,
         payload.activeModal ? `${payload.activeModal.message}|${payload.activeModal.buttons.join("")}` : "",
         stringifySignatureMessages(payload.messages)
       ]);
@@ -39883,7 +39097,6 @@ ${effect.notification.body || ""}`.trim();
         Array.isArray(payload.modalButtons) ? payload.modalButtons.join("") : ""
       ]);
     }
-    init_chat_message_normalization();
     var RECENT_SEND_WINDOW_MS = 1200;
     var READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25e3;
     var recentSendByTarget = /* @__PURE__ */ new Map();
@@ -39984,99 +39197,13 @@ ${effect.notification.body || ""}`.trim();
         return value;
       }
     }
-    function getChatMessageSignature(message) {
-      return buildChatMessageSignature(message);
-    }
-    function normalizeReadChatCursor(args) {
-      const knownMessageCount = Math.max(0, Number(args?.knownMessageCount || 0));
-      const lastMessageSignature = typeof args?.lastMessageSignature === "string" ? args.lastMessageSignature : "";
-      const tailLimit = Math.max(0, Number(args?.tailLimit || 0));
-      return { knownMessageCount, lastMessageSignature, tailLimit };
+    function normalizeReadChatTailLimit(args) {
+      const value = Number(args?.tailLimit || 0);
+      return Number.isFinite(value) ? Math.max(0, value) : 0;
     }
     function normalizeReadChatMessages(payload) {
       const messages = Array.isArray(payload.messages) ? payload.messages : [];
-      return normalizeChatMessages(messages);
-    }
-    function normalizeReadChatReplayTextContent(content) {
-      return flattenContent(content || "").replace(/\s+/g, " ").trim();
-    }
-    function getReadChatReplayCollapseInfo(message) {
-      if (!message) return null;
-      const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
-      const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
-      const senderName = typeof message.senderName === "string" ? message.senderName.trim().toLowerCase() : "";
-      const collapsible = role === "assistant" || role === "system";
-      if (!collapsible) return { role, kind, senderName, content: "", signature: "", collapsible };
-      const content = normalizeReadChatReplayTextContent(message.content);
-      return {
-        role,
-        kind,
-        senderName,
-        content,
-        signature: `${role}:${kind}:${senderName}:${content}`,
-        collapsible
-      };
-    }
-    function isStableReadChatAssistantAnswerInfo(info) {
-      if (!info) return false;
-      if (info.role !== "assistant") return false;
-      if (info.kind && info.kind !== "standard") return false;
-      if (info.content.length < 160) return false;
-      if (/^(bash|shell|terminal) command\b/i.test(info.content)) return false;
-      return true;
-    }
-    function isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableContent) {
-      if (!info || !stableContent) return false;
-      if (info.role !== "assistant") return false;
-      if (info.kind && info.kind !== "standard") return false;
-      const content = info.content;
-      if (content.length < 80 || stableContent.length < 80) return false;
-      return content === stableContent || content.startsWith(stableContent) || stableContent.startsWith(content);
-    }
-    function collapseReplayDuplicatesFromReadChat(messages) {
-      const collapsed = [];
-      const replaySignaturesInCurrentTurn = /* @__PURE__ */ new Set();
-      let stableAssistantAnswerContentInCurrentTurn = "";
-      let stableAssistantAnswerCollapsedIndex = -1;
-      let stableAssistantAnswerHadInterveningActivity = false;
-      let previousReplaySignature = "";
-      for (const message of messages) {
-        const info = getReadChatReplayCollapseInfo(message);
-        if (info?.role === "user") {
-          replaySignaturesInCurrentTurn.clear();
-          stableAssistantAnswerContentInCurrentTurn = "";
-          stableAssistantAnswerCollapsedIndex = -1;
-          stableAssistantAnswerHadInterveningActivity = false;
-          previousReplaySignature = "";
-        }
-        if (info?.collapsible && info.signature) {
-          if (previousReplaySignature === info.signature) continue;
-          if (replaySignaturesInCurrentTurn.has(info.signature)) continue;
-          if (isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableAssistantAnswerContentInCurrentTurn)) {
-            const isAdjacentFullerAssistantAnswer = info.role === "assistant" && (!info.kind || info.kind === "standard") && stableAssistantAnswerCollapsedIndex >= 0 && stableAssistantAnswerCollapsedIndex === collapsed.length - 1 && !stableAssistantAnswerHadInterveningActivity && info.content.length > stableAssistantAnswerContentInCurrentTurn.length && info.content.startsWith(stableAssistantAnswerContentInCurrentTurn);
-            if (isAdjacentFullerAssistantAnswer) {
-              collapsed[stableAssistantAnswerCollapsedIndex] = message;
-              replaySignaturesInCurrentTurn.add(info.signature);
-              stableAssistantAnswerContentInCurrentTurn = info.content;
-              previousReplaySignature = info.signature;
-            }
-            continue;
-          }
-        }
-        collapsed.push(message);
-        previousReplaySignature = info?.collapsible ? info.signature : "";
-        if (info?.collapsible && info.signature) {
-          replaySignaturesInCurrentTurn.add(info.signature);
-        }
-        if (isStableReadChatAssistantAnswerInfo(info)) {
-          stableAssistantAnswerContentInCurrentTurn = info?.content || "";
-          stableAssistantAnswerCollapsedIndex = collapsed.length - 1;
-          stableAssistantAnswerHadInterveningActivity = false;
-        } else if (stableAssistantAnswerContentInCurrentTurn && info?.role === "assistant" && (!info.kind || info.kind !== "standard")) {
-          stableAssistantAnswerHadInterveningActivity = true;
-        }
-      }
-      return collapsed;
+      return messages;
     }
     function deriveHistoryDedupKey(message) {
       const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
@@ -40101,102 +39228,12 @@ ${effect.notification.body || ""}`.trim();
         historyDedupKey: deriveHistoryDedupKey(message)
       }));
     }
-    function findLastMessageIndexBySignature(messages, signature) {
-      if (!signature) return -1;
-      for (let index = messages.length - 1; index >= 0; index -= 1) {
-        if (getChatMessageSignature(messages[index]) === signature) {
-          return index;
-        }
-      }
-      return -1;
-    }
-    function buildBoundedTailSync(messages, cursor) {
+    function buildFullTail(messages, tailLimit) {
       const totalMessages = messages.length;
-      const tailMessages = cursor.tailLimit > 0 && totalMessages > cursor.tailLimit ? messages.slice(-cursor.tailLimit) : messages;
+      const tailMessages = tailLimit > 0 ? messages.slice(-tailLimit) : messages;
       return {
-        syncMode: "full",
-        replaceFrom: 0,
         messages: tailMessages,
-        totalMessages,
-        lastMessageSignature: getChatMessageSignature(messages[totalMessages - 1])
-      };
-    }
-    function computeReadChatSync(messages, cursor) {
-      const totalMessages = messages.length;
-      const lastMessageSignature = getChatMessageSignature(messages[totalMessages - 1]);
-      const { knownMessageCount, lastMessageSignature: knownSignature } = cursor;
-      if (!knownMessageCount || !knownSignature) {
-        return {
-          syncMode: "full",
-          replaceFrom: 0,
-          messages,
-          totalMessages,
-          lastMessageSignature
-        };
-      }
-      if (knownMessageCount > totalMessages) {
-        return {
-          syncMode: "full",
-          replaceFrom: 0,
-          messages,
-          totalMessages,
-          lastMessageSignature
-        };
-      }
-      if (knownMessageCount === totalMessages && knownSignature === lastMessageSignature) {
-        return {
-          syncMode: "noop",
-          replaceFrom: totalMessages,
-          messages: [],
-          totalMessages,
-          lastMessageSignature
-        };
-      }
-      if (cursor.tailLimit > 0 && knownSignature === lastMessageSignature) {
-        const requestedTailCount = Math.min(totalMessages, cursor.tailLimit);
-        if (knownMessageCount >= requestedTailCount) {
-          return {
-            syncMode: "noop",
-            replaceFrom: totalMessages,
-            messages: [],
-            totalMessages,
-            lastMessageSignature
-          };
-        }
-        return buildBoundedTailSync(messages, cursor);
-      }
-      if (knownMessageCount < totalMessages) {
-        const anchorSignature = getChatMessageSignature(messages[knownMessageCount - 1]);
-        if (anchorSignature === knownSignature) {
-          return {
-            syncMode: "append",
-            replaceFrom: knownMessageCount,
-            messages: messages.slice(knownMessageCount),
-            totalMessages,
-            lastMessageSignature
-          };
-        }
-        if (cursor.tailLimit > 0) {
-          const signatureIndex = findLastMessageIndexBySignature(messages, knownSignature);
-          if (signatureIndex >= 0) {
-            return {
-              syncMode: "append",
-              replaceFrom: knownMessageCount,
-              messages: messages.slice(signatureIndex + 1),
-              totalMessages,
-              lastMessageSignature
-            };
-          }
-          return buildBoundedTailSync(messages, cursor);
-        }
-      }
-      const replaceFrom = Math.max(0, Math.min(knownMessageCount - 1, totalMessages));
-      return {
-        syncMode: replaceFrom === 0 ? "full" : "replace_tail",
-        replaceFrom,
-        messages: replaceFrom === 0 ? messages : messages.slice(replaceFrom),
-        totalMessages,
-        lastMessageSignature
+        totalMessages
       };
     }
     function hasNonEmptyModalButtons(activeModal) {
@@ -40231,31 +39268,13 @@ ${effect.notification.body || ""}`.trim();
       } catch (error48) {
         return { success: false, error: error48?.message || String(error48) };
       }
-      const messages = collapseReplayDuplicatesFromReadChat(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,
-          ...validatedPayload,
-          messages: tailMessages,
-          syncMode: "full",
-          replaceFrom: 0,
-          totalMessages: messages.length,
-          lastMessageSignature,
-          ...debugReadChat ? { debugReadChat } : {}
-        };
-      }
-      const sync = computeReadChatSync(messages, cursor);
+      const messages = normalizeReadChatMessages(validatedPayload);
+      const sync = buildFullTail(messages, normalizeReadChatTailLimit(args));
       return {
         success: true,
         ...validatedPayload,
         messages: sync.messages,
-        syncMode: sync.syncMode,
-        replaceFrom: sync.replaceFrom,
         totalMessages: sync.totalMessages,
-        lastMessageSignature: sync.lastMessageSignature,
         ...debugReadChat ? { debugReadChat } : {}
       };
     }
@@ -40480,10 +39499,6 @@ ${effect.notification.body || ""}`.trim();
           status: readResult.status,
           title: readResult.title,
           totalMessages: readResult.totalMessages,
-          returnedMessages: Array.isArray(readResult.messages) ? readResult.messages.length : void 0,
-          syncMode: readResult.syncMode,
-          replaceFrom: readResult.replaceFrom,
-          lastMessageSignature: readResult.lastMessageSignature,
           providerSessionId: readResult.providerSessionId,
           transcriptAuthority: readResult.transcriptAuthority,
           coverage: readResult.coverage,
@@ -40593,22 +39608,13 @@ ${effect.notification.body || ""}`.trim();
       return Number.isFinite(numeric) ? Math.max(0, numeric) : 0;
     }
     function getCliVisibleTranscriptCount(adapter) {
-      const adapterStatus = adapter?.getStatus?.() || {};
-      const adapterMessages = Array.isArray(adapterStatus.messages) ? adapterStatus.messages : [];
-      let parsedRecord = null;
-      if (typeof adapter?.getScriptParsedStatus === "function") {
-        try {
-          const parsed = parseMaybeJson(adapter.getScriptParsedStatus());
-          parsedRecord = parsed && typeof parsed === "object" ? parsed : null;
-        } catch {
-          parsedRecord = null;
-        }
+      if (typeof adapter?.getScriptParsedStatus !== "function") return 0;
+      try {
+        const parsed = parseMaybeJson(adapter.getScriptParsedStatus());
+        return Array.isArray(parsed?.messages) ? parsed.messages.length : 0;
+      } catch {
+        return 0;
       }
-      const parsedMessages = Array.isArray(parsedRecord?.messages) ? parsedRecord.messages : [];
-      if (!parsedRecord) return adapterMessages.length;
-      const parsedIsProviderAuthoritative = parsedRecord.transcriptAuthority === "provider" || parsedRecord.coverage === "full";
-      const shouldPreferAdapterMessages = !parsedIsProviderAuthoritative && adapterMessages.length > 0 && adapterMessages.length > parsedMessages.length;
-      return shouldPreferAdapterMessages ? adapterMessages.length : parsedMessages.length;
     }
     async function getStableExtensionBaseline(h) {
       const first = await readExtensionChatState(h);
@@ -40670,52 +39676,46 @@ ${effect.notification.body || ""}`.trim();
         const adapter = getTargetedCliAdapter(h, args, provider?.type);
         if (adapter) {
           _log(`${transport} adapter: ${adapter.cliType}`);
+          if (typeof adapter.getScriptParsedStatus !== "function") {
+            return { success: false, error: `${transport} adapter parseSession unavailable` };
+          }
           let parsedStatus = null;
-          if (typeof adapter.getScriptParsedStatus === "function") {
-            try {
-              parsedStatus = parseMaybeJson(adapter.getScriptParsedStatus());
-            } catch (error48) {
-              return { success: false, error: error48?.message || String(error48) };
-            }
+          try {
+            parsedStatus = parseMaybeJson(adapter.getScriptParsedStatus());
+          } catch (error48) {
+            return { success: false, error: error48?.message || String(error48) };
           }
           const parsedRecord = parsedStatus && typeof parsedStatus === "object" ? parsedStatus : null;
-          const adapterStatus = adapter.getStatus();
-          const parsedIsProviderAuthoritative = parsedRecord?.transcriptAuthority === "provider" || parsedRecord?.coverage === "full";
-          const shouldPreferAdapterMessages = !parsedIsProviderAuthoritative && Array.isArray(adapterStatus.messages) && adapterStatus.messages.length > 0 && Array.isArray(parsedRecord?.messages) && adapterStatus.messages.length > parsedRecord.messages.length;
-          const parsedShowsApproval = hasNonEmptyModalButtons(parsedRecord?.activeModal) && parsedRecord?.status === "waiting_approval";
-          const status = parsedRecord ? {
-            ...parsedRecord,
-            messages: shouldPreferAdapterMessages ? adapterStatus.messages : parsedRecord.messages,
-            status: parsedShowsApproval ? parsedRecord.status : adapterStatus.status !== "idle" ? adapterStatus.status : parsedRecord.status || adapterStatus.status,
-            activeModal: parsedRecord.activeModal || adapterStatus.activeModal
-          } : adapterStatus;
-          const title = typeof parsedRecord?.title === "string" ? parsedRecord.title : void 0;
-          const providerSessionId = typeof parsedRecord?.providerSessionId === "string" ? parsedRecord.providerSessionId : void 0;
-          const transcriptAuthority = parsedRecord?.transcriptAuthority === "provider" || parsedRecord?.transcriptAuthority === "daemon" ? parsedRecord.transcriptAuthority : void 0;
-          const coverage = parsedRecord?.coverage === "full" || parsedRecord?.coverage === "tail" || parsedRecord?.coverage === "current-turn" ? parsedRecord.coverage : void 0;
-          if (status) {
-            LOG2.debug("Command", `[read_chat] cli-like resolved provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord?.status || "")} shouldPreferAdapterMessages=${String(shouldPreferAdapterMessages)} adapterMsgCount=${Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0} parsedMsgCount=${Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0} returnedMsgCount=${Array.isArray(status.messages) ? status.messages.length : 0}`);
-            return buildReadChatCommandResult({
-              messages: status.messages || [],
-              status: status.status,
-              activeModal: status.activeModal,
-              debugReadChat: {
-                provider: adapter.cliType,
-                targetSessionId: String(args?.targetSessionId || ""),
-                adapterStatus: String(adapterStatus.status || ""),
-                parsedStatus: String(parsedRecord?.status || ""),
-                returnedStatus: String(status.status || ""),
-                shouldPreferAdapterMessages,
-                adapterMsgCount: Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0,
-                parsedMsgCount: Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0,
-                returnedMsgCount: Array.isArray(status.messages) ? status.messages.length : 0
-              },
-              ...title ? { title } : {},
-              ...providerSessionId ? { providerSessionId } : {},
-              ...transcriptAuthority ? { transcriptAuthority } : {},
-              ...coverage ? { coverage } : {}
-            }, args);
-          }
+          if (!parsedRecord || !Array.isArray(parsedRecord.messages)) {
+            return { success: false, error: `${transport} parser did not return messages` };
+          }
+          const adapterStatus = typeof adapter.getStatus === "function" ? adapter.getStatus() : {};
+          const title = typeof parsedRecord.title === "string" ? parsedRecord.title : void 0;
+          const providerSessionId = typeof parsedRecord.providerSessionId === "string" ? parsedRecord.providerSessionId : void 0;
+          const transcriptAuthority = parsedRecord.transcriptAuthority === "provider" || parsedRecord.transcriptAuthority === "daemon" ? parsedRecord.transcriptAuthority : void 0;
+          const coverage = parsedRecord.coverage === "full" || parsedRecord.coverage === "tail" || parsedRecord.coverage === "current-turn" ? parsedRecord.coverage : void 0;
+          const activeModal = parsedRecord.activeModal ?? parsedRecord.modal ?? null;
+          const returnedStatus = parsedRecord.status || "idle";
+          LOG2.debug("Command", `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord.status || "")} parsedMsgCount=${parsedRecord.messages.length}`);
+          return buildReadChatCommandResult({
+            messages: parsedRecord.messages,
+            status: returnedStatus,
+            activeModal,
+            debugReadChat: {
+              provider: adapter.cliType,
+              targetSessionId: String(args?.targetSessionId || ""),
+              adapterStatus: String(adapterStatus.status || ""),
+              parsedStatus: String(parsedRecord.status || ""),
+              returnedStatus: String(returnedStatus || ""),
+              shouldPreferAdapterMessages: false,
+              parsedMsgCount: parsedRecord.messages.length,
+              returnedMsgCount: parsedRecord.messages.length
+            },
+            ...title ? { title } : {},
+            ...providerSessionId ? { providerSessionId } : {},
+            ...transcriptAuthority ? { transcriptAuthority } : {},
+            ...coverage ? { coverage } : {}
+          }, args);
         }
         return { success: false, error: `${transport} adapter not found` };
       }
@@ -43001,7 +42001,6 @@ ${effect.notification.body || ""}`.trim();
     var crypto3 = __toESM2(require("crypto"));
     var fs6 = __toESM2(require("fs"));
     var import_node_module = require("module");
-    init_contracts();
     init_provider_cli_adapter();
     init_logger();
     function normalizeProviderSessionId(provider, providerSessionId) {
@@ -43019,7 +42018,6 @@ ${effect.notification.body || ""}`.trim();
       }
       return normalizedId;
     }
-    init_chat_message_normalization();
     function normalizePersistableCliHistoryContent(content) {
       return flattenContent(content).replace(/\s+/g, " ").trim();
     }
@@ -43259,17 +42257,11 @@ ${effect.notification.body || ""}`.trim();
         }
         const runtime = this.adapter.getRuntimeMetadata();
         this.maybeAppendRuntimeRecoveryMessage(runtime);
-        let parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : parseErrorMessage ? normalizeChatMessages(Array.isArray(adapterStatus.messages) ? adapterStatus.messages : []) : [];
+        let parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
         const historyMessageCount = Number.isFinite(parsedStatus?.historyMessageCount) ? Math.max(0, Number(parsedStatus.historyMessageCount)) : null;
         if (historyMessageCount !== null) {
           parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
         }
-        const committedMessages = Array.isArray(adapterStatus.messages) ? adapterStatus.messages : [];
-        const isActiveNonIdle = adapterStatus.status !== "idle";
-        const shouldApplyCommittedFloor = parsedMessages.length < committedMessages.length && (adapterStatus.status === "waiting_approval" || isActiveNonIdle && historyMessageCount === null);
-        if (shouldApplyCommittedFloor) {
-          parsedMessages = normalizeChatMessages(committedMessages);
-        }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
         const canonicalBackedHistory = this.syncCanonicalSavedHistoryIfNeeded();
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
@@ -43362,11 +42354,9 @@ ${effect.notification.body || ""}`.trim();
         const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
         const visibleStatus = autoApproveActive ? "generating" : adapterStatus.status;
         const runtime = this.adapter.getRuntimeMetadata();
-        const lastCommittedMessageActivityAt = typeof this.adapter.getLastCommittedMessageActivityAt === "function" ? this.adapter.getLastCommittedMessageActivityAt() : 0;
         return {
           id: this.instanceId,
           status: visibleStatus,
-          lastMessageAt: lastCommittedMessageActivityAt || void 0,
           runtimeLifecycle: runtime?.lifecycle ?? null,
           runtimeSurfaceKind: runtime?.surfaceKind,
           runtimeRestoredFromStorage: runtime?.restoredFromStorage === true,
@@ -43472,7 +42462,7 @@ ${effect.notification.body || ""}`.trim();
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
         const partial2 = this.adapter.getPartialResponse();
-        const progressFingerprint = newStatus === "generating" ? `${partial2 || ""}::${adapterStatus.messages.at(-1)?.content || ""}`.slice(-2e3) : void 0;
+        const progressFingerprint = newStatus === "generating" ? `${partial2 || ""}`.slice(-2e3) : void 0;
         const previousStatus = this.lastStatus;
         if (newStatus !== this.lastStatus) {
           LOG2.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
@@ -43918,18 +42908,6 @@ ${effect.notification.body || ""}`.trim();
           receivedAt: message.receivedAt
         }));
         this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
-        if (restoredHistory.messages.length > 0) {
-          this.adapter.seedCommittedMessages(
-            restoredHistory.messages.map((message) => ({
-              role: message.role,
-              content: message.content,
-              timestamp: message.receivedAt,
-              receivedAt: message.receivedAt,
-              kind: message.kind,
-              senderName: message.senderName
-            }))
-          );
-        }
       }
       getProbeDirectories() {
         const dirs = /* @__PURE__ */ new Set();
@@ -43977,8 +42955,6 @@ ${effect.notification.body || ""}`.trim();
     var import_stream = require("stream");
     var import_child_process5 = require("child_process");
     var import_sdk = (init_acp(), __toCommonJS(acp_exports));
-    init_contracts();
-    init_chat_message_normalization();
     init_logger();
     function getPromptCapabilityFlags(agentCapabilities) {
       const prompt = agentCapabilities?.promptCapabilities || {};
@@ -45120,7 +44096,6 @@ ${rawInput}` : rawInput;
         return this.agentCapabilities;
       }
     };
-    init_contracts();
     init_logger();
     function shouldRestoreHostedRuntime(record2, managerTag) {
       if (!managerTag) return true;
@@ -48038,13 +47013,24 @@ Run 'adhdev doctor' for detailed diagnostics.`
             break;
           }
         }
+        if (!cdpReady) {
+          return {
+            success: false,
+            ideId: targetIde.id,
+            ideName: targetIde.displayName,
+            port,
+            action: "failed",
+            message: "",
+            error: `${targetIde.displayName} launched but CDP did not become available on port ${port}`
+          };
+        }
         return {
           success: true,
           ideId: targetIde.id,
           ideName: targetIde.displayName,
           port,
           action: alreadyRunning ? "restarted" : "started",
-          message: cdpReady ? `${targetIde.displayName} launched with CDP on port ${port}` : `${targetIde.displayName} launched (CDP may take a moment to initialize)`
+          message: `${targetIde.displayName} launched with CDP on port ${port}`
         };
       } catch (e) {
         return {
@@ -49952,9 +48938,6 @@ Run 'adhdev doctor' for detailed diagnostics.`
     init_debug_config();
     var DEFAULT_DAEMON_PORT = 19222;
     var DAEMON_WS_PATH = "/ipc";
-    function normalizeSyncMode(syncMode) {
-      return syncMode === "append" || syncMode === "replace_tail" || syncMode === "noop" || syncMode === "full" ? syncMode : "full";
-    }
     function normalizeModalButtons(value) {
       return Array.isArray(value) ? value.filter((button) => typeof button === "string") : [];
     }
@@ -49981,55 +48964,39 @@ Run 'adhdev doctor' for detailed diagnostics.`
         modalButtons: normalizeModalButtons(activeModal.buttons)
       };
     }
-    function buildNextChatCursor(cursor, result) {
-      return {
-        knownMessageCount: Math.max(0, Number(result.totalMessages || cursor.knownMessageCount)),
-        lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : cursor.lastMessageSignature,
-        tailLimit: cursor.tailLimit
-      };
-    }
     function prepareSessionChatTailUpdate2(input) {
       const result = input.result;
-      if (!result?.success || result.syncMode === "noop") {
+      if (!result?.success) {
         return {
-          cursor: result?.success ? buildNextChatCursor(input.cursor, result) : input.cursor,
+          cursor: input.cursor,
           seq: input.seq,
           lastDeliveredSignature: input.lastDeliveredSignature,
           update: null
         };
       }
-      const syncMode = normalizeSyncMode(result.syncMode);
-      const cursor = {
-        knownMessageCount: Math.max(0, Number(result.totalMessages || 0)),
-        lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : "",
-        tailLimit: input.cursor.tailLimit
-      };
+      const messages = Array.isArray(result.messages) ? result.messages : [];
       const title = typeof result.title === "string" ? result.title : void 0;
       const activeModal = normalizeChatTailActiveModal(result.activeModal);
       const status = typeof result.status === "string" ? result.status : "idle";
       const deliverySignature = buildChatTailDeliverySignature({
         sessionId: input.sessionId,
         ...input.historySessionId ? { historySessionId: input.historySessionId } : {},
-        messages: Array.isArray(result.messages) ? result.messages : [],
+        messages,
         status,
         ...title ? { title } : {},
-        ...activeModal ? { activeModal } : {},
-        syncMode,
-        replaceFrom: Number(result.replaceFrom || 0),
-        totalMessages: Number(result.totalMessages || 0),
-        lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : ""
+        ...activeModal ? { activeModal } : {}
       });
       const seq = input.seq + 1;
       if (deliverySignature === input.lastDeliveredSignature) {
         return {
-          cursor,
+          cursor: input.cursor,
           seq,
           lastDeliveredSignature: input.lastDeliveredSignature,
           update: null
         };
       }
       return {
-        cursor,
+        cursor: input.cursor,
         seq,
         lastDeliveredSignature: deliverySignature,
         update: {
@@ -50040,14 +49007,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
           ...input.interactionId ? { interactionId: input.interactionId } : {},
           seq,
           timestamp: input.timestamp,
-          messages: Array.isArray(result.messages) ? result.messages : [],
+          messages,
           status,
           ...title ? { title } : {},
-          ...activeModal ? { activeModal } : {},
-          syncMode,
-          replaceFrom: Number(result.replaceFrom || 0),
-          totalMessages: Number(result.totalMessages || 0),
-          lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : ""
+          ...activeModal ? { activeModal } : {}
         }
       };
     }
@@ -50103,8 +49066,6 @@ Run 'adhdev doctor' for detailed diagnostics.`
       });
       await Promise.all(runners);
     }
-    init_read_chat_contract();
-    init_chat_message_normalization();
     var ProviderStreamAdapter = class {
       agentType;
       agentName;
@@ -50785,7 +49746,6 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     };
     init_logger();
-    init_chat_message_normalization();
     var AgentStreamPoller = class {
       deps;
       timer = null;
@@ -51259,8 +50219,6 @@ Run 'adhdev doctor' for detailed diagnostics.`
         this.eventListeners = [];
       }
     };
-    init_io_contracts();
-    init_chat_message_normalization();
     var fs11 = __toESM2(require("fs"));
     var path21 = __toESM2(require("path"));
     var os19 = __toESM2(require("os"));
@@ -54685,7 +53643,7 @@ async (params) => {
       lines.push("Provider category: `cli`");
       lines.push("");
       const funcToFile = {
-        parseOutput: "parse_output.js",
+        parseSession: "parse_session.js",
         detectStatus: "detect_status.js",
         parseApproval: "parse_approval.js"
       };
@@ -54774,7 +53732,7 @@ async (params) => {
       lines.push("");
       lines.push("| Function | Input | Return |");
       lines.push("|---|---|---|");
-      lines.push("| `parseOutput` | `{ buffer, rawBuffer, recentBuffer, screenText, messages, partialResponse }` | `{ id, status, title, messages, activeModal }` |");
+      lines.push("| `parseSession` | `{ buffer, rawBuffer, recentBuffer, screenText, messages, partialResponse }` | `{ id, status, title, messages, activeModal }` |");
       lines.push("| `detectStatus` | `{ tail, screenText, rawBuffer }` | `idle`, `generating`, `waiting_approval`, or `error` |");
       lines.push("| `parseApproval` | `{ buffer, rawBuffer, tail }` | `{ message, buttons }` or `null` |");
       lines.push("");
@@ -54994,7 +53952,7 @@ async (params) => {
       lines.push("");
       lines.push("## Required Validation");
       lines.push("1. Confirm `detectStatus` changes sensibly between startup, generating, approval, and idle.");
-      lines.push("2. Confirm `parseOutput` produces a stable transcript without duplicating past turns when the PTY redraws.");
+      lines.push("2. Confirm `parseSession` produces a stable transcript without duplicating past turns when the PTY redraws.");
       lines.push("3. Confirm the latest assistant message streams through `partialResponse` while generation is in progress.");
       lines.push("4. Confirm approval parsing returns meaningful button labels when the CLI requests permission.");
       lines.push("5. Confirm the Python file was actually created and executed, not just described in chat text.");
@@ -56262,7 +55220,7 @@ data: ${JSON.stringify(msg.data)}
         lines.push("Provider category: `cli`");
         lines.push("");
         const funcToFile = {
-          parseOutput: "parse_output.js",
+          parseSession: "parse_session.js",
           detectStatus: "detect_status.js",
           parseApproval: "parse_approval.js"
         };
@@ -56351,7 +55309,7 @@ data: ${JSON.stringify(msg.data)}
         lines.push("");
         lines.push("| Function | Input | Return |");
         lines.push("|---|---|---|");
-        lines.push("| `parseOutput` | `{ buffer, rawBuffer, recentBuffer, screenText, messages, partialResponse }` | `{ id, status, title, messages, activeModal }` |");
+        lines.push("| `parseSession` | `{ buffer, rawBuffer, recentBuffer, screenText, messages, partialResponse }` | `{ id, status, title, messages, activeModal }` |");
         lines.push("| `detectStatus` | `{ tail, screenText, rawBuffer }` | `idle`, `generating`, `waiting_approval`, or `error` |");
         lines.push("| `parseApproval` | `{ buffer, rawBuffer, tail }` | `{ message, buttons }` or `null` |");
         lines.push("");
@@ -56446,7 +55404,7 @@ data: ${JSON.stringify(msg.data)}
         lines.push("");
         lines.push("## Required Validation");
         lines.push("1. Confirm `detectStatus` changes sensibly between startup, generating, approval, and idle.");
-        lines.push("2. Confirm `parseOutput` produces a stable transcript without duplicating past turns when the PTY redraws.");
+        lines.push("2. Confirm `parseSession` produces a stable transcript without duplicating past turns when the PTY redraws.");
         lines.push("3. Confirm the latest assistant message streams through `partialResponse` while generation is in progress.");
         lines.push("4. Confirm approval parsing returns meaningful button labels when the CLI requests permission.");
         lines.push("5. Confirm the Python file was actually created and executed, not just described in chat text.");
@@ -59174,8 +58132,6 @@ var StandaloneServer = class {
         },
         seq: 0,
         cursor: {
-          knownMessageCount: Math.max(0, Number(params.knownMessageCount || 0)),
-          lastMessageSignature: typeof params.lastMessageSignature === "string" ? params.lastMessageSignature : "",
           tailLimit: Math.max(0, Number(params.tailLimit || 0))
         },
         lastDeliveredSignature: ""
@@ -59299,8 +58255,6 @@ var StandaloneServer = class {
     const result = await this.executeCommand("read_chat", {
       targetSessionId: request.targetSessionId,
       ...request.historySessionId ? { historySessionId: request.historySessionId } : {},
-      knownMessageCount: state.cursor.knownMessageCount,
-      lastMessageSignature: state.cursor.lastMessageSignature,
       ...state.cursor.tailLimit > 0 ? { tailLimit: state.cursor.tailLimit } : {}
     });
     const prepared = (0, import_daemon_core2.prepareSessionChatTailUpdate)({