@adhdev/daemon-core 0.8.52 → 0.8.53

package/dist/index.js

@@ -3042,6 +3042,7 @@ __export(index_exports, {
   detectIDEs: () => detectIDEs,
   ensureSessionHostReady: () => ensureSessionHostReady,
   findCdpManager: () => findCdpManager,
+  flattenMessageParts: () => flattenMessageParts,
   forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance,
   getAIExtensions: () => getAIExtensions,
   getAvailableIdeIds: () => getAvailableIdeIds,
@@ -3055,6 +3056,8 @@ __export(index_exports, {
   getRecentDebugTrace: () => getRecentDebugTrace,
   getRecentLogs: () => getRecentLogs,
   getSavedProviderSessions: () => getSavedProviderSessions,
+  getSessionHostRecoveryLabel: () => getSessionHostRecoveryLabel,
+  getSessionHostSurfaceKind: () => getSessionHostSurfaceKind,
   getWorkspaceState: () => getWorkspaceState,
   hasCdpManager: () => hasCdpManager,
   initDaemonComponents: () => initDaemonComponents,
@@ -3065,6 +3068,8 @@ __export(index_exports, {
   isIdeRunning: () => isIdeRunning,
   isManagedStatusWaiting: () => isManagedStatusWaiting,
   isManagedStatusWorking: () => isManagedStatusWorking,
+  isSessionHostLiveRuntime: () => isSessionHostLiveRuntime,
+  isSessionHostRecoverySnapshot: () => isSessionHostRecoverySnapshot,
   isSetupComplete: () => isSetupComplete,
   killIdeProcess: () => killIdeProcess,
   launchIDE: () => launchIDE,
@@ -3076,7 +3081,11 @@ __export(index_exports, {
   markSetupComplete: () => markSetupComplete,
   maybeRunDaemonUpgradeHelperFromEnv: () => maybeRunDaemonUpgradeHelperFromEnv,
   normalizeActiveChatData: () => normalizeActiveChatData,
+  normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
+  normalizeMessageParts: () => normalizeMessageParts,
+  partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
+  partitionSessionHostRecords: () => partitionSessionHostRecords,
   probeCdpPort: () => probeCdpPort,
   readChatHistory: () => readChatHistory,
   recordDebugTrace: () => recordDebugTrace,
@@ -3091,6 +3100,7 @@ __export(index_exports, {
   setDebugRuntimeConfig: () => setDebugRuntimeConfig,
   setLogLevel: () => setLogLevel,
   setupIdeInstance: () => setupIdeInstance,
+  shouldAutoRestoreHostedSessionsOnStartup: () => shouldAutoRestoreHostedSessionsOnStartup,
   shouldCollectTraceCategory: () => shouldCollectTraceCategory,
   shutdownDaemonComponents: () => shutdownDaemonComponents,
   spawnDetachedDaemonUpgradeHelper: () => spawnDetachedDaemonUpgradeHelper,
@@ -5186,6 +5196,61 @@ function normalizeProviderEffects(data) {
   }
   return effects;
 }
+function normalizeControlListResult(data) {
+  if (data && typeof data === "object" && Array.isArray(data.options)) {
+    return {
+      options: normalizeControlOptions(data.options),
+      ...isScalarControlValue(data.currentValue) ? { currentValue: data.currentValue } : {},
+      ...typeof data.error === "string" ? { error: data.error } : {}
+    };
+  }
+  const rawOptions = Array.isArray(data?.models) ? data.models : Array.isArray(data?.modes) ? data.modes : Array.isArray(data?.options) ? data.options : [];
+  const options = normalizeControlOptions(rawOptions);
+  return {
+    options,
+    ...isScalarControlValue(data?.current) ? { currentValue: data.current } : {},
+    ...isScalarControlValue(data?.currentValue) ? { currentValue: data.currentValue } : {},
+    ...typeof data?.error === "string" ? { error: data.error } : {}
+  };
+}
+function normalizeControlSetResult(data) {
+  const currentValue = isScalarControlValue(data?.currentValue) ? data.currentValue : isScalarControlValue(data?.value) ? data.value : void 0;
+  return {
+    ok: data?.ok === true || data?.success === true,
+    ...currentValue !== void 0 ? { currentValue } : {},
+    ...Array.isArray(data?.effects) ? { effects: normalizeProviderEffects(data) } : {},
+    ...typeof data?.error === "string" ? { error: data.error } : {}
+  };
+}
+function normalizeControlInvokeResult(data) {
+  const currentValue = isScalarControlValue(data?.currentValue) ? data.currentValue : isScalarControlValue(data?.value) ? data.value : void 0;
+  return {
+    ok: data?.ok === true || data?.success === true,
+    ...currentValue !== void 0 ? { currentValue } : {},
+    ...Array.isArray(data?.effects) ? { effects: normalizeProviderEffects(data) } : {},
+    ...typeof data?.error === "string" ? { error: data.error } : {}
+  };
+}
+function normalizeControlOptions(options) {
+  return options.map((option) => normalizeControlOption(option)).filter((option) => !!option);
+}
+function normalizeControlOption(option) {
+  if (typeof option === "string") {
+    return { value: option, label: option };
+  }
+  if (!option || typeof option !== "object") return null;
+  const record = option;
+  const value = typeof record.value === "string" ? record.value : typeof record.id === "string" ? record.id : null;
+  if (!value) return null;
+  const label = typeof record.label === "string" ? record.label : typeof record.name === "string" ? record.name : value;
+  const normalized = { value, label };
+  if (typeof record.description === "string") normalized.description = record.description;
+  if (typeof record.group === "string") normalized.group = record.group;
+  return normalized;
+}
+function isScalarControlValue(value) {
+  return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+}
 function normalizeControlValue(value) {
   if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
     return value;
@@ -7177,50 +7242,6 @@ function isCdpConnected(cdpManagers, key) {
   }
   return false;
 }
-function buildFallbackControls(providerControls, serverModel, serverMode, acpConfigOptions, acpModes) {
-  if (providerControls && providerControls.length > 0) return providerControls;
-  const controls = [];
-  const isAcp = !!(acpConfigOptions || acpModes);
-  const modelFromAcp = acpConfigOptions?.find((c) => c.category === "model");
-  if (!isAcp || modelFromAcp) {
-    controls.push({
-      id: "model",
-      type: "select",
-      label: "Model",
-      icon: "\u{1F916}",
-      placement: "bar",
-      dynamic: !modelFromAcp,
-      listScript: "listModels",
-      setScript: "setModel",
-      readFrom: "model",
-      ...modelFromAcp && {
-        options: modelFromAcp.options.map((o) => ({ value: o.value, label: o.name || o.value }))
-      }
-    });
-  }
-  const modeFromAcp = acpModes && acpModes.length > 0;
-  const thoughtFromAcp = !modeFromAcp && acpConfigOptions?.find((c) => c.category !== "model");
-  if (!isAcp || modeFromAcp || thoughtFromAcp) {
-    controls.push({
-      id: "mode",
-      type: thoughtFromAcp ? "cycle" : "select",
-      label: thoughtFromAcp ? "Thinking" : "Mode",
-      icon: thoughtFromAcp ? "\u{1F9E0}" : "\u26A1",
-      placement: "bar",
-      dynamic: !modeFromAcp && !thoughtFromAcp,
-      listScript: "listModes",
-      setScript: thoughtFromAcp ? "setThinkingLevel" : "setMode",
-      readFrom: "mode",
-      ...modeFromAcp && {
-        options: acpModes.map((m) => ({ value: m.id, label: m.name || m.id }))
-      },
-      ...thoughtFromAcp && {
-        options: thoughtFromAcp.options.map((o) => ({ value: o.value, label: o.name || o.value }))
-      }
-    });
-  }
-  return controls;
-}
 var IDE_SESSION_CAPABILITIES = [
   "read_chat",
   "send_message",
@@ -7289,11 +7310,7 @@ function buildIdeWorkspaceSession(state, cdpManagers, options) {
     currentAutoApprove: state.currentAutoApprove,
     ...includeSessionControls && {
       controlValues: state.controlValues,
-      providerControls: buildFallbackControls(
-        state.providerControls,
-        state.currentModel,
-        state.currentPlan
-      )
+      providerControls: state.providerControls
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
@@ -7323,11 +7340,7 @@ function buildExtensionAgentSession(parent, ext, options) {
     currentPlan: ext.currentPlan,
     ...includeSessionControls && {
       controlValues: ext.controlValues,
-      providerControls: buildFallbackControls(
-        ext.providerControls,
-        ext.currentModel,
-        ext.currentPlan
-      )
+      providerControls: ext.providerControls
     },
     errorMessage: ext.errorMessage,
     errorReason: ext.errorReason,
@@ -7368,9 +7381,7 @@ function buildCliSession(state, options) {
     },
     ...includeSessionControls && {
       controlValues: state.controlValues,
-      providerControls: buildFallbackControls(
-        state.providerControls
-      )
+      providerControls: state.providerControls
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
@@ -7402,13 +7413,7 @@ function buildAcpSession(state, options) {
       acpConfigOptions: state.acpConfigOptions,
       acpModes: state.acpModes,
       controlValues: state.controlValues,
-      providerControls: buildFallbackControls(
-        state.providerControls,
-        state.currentModel,
-        state.currentPlan,
-        state.acpConfigOptions,
-        state.acpModes
-      )
+      providerControls: state.providerControls
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
@@ -7491,10 +7496,217 @@ function reconcileIdeRuntimeSessions(instanceManager, sessionRegistry) {
 // src/commands/handler.ts
 init_logger();
 
+// src/providers/io-contracts.ts
+function normalizeInputEnvelope(input) {
+  const normalized = normalizeInputEnvelopePayload(input);
+  const textFallback = normalized.textFallback ?? flattenInputParts(normalized.parts);
+  return {
+    parts: normalized.parts,
+    textFallback,
+    ...normalized.metadata ? { metadata: normalized.metadata } : {}
+  };
+}
+function normalizeMessageParts(content) {
+  if (typeof content === "string") return [{ type: "text", text: content }];
+  if (!Array.isArray(content)) {
+    if (content && typeof content === "object" && typeof content.text === "string") {
+      return [{ type: "text", text: String(content.text) }];
+    }
+    return [];
+  }
+  const parts = [];
+  for (const raw of content) {
+    if (typeof raw === "string") {
+      parts.push({ type: "text", text: raw });
+      continue;
+    }
+    if (!raw || typeof raw !== "object") continue;
+    const part = normalizeMessagePartObject(raw);
+    if (part) parts.push(part);
+  }
+  return parts;
+}
+function flattenMessageParts(parts) {
+  return parts.map((part) => {
+    if (part.type === "text") return part.text;
+    if (part.type === "resource") return part.resource.text || "";
+    return "";
+  }).filter((value) => value.length > 0).join("\n");
+}
+function normalizeInputEnvelopePayload(input) {
+  if (typeof input === "string") {
+    return { parts: [{ type: "text", text: input }], textFallback: input };
+  }
+  if (!input || typeof input !== "object") {
+    return { parts: [], textFallback: "" };
+  }
+  const record = input;
+  const nestedInput = record.input;
+  if (nestedInput && typeof nestedInput === "object") {
+    const nested = nestedInput;
+    return {
+      parts: normalizeInputParts(nested.parts ?? nested.prompt),
+      textFallback: typeof nested.textFallback === "string" ? nested.textFallback : void 0,
+      metadata: normalizeInputMetadata(nested.metadata)
+    };
+  }
+  const directText = typeof record.text === "string" ? record.text : typeof record.message === "string" ? record.message : void 0;
+  if (directText !== void 0) {
+    return { parts: [{ type: "text", text: directText }], textFallback: directText };
+  }
+  const directParts = normalizeInputParts(record.parts ?? record.prompt);
+  return {
+    parts: directParts,
+    textFallback: typeof record.textFallback === "string" ? record.textFallback : void 0,
+    metadata: normalizeInputMetadata(record.metadata)
+  };
+}
+function normalizeInputMetadata(value) {
+  if (!value || typeof value !== "object") return void 0;
+  const record = value;
+  const metadata = {};
+  if (record.source === "dashboard" || record.source === "shortcut_api" || record.source === "provider_script" || record.source === "session_replay") {
+    metadata.source = record.source;
+  }
+  if (typeof record.clientTimestamp === "number" && Number.isFinite(record.clientTimestamp)) {
+    metadata.clientTimestamp = record.clientTimestamp;
+  }
+  return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
+function normalizeInputParts(value) {
+  if (!Array.isArray(value)) return [];
+  const parts = [];
+  for (const raw of value) {
+    if (typeof raw === "string") {
+      parts.push({ type: "text", text: raw });
+      continue;
+    }
+    if (!raw || typeof raw !== "object") continue;
+    const part = normalizeInputPartObject(raw);
+    if (part) parts.push(part);
+  }
+  return parts;
+}
+function normalizeInputPartObject(raw) {
+  const type = raw.type;
+  if (type === "text" && typeof raw.text === "string") {
+    return { type, text: raw.text };
+  }
+  if (type === "image" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.alt === "string" ? { alt: raw.alt } : {}
+    };
+  }
+  if (type === "audio" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+    };
+  }
+  if (type === "video" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
+    };
+  }
+  if (type === "resource" && typeof raw.uri === "string") {
+    return {
+      type,
+      uri: raw.uri,
+      ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+      ...typeof raw.name === "string" ? { name: raw.name } : {},
+      ...typeof raw.text === "string" ? { text: raw.text } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {}
+    };
+  }
+  if (type === "resource_link" && typeof raw.uri === "string") {
+    return {
+      type: "resource",
+      uri: raw.uri,
+      ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+      ...typeof raw.name === "string" ? { name: raw.name } : {}
+    };
+  }
+  return null;
+}
+function normalizeMessagePartObject(raw) {
+  const type = raw.type;
+  if (type === "text" && typeof raw.text === "string") {
+    return { type, text: raw.text };
+  }
+  if (type === "image" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {}
+    };
+  }
+  if (type === "audio" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+    };
+  }
+  if (type === "video" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
+    };
+  }
+  if (type === "resource_link" && typeof raw.uri === "string" && typeof raw.name === "string") {
+    return {
+      type,
+      uri: raw.uri,
+      name: raw.name,
+      ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+      ...typeof raw.size === "number" ? { size: raw.size } : {}
+    };
+  }
+  if (type === "resource" && raw.resource && typeof raw.resource === "object") {
+    const resource = raw.resource;
+    if (typeof resource.uri !== "string") return null;
+    return {
+      type,
+      resource: {
+        uri: resource.uri,
+        ...typeof resource.mimeType === "string" || resource.mimeType === null ? { mimeType: resource.mimeType } : {},
+        ...typeof resource.text === "string" ? { text: resource.text } : {},
+        ...typeof resource.blob === "string" ? { blob: resource.blob } : {}
+      }
+    };
+  }
+  return null;
+}
+function flattenInputParts(parts) {
+  return parts.map((part) => {
+    if (part.type === "text") return part.text;
+    if (part.type === "audio") return part.transcript || "";
+    if (part.type === "resource") return part.text || "";
+    return "";
+  }).filter((value) => value.length > 0).join("\n");
+}
+
 // src/providers/contracts.ts
 function flattenContent(content) {
   if (typeof content === "string") return content;
-  return content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
+  return flattenMessageParts(normalizeMessageParts(content));
 }
 
 // src/commands/chat-commands.ts
@@ -7683,6 +7895,9 @@ function buildRecentSendKey(h, args, provider, text) {
   const target = args?.targetSessionId || args?.agentType || h.currentSession?.providerType || h.currentProviderType || h.currentManagerKey || "unknown";
   return `${transport}:${target}:${text.trim()}`;
 }
+function getSendChatInputEnvelope(args) {
+  return normalizeInputEnvelope(args?.input ? { input: args.input } : args);
+}
 function getHistorySessionId(h, args) {
   const explicit = typeof args?.historySessionId === "string" ? args.historySessionId.trim() : "";
   if (explicit) return explicit;
@@ -8087,7 +8302,8 @@ async function handleReadChat(h, args) {
   return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
 }
 async function handleSendChat(h, args) {
-  const text = args?.text || args?.message;
+  const input = getSendChatInputEnvelope(args);
+  const text = input.textFallback;
   if (!text) return { success: false, error: "text required" };
   const _log = (msg) => LOG.debug("Command", `[send_chat] ${msg}`);
   const provider = h.getProvider(args?.agentType);
@@ -9027,6 +9243,21 @@ function listDirectoryEntriesSafe(dirPath) {
   }
   return files;
 }
+function listWindowsDriveEntries(excludePath) {
+  const excluded = typeof excludePath === "string" ? excludePath.toLowerCase() : "";
+  const drives = [];
+  for (let code = 65; code <= 90; code += 1) {
+    const letter = String.fromCharCode(code);
+    const root = `${letter}:\\`;
+    try {
+      if (!fs4.existsSync(root)) continue;
+      if (excluded && root.toLowerCase() === excluded) continue;
+      drives.push({ name: `${letter}:`, type: "directory", path: root });
+    } catch {
+    }
+  }
+  return drives;
+}
 async function handleFileRead(h, args) {
   try {
     const filePath = resolveSafePath(args?.path);
@@ -9059,12 +9290,51 @@ async function handleFileListBrowse(h, args) {
   try {
     const dirPath = resolveSafePath(args?.path || ".");
     const files = listDirectoryEntriesSafe(dirPath).filter((entry) => entry.type === "directory").sort((a, b) => a.name.localeCompare(b.name));
+    if (process.platform === "win32" && /^[A-Za-z]:\\?$/.test(dirPath)) {
+      const driveEntries = listWindowsDriveEntries(dirPath);
+      return {
+        success: true,
+        files: [...driveEntries, ...files],
+        path: dirPath
+      };
+    }
     return { success: true, files, path: dirPath };
   } catch (e) {
     return { success: false, error: e.message };
   }
 }
 
+// src/providers/cli-script-results.ts
+function parseCliScriptResult(result) {
+  if (typeof result === "string") {
+    try {
+      const parsed = JSON.parse(result);
+      if (parsed && typeof parsed === "object" && parsed.success === false) {
+        return { success: false, payload: parsed };
+      }
+      return { success: true, payload: parsed };
+    } catch {
+      return { success: true, payload: { result } };
+    }
+  }
+  if (result && typeof result === "object" && "success" in result && result.success === false) {
+    return { success: false, payload: result };
+  }
+  return { success: true, payload: result };
+}
+function getCliScriptCommand(payload) {
+  if (!payload || typeof payload !== "object") return null;
+  if (typeof payload.sendMessage === "string" && payload.sendMessage.trim()) {
+    return { type: "send_message", text: payload.sendMessage.trim() };
+  }
+  const command = payload.command;
+  if (!command || typeof command !== "object") return null;
+  if (command.type !== "send_message" && command.type !== "pty_write") return null;
+  const text = typeof command.text === "string" ? command.text.trim() : typeof command.message === "string" ? command.message.trim() : "";
+  if (!text) return null;
+  return { type: command.type, text };
+}
+
 // src/commands/stream-commands.ts
 init_logger();
 function getCliPresentationMode(h, targetSessionId) {
@@ -9155,34 +9425,19 @@ function normalizeProviderScriptArgs(args) {
   }
   return normalizedArgs;
 }
-function parseScriptResult(result) {
-  if (typeof result === "string") {
-    try {
-      const parsed = JSON.parse(result);
-      if (parsed && typeof parsed === "object" && parsed.success === false) {
-        return { success: false, payload: parsed };
-      }
-      return { success: true, payload: parsed };
-    } catch {
-      return { success: true, payload: { result } };
-    }
+function buildControlScriptResult(scriptName, payload) {
+  if (!payload || typeof payload !== "object") return {};
+  if (Array.isArray(payload.options) || Array.isArray(payload.models) || Array.isArray(payload.modes)) {
+    return { controlResult: normalizeControlListResult(payload) };
   }
-  if (result && typeof result === "object" && "success" in result && result.success === false) {
-    return { success: false, payload: result };
+  const looksLikeValueMutation = /^set|^change/i.test(scriptName) || payload.currentValue !== void 0 || payload.value !== void 0;
+  if (looksLikeValueMutation) {
+    return { controlResult: normalizeControlSetResult(payload) };
   }
-  return { success: true, payload: result };
-}
-function getCliScriptCommand(payload) {
-  if (!payload || typeof payload !== "object") return null;
-  if (typeof payload.sendMessage === "string" && payload.sendMessage.trim()) {
-    return { type: "send_message", text: payload.sendMessage.trim() };
+  if (payload.ok !== void 0 || payload.success !== void 0 || Array.isArray(payload.effects)) {
+    return { controlResult: normalizeControlInvokeResult(payload) };
   }
-  const command = payload.command;
-  if (!command || typeof command !== "object") return null;
-  if (command.type !== "send_message" && command.type !== "pty_write") return null;
-  const text = typeof command.text === "string" ? command.text.trim() : typeof command.message === "string" ? command.message.trim() : "";
-  if (!text) return null;
-  return { type: command.type, text };
+  return {};
 }
 function applyProviderPatch(h, args, payload) {
   if (!payload || typeof payload !== "object") return;
@@ -9216,7 +9471,7 @@ async function executeProviderScript(h, args, scriptName) {
     }
     try {
       const raw = await adapter.invokeScript(actualScriptName, normalizedArgs);
-      const parsed = parseScriptResult(raw);
+      const parsed = parseCliScriptResult(raw);
       if (!parsed.success) {
         return { success: false, ...parsed.payload || {} };
       }
@@ -9227,7 +9482,11 @@ async function executeProviderScript(h, args, scriptName) {
         adapter.writeRaw(cliCommand.text + "\r");
       }
       applyProviderPatch(h, args, parsed.payload);
-      return { success: true, ...parsed.payload && typeof parsed.payload === "object" ? parsed.payload : { result: parsed.payload } };
+      return {
+        success: true,
+        ...parsed.payload && typeof parsed.payload === "object" ? parsed.payload : { result: parsed.payload },
+        ...buildControlScriptResult(scriptName, parsed.payload)
+      };
     } catch (e) {
       return { success: false, error: `Script execution failed: ${e.message}` };
     }
@@ -9290,7 +9549,7 @@ async function executeProviderScript(h, args, scriptName) {
         if (parsed && typeof parsed === "object" && parsed.success === false) {
           return { success: false, ...parsed };
         }
-        return { success: true, ...parsed };
+        return { success: true, ...parsed, ...buildControlScriptResult(scriptName, parsed) };
       } catch {
         return { success: true, result };
       }
@@ -9301,9 +9560,6 @@ async function executeProviderScript(h, args, scriptName) {
     return { success: false, error: `Script execution failed: ${e.message}` };
   }
 }
-async function handleExtensionScript(h, args, scriptName) {
-  return executeProviderScript(h, args, scriptName);
-}
 async function handleProviderScript(h, args) {
   const scriptName = typeof args?.scriptName === "string" ? args.scriptName.trim() : "";
   if (!scriptName) return { success: false, error: "scriptName is required" };
@@ -9746,11 +10002,7 @@ var DaemonCommandHandler = class {
       "focus_session",
       "pty_input",
       "pty_resize",
-      "invoke_provider_script",
-      "list_extension_models",
-      "set_extension_model",
-      "list_extension_modes",
-      "set_extension_mode"
+      "invoke_provider_script"
     ]);
     if (this._currentRoute.sessionLookupFailed && sessionScopedCommands.has(cmd)) {
       const result2 = {
@@ -9862,17 +10114,9 @@ var DaemonCommandHandler = class {
         return handleGetIdeExtensions(this, args);
       case "set_ide_extension":
         return handleSetIdeExtension(this, args);
-      // ─── Extension Model / Mode Control (stream-commands.ts) ──────────
+      // ─── Provider control execution (stream-commands.ts) ──────────
       case "invoke_provider_script":
         return handleProviderScript(this, args);
-      case "list_extension_models":
-        return handleExtensionScript(this, args, "listModels");
-      case "set_extension_model":
-        return handleExtensionScript(this, args, "setModel");
-      case "list_extension_modes":
-        return handleExtensionScript(this, args, "listModes");
-      case "set_extension_mode":
-        return handleExtensionScript(this, args, "setMode");
       // ─── Provider Auto-Fix / Clone (DevServer proxy) ──────────
       case "provider_auto_fix":
         return this.proxyDevServerPost(args, "auto-implement");
@@ -9989,7 +10233,7 @@ var DaemonCommandHandler = class {
 
 // src/commands/cli-manager.ts
 var os12 = __toESM(require("os"));
-var path12 = __toESM(require("path"));
+var path13 = __toESM(require("path"));
 var crypto4 = __toESM(require("crypto"));
 var import_chalk = __toESM(require("chalk"));
 init_provider_cli_adapter();
@@ -10014,6 +10258,23 @@ function getDatabaseSync() {
   }
   return CachedDatabaseSync;
 }
+function getForcedNewSessionScriptName(provider, launchMode) {
+  if (!provider || launchMode !== "new") return null;
+  const resume = provider.resume;
+  if (!resume?.supported) return null;
+  if (Array.isArray(resume.newSessionArgs) && resume.newSessionArgs.length > 0) return null;
+  const controls = Array.isArray(provider.controls) ? provider.controls : [];
+  for (const control of controls) {
+    if (control?.type !== "action") continue;
+    const invokeScript = typeof control?.invokeScript === "string" ? control.invokeScript.trim() : "";
+    if (!invokeScript) continue;
+    const controlId = typeof control?.id === "string" ? control.id.trim() : "";
+    if (controlId === "new_session" || /^new.?session$/i.test(invokeScript)) {
+      return invokeScript;
+    }
+  }
+  return null;
+}
 var CliProviderInstance = class {
   constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
     this.provider = provider;
@@ -10072,6 +10333,7 @@ var CliProviderInstance = class {
       this.detectStatusTransition();
     });
     await this.adapter.spawn();
+    await this.enforceFreshSessionLaunchIfNeeded();
     this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
     if (this.providerSessionId) {
       this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
@@ -10263,10 +10525,13 @@ var CliProviderInstance = class {
     });
   }
   onEvent(event, data) {
-    if (event === "send_message" && data?.text) {
-      void this.adapter.sendMessage(data.text).catch((e) => {
-        LOG.warn("CLI", `[${this.type}] send_message failed: ${e?.message || e}`);
-      });
+    if (event === "send_message") {
+      const input = normalizeInputEnvelope(data);
+      if (input.textFallback) {
+        void this.adapter.sendMessage(input.textFallback).catch((e) => {
+          LOG.warn("CLI", `[${this.type}] send_message failed: ${e?.message || e}`);
+        });
+      }
     } else if (event === "server_connected" && data?.serverConn) {
       this.adapter.setServerConn(data.serverConn);
     } else if (event === "resolve_action" && data) {
@@ -10284,6 +10549,23 @@ var CliProviderInstance = class {
   }
   completedDebounceTimer = null;
   completedDebouncePending = null;
+  async enforceFreshSessionLaunchIfNeeded() {
+    const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
+    if (!scriptName) return;
+    LOG.info("CLI", `[${this.type}] forcing fresh session launch via script: ${scriptName}`);
+    const raw = await this.adapter.invokeScript(scriptName, {});
+    const parsed = parseCliScriptResult(raw);
+    if (!parsed.success) {
+      throw new Error(parsed.payload?.error || `Failed to invoke fresh-session script '${scriptName}'`);
+    }
+    const cliCommand = getCliScriptCommand(parsed.payload);
+    if (cliCommand?.type === "send_message" && cliCommand.text) {
+      await this.adapter.sendMessage(cliCommand.text);
+    } else if (cliCommand?.type === "pty_write" && cliCommand.text) {
+      this.adapter.writeRaw(cliCommand.text + "\r");
+    }
+    this.applyProviderResponse(parsed.payload, { phase: "immediate" });
+  }
   detectStatusTransition() {
     const now = Date.now();
     const adapterStatus = this.adapter.getStatus();
@@ -10667,10 +10949,106 @@ ${effect.notification.body || ""}`.trim();
 };
 
 // src/providers/acp-provider-instance.ts
+var path12 = __toESM(require("path"));
 var import_stream = require("stream");
 var import_child_process5 = require("child_process");
 var import_sdk = require("@agentclientprotocol/sdk");
 init_logger();
+function getPromptCapabilityFlags(agentCapabilities) {
+  const prompt = agentCapabilities?.promptCapabilities || {};
+  return {
+    image: prompt.image === true,
+    audio: prompt.audio === true,
+    embeddedContext: prompt.embeddedContext === true
+  };
+}
+function getResourceNameFromUri(uri, fallback) {
+  try {
+    if (uri.startsWith("file://")) {
+      return path12.basename(new URL(uri).pathname) || fallback;
+    }
+    return path12.basename(uri) || fallback;
+  } catch {
+    return fallback;
+  }
+}
+function inputPartToResourceLink(part, fallbackName) {
+  if (!part.uri) return null;
+  return {
+    type: "resource_link",
+    uri: part.uri,
+    name: getResourceNameFromUri(part.uri, fallbackName),
+    ...part.mimeType ? { mimeType: part.mimeType } : {}
+  };
+}
+function appendPromptText(promptParts, text) {
+  const normalized = typeof text === "string" ? text.trim() : "";
+  if (!normalized) return;
+  const last = promptParts[promptParts.length - 1];
+  if (last?.type === "text" && last.text === normalized) return;
+  promptParts.push({ type: "text", text: normalized });
+}
+function buildAcpPromptParts(input, agentCapabilities) {
+  const caps = getPromptCapabilityFlags(agentCapabilities);
+  const promptParts = [];
+  for (const part of input.parts) {
+    if (part.type === "text") {
+      promptParts.push({ type: "text", text: part.text });
+      continue;
+    }
+    if (part.type === "image") {
+      if (caps.image && part.data) {
+        promptParts.push({
+          type: "image",
+          data: part.data,
+          mimeType: part.mimeType,
+          ...part.uri ? { uri: part.uri } : {}
+        });
+        continue;
+      }
+      const fallback = inputPartToResourceLink(part, "image");
+      if (fallback) promptParts.push(fallback);
+      appendPromptText(promptParts, part.alt || (!part.uri ? `Attached image (${part.mimeType})` : void 0));
+      continue;
+    }
+    if (part.type === "audio") {
+      if (caps.audio && part.data) {
+        promptParts.push({
+          type: "audio",
+          data: part.data,
+          mimeType: part.mimeType
+        });
+        continue;
+      }
+      const fallback = inputPartToResourceLink(part, "audio");
+      if (fallback) promptParts.push(fallback);
+      appendPromptText(promptParts, part.transcript || (!part.uri ? `Attached audio (${part.mimeType})` : void 0));
+      continue;
+    }
+    if (part.type === "resource") {
+      if (caps.embeddedContext && (part.text || part.data)) {
+        promptParts.push({
+          type: "resource",
+          resource: part.text ? { uri: part.uri, text: part.text, mimeType: part.mimeType ?? null } : { uri: part.uri, blob: part.data || "", mimeType: part.mimeType ?? null }
+        });
+        continue;
+      }
+      const fallback = inputPartToResourceLink(part, part.name || "resource");
+      if (fallback) promptParts.push(fallback);
+      appendPromptText(promptParts, part.text || (!part.uri && part.name ? part.name : void 0));
+      continue;
+    }
+    if (part.type === "video") {
+      const fallback = inputPartToResourceLink(part, "video");
+      if (fallback) promptParts.push(fallback);
+      appendPromptText(promptParts, !part.uri ? `Attached video (${part.mimeType})` : void 0);
+    }
+  }
+  if (!promptParts.some((part) => part.type === "text") && input.textFallback) {
+    promptParts.unshift({ type: "text", text: input.textFallback });
+  }
+  return promptParts;
+}
 var AcpProviderInstance = class {
   constructor(provider, workingDir, cliArgs = []) {
     this.cliArgs = cliArgs;
@@ -10799,8 +11177,10 @@ var AcpProviderInstance = class {
     };
   }
   onEvent(event, data) {
-    if (event === "send_message" && data?.text) {
-      this.sendPrompt(data.text).catch(
+    if (event === "send_message") {
+      const input = normalizeInputEnvelope(data);
+      const promptParts = buildAcpPromptParts(input, this.agentCapabilities);
+      this.sendPrompt(input.textFallback, promptParts.length > 0 ? promptParts : void 0).catch(
         (e) => this.log.warn(`[${this.type}] sendPrompt error: ${e?.message}`)
       );
     } else if (event === "resolve_action") {
@@ -11225,18 +11605,34 @@ var AcpProviderInstance = class {
       this.log.warn(`[${this.type}] Cannot send prompt: no active connection/session`);
       return;
     }
-    let promptParts;
-    if (contentBlocks && contentBlocks.length > 0) {
-      promptParts = contentBlocks.map((b) => {
-        if (b.type === "text") return { type: "text", text: b.text };
-        if (b.type === "image") return { type: "image", data: b.data, mimeType: b.mimeType };
-        if (b.type === "resource_link") return { type: "resource_link", uri: b.uri, name: b.name };
-        if (b.type === "resource") return { type: "resource", resource: b.resource };
-        return { type: "text", text: flattenContent([b]) };
-      });
-    } else {
-      promptParts = [{ type: "text", text }];
-    }
+    const promptParts = contentBlocks && contentBlocks.length > 0 ? contentBlocks.map((b) => {
+      if (b.type === "text") return { type: "text", text: b.text };
+      if (b.type === "image") {
+        return {
+          type: "image",
+          data: b.data,
+          mimeType: b.mimeType,
+          ...b.uri ? { uri: b.uri } : {}
+        };
+      }
+      if (b.type === "audio") {
+        return {
+          type: "audio",
+          data: b.data,
+          mimeType: b.mimeType
+        };
+      }
+      if (b.type === "resource_link") {
+        return {
+          type: "resource_link",
+          uri: b.uri,
+          name: b.name,
+          ...b.mimeType ? { mimeType: b.mimeType } : {}
+        };
+      }
+      if (b.type === "resource") return { type: "resource", resource: b.resource };
+      return { type: "text", text: flattenContent([b]) };
+    }) : [{ type: "text", text }];
     this.messages.push({
       role: "user",
       content: contentBlocks && contentBlocks.length > 0 ? contentBlocks : text,
@@ -11300,6 +11696,13 @@ var AcpProviderInstance = class {
           this.partialBlocks.push({
             type: "image",
             data: content.data,
+            mimeType: content.mimeType,
+            ...content.uri ? { uri: content.uri } : {}
+          });
+        } else if (content.type === "audio") {
+          this.partialBlocks.push({
+            type: "audio",
+            data: content.data,
             mimeType: content.mimeType
           });
         } else if (content.type === "resource_link") {
@@ -11691,7 +12094,7 @@ function resolveCliSessionBinding(provider, normalizedType, cliArgs, requestedRe
     };
   }
   if (!supportsExplicitSessionStart(resume)) {
-    return { cliArgs: baseArgs, launchMode: "manual" };
+    return { cliArgs: baseArgs, launchMode: "new" };
   }
   const providerSessionId = crypto4.randomUUID();
   const newSessionArgs = expandResumeArgs(resume.newSessionArgs, providerSessionId);
@@ -11839,7 +12242,7 @@ var DaemonCliManager = class {
   async startSession(cliType, workingDir, cliArgs, initialModel, options) {
     const trimmed = (workingDir || "").trim();
     if (!trimmed) throw new Error("working directory required");
-    const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os12.homedir()) : path12.resolve(trimmed);
+    const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os12.homedir()) : path13.resolve(trimmed);
     const normalizedType = this.providerLoader.resolveAlias(cliType);
     const provider = this.providerLoader.getByAlias(cliType);
     const key = crypto4.randomUUID();
@@ -11887,7 +12290,8 @@ ${installInfo}`
           instanceManager2.removeInstance(key);
         },
         sendMessage: async (text) => {
-          acpInstance.onEvent("send_message", { text });
+          const input = normalizeInputEnvelope(text);
+          acpInstance.onEvent("send_message", { input });
         },
         getStatus: () => {
           const state = acpInstance.getState();
@@ -12296,7 +12700,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (!found) throw new Error(`CLI agent not running: ${agentType}`);
         const { adapter, key } = found;
         if (action === "send_chat") {
-          const message = args.message || args.text;
+          const input = normalizeInputEnvelope(args?.input ? { input: args.input } : args);
+          const message = input.textFallback;
           if (!message) throw new Error("message required for send_chat");
           await adapter.sendMessage(message);
           return { success: true, status: "generating" };
@@ -12318,14 +12723,144 @@ Run 'adhdev doctor' for detailed diagnostics.`
 var import_child_process6 = require("child_process");
 var net = __toESM(require("net"));
 var os14 = __toESM(require("os"));
-var path14 = __toESM(require("path"));
+var path15 = __toESM(require("path"));
 
 // src/providers/provider-loader.ts
 var fs6 = __toESM(require("fs"));
-var path13 = __toESM(require("path"));
+var path14 = __toESM(require("path"));
 var os13 = __toESM(require("os"));
 var chokidar = __toESM(require("chokidar"));
 init_logger();
+
+// src/providers/provider-schema.ts
+var KNOWN_PROVIDER_FIELDS = /* @__PURE__ */ new Set([
+  "type",
+  "name",
+  "category",
+  "aliases",
+  "cdpPorts",
+  "targetFilter",
+  "cli",
+  "icon",
+  "displayName",
+  "install",
+  "versionCommand",
+  "testedVersions",
+  "processNames",
+  "launch",
+  "paths",
+  "extensionId",
+  "extensionIdPattern",
+  "extensionIdPattern_flags",
+  "compatibility",
+  "defaultScriptDir",
+  "binary",
+  "spawn",
+  "approvalKeys",
+  "patterns",
+  "cleanOutput",
+  "resume",
+  "sessionProbe",
+  "approvalPositiveHints",
+  "scripts",
+  "vscodeCommands",
+  "inputMethod",
+  "inputSelector",
+  "webviewMatchText",
+  "os",
+  "versions",
+  "overrides",
+  "settings",
+  "controls",
+  "staticConfigOptions",
+  "spawnArgBuilder",
+  "auth",
+  "contractVersion",
+  "capabilities",
+  "providerVersion",
+  "status",
+  "details",
+  "sendDelayMs",
+  "sendKey",
+  "submitStrategy",
+  "disableUpstream"
+]);
+var VALUE_CONTROL_TYPES = /* @__PURE__ */ new Set(["select", "toggle", "cycle", "slider"]);
+function validateProviderDefinition(raw) {
+  const errors = [];
+  const warnings = [];
+  if (!raw || typeof raw !== "object") {
+    return { errors: ["Provider definition must be an object"], warnings };
+  }
+  const provider = raw;
+  if (!provider.type) errors.push("Missing required field: type");
+  if (!provider.name) errors.push("Missing required field: name");
+  if (!provider.category) {
+    errors.push("Missing required field: category");
+  } else if (!["ide", "extension", "cli", "acp"].includes(String(provider.category))) {
+    errors.push(`Invalid category: ${String(provider.category)}`);
+  }
+  for (const key of Object.keys(provider)) {
+    if (!KNOWN_PROVIDER_FIELDS.has(key)) {
+      warnings.push(`Unknown provider field: ${key}`);
+    }
+  }
+  const category = provider.category;
+  if (category === "cli" || category === "acp") {
+    const spawn4 = provider.spawn;
+    const command = spawn4 && typeof spawn4 === "object" ? spawn4.command : void 0;
+    if (!spawn4 || typeof spawn4 !== "object") {
+      errors.push(`${String(category).toUpperCase()}/CLI providers must have spawn config`);
+    } else if (typeof command !== "string" || !command.trim()) {
+      errors.push("spawn.command is required");
+    }
+  }
+  if ((category === "ide" || category === "extension") && provider.cdpPorts !== void 0) {
+    if (!Array.isArray(provider.cdpPorts) || provider.cdpPorts.length === 0) {
+      warnings.push("IDE/Extension providers should have cdpPorts");
+    }
+  }
+  if (category === "extension" && !provider.extensionId) {
+    warnings.push("Extension providers should have extensionId");
+  }
+  for (const control of Array.isArray(provider.controls) ? provider.controls : []) {
+    validateControl(control, errors);
+  }
+  return { errors, warnings };
+}
+function validateControl(control, errors) {
+  if (!control || typeof control !== "object") {
+    errors.push("controls: each control must be an object");
+    return;
+  }
+  const id = typeof control.id === "string" && control.id.trim() ? control.id.trim() : "unknown";
+  const prefix = `controls.${id}`;
+  if (!control.id || !String(control.id).trim()) errors.push(`${prefix}: id is required`);
+  if (!control.type) errors.push(`${prefix}: type is required`);
+  if (!control.label || !String(control.label).trim()) errors.push(`${prefix}: label is required`);
+  if (!control.placement) errors.push(`${prefix}: placement is required`);
+  if (control.dynamic && !control.listScript) {
+    errors.push(`${prefix}: dynamic controls require listScript`);
+  }
+  if (VALUE_CONTROL_TYPES.has(control.type) && !control.setScript) {
+    errors.push(`${prefix}: ${control.type} controls require setScript`);
+  }
+  if (control.type === "action" && !control.invokeScript) {
+    errors.push(`${prefix}: action controls require invokeScript`);
+  }
+  if (control.type === "slider") {
+    if (typeof control.min !== "number" || typeof control.max !== "number") {
+      errors.push(`${prefix}: slider controls require numeric min and max`);
+    } else if (control.min > control.max) {
+      errors.push(`${prefix}: slider min cannot exceed max`);
+    }
+  }
+  if (control.readFrom !== void 0 && (typeof control.readFrom !== "string" || !control.readFrom.trim())) {
+    errors.push(`${prefix}: readFrom must be a non-empty string when provided`);
+  }
+}
+
+// src/providers/provider-loader.ts
 var ProviderLoader = class _ProviderLoader {
   providers = /* @__PURE__ */ new Map();
   providerAvailability = /* @__PURE__ */ new Map();
@@ -12344,12 +12879,12 @@ var ProviderLoader = class _ProviderLoader {
   static META_FILE = ".meta.json";
   constructor(options) {
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-    const defaultProvidersDir = path13.join(os13.homedir(), ".adhdev", "providers");
+    const defaultProvidersDir = path14.join(os13.homedir(), ".adhdev", "providers");
     if (options?.userDir) {
       this.userDir = options.userDir;
       this.log(`Config 'providerDir' applied: ${this.userDir}`);
     } else {
-      const localRepoPath = path13.resolve(__dirname, "../../../../../adhdev-providers");
+      const localRepoPath = path14.resolve(__dirname, "../../../../../adhdev-providers");
       if (fs6.existsSync(localRepoPath)) {
         this.userDir = localRepoPath;
         this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
@@ -12358,7 +12893,7 @@ var ProviderLoader = class _ProviderLoader {
         this.log(`Using default user providers directory: ${this.userDir}`);
       }
     }
-    this.upstreamDir = path13.join(defaultProvidersDir, ".upstream");
+    this.upstreamDir = path14.join(defaultProvidersDir, ".upstream");
     this.disableUpstream = options?.disableUpstream ?? false;
   }
   log(msg) {
@@ -12388,7 +12923,7 @@ var ProviderLoader = class _ProviderLoader {
   * Canonical provider directory shape for a given root.
   */
   getProviderDir(root, category, type) {
-    return path13.join(root, category, type);
+    return path14.join(root, category, type);
   }
   /**
   * Canonical user override directory for a provider.
@@ -12415,7 +12950,7 @@ var ProviderLoader = class _ProviderLoader {
   resolveProviderFile(type, ...segments) {
     const dir = this.findProviderDirInternal(type);
     if (!dir) return null;
-    return path13.join(dir, ...segments);
+    return path14.join(dir, ...segments);
   }
   /**
   * Load all providers (3-tier priority)
@@ -12454,7 +12989,7 @@ var ProviderLoader = class _ProviderLoader {
     if (!fs6.existsSync(this.upstreamDir)) return false;
     try {
       return fs6.readdirSync(this.upstreamDir).some(
-        (d) => fs6.statSync(path13.join(this.upstreamDir, d)).isDirectory()
+        (d) => fs6.statSync(path14.join(this.upstreamDir, d)).isDirectory()
       );
     } catch {
       return false;
@@ -12769,8 +13304,8 @@ var ProviderLoader = class _ProviderLoader {
               resolved._resolvedScriptDir = entry.scriptDir;
               resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
               if (providerDir) {
-                const fullDir = path13.join(providerDir, entry.scriptDir);
-                resolved._resolvedScriptsPath = fs6.existsSync(path13.join(fullDir, "scripts.js")) ? path13.join(fullDir, "scripts.js") : fullDir;
+                const fullDir = path14.join(providerDir, entry.scriptDir);
+                resolved._resolvedScriptsPath = fs6.existsSync(path14.join(fullDir, "scripts.js")) ? path14.join(fullDir, "scripts.js") : fullDir;
               }
               matched = true;
             }
@@ -12785,8 +13320,8 @@ var ProviderLoader = class _ProviderLoader {
             resolved._resolvedScriptDir = base.defaultScriptDir;
             resolved._resolvedScriptsSource = "defaultScriptDir:version_miss";
             if (providerDir) {
-              const fullDir = path13.join(providerDir, base.defaultScriptDir);
-              resolved._resolvedScriptsPath = fs6.existsSync(path13.join(fullDir, "scripts.js")) ? path13.join(fullDir, "scripts.js") : fullDir;
+              const fullDir = path14.join(providerDir, base.defaultScriptDir);
+              resolved._resolvedScriptsPath = fs6.existsSync(path14.join(fullDir, "scripts.js")) ? path14.join(fullDir, "scripts.js") : fullDir;
             }
           }
           resolved._versionWarning = `Version ${currentVersion} not in compatibility matrix. Using default scripts.`;
@@ -12803,8 +13338,8 @@ var ProviderLoader = class _ProviderLoader {
               resolved._resolvedScriptDir = dirOverride;
               resolved._resolvedScriptsSource = `versions:${range}`;
               if (providerDir) {
-                const fullDir = path13.join(providerDir, dirOverride);
-                resolved._resolvedScriptsPath = fs6.existsSync(path13.join(fullDir, "scripts.js")) ? path13.join(fullDir, "scripts.js") : fullDir;
+                const fullDir = path14.join(providerDir, dirOverride);
+                resolved._resolvedScriptsPath = fs6.existsSync(path14.join(fullDir, "scripts.js")) ? path14.join(fullDir, "scripts.js") : fullDir;
               }
             }
           } else if (override.scripts) {
@@ -12820,8 +13355,8 @@ var ProviderLoader = class _ProviderLoader {
         resolved._resolvedScriptDir = base.defaultScriptDir;
         resolved._resolvedScriptsSource = "defaultScriptDir:no_version";
         if (providerDir) {
-          const fullDir = path13.join(providerDir, base.defaultScriptDir);
-          resolved._resolvedScriptsPath = fs6.existsSync(path13.join(fullDir, "scripts.js")) ? path13.join(fullDir, "scripts.js") : fullDir;
+          const fullDir = path14.join(providerDir, base.defaultScriptDir);
+          resolved._resolvedScriptsPath = fs6.existsSync(path14.join(fullDir, "scripts.js")) ? path14.join(fullDir, "scripts.js") : fullDir;
         }
       }
     }
@@ -12846,14 +13381,14 @@ var ProviderLoader = class _ProviderLoader {
       this.log(`  [loadScriptsFromDir] ${type}: providerDir not found`);
       return null;
     }
-    const dir = path13.join(providerDir, scriptDir);
+    const dir = path14.join(providerDir, scriptDir);
     if (!fs6.existsSync(dir)) {
       this.log(`  [loadScriptsFromDir] ${type}: dir not found: ${dir}`);
       return null;
     }
     const cached = this.scriptsCache.get(dir);
     if (cached) return cached;
-    const scriptsJs = path13.join(dir, "scripts.js");
+    const scriptsJs = path14.join(dir, "scripts.js");
     if (fs6.existsSync(scriptsJs)) {
       try {
         delete require.cache[require.resolve(scriptsJs)];
@@ -12895,7 +13430,7 @@ var ProviderLoader = class _ProviderLoader {
             return;
           }
           if (filePath.endsWith(".js") || filePath.endsWith(".json")) {
-            this.log(`File changed: ${path13.basename(filePath)}, reloading...`);
+            this.log(`File changed: ${path14.basename(filePath)}, reloading...`);
             this.reload();
           }
         };
@@ -12950,7 +13485,7 @@ var ProviderLoader = class _ProviderLoader {
     }
     const https = require("https");
     const { execSync: execSync7 } = require("child_process");
-    const metaPath = path13.join(this.upstreamDir, _ProviderLoader.META_FILE);
+    const metaPath = path14.join(this.upstreamDir, _ProviderLoader.META_FILE);
     let prevEtag = "";
     let prevTimestamp = 0;
     try {
@@ -13010,17 +13545,17 @@ var ProviderLoader = class _ProviderLoader {
         return { updated: false };
       }
       this.log("Downloading latest providers from GitHub...");
-      const tmpTar = path13.join(os13.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-      const tmpExtract = path13.join(os13.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+      const tmpTar = path14.join(os13.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+      const tmpExtract = path14.join(os13.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
       await this.downloadFile(_ProviderLoader.GITHUB_TARBALL_URL, tmpTar);
       fs6.mkdirSync(tmpExtract, { recursive: true });
       execSync7(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
       const extracted = fs6.readdirSync(tmpExtract);
       const rootDir = extracted.find(
-        (d) => fs6.statSync(path13.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
+        (d) => fs6.statSync(path14.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
       );
       if (!rootDir) throw new Error("Unexpected tarball structure");
-      const sourceDir = path13.join(tmpExtract, rootDir);
+      const sourceDir = path14.join(tmpExtract, rootDir);
       const backupDir = this.upstreamDir + ".bak";
       if (fs6.existsSync(this.upstreamDir)) {
         if (fs6.existsSync(backupDir)) fs6.rmSync(backupDir, { recursive: true, force: true });
@@ -13095,8 +13630,8 @@ var ProviderLoader = class _ProviderLoader {
   copyDirRecursive(src, dest) {
     fs6.mkdirSync(dest, { recursive: true });
     for (const entry of fs6.readdirSync(src, { withFileTypes: true })) {
-      const srcPath = path13.join(src, entry.name);
-      const destPath = path13.join(dest, entry.name);
+      const srcPath = path14.join(src, entry.name);
+      const destPath = path14.join(dest, entry.name);
       if (entry.isDirectory()) {
         this.copyDirRecursive(srcPath, destPath);
       } else {
@@ -13107,7 +13642,7 @@ var ProviderLoader = class _ProviderLoader {
   /** .meta.json save */
   writeMeta(metaPath, etag, timestamp) {
     try {
-      fs6.mkdirSync(path13.dirname(metaPath), { recursive: true });
+      fs6.mkdirSync(path14.dirname(metaPath), { recursive: true });
       fs6.writeFileSync(metaPath, JSON.stringify({
         etag,
         timestamp,
@@ -13124,7 +13659,7 @@ var ProviderLoader = class _ProviderLoader {
     const scan = (d) => {
       try {
         for (const entry of fs6.readdirSync(d, { withFileTypes: true })) {
-          if (entry.isDirectory()) scan(path13.join(d, entry.name));
+          if (entry.isDirectory()) scan(path14.join(d, entry.name));
           else if (entry.name === "provider.json") count++;
         }
       } catch {
@@ -13309,17 +13844,17 @@ var ProviderLoader = class _ProviderLoader {
     for (const root of searchRoots) {
       if (!fs6.existsSync(root)) continue;
       const candidate = this.getProviderDir(root, cat, type);
-      if (fs6.existsSync(path13.join(candidate, "provider.json"))) return candidate;
-      const catDir = path13.join(root, cat);
+      if (fs6.existsSync(path14.join(candidate, "provider.json"))) return candidate;
+      const catDir = path14.join(root, cat);
       if (fs6.existsSync(catDir)) {
         try {
           for (const entry of fs6.readdirSync(catDir, { withFileTypes: true })) {
             if (!entry.isDirectory()) continue;
-            const jsonPath = path13.join(catDir, entry.name, "provider.json");
+            const jsonPath = path14.join(catDir, entry.name, "provider.json");
             if (fs6.existsSync(jsonPath)) {
               try {
                 const data = JSON.parse(fs6.readFileSync(jsonPath, "utf-8"));
-                if (data.type === type) return path13.join(catDir, entry.name);
+                if (data.type === type) return path14.join(catDir, entry.name);
               } catch {
               }
             }
@@ -13336,7 +13871,7 @@ var ProviderLoader = class _ProviderLoader {
    * (template substitution is NOT applied here — scripts.js handles that)
    */
   buildScriptWrappersFromDir(dir) {
-    const scriptsJs = path13.join(dir, "scripts.js");
+    const scriptsJs = path14.join(dir, "scripts.js");
     if (fs6.existsSync(scriptsJs)) {
       try {
         delete require.cache[require.resolve(scriptsJs)];
@@ -13350,7 +13885,7 @@ var ProviderLoader = class _ProviderLoader {
       for (const file of fs6.readdirSync(dir)) {
         if (!file.endsWith(".js")) continue;
         const scriptName = toCamel(file.replace(".js", ""));
-        const filePath = path13.join(dir, file);
+        const filePath = path14.join(dir, file);
         result[scriptName] = (...args) => {
           try {
             let content = fs6.readFileSync(filePath, "utf-8");
@@ -13410,24 +13945,28 @@ var ProviderLoader = class _ProviderLoader {
       }
       const hasJson = entries.some((e) => e.name === "provider.json");
       if (hasJson) {
-        const jsonPath = path13.join(d, "provider.json");
+        const jsonPath = path14.join(d, "provider.json");
         try {
           const raw = fs6.readFileSync(jsonPath, "utf-8");
           const mod = JSON.parse(raw);
-          if (!mod.type || !mod.name || !mod.category) {
-            this.log(`\u26A0 Invalid provider at ${jsonPath}: missing type/name/category`);
+          if (typeof mod.extensionIdPattern === "string") {
+            const flags = mod.extensionIdPattern_flags || "";
+            mod.extensionIdPattern = new RegExp(mod.extensionIdPattern, flags);
+          }
+          const { extensionIdPattern_flags, extensionIdPattern, ...providerFields } = mod;
+          const normalizedProvider = {
+            ...providerFields,
+            ...extensionIdPattern instanceof RegExp ? { extensionIdPattern } : {}
+          };
+          const validation = validateProviderDefinition(normalizedProvider);
+          for (const warning of validation.warnings) {
+            this.log(`\u26A0 ${jsonPath}: ${warning}`);
+          }
+          if (validation.errors.length > 0) {
+            this.log(`\u26A0 Invalid provider at ${jsonPath}: ${validation.errors.join("; ")}`);
           } else {
-            if (typeof mod.extensionIdPattern === "string") {
-              const flags = mod.extensionIdPattern_flags || "";
-              mod.extensionIdPattern = new RegExp(mod.extensionIdPattern, flags);
-            }
-            const { extensionIdPattern_flags, extensionIdPattern, ...providerFields } = mod;
-            const normalizedProvider = {
-              ...providerFields,
-              ...extensionIdPattern instanceof RegExp ? { extensionIdPattern } : {}
-            };
             const hasCompatibility = Array.isArray(normalizedProvider.compatibility);
-            const scriptsPath = path13.join(d, "scripts.js");
+            const scriptsPath = path14.join(d, "scripts.js");
             if (!hasCompatibility && fs6.existsSync(scriptsPath)) {
               try {
                 delete require.cache[require.resolve(scriptsPath)];
@@ -13453,7 +13992,7 @@ var ProviderLoader = class _ProviderLoader {
           if (!entry.isDirectory()) continue;
           if (entry.name.startsWith("_") || entry.name.startsWith(".")) continue;
           if (excludeDirs && d === dir && excludeDirs.includes(entry.name)) continue;
-          scan(path13.join(d, entry.name));
+          scan(path14.join(d, entry.name));
         }
       }
     };
@@ -13711,8 +14250,8 @@ function detectCurrentWorkspace(ideId) {
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
-        const storagePath = path14.join(
-          process.env.APPDATA || path14.join(os14.homedir(), "AppData", "Roaming"),
+        const storagePath = path15.join(
+          process.env.APPDATA || path15.join(os14.homedir(), "AppData", "Roaming"),
           appName,
           "storage.json"
         );
@@ -13890,9 +14429,9 @@ init_logger();
 
 // src/logging/command-log.ts
 var fs7 = __toESM(require("fs"));
-var path15 = __toESM(require("path"));
+var path16 = __toESM(require("path"));
 var os15 = __toESM(require("os"));
-var LOG_DIR2 = process.platform === "win32" ? path15.join(process.env.LOCALAPPDATA || process.env.APPDATA || path15.join(os15.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path15.join(os15.homedir(), "Library", "Logs", "adhdev") : path15.join(os15.homedir(), ".local", "share", "adhdev", "logs");
+var LOG_DIR2 = process.platform === "win32" ? path16.join(process.env.LOCALAPPDATA || process.env.APPDATA || path16.join(os15.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path16.join(os15.homedir(), "Library", "Logs", "adhdev") : path16.join(os15.homedir(), ".local", "share", "adhdev", "logs");
 var MAX_FILE_SIZE = 5 * 1024 * 1024;
 var MAX_DAYS = 7;
 try {
@@ -13930,13 +14469,13 @@ function getDateStr2() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
 }
 var currentDate2 = getDateStr2();
-var currentFile = path15.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+var currentFile = path16.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
 var writeCount2 = 0;
 function checkRotation() {
   const today = getDateStr2();
   if (today !== currentDate2) {
     currentDate2 = today;
-    currentFile = path15.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+    currentFile = path16.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
     cleanOldFiles();
   }
 }
@@ -13950,7 +14489,7 @@ function cleanOldFiles() {
       const dateMatch = file.match(/commands-(\d{4}-\d{2}-\d{2})/);
       if (dateMatch && dateMatch[1] < cutoffStr) {
         try {
-          fs7.unlinkSync(path15.join(LOG_DIR2, file));
+          fs7.unlinkSync(path16.join(LOG_DIR2, file));
         } catch {
         }
       }
@@ -14267,13 +14806,13 @@ var import_child_process7 = require("child_process");
 var import_child_process8 = require("child_process");
 var fs8 = __toESM(require("fs"));
 var os17 = __toESM(require("os"));
-var path16 = __toESM(require("path"));
+var path17 = __toESM(require("path"));
 var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
 function getUpgradeLogPath() {
   const home = os17.homedir();
-  const dir = path16.join(home, ".adhdev");
+  const dir = path17.join(home, ".adhdev");
   fs8.mkdirSync(dir, { recursive: true });
-  return path16.join(dir, "daemon-upgrade.log");
+  return path17.join(dir, "daemon-upgrade.log");
 }
 function appendUpgradeLog(message) {
   const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${message}
@@ -14313,7 +14852,7 @@ async function waitForPidExit(pid, timeoutMs) {
   }
 }
 function stopSessionHostProcesses(appName) {
-  const pidFile = path16.join(os17.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  const pidFile = path17.join(os17.homedir(), ".adhdev", `${appName}-session-host.pid`);
   try {
     if (fs8.existsSync(pidFile)) {
       const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
@@ -14342,7 +14881,7 @@ function stopSessionHostProcesses(appName) {
   }
 }
 function removeDaemonPidFile() {
-  const pidFile = path16.join(os17.homedir(), ".adhdev", "daemon.pid");
+  const pidFile = path17.join(os17.homedir(), ".adhdev", "daemon.pid");
   try {
     fs8.unlinkSync(pidFile);
   } catch {
@@ -14353,7 +14892,7 @@ function cleanupStaleGlobalInstallDirs(pkgName) {
   const npmRoot = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["root", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
   if (!npmRoot) return;
   const npmPrefix = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["prefix", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
-  const binDir = process.platform === "win32" ? npmPrefix : path16.join(npmPrefix, "bin");
+  const binDir = process.platform === "win32" ? npmPrefix : path17.join(npmPrefix, "bin");
   const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
   const binNames = /* @__PURE__ */ new Set([packageBaseName]);
   if (pkgName === "@adhdev/daemon-standalone") {
@@ -14361,25 +14900,25 @@ function cleanupStaleGlobalInstallDirs(pkgName) {
   }
   if (pkgName.startsWith("@")) {
     const [scope, name] = pkgName.split("/");
-    const scopeDir = path16.join(npmRoot, scope);
+    const scopeDir = path17.join(npmRoot, scope);
     if (!fs8.existsSync(scopeDir)) return;
     for (const entry of fs8.readdirSync(scopeDir)) {
       if (!entry.startsWith(`.${name}-`)) continue;
-      fs8.rmSync(path16.join(scopeDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale scoped staging dir: ${path16.join(scopeDir, entry)}`);
+      fs8.rmSync(path17.join(scopeDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale scoped staging dir: ${path17.join(scopeDir, entry)}`);
     }
   } else {
     for (const entry of fs8.readdirSync(npmRoot)) {
       if (!entry.startsWith(`.${pkgName}-`)) continue;
-      fs8.rmSync(path16.join(npmRoot, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale staging dir: ${path16.join(npmRoot, entry)}`);
+      fs8.rmSync(path17.join(npmRoot, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale staging dir: ${path17.join(npmRoot, entry)}`);
     }
   }
   if (fs8.existsSync(binDir)) {
     for (const entry of fs8.readdirSync(binDir)) {
       if (![...binNames].some((name) => entry.startsWith(`.${name}-`))) continue;
-      fs8.rmSync(path16.join(binDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale bin staging entry: ${path16.join(binDir, entry)}`);
+      fs8.rmSync(path17.join(binDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale bin staging entry: ${path17.join(binDir, entry)}`);
     }
   }
 }
@@ -16257,11 +16796,11 @@ var ProviderInstanceManager = class {
 
 // src/providers/version-archive.ts
 var fs10 = __toESM(require("fs"));
-var path17 = __toESM(require("path"));
+var path18 = __toESM(require("path"));
 var os18 = __toESM(require("os"));
 var import_child_process9 = require("child_process");
 var import_os3 = require("os");
-var ARCHIVE_PATH = path17.join(os18.homedir(), ".adhdev", "version-history.json");
+var ARCHIVE_PATH = path18.join(os18.homedir(), ".adhdev", "version-history.json");
 var MAX_ENTRIES_PER_PROVIDER = 20;
 var VersionArchive = class {
   history = {};
@@ -16308,7 +16847,7 @@ var VersionArchive = class {
   }
   save() {
     try {
-      fs10.mkdirSync(path17.dirname(ARCHIVE_PATH), { recursive: true });
+      fs10.mkdirSync(path18.dirname(ARCHIVE_PATH), { recursive: true });
       fs10.writeFileSync(ARCHIVE_PATH, JSON.stringify(this.history, null, 2));
     } catch {
     }
@@ -16365,7 +16904,7 @@ function checkPathExists2(paths) {
   for (const p of paths) {
     if (p.includes("*")) {
       const home = os18.homedir();
-      const resolved = p.replace(/\*/g, home.split(path17.sep).pop() || "");
+      const resolved = p.replace(/\*/g, home.split(path18.sep).pop() || "");
       if (fs10.existsSync(resolved)) return resolved;
     } else {
       if (fs10.existsSync(p)) return p;
@@ -16375,7 +16914,7 @@ function checkPathExists2(paths) {
 }
 function getMacAppVersion(appPath) {
   if ((0, import_os3.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
-  const plistPath = path17.join(appPath, "Contents", "Info.plist");
+  const plistPath = path18.join(appPath, "Contents", "Info.plist");
   if (!fs10.existsSync(plistPath)) return null;
   const raw = runCommand(`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${plistPath}"`);
   return raw || null;
@@ -16401,7 +16940,7 @@ async function detectAllVersions(loader, archive) {
       const cliBin = provider.cli ? findBinary2(provider.cli) : null;
       let resolvedBin = cliBin;
       if (!resolvedBin && appPath && currentOs === "darwin") {
-        const bundled = path17.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
+        const bundled = path18.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
         if (provider.cli && fs10.existsSync(bundled)) resolvedBin = bundled;
       }
       info.installed = !!(appPath || resolvedBin);
@@ -16442,7 +16981,7 @@ async function detectAllVersions(loader, archive) {
 // src/daemon/dev-server.ts
 var http2 = __toESM(require("http"));
 var fs14 = __toESM(require("fs"));
-var path21 = __toESM(require("path"));
+var path22 = __toESM(require("path"));
 
 // src/daemon/scaffold-template.ts
 function generateFiles(type, name, category, opts = {}) {
@@ -16778,7 +17317,7 @@ init_logger();
 
 // src/daemon/dev-cdp-handlers.ts
 var fs11 = __toESM(require("fs"));
-var path18 = __toESM(require("path"));
+var path19 = __toESM(require("path"));
 init_logger();
 async function handleCdpEvaluate(ctx, req, res) {
   const body = await ctx.readBody(req);
@@ -16957,17 +17496,17 @@ async function handleScriptHints(ctx, type, _req, res) {
     return;
   }
   let scriptsPath = "";
-  const directScripts = path18.join(dir, "scripts.js");
+  const directScripts = path19.join(dir, "scripts.js");
   if (fs11.existsSync(directScripts)) {
     scriptsPath = directScripts;
   } else {
-    const scriptsDir = path18.join(dir, "scripts");
+    const scriptsDir = path19.join(dir, "scripts");
     if (fs11.existsSync(scriptsDir)) {
       const versions = fs11.readdirSync(scriptsDir).filter((d) => {
-        return fs11.statSync(path18.join(scriptsDir, d)).isDirectory();
+        return fs11.statSync(path19.join(scriptsDir, d)).isDirectory();
       }).sort().reverse();
       for (const ver of versions) {
-        const p = path18.join(scriptsDir, ver, "scripts.js");
+        const p = path19.join(scriptsDir, ver, "scripts.js");
         if (fs11.existsSync(p)) {
           scriptsPath = p;
           break;
@@ -17796,7 +18335,7 @@ async function handleDomContext(ctx, type, req, res) {
 
 // src/daemon/dev-cli-debug.ts
 var fs12 = __toESM(require("fs"));
-var path19 = __toESM(require("path"));
+var path20 = __toESM(require("path"));
 function slugifyFixtureName(value) {
   const normalized = String(value || "").trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
   return normalized || `fixture-${Date.now()}`;
@@ -17806,11 +18345,11 @@ function getCliFixtureDir(ctx, type) {
   if (!providerDir) {
     throw new Error(`Provider directory not found for '${type}'`);
   }
-  return path19.join(providerDir, "fixtures");
+  return path20.join(providerDir, "fixtures");
 }
 function readCliFixture(ctx, type, name) {
   const fixtureDir = getCliFixtureDir(ctx, type);
-  const filePath = path19.join(fixtureDir, `${name}.json`);
+  const filePath = path20.join(fixtureDir, `${name}.json`);
   if (!fs12.existsSync(filePath)) {
     throw new Error(`Fixture not found: ${filePath}`);
   }
@@ -18578,7 +19117,7 @@ async function handleCliFixtureCapture(ctx, req, res) {
       },
       notes: typeof body?.notes === "string" ? body.notes : void 0
     };
-    const filePath = path19.join(fixtureDir, `${name}.json`);
+    const filePath = path20.join(fixtureDir, `${name}.json`);
     fs12.writeFileSync(filePath, JSON.stringify(fixture, null, 2));
     ctx.json(res, 200, {
       saved: true,
@@ -18602,7 +19141,7 @@ async function handleCliFixtureList(ctx, type, _req, res) {
       return;
     }
     const fixtures = fs12.readdirSync(fixtureDir).filter((file) => file.endsWith(".json")).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" })).map((file) => {
-      const fullPath = path19.join(fixtureDir, file);
+      const fullPath = path20.join(fixtureDir, file);
       try {
         const raw = JSON.parse(fs12.readFileSync(fullPath, "utf-8"));
         return {
@@ -18738,7 +19277,7 @@ async function handleCliRaw(ctx, req, res) {
 
 // src/daemon/dev-auto-implement.ts
 var fs13 = __toESM(require("fs"));
-var path20 = __toESM(require("path"));
+var path21 = __toESM(require("path"));
 var os19 = __toESM(require("os"));
 function getAutoImplPid(ctx) {
   const pid = ctx.autoImplProcess?.pid;
@@ -18795,22 +19334,22 @@ function getLatestScriptVersionDir(scriptsDir) {
   if (!fs13.existsSync(scriptsDir)) return null;
   const versions = fs13.readdirSync(scriptsDir).filter((d) => {
     try {
-      return fs13.statSync(path20.join(scriptsDir, d)).isDirectory();
+      return fs13.statSync(path21.join(scriptsDir, d)).isDirectory();
     } catch {
       return false;
     }
   }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
   if (versions.length === 0) return null;
-  return path20.join(scriptsDir, versions[0]);
+  return path21.join(scriptsDir, versions[0]);
 }
 function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
-  const canonicalUserDir = path20.resolve(ctx.providerLoader.getUserProviderDir(category, type));
-  const desiredDir = requestedDir ? path20.resolve(requestedDir) : canonicalUserDir;
-  const upstreamRoot = path20.resolve(ctx.providerLoader.getUpstreamDir());
-  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path20.sep}`)) {
+  const canonicalUserDir = path21.resolve(ctx.providerLoader.getUserProviderDir(category, type));
+  const desiredDir = requestedDir ? path21.resolve(requestedDir) : canonicalUserDir;
+  const upstreamRoot = path21.resolve(ctx.providerLoader.getUpstreamDir());
+  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path21.sep}`)) {
     return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
   }
-  if (path20.basename(desiredDir) !== type) {
+  if (path21.basename(desiredDir) !== type) {
     return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
   }
   const sourceDir = ctx.findProviderDir(type);
@@ -18818,11 +19357,11 @@ function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
     return { dir: null, reason: `Provider source directory not found for '${type}'` };
   }
   if (!fs13.existsSync(desiredDir)) {
-    fs13.mkdirSync(path20.dirname(desiredDir), { recursive: true });
+    fs13.mkdirSync(path21.dirname(desiredDir), { recursive: true });
     fs13.cpSync(sourceDir, desiredDir, { recursive: true });
     ctx.log(`Auto-implement writable copy created: ${desiredDir}`);
   }
-  const providerJson = path20.join(desiredDir, "provider.json");
+  const providerJson = path21.join(desiredDir, "provider.json");
   if (!fs13.existsSync(providerJson)) {
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
@@ -18845,13 +19384,13 @@ function loadAutoImplReferenceScripts(ctx, referenceType) {
   const refDir = ctx.findProviderDir(referenceType);
   if (!refDir || !fs13.existsSync(refDir)) return {};
   const referenceScripts = {};
-  const scriptsDir = path20.join(refDir, "scripts");
+  const scriptsDir = path21.join(refDir, "scripts");
   const latestDir = getLatestScriptVersionDir(scriptsDir);
   if (!latestDir) return referenceScripts;
   for (const file of fs13.readdirSync(latestDir)) {
     if (!file.endsWith(".js")) continue;
     try {
-      referenceScripts[file] = fs13.readFileSync(path20.join(latestDir, file), "utf-8");
+      referenceScripts[file] = fs13.readFileSync(path21.join(latestDir, file), "utf-8");
     } catch {
     }
   }
@@ -18959,9 +19498,9 @@ async function handleAutoImplement(ctx, type, req, res) {
     });
     const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
     const prompt = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-    const tmpDir = path20.join(os19.tmpdir(), "adhdev-autoimpl");
+    const tmpDir = path21.join(os19.tmpdir(), "adhdev-autoimpl");
     if (!fs13.existsSync(tmpDir)) fs13.mkdirSync(tmpDir, { recursive: true });
-    const promptFile = path20.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
+    const promptFile = path21.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
     fs13.writeFileSync(promptFile, prompt, "utf-8");
     ctx.log(`Auto-implement prompt written to ${promptFile} (${prompt.length} chars)`);
     const agentProvider = ctx.providerLoader.resolve(agent) || ctx.providerLoader.getMeta(agent);
@@ -19398,7 +19937,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     setMode: "set_mode.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path20.join(providerDir, "scripts");
+  const scriptsDir = path21.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -19409,7 +19948,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     for (const file of fs13.readdirSync(latestScriptsDir)) {
       if (file.endsWith(".js") && targetFileNames.has(file)) {
         try {
-          const content = fs13.readFileSync(path20.join(latestScriptsDir, file), "utf-8");
+          const content = fs13.readFileSync(path21.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -19426,7 +19965,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
       for (const file of refFiles) {
         try {
-          const content = fs13.readFileSync(path20.join(latestScriptsDir, file), "utf-8");
+          const content = fs13.readFileSync(path21.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -19467,10 +20006,10 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
     }
   }
-  const docsDir = path20.join(providerDir, "../../docs");
+  const docsDir = path21.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path20.join(docsDir, name);
+      const p = path21.join(docsDir, name);
       if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
     } catch {
     }
@@ -19707,7 +20246,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
     parseApproval: "parse_approval.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path20.join(providerDir, "scripts");
+  const scriptsDir = path21.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -19719,7 +20258,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       if (!file.endsWith(".js")) continue;
       if (!targetFileNames.has(file)) continue;
       try {
-        const content = fs13.readFileSync(path20.join(latestScriptsDir, file), "utf-8");
+        const content = fs13.readFileSync(path21.join(latestScriptsDir, file), "utf-8");
         lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
         lines.push("```javascript");
         lines.push(content);
@@ -19735,7 +20274,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
       for (const file of refFiles) {
         try {
-          const content = fs13.readFileSync(path20.join(latestScriptsDir, file), "utf-8");
+          const content = fs13.readFileSync(path21.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -19768,10 +20307,10 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
     }
   }
-  const docsDir = path20.join(providerDir, "../../docs");
+  const docsDir = path21.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path20.join(docsDir, name);
+      const p = path21.join(docsDir, name);
       if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
     } catch {
     }
@@ -20214,8 +20753,8 @@ var DevServer = class _DevServer {
   }
   getEndpointList() {
     return this.routes.map((r) => {
-      const path22 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-      return `${r.method.padEnd(5)} ${path22}`;
+      const path23 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+      return `${r.method.padEnd(5)} ${path23}`;
     });
   }
   async start(port = DEV_SERVER_PORT) {
@@ -20470,12 +21009,12 @@ var DevServer = class _DevServer {
   // ─── DevConsole SPA ───
   getConsoleDistDir() {
     const candidates = [
-      path21.resolve(__dirname, "../../web-devconsole/dist"),
-      path21.resolve(__dirname, "../../../web-devconsole/dist"),
-      path21.join(process.cwd(), "packages/web-devconsole/dist")
+      path22.resolve(__dirname, "../../web-devconsole/dist"),
+      path22.resolve(__dirname, "../../../web-devconsole/dist"),
+      path22.join(process.cwd(), "packages/web-devconsole/dist")
     ];
     for (const dir of candidates) {
-      if (fs14.existsSync(path21.join(dir, "index.html"))) return dir;
+      if (fs14.existsSync(path22.join(dir, "index.html"))) return dir;
     }
     return null;
   }
@@ -20485,7 +21024,7 @@ var DevServer = class _DevServer {
       this.json(res, 500, { error: "DevConsole not found. Run: npm run build -w packages/web-devconsole" });
       return;
     }
-    const htmlPath = path21.join(distDir, "index.html");
+    const htmlPath = path22.join(distDir, "index.html");
     try {
       const html = fs14.readFileSync(htmlPath, "utf-8");
       res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -20510,15 +21049,15 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: "Not found" });
       return;
     }
-    const safePath = path21.normalize(pathname).replace(/^\.\.\//, "");
-    const filePath = path21.join(distDir, safePath);
+    const safePath = path22.normalize(pathname).replace(/^\.\.\//, "");
+    const filePath = path22.join(distDir, safePath);
     if (!filePath.startsWith(distDir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
     }
     try {
       const content = fs14.readFileSync(filePath);
-      const ext = path21.extname(filePath);
+      const ext = path22.extname(filePath);
       const contentType = _DevServer.MIME_MAP[ext] || "application/octet-stream";
       res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "public, max-age=31536000, immutable" });
       res.end(content);
@@ -20631,9 +21170,9 @@ var DevServer = class _DevServer {
           const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
           if (entry.isDirectory()) {
             files.push({ path: rel, size: 0, type: "dir" });
-            scan(path21.join(d, entry.name), rel);
+            scan(path22.join(d, entry.name), rel);
           } else {
-            const stat = fs14.statSync(path21.join(d, entry.name));
+            const stat = fs14.statSync(path22.join(d, entry.name));
             files.push({ path: rel, size: stat.size, type: "file" });
           }
         }
@@ -20656,7 +21195,7 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider directory not found: ${type}` });
       return;
     }
-    const fullPath = path21.resolve(dir, path21.normalize(filePath));
+    const fullPath = path22.resolve(dir, path22.normalize(filePath));
     if (!fullPath.startsWith(dir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
@@ -20681,14 +21220,14 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider directory not found: ${type}` });
       return;
     }
-    const fullPath = path21.resolve(dir, path21.normalize(filePath));
+    const fullPath = path22.resolve(dir, path22.normalize(filePath));
     if (!fullPath.startsWith(dir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
     }
     try {
       if (fs14.existsSync(fullPath)) fs14.copyFileSync(fullPath, fullPath + ".bak");
-      fs14.mkdirSync(path21.dirname(fullPath), { recursive: true });
+      fs14.mkdirSync(path22.dirname(fullPath), { recursive: true });
       fs14.writeFileSync(fullPath, content, "utf-8");
       this.log(`File saved: ${fullPath} (${content.length} chars)`);
       this.providerLoader.reload();
@@ -20705,7 +21244,7 @@ var DevServer = class _DevServer {
       return;
     }
     for (const name of ["scripts.js", "provider.json"]) {
-      const p = path21.join(dir, name);
+      const p = path22.join(dir, name);
       if (fs14.existsSync(p)) {
         const source = fs14.readFileSync(p, "utf-8");
         this.json(res, 200, { type, path: p, source, lines: source.split("\n").length });
@@ -20726,8 +21265,8 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider not found: ${type}` });
       return;
     }
-    const target = fs14.existsSync(path21.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
-    const targetPath = path21.join(dir, target);
+    const target = fs14.existsSync(path22.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
+    const targetPath = path22.join(dir, target);
     try {
       if (fs14.existsSync(targetPath)) fs14.copyFileSync(targetPath, targetPath + ".bak");
       fs14.writeFileSync(targetPath, source, "utf-8");
@@ -20755,22 +21294,9 @@ var DevServer = class _DevServer {
     const warnings = [];
     try {
       const config = typeof content === "string" ? JSON.parse(content) : content;
-      if (!config.type) errors.push("Missing required field: type");
-      if (!config.name) errors.push("Missing required field: name");
-      if (!config.category) errors.push("Missing required field: category");
-      else if (!["ide", "extension", "cli", "acp"].includes(config.category)) errors.push(`Invalid category: ${config.category}`);
-      if (config.category === "ide" || config.category === "extension") {
-        if (!config.cdpPorts || !Array.isArray(config.cdpPorts) || config.cdpPorts.length === 0)
-          warnings.push("IDE/Extension providers should have cdpPorts");
-        if (config.category === "extension" && !config.extensionId)
-          warnings.push("Extension providers should have extensionId");
-      }
-      if (config.category === "acp" || config.category === "cli") {
-        if (!config.spawn) errors.push("ACP/CLI providers must have spawn config");
-        else {
-          if (!config.spawn.command) errors.push("spawn.command is required");
-        }
-      }
+      const validation = validateProviderDefinition(config);
+      errors.push(...validation.errors);
+      warnings.push(...validation.warnings);
       if (config.settings) {
         for (const [key, val] of Object.entries(config.settings)) {
           const s = val;
@@ -20887,7 +21413,7 @@ var DevServer = class _DevServer {
     }
     let targetDir;
     targetDir = this.providerLoader.getUserProviderDir(category, type);
-    const jsonPath = path21.join(targetDir, "provider.json");
+    const jsonPath = path22.join(targetDir, "provider.json");
     if (fs14.existsSync(jsonPath)) {
       this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
       return;
@@ -20899,8 +21425,8 @@ var DevServer = class _DevServer {
       const createdFiles = ["provider.json"];
       if (result.files) {
         for (const [relPath, content] of Object.entries(result.files)) {
-          const fullPath = path21.join(targetDir, relPath);
-          fs14.mkdirSync(path21.dirname(fullPath), { recursive: true });
+          const fullPath = path22.join(targetDir, relPath);
+          fs14.mkdirSync(path22.dirname(fullPath), { recursive: true });
           fs14.writeFileSync(fullPath, content, "utf-8");
           createdFiles.push(relPath);
         }
@@ -20953,22 +21479,22 @@ var DevServer = class _DevServer {
     if (!fs14.existsSync(scriptsDir)) return null;
     const versions = fs14.readdirSync(scriptsDir).filter((d) => {
       try {
-        return fs14.statSync(path21.join(scriptsDir, d)).isDirectory();
+        return fs14.statSync(path22.join(scriptsDir, d)).isDirectory();
       } catch {
         return false;
       }
     }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
     if (versions.length === 0) return null;
-    return path21.join(scriptsDir, versions[0]);
+    return path22.join(scriptsDir, versions[0]);
   }
   resolveAutoImplWritableProviderDir(category, type, requestedDir) {
-    const canonicalUserDir = path21.resolve(this.providerLoader.getUserProviderDir(category, type));
-    const desiredDir = requestedDir ? path21.resolve(requestedDir) : canonicalUserDir;
-    const upstreamRoot = path21.resolve(this.providerLoader.getUpstreamDir());
-    if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path21.sep}`)) {
+    const canonicalUserDir = path22.resolve(this.providerLoader.getUserProviderDir(category, type));
+    const desiredDir = requestedDir ? path22.resolve(requestedDir) : canonicalUserDir;
+    const upstreamRoot = path22.resolve(this.providerLoader.getUpstreamDir());
+    if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path22.sep}`)) {
       return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
     }
-    if (path21.basename(desiredDir) !== type) {
+    if (path22.basename(desiredDir) !== type) {
       return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
     }
     const sourceDir = this.findProviderDir(type);
@@ -20976,11 +21502,11 @@ var DevServer = class _DevServer {
       return { dir: null, reason: `Provider source directory not found for '${type}'` };
     }
     if (!fs14.existsSync(desiredDir)) {
-      fs14.mkdirSync(path21.dirname(desiredDir), { recursive: true });
+      fs14.mkdirSync(path22.dirname(desiredDir), { recursive: true });
       fs14.cpSync(sourceDir, desiredDir, { recursive: true });
       this.log(`Auto-implement writable copy created: ${desiredDir}`);
     }
-    const providerJson = path21.join(desiredDir, "provider.json");
+    const providerJson = path22.join(desiredDir, "provider.json");
     if (!fs14.existsSync(providerJson)) {
       return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
     }
@@ -21028,7 +21554,7 @@ var DevServer = class _DevServer {
       setMode: "set_mode.js"
     };
     const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-    const scriptsDir = path21.join(providerDir, "scripts");
+    const scriptsDir = path22.join(providerDir, "scripts");
     const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
     if (latestScriptsDir) {
       lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -21039,7 +21565,7 @@ var DevServer = class _DevServer {
       for (const file of fs14.readdirSync(latestScriptsDir)) {
         if (file.endsWith(".js") && targetFileNames.has(file)) {
           try {
-            const content = fs14.readFileSync(path21.join(latestScriptsDir, file), "utf-8");
+            const content = fs14.readFileSync(path22.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
             lines.push("```javascript");
             lines.push(content);
@@ -21056,7 +21582,7 @@ var DevServer = class _DevServer {
         lines.push("");
         for (const file of refFiles) {
           try {
-            const content = fs14.readFileSync(path21.join(latestScriptsDir, file), "utf-8");
+            const content = fs14.readFileSync(path22.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u{1F512}`);
             lines.push("```javascript");
             lines.push(content);
@@ -21097,10 +21623,10 @@ var DevServer = class _DevServer {
         lines.push("");
       }
     }
-    const docsDir = path21.join(providerDir, "../../docs");
+    const docsDir = path22.join(providerDir, "../../docs");
     const loadGuide = (name) => {
       try {
-        const p = path21.join(docsDir, name);
+        const p = path22.join(docsDir, name);
         if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
       } catch {
       }
@@ -21274,7 +21800,7 @@ var DevServer = class _DevServer {
       parseApproval: "parse_approval.js"
     };
     const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-    const scriptsDir = path21.join(providerDir, "scripts");
+    const scriptsDir = path22.join(providerDir, "scripts");
     const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
     if (latestScriptsDir) {
       lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -21286,7 +21812,7 @@ var DevServer = class _DevServer {
         if (!file.endsWith(".js")) continue;
         if (!targetFileNames.has(file)) continue;
         try {
-          const content = fs14.readFileSync(path21.join(latestScriptsDir, file), "utf-8");
+          const content = fs14.readFileSync(path22.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -21302,7 +21828,7 @@ var DevServer = class _DevServer {
         lines.push("");
         for (const file of refFiles) {
           try {
-            const content = fs14.readFileSync(path21.join(latestScriptsDir, file), "utf-8");
+            const content = fs14.readFileSync(path22.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u{1F512}`);
             lines.push("```javascript");
             lines.push(content);
@@ -21335,10 +21861,10 @@ var DevServer = class _DevServer {
         lines.push("");
       }
     }
-    const docsDir = path21.join(providerDir, "../../docs");
+    const docsDir = path22.join(providerDir, "../../docs");
     const loadGuide = (name) => {
       try {
-        const p = path21.join(docsDir, name);
+        const p = path22.join(docsDir, name);
         if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
       } catch {
       }
@@ -22046,6 +22572,67 @@ async function listHostedCliRuntimes(endpoint) {
   }
 }
 
+// src/session-host/runtime-surface.ts
+var LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
+function isSessionHostLiveRuntime(record) {
+  const lifecycle = String(record?.lifecycle || "").trim();
+  return LIVE_LIFECYCLES.has(lifecycle);
+}
+function getSessionHostRecoveryLabel(meta) {
+  const recoveryState = typeof meta?.runtimeRecoveryState === "string" ? String(meta.runtimeRecoveryState).trim() : "";
+  if (!recoveryState) return null;
+  if (recoveryState === "auto_resumed") return "restored after restart";
+  if (recoveryState === "resume_failed") return "restore failed";
+  if (recoveryState === "host_restart_interrupted") return "host restart interrupted";
+  if (recoveryState === "orphan_snapshot") return "snapshot recovered";
+  return recoveryState.replace(/_/g, " ");
+}
+function isSessionHostRecoverySnapshot(record) {
+  if (!record) return false;
+  if (isSessionHostLiveRuntime(record)) return false;
+  const lifecycle = String(record.lifecycle || "").trim();
+  if (lifecycle && lifecycle !== "stopped" && lifecycle !== "failed") {
+    return false;
+  }
+  const meta = record.meta || void 0;
+  if (meta?.restoredFromStorage === true) return true;
+  return getSessionHostRecoveryLabel(meta) !== null;
+}
+function getSessionHostSurfaceKind(record) {
+  if (isSessionHostLiveRuntime(record)) return "live_runtime";
+  if (isSessionHostRecoverySnapshot(record)) return "recovery_snapshot";
+  return "inactive_record";
+}
+function partitionSessionHostRecords(records) {
+  const liveRuntimes = [];
+  const recoverySnapshots = [];
+  const inactiveRecords = [];
+  for (const record of records) {
+    const kind = getSessionHostSurfaceKind(record);
+    if (kind === "live_runtime") {
+      liveRuntimes.push(record);
+    } else if (kind === "recovery_snapshot") {
+      recoverySnapshots.push(record);
+    } else {
+      inactiveRecords.push(record);
+    }
+  }
+  return {
+    liveRuntimes,
+    recoverySnapshots,
+    inactiveRecords
+  };
+}
+function partitionSessionHostDiagnosticsSessions(records) {
+  return partitionSessionHostRecords(records || []);
+}
+
+// src/session-host/startup-restore-policy.js
+function shouldAutoRestoreHostedSessionsOnStartup(env = process.env) {
+  const raw = typeof env.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP === "string" ? env.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP.trim().toLowerCase() : "";
+  return raw === "1" || raw === "true" || raw === "yes";
+}
+
 // src/installer.ts
 var import_child_process10 = require("child_process");
 var EXTENSION_CATALOG = [
@@ -22552,6 +23139,7 @@ async function shutdownDaemonComponents(components) {
   detectIDEs,
   ensureSessionHostReady,
   findCdpManager,
+  flattenMessageParts,
   forwardAgentStreamsToIdeInstance,
   getAIExtensions,
   getAvailableIdeIds,
@@ -22565,6 +23153,8 @@ async function shutdownDaemonComponents(components) {
   getRecentDebugTrace,
   getRecentLogs,
   getSavedProviderSessions,
+  getSessionHostRecoveryLabel,
+  getSessionHostSurfaceKind,
   getWorkspaceState,
   hasCdpManager,
   initDaemonComponents,
@@ -22575,6 +23165,8 @@ async function shutdownDaemonComponents(components) {
   isIdeRunning,
   isManagedStatusWaiting,
   isManagedStatusWorking,
+  isSessionHostLiveRuntime,
+  isSessionHostRecoverySnapshot,
   isSetupComplete,
   killIdeProcess,
   launchIDE,
@@ -22586,7 +23178,11 @@ async function shutdownDaemonComponents(components) {
   markSetupComplete,
   maybeRunDaemonUpgradeHelperFromEnv,
   normalizeActiveChatData,
+  normalizeInputEnvelope,
   normalizeManagedStatus,
+  normalizeMessageParts,
+  partitionSessionHostDiagnosticsSessions,
+  partitionSessionHostRecords,
   probeCdpPort,
   readChatHistory,
   recordDebugTrace,
@@ -22601,6 +23197,7 @@ async function shutdownDaemonComponents(components) {
   setDebugRuntimeConfig,
   setLogLevel,
   setupIdeInstance,
+  shouldAutoRestoreHostedSessionsOnStartup,
   shouldCollectTraceCategory,
   shutdownDaemonComponents,
   spawnDetachedDaemonUpgradeHelper,