adhdev 0.8.52 → 0.8.54

package/dist/index.js

@@ -649,17 +649,17 @@ function checkPathExists(paths) {
   return null;
 }
 async function detectIDEs(providerLoader) {
-  const os24 = (0, import_os2.platform)();
+  const os25 = (0, import_os2.platform)();
   const results = [];
   for (const def of getMergedDefinitions()) {
     const cliPath = findCliCommand(providerLoader?.getIdeCliCommand(def.id, def.cli) || def.cli);
-    const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os24] || []) || []);
+    const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os25] || []) || []);
     let resolvedCli = cliPath;
-    if (!resolvedCli && appPath && os24 === "darwin") {
+    if (!resolvedCli && appPath && os25 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
       if ((0, import_fs3.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
-    if (!resolvedCli && appPath && os24 === "win32") {
+    if (!resolvedCli && appPath && os25 === "win32") {
       const { dirname: dirname9 } = await import("path");
       const appDir = dirname9(appPath);
       const candidates = [
@@ -676,7 +676,7 @@ async function detectIDEs(providerLoader) {
         }
       }
     }
-    const installed = os24 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
+    const installed = os25 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
     const version2 = resolvedCli ? getIdeVersion(resolvedCli) : null;
     results.push({
       id: def.id,
@@ -2599,6 +2599,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 record2 = option;
+  const value = typeof record2.value === "string" ? record2.value : typeof record2.id === "string" ? record2.id : null;
+  if (!value) return null;
+  const label = typeof record2.label === "string" ? record2.label : typeof record2.name === "string" ? record2.name : value;
+  const normalized = { value, label };
+  if (typeof record2.description === "string") normalized.description = record2.description;
+  if (typeof record2.group === "string") normalized.group = record2.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;
@@ -4656,50 +4711,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;
-}
 function buildIdeWorkspaceSession(state, cdpManagers, options) {
   const profile = options.profile || "full";
   const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
@@ -4726,11 +4737,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,
@@ -4760,11 +4767,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,
@@ -4805,9 +4808,7 @@ function buildCliSession(state, options) {
     },
     ...includeSessionControls && {
       controlValues: state.controlValues,
-      providerControls: buildFallbackControls(
-        state.providerControls
-      )
+      providerControls: state.providerControls
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
@@ -4839,13 +4840,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,
@@ -4979,14 +4974,228 @@ var init_reconcile = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/io-contracts.ts
+function normalizeInputEnvelope(input) {
+  const normalized = normalizeInputEnvelopePayload(input);
+  const textFallback = normalized.textFallback ?? flattenInputParts(normalized.parts);
+  return {
+    parts: normalized.parts,
+    textFallback,
+    ...normalized.metadata ? { metadata: normalized.metadata } : {}
+  };
+}
+function normalizeMessageParts(content) {
+  if (typeof content === "string") return [{ type: "text", text: content }];
+  if (!Array.isArray(content)) {
+    if (content && typeof content === "object" && typeof content.text === "string") {
+      return [{ type: "text", text: String(content.text) }];
+    }
+    return [];
+  }
+  const parts = [];
+  for (const raw of content) {
+    if (typeof raw === "string") {
+      parts.push({ type: "text", text: raw });
+      continue;
+    }
+    if (!raw || typeof raw !== "object") continue;
+    const part = normalizeMessagePartObject(raw);
+    if (part) parts.push(part);
+  }
+  return parts;
+}
+function flattenMessageParts(parts) {
+  return parts.map((part) => {
+    if (part.type === "text") return part.text;
+    if (part.type === "resource") return part.resource.text || "";
+    return "";
+  }).filter((value) => value.length > 0).join("\n");
+}
+function normalizeInputEnvelopePayload(input) {
+  if (typeof input === "string") {
+    return { parts: [{ type: "text", text: input }], textFallback: input };
+  }
+  if (!input || typeof input !== "object") {
+    return { parts: [], textFallback: "" };
+  }
+  const record2 = input;
+  const nestedInput = record2.input;
+  if (nestedInput && typeof nestedInput === "object") {
+    const nested = nestedInput;
+    return {
+      parts: normalizeInputParts(nested.parts ?? nested.prompt),
+      textFallback: typeof nested.textFallback === "string" ? nested.textFallback : void 0,
+      metadata: normalizeInputMetadata(nested.metadata)
+    };
+  }
+  const directText = typeof record2.text === "string" ? record2.text : typeof record2.message === "string" ? record2.message : void 0;
+  if (directText !== void 0) {
+    return { parts: [{ type: "text", text: directText }], textFallback: directText };
+  }
+  const directParts = normalizeInputParts(record2.parts ?? record2.prompt);
+  return {
+    parts: directParts,
+    textFallback: typeof record2.textFallback === "string" ? record2.textFallback : void 0,
+    metadata: normalizeInputMetadata(record2.metadata)
+  };
+}
+function normalizeInputMetadata(value) {
+  if (!value || typeof value !== "object") return void 0;
+  const record2 = value;
+  const metadata = {};
+  if (record2.source === "dashboard" || record2.source === "shortcut_api" || record2.source === "provider_script" || record2.source === "session_replay") {
+    metadata.source = record2.source;
+  }
+  if (typeof record2.clientTimestamp === "number" && Number.isFinite(record2.clientTimestamp)) {
+    metadata.clientTimestamp = record2.clientTimestamp;
+  }
+  return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
+function normalizeInputParts(value) {
+  if (!Array.isArray(value)) return [];
+  const parts = [];
+  for (const raw of value) {
+    if (typeof raw === "string") {
+      parts.push({ type: "text", text: raw });
+      continue;
+    }
+    if (!raw || typeof raw !== "object") continue;
+    const part = normalizeInputPartObject(raw);
+    if (part) parts.push(part);
+  }
+  return parts;
+}
+function normalizeInputPartObject(raw) {
+  const type = raw.type;
+  if (type === "text" && typeof raw.text === "string") {
+    return { type, text: raw.text };
+  }
+  if (type === "image" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.alt === "string" ? { alt: raw.alt } : {}
+    };
+  }
+  if (type === "audio" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+    };
+  }
+  if (type === "video" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
+    };
+  }
+  if (type === "resource" && typeof raw.uri === "string") {
+    return {
+      type,
+      uri: raw.uri,
+      ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+      ...typeof raw.name === "string" ? { name: raw.name } : {},
+      ...typeof raw.text === "string" ? { text: raw.text } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {}
+    };
+  }
+  if (type === "resource_link" && typeof raw.uri === "string") {
+    return {
+      type: "resource",
+      uri: raw.uri,
+      ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+      ...typeof raw.name === "string" ? { name: raw.name } : {}
+    };
+  }
+  return null;
+}
+function normalizeMessagePartObject(raw) {
+  const type = raw.type;
+  if (type === "text" && typeof raw.text === "string") {
+    return { type, text: raw.text };
+  }
+  if (type === "image" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {}
+    };
+  }
+  if (type === "audio" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.transcript === "string" ? { transcript: raw.transcript } : {}
+    };
+  }
+  if (type === "video" && typeof raw.mimeType === "string") {
+    return {
+      type,
+      mimeType: raw.mimeType,
+      ...typeof raw.uri === "string" ? { uri: raw.uri } : {},
+      ...typeof raw.data === "string" ? { data: raw.data } : {},
+      ...typeof raw.posterUri === "string" ? { posterUri: raw.posterUri } : {}
+    };
+  }
+  if (type === "resource_link" && typeof raw.uri === "string" && typeof raw.name === "string") {
+    return {
+      type,
+      uri: raw.uri,
+      name: raw.name,
+      ...typeof raw.mimeType === "string" ? { mimeType: raw.mimeType } : {},
+      ...typeof raw.size === "number" ? { size: raw.size } : {}
+    };
+  }
+  if (type === "resource" && raw.resource && typeof raw.resource === "object") {
+    const resource = raw.resource;
+    if (typeof resource.uri !== "string") return null;
+    return {
+      type,
+      resource: {
+        uri: resource.uri,
+        ...typeof resource.mimeType === "string" || resource.mimeType === null ? { mimeType: resource.mimeType } : {},
+        ...typeof resource.text === "string" ? { text: resource.text } : {},
+        ...typeof resource.blob === "string" ? { blob: resource.blob } : {}
+      }
+    };
+  }
+  return null;
+}
+function flattenInputParts(parts) {
+  return parts.map((part) => {
+    if (part.type === "text") return part.text;
+    if (part.type === "audio") return part.transcript || "";
+    if (part.type === "resource") return part.text || "";
+    return "";
+  }).filter((value) => value.length > 0).join("\n");
+}
+var init_io_contracts = __esm({
+  "../../oss/packages/daemon-core/src/providers/io-contracts.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/contracts.ts
 function flattenContent(content) {
   if (typeof content === "string") return content;
-  return content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
+  return flattenMessageParts(normalizeMessageParts(content));
 }
 var init_contracts = __esm({
   "../../oss/packages/daemon-core/src/providers/contracts.ts"() {
     "use strict";
+    init_io_contracts();
+    init_io_contracts();
   }
 });
 
@@ -5184,6 +5393,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;
@@ -5588,7 +5800,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);
@@ -6502,6 +6715,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);
@@ -6534,6 +6762,14 @@ 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 };
@@ -6584,6 +6820,42 @@ var init_cdp_commands = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/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 };
+}
+var init_cli_script_results = __esm({
+  "../../oss/packages/daemon-core/src/providers/cli-script-results.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/commands/stream-commands.ts
 function getCliPresentationMode(h, targetSessionId) {
   if (!targetSessionId) return null;
@@ -6673,34 +6945,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;
@@ -6734,7 +6991,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 || {} };
       }
@@ -6745,7 +7002,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}` };
     }
@@ -6808,7 +7069,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 };
       }
@@ -6819,9 +7080,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" };
@@ -6871,6 +7129,8 @@ function handleSetIdeExtension(h, args) {
 var init_stream_commands = __esm({
   "../../oss/packages/daemon-core/src/commands/stream-commands.ts"() {
     "use strict";
+    init_cli_script_results();
+    init_control_effects();
     init_logger();
   }
 });
@@ -7289,11 +7549,7 @@ var init_handler = __esm({
           "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 = {
@@ -7405,17 +7661,9 @@ var init_handler = __esm({
             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");
@@ -7860,14 +8108,14 @@ function applyTerminalColorEnv(env) {
 function ensureNodePtySpawnHelperPermissions(logFn) {
   if (os22.platform() === "win32") return;
   try {
-    const fs18 = __require("fs");
+    const fs19 = __require("fs");
     const ptyDir = path32.resolve(path32.dirname(__require.resolve("node-pty")), "..");
     const platformArch = `${os22.platform()}-${os22.arch()}`;
     const helper = path32.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-    if (fs18.existsSync(helper)) {
-      const stat4 = fs18.statSync(helper);
+    if (fs19.existsSync(helper)) {
+      const stat4 = fs19.statSync(helper);
       if (!(stat4.mode & 73)) {
-        fs18.chmodSync(helper, stat4.mode | 493);
+        fs19.chmodSync(helper, stat4.mode | 493);
         logFn?.(`Fixed spawn-helper permissions: ${helper}`);
       }
     }
@@ -8059,8 +8307,8 @@ var init_pty_transport = __esm({
         let cwd = options.cwd;
         if (cwd) {
           try {
-            const fs18 = require("fs");
-            const stat4 = fs18.statSync(cwd);
+            const fs19 = require("fs");
+            const stat4 = fs19.statSync(cwd);
             if (!stat4.isDirectory()) cwd = os8.homedir();
           } catch {
             cwd = os8.homedir();
@@ -8158,12 +8406,12 @@ function findBinary(name) {
 function isScriptBinary(binaryPath) {
   if (!path9.isAbsolute(binaryPath)) return false;
   try {
-    const fs18 = require("fs");
-    const resolved = fs18.realpathSync(binaryPath);
+    const fs19 = require("fs");
+    const resolved = fs19.realpathSync(binaryPath);
     const head = Buffer.alloc(8);
-    const fd = fs18.openSync(resolved, "r");
-    fs18.readSync(fd, head, 0, 8, 0);
-    fs18.closeSync(fd);
+    const fd = fs19.openSync(resolved, "r");
+    fs19.readSync(fd, head, 0, 8, 0);
+    fs19.closeSync(fd);
     let i = 0;
     if (head[0] === 239 && head[1] === 187 && head[2] === 191) i = 3;
     return head[i] === 35 && head[i + 1] === 33;
@@ -8174,12 +8422,12 @@ function isScriptBinary(binaryPath) {
 function looksLikeMachOOrElf(filePath) {
   if (!path9.isAbsolute(filePath)) return false;
   try {
-    const fs18 = require("fs");
-    const resolved = fs18.realpathSync(filePath);
+    const fs19 = require("fs");
+    const resolved = fs19.realpathSync(filePath);
     const buf = Buffer.alloc(8);
-    const fd = fs18.openSync(resolved, "r");
-    fs18.readSync(fd, buf, 0, 8, 0);
-    fs18.closeSync(fd);
+    const fd = fs19.openSync(resolved, "r");
+    fs19.readSync(fd, buf, 0, 8, 0);
+    fs19.closeSync(fd);
     let i = 0;
     if (buf[0] === 239 && buf[1] === 187 && buf[2] === 191) i = 3;
     const b = buf.subarray(i);
@@ -10293,6 +10541,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 os12, path11, crypto3, fs5, import_node_module, CachedDatabaseSync, CliProviderInstance;
 var init_cli_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/cli-provider-instance.ts"() {
@@ -10302,12 +10567,14 @@ var init_cli_provider_instance = __esm({
     crypto3 = __toESM(require("crypto"));
     fs5 = __toESM(require("fs"));
     import_node_module = require("module");
+    init_contracts();
     init_provider_cli_adapter();
     init_status_monitor();
     init_chat_history();
     init_logger();
     init_control_effects();
     init_approval_utils();
+    init_cli_script_results();
     CachedDatabaseSync = null;
     CliProviderInstance = class {
       constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
@@ -10367,6 +10634,7 @@ var init_cli_provider_instance = __esm({
           this.detectStatusTransition();
         });
         await this.adapter.spawn();
+        await this.enforceFreshSessionLaunchIfNeeded();
         this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
         if (this.providerSessionId) {
           this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
@@ -10558,10 +10826,13 @@ var init_cli_provider_instance = __esm({
         });
       }
       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) {
@@ -10579,6 +10850,23 @@ var init_cli_provider_instance = __esm({
       }
       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();
@@ -11216,10 +11504,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path26) {
-  if (!path26)
+function getElementAtPath(obj, path28) {
+  if (!path28)
     return obj;
-  return path26.reduce((acc, key) => acc?.[key], obj);
+  return path28.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -11531,11 +11819,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path26, issues) {
+function prefixIssues(path28, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path26);
+    iss.path.unshift(path28);
     return iss;
   });
 }
@@ -11778,7 +12066,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path26 = []) => {
+  const processError = (error49, path28 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -11788,7 +12076,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path26, ...issue2.path];
+        const fullpath = [...path28, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -11820,8 +12108,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path26 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path26) {
+  const path28 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path28) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -24585,13 +24873,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path26 = ref.slice(1).split("/").filter(Boolean);
-  if (path26.length === 0) {
+  const path28 = ref.slice(1).split("/").filter(Boolean);
+  if (path28.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path26[0] === defsKey) {
-    const key = path26[1];
+  if (path28[0] === defsKey) {
+    const key = path28[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -27265,10 +27553,106 @@ var init_acp = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/providers/acp-provider-instance.ts
-var import_stream, import_child_process5, AcpProviderInstance;
+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 path12, import_stream, import_child_process5, AcpProviderInstance;
 var init_acp_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/acp-provider-instance.ts"() {
     "use strict";
+    path12 = __toESM(require("path"));
     import_stream = require("stream");
     import_child_process5 = require("child_process");
     init_acp();
@@ -27403,8 +27787,10 @@ var init_acp_provider_instance = __esm({
         };
       }
       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") {
@@ -27829,18 +28215,34 @@ var init_acp_provider_instance = __esm({
           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,
@@ -27904,6 +28306,13 @@ var init_acp_provider_instance = __esm({
               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") {
@@ -28297,7 +28706,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);
@@ -28307,12 +28716,12 @@ function resolveCliSessionBinding(provider, normalizedType, cliArgs, requestedRe
     launchMode: "new"
   };
 }
-var os13, path12, crypto4, import_chalk, chalkModule, chalkApi, DaemonCliManager;
+var os13, path13, crypto4, import_chalk, chalkModule, chalkApi, DaemonCliManager;
 var init_cli_manager = __esm({
   "../../oss/packages/daemon-core/src/commands/cli-manager.ts"() {
     "use strict";
     os13 = __toESM(require("os"));
-    path12 = __toESM(require("path"));
+    path13 = __toESM(require("path"));
     crypto4 = __toESM(require("crypto"));
     import_chalk = __toESM(require("chalk"));
     init_provider_cli_adapter();
@@ -28324,6 +28733,7 @@ var init_cli_manager = __esm({
     init_saved_sessions();
     init_cli_provider_instance();
     init_acp_provider_instance();
+    init_contracts();
     init_logger();
     init_hosted_runtime_restore();
     chalkModule = import_chalk.default;
@@ -28466,7 +28876,7 @@ var init_cli_manager = __esm({
       async startSession(cliType, workingDir, cliArgs, initialModel, options) {
         const trimmed = (workingDir || "").trim();
         if (!trimmed) throw new Error("working directory required");
-        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os13.homedir()) : path12.resolve(trimmed);
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os13.homedir()) : path13.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
         const provider = this.providerLoader.getByAlias(cliType);
         const key = crypto4.randomUUID();
@@ -28514,7 +28924,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();
@@ -28923,7 +29334,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" };
@@ -29047,7 +29459,7 @@ var init_readdirp = __esm({
         this._directoryFilter = normalizeFilter(opts.directoryFilter);
         const statMethod = opts.lstat ? import_promises.lstat : import_promises.stat;
         if (wantBigintFsStats) {
-          this._stat = (path26) => statMethod(path26, { bigint: true });
+          this._stat = (path28) => statMethod(path28, { bigint: true });
         } else {
           this._stat = statMethod;
         }
@@ -29072,8 +29484,8 @@ var init_readdirp = __esm({
             const par = this.parent;
             const fil = par && par.files;
             if (fil && fil.length > 0) {
-              const { path: path26, depth } = par;
-              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path26));
+              const { path: path28, depth } = par;
+              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path28));
               const awaited = await Promise.all(slice);
               for (const entry of awaited) {
                 if (!entry)
@@ -29113,21 +29525,21 @@ var init_readdirp = __esm({
           this.reading = false;
         }
       }
-      async _exploreDir(path26, depth) {
+      async _exploreDir(path28, depth) {
         let files;
         try {
-          files = await (0, import_promises.readdir)(path26, this._rdOptions);
+          files = await (0, import_promises.readdir)(path28, this._rdOptions);
         } catch (error48) {
           this._onError(error48);
         }
-        return { files, depth, path: path26 };
+        return { files, depth, path: path28 };
       }
-      async _formatEntry(dirent, path26) {
+      async _formatEntry(dirent, path28) {
         let entry;
-        const basename7 = this._isDirent ? dirent.name : dirent;
+        const basename9 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path26, basename7));
-          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename7 };
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path28, basename9));
+          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename9 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
           this._onError(err);
@@ -29183,16 +29595,16 @@ var init_readdirp = __esm({
 });
 
 // ../../oss/packages/daemon-core/node_modules/chokidar/handler.js
-function createFsWatchInstance(path26, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path28, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path26);
-    emitRaw(rawEvent, evPath, { watchedPath: path26 });
-    if (evPath && path26 !== evPath) {
-      fsWatchBroadcast(sp.resolve(path26, evPath), KEY_LISTENERS, sp.join(path26, evPath));
+    listener(path28);
+    emitRaw(rawEvent, evPath, { watchedPath: path28 });
+    if (evPath && path28 !== evPath) {
+      fsWatchBroadcast(sp.resolve(path28, evPath), KEY_LISTENERS, sp.join(path28, evPath));
     }
   };
   try {
-    return (0, import_node_fs.watch)(path26, {
+    return (0, import_node_fs.watch)(path28, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error48) {
@@ -29541,12 +29953,12 @@ var init_handler2 = __esm({
         listener(val1, val2, val3);
       });
     };
-    setFsWatchListener = (path26, fullPath, options, handlers) => {
+    setFsWatchListener = (path28, fullPath, options, handlers) => {
       const { listener, errHandler, rawEmitter } = handlers;
       let cont = FsWatchInstances.get(fullPath);
       let watcher;
       if (!options.persistent) {
-        watcher = createFsWatchInstance(path26, options, listener, errHandler, rawEmitter);
+        watcher = createFsWatchInstance(path28, options, listener, errHandler, rawEmitter);
         if (!watcher)
           return;
         return watcher.close.bind(watcher);
@@ -29557,7 +29969,7 @@ var init_handler2 = __esm({
         addAndConvert(cont, KEY_RAW, rawEmitter);
       } else {
         watcher = createFsWatchInstance(
-          path26,
+          path28,
           options,
           fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
           errHandler,
@@ -29572,7 +29984,7 @@ var init_handler2 = __esm({
             cont.watcherUnusable = true;
           if (isWindows && error48.code === "EPERM") {
             try {
-              const fd = await (0, import_promises2.open)(path26, "r");
+              const fd = await (0, import_promises2.open)(path28, "r");
               await fd.close();
               broadcastErr(error48);
             } catch (err) {
@@ -29603,7 +30015,7 @@ var init_handler2 = __esm({
       };
     };
     FsWatchFileInstances = /* @__PURE__ */ new Map();
-    setFsWatchFileListener = (path26, fullPath, options, handlers) => {
+    setFsWatchFileListener = (path28, fullPath, options, handlers) => {
       const { listener, rawEmitter } = handlers;
       let cont = FsWatchFileInstances.get(fullPath);
       const copts = cont && cont.options;
@@ -29625,7 +30037,7 @@ var init_handler2 = __esm({
             });
             const currmtime = curr.mtimeMs;
             if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-              foreach(cont.listeners, (listener2) => listener2(path26, curr));
+              foreach(cont.listeners, (listener2) => listener2(path28, curr));
             }
           })
         };
@@ -29655,13 +30067,13 @@ var init_handler2 = __esm({
        * @param listener on fs change
        * @returns closer for the watcher instance
        */
-      _watchWithNodeFs(path26, listener) {
+      _watchWithNodeFs(path28, listener) {
         const opts = this.fsw.options;
-        const directory = sp.dirname(path26);
-        const basename7 = sp.basename(path26);
+        const directory = sp.dirname(path28);
+        const basename9 = sp.basename(path28);
         const parent = this.fsw._getWatchedDir(directory);
-        parent.add(basename7);
-        const absolutePath = sp.resolve(path26);
+        parent.add(basename9);
+        const absolutePath = sp.resolve(path28);
         const options = {
           persistent: opts.persistent
         };
@@ -29670,13 +30082,13 @@ var init_handler2 = __esm({
         let closer;
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
-          options.interval = enableBin && isBinaryPath(basename7) ? opts.binaryInterval : opts.interval;
-          closer = setFsWatchFileListener(path26, absolutePath, options, {
+          options.interval = enableBin && isBinaryPath(basename9) ? opts.binaryInterval : opts.interval;
+          closer = setFsWatchFileListener(path28, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
           });
         } else {
-          closer = setFsWatchListener(path26, absolutePath, options, {
+          closer = setFsWatchListener(path28, absolutePath, options, {
             listener,
             errHandler: this._boundHandleError,
             rawEmitter: this.fsw._emitRaw
@@ -29693,12 +30105,12 @@ var init_handler2 = __esm({
           return;
         }
         const dirname9 = sp.dirname(file2);
-        const basename7 = sp.basename(file2);
+        const basename9 = sp.basename(file2);
         const parent = this.fsw._getWatchedDir(dirname9);
         let prevStats = stats;
-        if (parent.has(basename7))
+        if (parent.has(basename9))
           return;
-        const listener = async (path26, newStats) => {
+        const listener = async (path28, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
             return;
           if (!newStats || newStats.mtimeMs === 0) {
@@ -29712,18 +30124,18 @@ var init_handler2 = __esm({
                 this.fsw._emit(EV.CHANGE, file2, newStats2);
               }
               if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-                this.fsw._closeFile(path26);
+                this.fsw._closeFile(path28);
                 prevStats = newStats2;
                 const closer2 = this._watchWithNodeFs(file2, listener);
                 if (closer2)
-                  this.fsw._addPathCloser(path26, closer2);
+                  this.fsw._addPathCloser(path28, closer2);
               } else {
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname9, basename7);
+              this.fsw._remove(dirname9, basename9);
             }
-          } else if (parent.has(basename7)) {
+          } else if (parent.has(basename9)) {
             const at = newStats.atimeMs;
             const mt = newStats.mtimeMs;
             if (!at || at <= mt || mt !== prevStats.mtimeMs) {
@@ -29748,7 +30160,7 @@ var init_handler2 = __esm({
        * @param item basename of this item
        * @returns true if no more processing is needed for this entry.
        */
-      async _handleSymlink(entry, directory, path26, item) {
+      async _handleSymlink(entry, directory, path28, item) {
         if (this.fsw.closed) {
           return;
         }
@@ -29758,7 +30170,7 @@ var init_handler2 = __esm({
           this.fsw._incrReadyCount();
           let linkPath;
           try {
-            linkPath = await (0, import_promises2.realpath)(path26);
+            linkPath = await (0, import_promises2.realpath)(path28);
           } catch (e) {
             this.fsw._emitReady();
             return true;
@@ -29768,12 +30180,12 @@ var init_handler2 = __esm({
           if (dir.has(item)) {
             if (this.fsw._symlinkPaths.get(full) !== linkPath) {
               this.fsw._symlinkPaths.set(full, linkPath);
-              this.fsw._emit(EV.CHANGE, path26, entry.stats);
+              this.fsw._emit(EV.CHANGE, path28, entry.stats);
             }
           } else {
             dir.add(item);
             this.fsw._symlinkPaths.set(full, linkPath);
-            this.fsw._emit(EV.ADD, path26, entry.stats);
+            this.fsw._emit(EV.ADD, path28, entry.stats);
           }
           this.fsw._emitReady();
           return true;
@@ -29803,9 +30215,9 @@ var init_handler2 = __esm({
             return;
           }
           const item = entry.path;
-          let path26 = sp.join(directory, item);
+          let path28 = sp.join(directory, item);
           current.add(item);
-          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path26, item)) {
+          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path28, item)) {
             return;
           }
           if (this.fsw.closed) {
@@ -29814,8 +30226,8 @@ var init_handler2 = __esm({
           }
           if (item === target || !target && !previous.has(item)) {
             this.fsw._incrReadyCount();
-            path26 = sp.join(dir, sp.relative(dir, path26));
-            this._addToNodeFs(path26, initialAdd, wh, depth + 1);
+            path28 = sp.join(dir, sp.relative(dir, path28));
+            this._addToNodeFs(path28, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
         return new Promise((resolve16, reject) => {
@@ -29884,13 +30296,13 @@ var init_handler2 = __esm({
        * @param depth Child path actually targeted for watch
        * @param target Child path actually targeted for watch
        */
-      async _addToNodeFs(path26, initialAdd, priorWh, depth, target) {
+      async _addToNodeFs(path28, initialAdd, priorWh, depth, target) {
         const ready = this.fsw._emitReady;
-        if (this.fsw._isIgnored(path26) || this.fsw.closed) {
+        if (this.fsw._isIgnored(path28) || this.fsw.closed) {
           ready();
           return false;
         }
-        const wh = this.fsw._getWatchHelpers(path26);
+        const wh = this.fsw._getWatchHelpers(path28);
         if (priorWh) {
           wh.filterPath = (entry) => priorWh.filterPath(entry);
           wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -29906,8 +30318,8 @@ var init_handler2 = __esm({
           const follow = this.fsw.options.followSymlinks;
           let closer;
           if (stats.isDirectory()) {
-            const absPath = sp.resolve(path26);
-            const targetPath = follow ? await (0, import_promises2.realpath)(path26) : path26;
+            const absPath = sp.resolve(path28);
+            const targetPath = follow ? await (0, import_promises2.realpath)(path28) : path28;
             if (this.fsw.closed)
               return;
             closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -29917,29 +30329,29 @@ var init_handler2 = __esm({
               this.fsw._symlinkPaths.set(absPath, targetPath);
             }
           } else if (stats.isSymbolicLink()) {
-            const targetPath = follow ? await (0, import_promises2.realpath)(path26) : path26;
+            const targetPath = follow ? await (0, import_promises2.realpath)(path28) : path28;
             if (this.fsw.closed)
               return;
             const parent = sp.dirname(wh.watchPath);
             this.fsw._getWatchedDir(parent).add(wh.watchPath);
             this.fsw._emit(EV.ADD, wh.watchPath, stats);
-            closer = await this._handleDir(parent, stats, initialAdd, depth, path26, wh, targetPath);
+            closer = await this._handleDir(parent, stats, initialAdd, depth, path28, wh, targetPath);
             if (this.fsw.closed)
               return;
             if (targetPath !== void 0) {
-              this.fsw._symlinkPaths.set(sp.resolve(path26), targetPath);
+              this.fsw._symlinkPaths.set(sp.resolve(path28), targetPath);
             }
           } else {
             closer = this._handleFile(wh.watchPath, stats, initialAdd);
           }
           ready();
           if (closer)
-            this.fsw._addPathCloser(path26, closer);
+            this.fsw._addPathCloser(path28, closer);
           return false;
         } catch (error48) {
           if (this.fsw._handleError(error48)) {
             ready();
-            return path26;
+            return path28;
           }
         }
       }
@@ -29974,24 +30386,24 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path26) {
-  if (typeof path26 !== "string")
+function normalizePath(path28) {
+  if (typeof path28 !== "string")
     throw new Error("string expected");
-  path26 = sp2.normalize(path26);
-  path26 = path26.replace(/\\/g, "/");
+  path28 = sp2.normalize(path28);
+  path28 = path28.replace(/\\/g, "/");
   let prepend = false;
-  if (path26.startsWith("//"))
+  if (path28.startsWith("//"))
     prepend = true;
-  path26 = path26.replace(DOUBLE_SLASH_RE, "/");
+  path28 = path28.replace(DOUBLE_SLASH_RE, "/");
   if (prepend)
-    path26 = "/" + path26;
-  return path26;
+    path28 = "/" + path28;
+  return path28;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path26 = normalizePath(testString);
+  const path28 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path26, stats)) {
+    if (pattern(path28, stats)) {
       return true;
     }
   }
@@ -30054,19 +30466,19 @@ var init_chokidar = __esm({
       }
       return str;
     };
-    normalizePathToUnix = (path26) => toUnix(sp2.normalize(toUnix(path26)));
-    normalizeIgnored = (cwd = "") => (path26) => {
-      if (typeof path26 === "string") {
-        return normalizePathToUnix(sp2.isAbsolute(path26) ? path26 : sp2.join(cwd, path26));
+    normalizePathToUnix = (path28) => toUnix(sp2.normalize(toUnix(path28)));
+    normalizeIgnored = (cwd = "") => (path28) => {
+      if (typeof path28 === "string") {
+        return normalizePathToUnix(sp2.isAbsolute(path28) ? path28 : sp2.join(cwd, path28));
       } else {
-        return path26;
+        return path28;
       }
     };
-    getAbsolutePath = (path26, cwd) => {
-      if (sp2.isAbsolute(path26)) {
-        return path26;
+    getAbsolutePath = (path28, cwd) => {
+      if (sp2.isAbsolute(path28)) {
+        return path28;
       }
-      return sp2.join(cwd, path26);
+      return sp2.join(cwd, path28);
     };
     EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
     DirEntry = class {
@@ -30131,10 +30543,10 @@ var init_chokidar = __esm({
       dirParts;
       followSymlinks;
       statMethod;
-      constructor(path26, follow, fsw) {
+      constructor(path28, follow, fsw) {
         this.fsw = fsw;
-        const watchPath = path26;
-        this.path = path26 = path26.replace(REPLACER_RE, "");
+        const watchPath = path28;
+        this.path = path28 = path28.replace(REPLACER_RE, "");
         this.watchPath = watchPath;
         this.fullWatchPath = sp2.resolve(watchPath);
         this.dirParts = [];
@@ -30274,20 +30686,20 @@ var init_chokidar = __esm({
         this._closePromise = void 0;
         let paths = unifyPaths(paths_);
         if (cwd) {
-          paths = paths.map((path26) => {
-            const absPath = getAbsolutePath(path26, cwd);
+          paths = paths.map((path28) => {
+            const absPath = getAbsolutePath(path28, cwd);
             return absPath;
           });
         }
-        paths.forEach((path26) => {
-          this._removeIgnoredPath(path26);
+        paths.forEach((path28) => {
+          this._removeIgnoredPath(path28);
         });
         this._userIgnored = void 0;
         if (!this._readyCount)
           this._readyCount = 0;
         this._readyCount += paths.length;
-        Promise.all(paths.map(async (path26) => {
-          const res = await this._nodeFsHandler._addToNodeFs(path26, !_internal, void 0, 0, _origAdd);
+        Promise.all(paths.map(async (path28) => {
+          const res = await this._nodeFsHandler._addToNodeFs(path28, !_internal, void 0, 0, _origAdd);
           if (res)
             this._emitReady();
           return res;
@@ -30309,17 +30721,17 @@ var init_chokidar = __esm({
           return this;
         const paths = unifyPaths(paths_);
         const { cwd } = this.options;
-        paths.forEach((path26) => {
-          if (!sp2.isAbsolute(path26) && !this._closers.has(path26)) {
+        paths.forEach((path28) => {
+          if (!sp2.isAbsolute(path28) && !this._closers.has(path28)) {
             if (cwd)
-              path26 = sp2.join(cwd, path26);
-            path26 = sp2.resolve(path26);
+              path28 = sp2.join(cwd, path28);
+            path28 = sp2.resolve(path28);
           }
-          this._closePath(path26);
-          this._addIgnoredPath(path26);
-          if (this._watched.has(path26)) {
+          this._closePath(path28);
+          this._addIgnoredPath(path28);
+          if (this._watched.has(path28)) {
             this._addIgnoredPath({
-              path: path26,
+              path: path28,
               recursive: true
             });
           }
@@ -30383,38 +30795,38 @@ var init_chokidar = __esm({
        * @param stats arguments to be passed with event
        * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
        */
-      async _emit(event, path26, stats) {
+      async _emit(event, path28, stats) {
         if (this.closed)
           return;
         const opts = this.options;
         if (isWindows)
-          path26 = sp2.normalize(path26);
+          path28 = sp2.normalize(path28);
         if (opts.cwd)
-          path26 = sp2.relative(opts.cwd, path26);
-        const args = [path26];
+          path28 = sp2.relative(opts.cwd, path28);
+        const args = [path28];
         if (stats != null)
           args.push(stats);
         const awf = opts.awaitWriteFinish;
         let pw;
-        if (awf && (pw = this._pendingWrites.get(path26))) {
+        if (awf && (pw = this._pendingWrites.get(path28))) {
           pw.lastChange = /* @__PURE__ */ new Date();
           return this;
         }
         if (opts.atomic) {
           if (event === EVENTS.UNLINK) {
-            this._pendingUnlinks.set(path26, [event, ...args]);
+            this._pendingUnlinks.set(path28, [event, ...args]);
             setTimeout(() => {
-              this._pendingUnlinks.forEach((entry, path27) => {
+              this._pendingUnlinks.forEach((entry, path29) => {
                 this.emit(...entry);
                 this.emit(EVENTS.ALL, ...entry);
-                this._pendingUnlinks.delete(path27);
+                this._pendingUnlinks.delete(path29);
               });
             }, typeof opts.atomic === "number" ? opts.atomic : 100);
             return this;
           }
-          if (event === EVENTS.ADD && this._pendingUnlinks.has(path26)) {
+          if (event === EVENTS.ADD && this._pendingUnlinks.has(path28)) {
             event = EVENTS.CHANGE;
-            this._pendingUnlinks.delete(path26);
+            this._pendingUnlinks.delete(path28);
           }
         }
         if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -30432,16 +30844,16 @@ var init_chokidar = __esm({
               this.emitWithAll(event, args);
             }
           };
-          this._awaitWriteFinish(path26, awf.stabilityThreshold, event, awfEmit);
+          this._awaitWriteFinish(path28, awf.stabilityThreshold, event, awfEmit);
           return this;
         }
         if (event === EVENTS.CHANGE) {
-          const isThrottled = !this._throttle(EVENTS.CHANGE, path26, 50);
+          const isThrottled = !this._throttle(EVENTS.CHANGE, path28, 50);
           if (isThrottled)
             return this;
         }
         if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-          const fullPath = opts.cwd ? sp2.join(opts.cwd, path26) : path26;
+          const fullPath = opts.cwd ? sp2.join(opts.cwd, path28) : path28;
           let stats2;
           try {
             stats2 = await (0, import_promises3.stat)(fullPath);
@@ -30472,23 +30884,23 @@ var init_chokidar = __esm({
        * @param timeout duration of time to suppress duplicate actions
        * @returns tracking object or false if action should be suppressed
        */
-      _throttle(actionType, path26, timeout) {
+      _throttle(actionType, path28, timeout) {
         if (!this._throttled.has(actionType)) {
           this._throttled.set(actionType, /* @__PURE__ */ new Map());
         }
         const action = this._throttled.get(actionType);
         if (!action)
           throw new Error("invalid throttle");
-        const actionPath = action.get(path26);
+        const actionPath = action.get(path28);
         if (actionPath) {
           actionPath.count++;
           return false;
         }
         let timeoutObject;
         const clear = () => {
-          const item = action.get(path26);
+          const item = action.get(path28);
           const count = item ? item.count : 0;
-          action.delete(path26);
+          action.delete(path28);
           clearTimeout(timeoutObject);
           if (item)
             clearTimeout(item.timeoutObject);
@@ -30496,7 +30908,7 @@ var init_chokidar = __esm({
         };
         timeoutObject = setTimeout(clear, timeout);
         const thr = { timeoutObject, clear, count: 0 };
-        action.set(path26, thr);
+        action.set(path28, thr);
         return thr;
       }
       _incrReadyCount() {
@@ -30510,44 +30922,44 @@ var init_chokidar = __esm({
        * @param event
        * @param awfEmit Callback to be called when ready for event to be emitted.
        */
-      _awaitWriteFinish(path26, threshold, event, awfEmit) {
+      _awaitWriteFinish(path28, threshold, event, awfEmit) {
         const awf = this.options.awaitWriteFinish;
         if (typeof awf !== "object")
           return;
         const pollInterval = awf.pollInterval;
         let timeoutHandler;
-        let fullPath = path26;
-        if (this.options.cwd && !sp2.isAbsolute(path26)) {
-          fullPath = sp2.join(this.options.cwd, path26);
+        let fullPath = path28;
+        if (this.options.cwd && !sp2.isAbsolute(path28)) {
+          fullPath = sp2.join(this.options.cwd, path28);
         }
         const now = /* @__PURE__ */ new Date();
         const writes = this._pendingWrites;
         function awaitWriteFinishFn(prevStat) {
           (0, import_node_fs2.stat)(fullPath, (err, curStat) => {
-            if (err || !writes.has(path26)) {
+            if (err || !writes.has(path28)) {
               if (err && err.code !== "ENOENT")
                 awfEmit(err);
               return;
             }
             const now2 = Number(/* @__PURE__ */ new Date());
             if (prevStat && curStat.size !== prevStat.size) {
-              writes.get(path26).lastChange = now2;
+              writes.get(path28).lastChange = now2;
             }
-            const pw = writes.get(path26);
+            const pw = writes.get(path28);
             const df = now2 - pw.lastChange;
             if (df >= threshold) {
-              writes.delete(path26);
+              writes.delete(path28);
               awfEmit(void 0, curStat);
             } else {
               timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
             }
           });
         }
-        if (!writes.has(path26)) {
-          writes.set(path26, {
+        if (!writes.has(path28)) {
+          writes.set(path28, {
             lastChange: now,
             cancelWait: () => {
-              writes.delete(path26);
+              writes.delete(path28);
               clearTimeout(timeoutHandler);
               return event;
             }
@@ -30558,8 +30970,8 @@ var init_chokidar = __esm({
       /**
        * Determines whether user has asked to ignore this path.
        */
-      _isIgnored(path26, stats) {
-        if (this.options.atomic && DOT_RE.test(path26))
+      _isIgnored(path28, stats) {
+        if (this.options.atomic && DOT_RE.test(path28))
           return true;
         if (!this._userIgnored) {
           const { cwd } = this.options;
@@ -30569,17 +30981,17 @@ var init_chokidar = __esm({
           const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
           this._userIgnored = anymatch(list, void 0);
         }
-        return this._userIgnored(path26, stats);
+        return this._userIgnored(path28, stats);
       }
-      _isntIgnored(path26, stat4) {
-        return !this._isIgnored(path26, stat4);
+      _isntIgnored(path28, stat4) {
+        return !this._isIgnored(path28, stat4);
       }
       /**
        * Provides a set of common helpers and properties relating to symlink handling.
        * @param path file or directory pattern being watched
        */
-      _getWatchHelpers(path26) {
-        return new WatchHelper(path26, this.options.followSymlinks, this);
+      _getWatchHelpers(path28) {
+        return new WatchHelper(path28, this.options.followSymlinks, this);
       }
       // Directory helpers
       // -----------------
@@ -30611,63 +31023,63 @@ var init_chokidar = __esm({
        * @param item      base path of item/directory
        */
       _remove(directory, item, isDirectory) {
-        const path26 = sp2.join(directory, item);
-        const fullPath = sp2.resolve(path26);
-        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path26) || this._watched.has(fullPath);
-        if (!this._throttle("remove", path26, 100))
+        const path28 = sp2.join(directory, item);
+        const fullPath = sp2.resolve(path28);
+        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path28) || this._watched.has(fullPath);
+        if (!this._throttle("remove", path28, 100))
           return;
         if (!isDirectory && this._watched.size === 1) {
           this.add(directory, item, true);
         }
-        const wp = this._getWatchedDir(path26);
+        const wp = this._getWatchedDir(path28);
         const nestedDirectoryChildren = wp.getChildren();
-        nestedDirectoryChildren.forEach((nested) => this._remove(path26, nested));
+        nestedDirectoryChildren.forEach((nested) => this._remove(path28, nested));
         const parent = this._getWatchedDir(directory);
         const wasTracked = parent.has(item);
         parent.remove(item);
         if (this._symlinkPaths.has(fullPath)) {
           this._symlinkPaths.delete(fullPath);
         }
-        let relPath = path26;
+        let relPath = path28;
         if (this.options.cwd)
-          relPath = sp2.relative(this.options.cwd, path26);
+          relPath = sp2.relative(this.options.cwd, path28);
         if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
           const event = this._pendingWrites.get(relPath).cancelWait();
           if (event === EVENTS.ADD)
             return;
         }
-        this._watched.delete(path26);
+        this._watched.delete(path28);
         this._watched.delete(fullPath);
         const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-        if (wasTracked && !this._isIgnored(path26))
-          this._emit(eventName, path26);
-        this._closePath(path26);
+        if (wasTracked && !this._isIgnored(path28))
+          this._emit(eventName, path28);
+        this._closePath(path28);
       }
       /**
        * Closes all watchers for a path
        */
-      _closePath(path26) {
-        this._closeFile(path26);
-        const dir = sp2.dirname(path26);
-        this._getWatchedDir(dir).remove(sp2.basename(path26));
+      _closePath(path28) {
+        this._closeFile(path28);
+        const dir = sp2.dirname(path28);
+        this._getWatchedDir(dir).remove(sp2.basename(path28));
       }
       /**
        * Closes only file-specific watchers
        */
-      _closeFile(path26) {
-        const closers = this._closers.get(path26);
+      _closeFile(path28) {
+        const closers = this._closers.get(path28);
         if (!closers)
           return;
         closers.forEach((closer) => closer());
-        this._closers.delete(path26);
+        this._closers.delete(path28);
       }
-      _addPathCloser(path26, closer) {
+      _addPathCloser(path28, closer) {
         if (!closer)
           return;
-        let list = this._closers.get(path26);
+        let list = this._closers.get(path28);
         if (!list) {
           list = [];
-          this._closers.set(path26, list);
+          this._closers.set(path28, list);
         }
         list.push(closer);
       }
@@ -30692,17 +31104,152 @@ var init_chokidar = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/provider-schema.ts
+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 spawn5 = provider.spawn;
+    const command = spawn5 && typeof spawn5 === "object" ? spawn5.command : void 0;
+    if (!spawn5 || typeof spawn5 !== "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`);
+  }
+}
+var KNOWN_PROVIDER_FIELDS, VALUE_CONTROL_TYPES;
+var init_provider_schema = __esm({
+  "../../oss/packages/daemon-core/src/providers/provider-schema.ts"() {
+    "use strict";
+    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"
+    ]);
+    VALUE_CONTROL_TYPES = /* @__PURE__ */ new Set(["select", "toggle", "cycle", "slider"]);
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/provider-loader.ts
-var fs6, path13, os14, ProviderLoader;
+var fs6, path14, os14, ProviderLoader;
 var init_provider_loader = __esm({
   "../../oss/packages/daemon-core/src/providers/provider-loader.ts"() {
     "use strict";
     fs6 = __toESM(require("fs"));
-    path13 = __toESM(require("path"));
+    path14 = __toESM(require("path"));
     os14 = __toESM(require("os"));
     init_chokidar();
     init_ide_detector();
     init_logger();
+    init_provider_schema();
     ProviderLoader = class _ProviderLoader {
       providers = /* @__PURE__ */ new Map();
       providerAvailability = /* @__PURE__ */ new Map();
@@ -30721,12 +31268,12 @@ var init_provider_loader = __esm({
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-        const defaultProvidersDir = path13.join(os14.homedir(), ".adhdev", "providers");
+        const defaultProvidersDir = path14.join(os14.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)`);
@@ -30735,7 +31282,7 @@ var init_provider_loader = __esm({
             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) {
@@ -30765,7 +31312,7 @@ var init_provider_loader = __esm({
       * 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.
@@ -30792,7 +31339,7 @@ var init_provider_loader = __esm({
       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)
@@ -30831,7 +31378,7 @@ var init_provider_loader = __esm({
         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;
@@ -31146,8 +31693,8 @@ var init_provider_loader = __esm({
                   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;
                 }
@@ -31162,8 +31709,8 @@ var init_provider_loader = __esm({
                 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.`;
@@ -31180,8 +31727,8 @@ var init_provider_loader = __esm({
                   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) {
@@ -31197,8 +31744,8 @@ var init_provider_loader = __esm({
             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;
             }
           }
         }
@@ -31223,14 +31770,14 @@ var init_provider_loader = __esm({
           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 cached2 = this.scriptsCache.get(dir);
         if (cached2) return cached2;
-        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)];
@@ -31272,7 +31819,7 @@ var init_provider_loader = __esm({
                 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();
               }
             };
@@ -31327,7 +31874,7 @@ var init_provider_loader = __esm({
         }
         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 {
@@ -31387,17 +31934,17 @@ var init_provider_loader = __esm({
             return { updated: false };
           }
           this.log("Downloading latest providers from GitHub...");
-          const tmpTar = path13.join(os14.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-          const tmpExtract = path13.join(os14.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+          const tmpTar = path14.join(os14.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+          const tmpExtract = path14.join(os14.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 });
@@ -31472,8 +32019,8 @@ var init_provider_loader = __esm({
       copyDirRecursive(src, dest) {
         fs6.mkdirSync(dest, { recursive: true });
         for (const entry of fs6.readdirSync(src, { withFileTypes: true })) {
-          const srcPath = 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 {
@@ -31484,7 +32031,7 @@ var init_provider_loader = __esm({
       /** .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,
@@ -31501,7 +32048,7 @@ var init_provider_loader = __esm({
         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 {
@@ -31686,17 +32233,17 @@ var init_provider_loader = __esm({
         for (const root of searchRoots) {
           if (!fs6.existsSync(root)) continue;
           const candidate = this.getProviderDir(root, cat, type);
-          if (fs6.existsSync(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 {
                   }
                 }
@@ -31713,7 +32260,7 @@ var init_provider_loader = __esm({
        * (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)];
@@ -31727,7 +32274,7 @@ var init_provider_loader = __esm({
           for (const file2 of fs6.readdirSync(dir)) {
             if (!file2.endsWith(".js")) continue;
             const scriptName = toCamel(file2.replace(".js", ""));
-            const filePath = path13.join(dir, file2);
+            const filePath = path14.join(dir, file2);
             result[scriptName] = (...args) => {
               try {
                 let content = fs6.readFileSync(filePath, "utf-8");
@@ -31787,24 +32334,28 @@ var init_provider_loader = __esm({
           }
           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)];
@@ -31830,7 +32381,7 @@ var init_provider_loader = __esm({
               if (!entry.isDirectory()) continue;
               if (entry.name.startsWith("_") || entry.name.startsWith(".")) continue;
               if (excludeDirs && d === dir && excludeDirs.includes(entry.name)) continue;
-              scan(path13.join(d, entry.name));
+              scan(path14.join(d, entry.name));
             }
           }
         };
@@ -32085,17 +32636,17 @@ function detectCurrentWorkspace(ideId) {
     }
   } else if (plat === "win32") {
     try {
-      const fs18 = require("fs");
+      const fs19 = require("fs");
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
-        const storagePath = path14.join(
-          process.env.APPDATA || path14.join(os15.homedir(), "AppData", "Roaming"),
+        const storagePath = path15.join(
+          process.env.APPDATA || path15.join(os15.homedir(), "AppData", "Roaming"),
           appName,
           "storage.json"
         );
-        if (fs18.existsSync(storagePath)) {
-          const data = JSON.parse(fs18.readFileSync(storagePath, "utf-8"));
+        if (fs19.existsSync(storagePath)) {
+          const data = JSON.parse(fs19.readFileSync(storagePath, "utf-8"));
           const workspaces = data?.openedPathsList?.workspaces3 || data?.openedPathsList?.entries || [];
           if (workspaces.length > 0) {
             const recent = workspaces[0];
@@ -32261,14 +32812,14 @@ async function launchLinux(ide, port, workspace, newWindow) {
 function getAvailableIdeIds() {
   return getProviderLoader().getAvailableIdeTypes();
 }
-var import_child_process6, net2, os15, path14, _providerLoader;
+var import_child_process6, net2, os15, path15, _providerLoader;
 var init_launch = __esm({
   "../../oss/packages/daemon-core/src/launch.ts"() {
     "use strict";
     import_child_process6 = require("child_process");
     net2 = __toESM(require("net"));
     os15 = __toESM(require("os"));
-    path14 = __toESM(require("path"));
+    path15 = __toESM(require("path"));
     init_ide_detector();
     init_provider_loader();
     _providerLoader = null;
@@ -32299,7 +32850,7 @@ 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();
   }
 }
@@ -32313,7 +32864,7 @@ function cleanOldFiles() {
       const dateMatch = file2.match(/commands-(\d{4}-\d{2}-\d{2})/);
       if (dateMatch && dateMatch[1] < cutoffStr) {
         try {
-          fs7.unlinkSync(path15.join(LOG_DIR2, file2));
+          fs7.unlinkSync(path16.join(LOG_DIR2, file2));
         } catch {
         }
       }
@@ -32382,14 +32933,14 @@ function getRecentCommands(count = 50) {
     return [];
   }
 }
-var fs7, path15, os16, LOG_DIR2, MAX_FILE_SIZE, MAX_DAYS, SENSITIVE_KEYS, currentDate2, currentFile, writeCount2, SKIP_COMMANDS;
+var fs7, path16, os16, LOG_DIR2, MAX_FILE_SIZE, MAX_DAYS, SENSITIVE_KEYS, currentDate2, currentFile, writeCount2, SKIP_COMMANDS;
 var init_command_log = __esm({
   "../../oss/packages/daemon-core/src/logging/command-log.ts"() {
     "use strict";
     fs7 = __toESM(require("fs"));
-    path15 = __toESM(require("path"));
+    path16 = __toESM(require("path"));
     os16 = __toESM(require("os"));
-    LOG_DIR2 = process.platform === "win32" ? path15.join(process.env.LOCALAPPDATA || process.env.APPDATA || path15.join(os16.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path15.join(os16.homedir(), "Library", "Logs", "adhdev") : path15.join(os16.homedir(), ".local", "share", "adhdev", "logs");
+    LOG_DIR2 = process.platform === "win32" ? path16.join(process.env.LOCALAPPDATA || process.env.APPDATA || path16.join(os16.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path16.join(os16.homedir(), "Library", "Logs", "adhdev") : path16.join(os16.homedir(), ".local", "share", "adhdev", "logs");
     MAX_FILE_SIZE = 5 * 1024 * 1024;
     MAX_DAYS = 7;
     try {
@@ -32408,7 +32959,7 @@ var init_command_log = __esm({
       "text"
     ]);
     currentDate2 = getDateStr2();
-    currentFile = path15.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+    currentFile = path16.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
     writeCount2 = 0;
     SKIP_COMMANDS = /* @__PURE__ */ new Set([
       "heartbeat",
@@ -32666,9 +33217,9 @@ var init_snapshot = __esm({
 // ../../oss/packages/daemon-core/src/commands/upgrade-helper.ts
 function getUpgradeLogPath() {
   const home = os18.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}
@@ -32708,7 +33259,7 @@ async function waitForPidExit(pid, timeoutMs) {
   }
 }
 function stopSessionHostProcesses(appName) {
-  const pidFile = path16.join(os18.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  const pidFile = path17.join(os18.homedir(), ".adhdev", `${appName}-session-host.pid`);
   try {
     if (fs8.existsSync(pidFile)) {
       const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
@@ -32737,7 +33288,7 @@ function stopSessionHostProcesses(appName) {
   }
 }
 function removeDaemonPidFile() {
-  const pidFile = path16.join(os18.homedir(), ".adhdev", "daemon.pid");
+  const pidFile = path17.join(os18.homedir(), ".adhdev", "daemon.pid");
   try {
     fs8.unlinkSync(pidFile);
   } catch {
@@ -32748,7 +33299,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") {
@@ -32756,25 +33307,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)}`);
     }
   }
 }
@@ -32849,7 +33400,7 @@ async function maybeRunDaemonUpgradeHelperFromEnv() {
     process.exit(1);
   }
 }
-var import_child_process7, import_child_process8, fs8, os18, path16, UPGRADE_HELPER_ENV;
+var import_child_process7, import_child_process8, fs8, os18, path17, UPGRADE_HELPER_ENV;
 var init_upgrade_helper = __esm({
   "../../oss/packages/daemon-core/src/commands/upgrade-helper.ts"() {
     "use strict";
@@ -32857,7 +33408,7 @@ var init_upgrade_helper = __esm({
     import_child_process8 = require("child_process");
     fs8 = __toESM(require("fs"));
     os18 = __toESM(require("os"));
-    path16 = __toESM(require("path"));
+    path17 = __toESM(require("path"));
     UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
   }
 });
@@ -34802,7 +35353,7 @@ function checkPathExists2(paths) {
   for (const p of paths) {
     if (p.includes("*")) {
       const home = os19.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;
@@ -34812,7 +35363,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;
@@ -34838,7 +35389,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);
@@ -34875,16 +35426,16 @@ async function detectAllVersions(loader, archive) {
   }
   return results;
 }
-var fs10, path17, os19, import_child_process9, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
+var fs10, path18, os19, import_child_process9, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
 var init_version_archive = __esm({
   "../../oss/packages/daemon-core/src/providers/version-archive.ts"() {
     "use strict";
     fs10 = __toESM(require("fs"));
-    path17 = __toESM(require("path"));
+    path18 = __toESM(require("path"));
     os19 = __toESM(require("os"));
     import_child_process9 = require("child_process");
     import_os3 = require("os");
-    ARCHIVE_PATH = path17.join(os19.homedir(), ".adhdev", "version-history.json");
+    ARCHIVE_PATH = path18.join(os19.homedir(), ".adhdev", "version-history.json");
     MAX_ENTRIES_PER_PROVIDER = 20;
     VersionArchive = class {
       history = {};
@@ -34931,7 +35482,7 @@ var init_version_archive = __esm({
       }
       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 {
         }
@@ -35452,17 +36003,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;
@@ -36288,12 +36839,12 @@ async function handleDomContext(ctx, type, req, res) {
     ctx.json(res, 500, { error: `DOM context collection failed: ${e.message}` });
   }
 }
-var fs11, path18;
+var fs11, path19;
 var init_dev_cdp_handlers = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-cdp-handlers.ts"() {
     "use strict";
     fs11 = __toESM(require("fs"));
-    path18 = __toESM(require("path"));
+    path19 = __toESM(require("path"));
     init_logger();
   }
 });
@@ -36308,11 +36859,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}`);
   }
@@ -37080,7 +37631,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,
@@ -37104,7 +37655,7 @@ async function handleCliFixtureList(ctx, type, _req, res) {
       return;
     }
     const fixtures = fs12.readdirSync(fixtureDir).filter((file2) => file2.endsWith(".json")).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" })).map((file2) => {
-      const fullPath = path19.join(fixtureDir, file2);
+      const fullPath = path20.join(fixtureDir, file2);
       try {
         const raw = JSON.parse(fs12.readFileSync(fullPath, "utf-8"));
         return {
@@ -37237,12 +37788,12 @@ async function handleCliRaw(ctx, req, res) {
     ctx.json(res, 500, { error: `Raw send failed: ${e.message}` });
   }
 }
-var fs12, path19;
+var fs12, path20;
 var init_dev_cli_debug = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-cli-debug.ts"() {
     "use strict";
     fs12 = __toESM(require("fs"));
-    path19 = __toESM(require("path"));
+    path20 = __toESM(require("path"));
   }
 });
 
@@ -37302,22 +37853,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);
@@ -37325,11 +37876,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}` };
   }
@@ -37352,13 +37903,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 file2 of fs13.readdirSync(latestDir)) {
     if (!file2.endsWith(".js")) continue;
     try {
-      referenceScripts[file2] = fs13.readFileSync(path20.join(latestDir, file2), "utf-8");
+      referenceScripts[file2] = fs13.readFileSync(path21.join(latestDir, file2), "utf-8");
     } catch {
     }
   }
@@ -37466,9 +38017,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(os20.tmpdir(), "adhdev-autoimpl");
+    const tmpDir = path21.join(os20.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);
@@ -37905,7 +38456,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}\``);
@@ -37916,7 +38467,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     for (const file2 of fs13.readdirSync(latestScriptsDir)) {
       if (file2.endsWith(".js") && targetFileNames.has(file2)) {
         try {
-          const content = fs13.readFileSync(path20.join(latestScriptsDir, file2), "utf-8");
+          const content = fs13.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -37933,7 +38484,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
       for (const file2 of refFiles) {
         try {
-          const content = fs13.readFileSync(path20.join(latestScriptsDir, file2), "utf-8");
+          const content = fs13.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -37974,10 +38525,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 {
     }
@@ -38214,7 +38765,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}\``);
@@ -38226,7 +38777,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       if (!file2.endsWith(".js")) continue;
       if (!targetFileNames.has(file2)) continue;
       try {
-        const content = fs13.readFileSync(path20.join(latestScriptsDir, file2), "utf-8");
+        const content = fs13.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
         lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
         lines.push("```javascript");
         lines.push(content);
@@ -38242,7 +38793,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
       for (const file2 of refFiles) {
         try {
-          const content = fs13.readFileSync(path20.join(latestScriptsDir, file2), "utf-8");
+          const content = fs13.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -38275,10 +38826,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 {
     }
@@ -38590,12 +39141,12 @@ data: ${JSON.stringify(msg.data)}
     }
   }
 }
-var fs13, path20, os20;
+var fs13, path21, os20;
 var init_dev_auto_implement = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-auto-implement.ts"() {
     "use strict";
     fs13 = __toESM(require("fs"));
-    path20 = __toESM(require("path"));
+    path21 = __toESM(require("path"));
     os20 = __toESM(require("os"));
     init_dev_server();
     init_dev_cli_debug();
@@ -38635,13 +39186,14 @@ function toProviderListEntry(provider) {
   }
   return base;
 }
-var http2, fs14, path21, DEV_SERVER_PORT, DevServer;
+var http2, fs14, path23, DEV_SERVER_PORT, DevServer;
 var init_dev_server = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-server.ts"() {
     "use strict";
     http2 = __toESM(require("http"));
     fs14 = __toESM(require("fs"));
-    path21 = __toESM(require("path"));
+    path23 = __toESM(require("path"));
+    init_provider_schema();
     init_scaffold_template();
     init_version_archive();
     init_logger();
@@ -38746,8 +39298,8 @@ var init_dev_server = __esm({
       }
       getEndpointList() {
         return this.routes.map((r) => {
-          const path26 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-          return `${r.method.padEnd(5)} ${path26}`;
+          const path28 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path28}`;
         });
       }
       async start(port = DEV_SERVER_PORT) {
@@ -39002,12 +39554,12 @@ var init_dev_server = __esm({
       // ─── 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")
+          path23.resolve(__dirname, "../../web-devconsole/dist"),
+          path23.resolve(__dirname, "../../../web-devconsole/dist"),
+          path23.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(path23.join(dir, "index.html"))) return dir;
         }
         return null;
       }
@@ -39017,7 +39569,7 @@ var init_dev_server = __esm({
           this.json(res, 500, { error: "DevConsole not found. Run: npm run build -w packages/web-devconsole" });
           return;
         }
-        const htmlPath = path21.join(distDir, "index.html");
+        const htmlPath = path23.join(distDir, "index.html");
         try {
           const html = fs14.readFileSync(htmlPath, "utf-8");
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -39042,15 +39594,15 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: "Not found" });
           return;
         }
-        const safePath = path21.normalize(pathname).replace(/^\.\.\//, "");
-        const filePath = path21.join(distDir, safePath);
+        const safePath = path23.normalize(pathname).replace(/^\.\.\//, "");
+        const filePath = path23.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 = path23.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);
@@ -39163,9 +39715,9 @@ var init_dev_server = __esm({
               const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
               if (entry.isDirectory()) {
                 files.push({ path: rel, size: 0, type: "dir" });
-                scan(path21.join(d, entry.name), rel);
+                scan(path23.join(d, entry.name), rel);
               } else {
-                const stat4 = fs14.statSync(path21.join(d, entry.name));
+                const stat4 = fs14.statSync(path23.join(d, entry.name));
                 files.push({ path: rel, size: stat4.size, type: "file" });
               }
             }
@@ -39188,7 +39740,7 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path21.resolve(dir, path21.normalize(filePath));
+        const fullPath = path23.resolve(dir, path23.normalize(filePath));
         if (!fullPath.startsWith(dir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
@@ -39213,14 +39765,14 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path21.resolve(dir, path21.normalize(filePath));
+        const fullPath = path23.resolve(dir, path23.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(path23.dirname(fullPath), { recursive: true });
           fs14.writeFileSync(fullPath, content, "utf-8");
           this.log(`File saved: ${fullPath} (${content.length} chars)`);
           this.providerLoader.reload();
@@ -39237,7 +39789,7 @@ var init_dev_server = __esm({
           return;
         }
         for (const name of ["scripts.js", "provider.json"]) {
-          const p = path21.join(dir, name);
+          const p = path23.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 });
@@ -39258,8 +39810,8 @@ var init_dev_server = __esm({
           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(path23.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
+        const targetPath = path23.join(dir, target);
         try {
           if (fs14.existsSync(targetPath)) fs14.copyFileSync(targetPath, targetPath + ".bak");
           fs14.writeFileSync(targetPath, source, "utf-8");
@@ -39287,22 +39839,9 @@ var init_dev_server = __esm({
         const warnings = [];
         try {
           const config2 = typeof content === "string" ? JSON.parse(content) : content;
-          if (!config2.type) errors.push("Missing required field: type");
-          if (!config2.name) errors.push("Missing required field: name");
-          if (!config2.category) errors.push("Missing required field: category");
-          else if (!["ide", "extension", "cli", "acp"].includes(config2.category)) errors.push(`Invalid category: ${config2.category}`);
-          if (config2.category === "ide" || config2.category === "extension") {
-            if (!config2.cdpPorts || !Array.isArray(config2.cdpPorts) || config2.cdpPorts.length === 0)
-              warnings.push("IDE/Extension providers should have cdpPorts");
-            if (config2.category === "extension" && !config2.extensionId)
-              warnings.push("Extension providers should have extensionId");
-          }
-          if (config2.category === "acp" || config2.category === "cli") {
-            if (!config2.spawn) errors.push("ACP/CLI providers must have spawn config");
-            else {
-              if (!config2.spawn.command) errors.push("spawn.command is required");
-            }
-          }
+          const validation = validateProviderDefinition(config2);
+          errors.push(...validation.errors);
+          warnings.push(...validation.warnings);
           if (config2.settings) {
             for (const [key, val] of Object.entries(config2.settings)) {
               const s = val;
@@ -39419,7 +39958,7 @@ var init_dev_server = __esm({
         }
         let targetDir;
         targetDir = this.providerLoader.getUserProviderDir(category, type);
-        const jsonPath = path21.join(targetDir, "provider.json");
+        const jsonPath = path23.join(targetDir, "provider.json");
         if (fs14.existsSync(jsonPath)) {
           this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
           return;
@@ -39431,8 +39970,8 @@ var init_dev_server = __esm({
           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 = path23.join(targetDir, relPath);
+              fs14.mkdirSync(path23.dirname(fullPath), { recursive: true });
               fs14.writeFileSync(fullPath, content, "utf-8");
               createdFiles.push(relPath);
             }
@@ -39485,22 +40024,22 @@ var init_dev_server = __esm({
         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(path23.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 path23.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 = path23.resolve(this.providerLoader.getUserProviderDir(category, type));
+        const desiredDir = requestedDir ? path23.resolve(requestedDir) : canonicalUserDir;
+        const upstreamRoot = path23.resolve(this.providerLoader.getUpstreamDir());
+        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path23.sep}`)) {
           return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
         }
-        if (path21.basename(desiredDir) !== type) {
+        if (path23.basename(desiredDir) !== type) {
           return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
         }
         const sourceDir = this.findProviderDir(type);
@@ -39508,11 +40047,11 @@ var init_dev_server = __esm({
           return { dir: null, reason: `Provider source directory not found for '${type}'` };
         }
         if (!fs14.existsSync(desiredDir)) {
-          fs14.mkdirSync(path21.dirname(desiredDir), { recursive: true });
+          fs14.mkdirSync(path23.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 = path23.join(desiredDir, "provider.json");
         if (!fs14.existsSync(providerJson)) {
           return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
         }
@@ -39560,7 +40099,7 @@ var init_dev_server = __esm({
           setMode: "set_mode.js"
         };
         const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-        const scriptsDir = path21.join(providerDir, "scripts");
+        const scriptsDir = path23.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -39571,7 +40110,7 @@ var init_dev_server = __esm({
           for (const file2 of fs14.readdirSync(latestScriptsDir)) {
             if (file2.endsWith(".js") && targetFileNames.has(file2)) {
               try {
-                const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path23.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -39588,7 +40127,7 @@ var init_dev_server = __esm({
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path23.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -39629,10 +40168,10 @@ var init_dev_server = __esm({
             lines.push("");
           }
         }
-        const docsDir = path21.join(providerDir, "../../docs");
+        const docsDir = path23.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path21.join(docsDir, name);
+            const p = path23.join(docsDir, name);
             if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
           } catch {
           }
@@ -39806,7 +40345,7 @@ var init_dev_server = __esm({
           parseApproval: "parse_approval.js"
         };
         const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-        const scriptsDir = path21.join(providerDir, "scripts");
+        const scriptsDir = path23.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -39818,7 +40357,7 @@ var init_dev_server = __esm({
             if (!file2.endsWith(".js")) continue;
             if (!targetFileNames.has(file2)) continue;
             try {
-              const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+              const content = fs14.readFileSync(path23.join(latestScriptsDir, file2), "utf-8");
               lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
               lines.push("```javascript");
               lines.push(content);
@@ -39834,7 +40373,7 @@ var init_dev_server = __esm({
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path23.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -39867,10 +40406,10 @@ var init_dev_server = __esm({
             lines.push("");
           }
         }
-        const docsDir = path21.join(providerDir, "../../docs");
+        const docsDir = path23.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path21.join(docsDir, name);
+            const p = path23.join(docsDir, name);
             if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
           } catch {
           }
@@ -40594,6 +41133,78 @@ var init_runtime_support = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/session-host/runtime-surface.ts
+function isSessionHostLiveRuntime(record2) {
+  const lifecycle = String(record2?.lifecycle || "").trim();
+  return LIVE_LIFECYCLES.has(lifecycle);
+}
+function getSessionHostRecoveryLabel(meta3) {
+  const recoveryState = typeof meta3?.runtimeRecoveryState === "string" ? String(meta3.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(record2) {
+  if (!record2) return false;
+  if (isSessionHostLiveRuntime(record2)) return false;
+  const lifecycle = String(record2.lifecycle || "").trim();
+  if (lifecycle && lifecycle !== "stopped" && lifecycle !== "failed") {
+    return false;
+  }
+  const meta3 = record2.meta || void 0;
+  if (meta3?.restoredFromStorage === true) return true;
+  return getSessionHostRecoveryLabel(meta3) !== null;
+}
+function getSessionHostSurfaceKind(record2) {
+  if (isSessionHostLiveRuntime(record2)) return "live_runtime";
+  if (isSessionHostRecoverySnapshot(record2)) return "recovery_snapshot";
+  return "inactive_record";
+}
+function partitionSessionHostRecords(records) {
+  const liveRuntimes = [];
+  const recoverySnapshots = [];
+  const inactiveRecords = [];
+  for (const record2 of records) {
+    const kind = getSessionHostSurfaceKind(record2);
+    if (kind === "live_runtime") {
+      liveRuntimes.push(record2);
+    } else if (kind === "recovery_snapshot") {
+      recoverySnapshots.push(record2);
+    } else {
+      inactiveRecords.push(record2);
+    }
+  }
+  return {
+    liveRuntimes,
+    recoverySnapshots,
+    inactiveRecords
+  };
+}
+function partitionSessionHostDiagnosticsSessions(records) {
+  return partitionSessionHostRecords(records || []);
+}
+var LIVE_LIFECYCLES;
+var init_runtime_surface = __esm({
+  "../../oss/packages/daemon-core/src/session-host/runtime-surface.ts"() {
+    "use strict";
+    LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
+  }
+});
+
+// ../../oss/packages/daemon-core/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";
+}
+var init_startup_restore_policy = __esm({
+  "../../oss/packages/daemon-core/src/session-host/startup-restore-policy.js"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/installer.ts
 function isExtensionInstalled(ide, marketplaceId) {
   if (!ide.cliCommand) return false;
@@ -40635,8 +41246,8 @@ async function installExtension(ide, extension) {
       const res = await fetch(extension.vsixUrl);
       if (res.ok) {
         const buffer = Buffer.from(await res.arrayBuffer());
-        const fs18 = await import("fs");
-        fs18.writeFileSync(vsixPath, buffer);
+        const fs19 = await import("fs");
+        fs19.writeFileSync(vsixPath, buffer);
         return new Promise((resolve16) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
@@ -41133,6 +41744,7 @@ __export(src_exports, {
   detectIDEs: () => detectIDEs,
   ensureSessionHostReady: () => ensureSessionHostReady,
   findCdpManager: () => findCdpManager,
+  flattenMessageParts: () => flattenMessageParts,
   forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance,
   getAIExtensions: () => getAIExtensions,
   getAvailableIdeIds: () => getAvailableIdeIds,
@@ -41146,6 +41758,8 @@ __export(src_exports, {
   getRecentDebugTrace: () => getRecentDebugTrace,
   getRecentLogs: () => getRecentLogs,
   getSavedProviderSessions: () => getSavedProviderSessions,
+  getSessionHostRecoveryLabel: () => getSessionHostRecoveryLabel,
+  getSessionHostSurfaceKind: () => getSessionHostSurfaceKind,
   getWorkspaceState: () => getWorkspaceState,
   hasCdpManager: () => hasCdpManager,
   initDaemonComponents: () => initDaemonComponents,
@@ -41156,6 +41770,8 @@ __export(src_exports, {
   isIdeRunning: () => isIdeRunning,
   isManagedStatusWaiting: () => isManagedStatusWaiting,
   isManagedStatusWorking: () => isManagedStatusWorking,
+  isSessionHostLiveRuntime: () => isSessionHostLiveRuntime,
+  isSessionHostRecoverySnapshot: () => isSessionHostRecoverySnapshot,
   isSetupComplete: () => isSetupComplete,
   killIdeProcess: () => killIdeProcess,
   launchIDE: () => launchIDE,
@@ -41167,7 +41783,11 @@ __export(src_exports, {
   markSetupComplete: () => markSetupComplete,
   maybeRunDaemonUpgradeHelperFromEnv: () => maybeRunDaemonUpgradeHelperFromEnv,
   normalizeActiveChatData: () => normalizeActiveChatData,
+  normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
+  normalizeMessageParts: () => normalizeMessageParts,
+  partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
+  partitionSessionHostRecords: () => partitionSessionHostRecords,
   probeCdpPort: () => probeCdpPort,
   readChatHistory: () => readChatHistory,
   recordDebugTrace: () => recordDebugTrace,
@@ -41182,6 +41802,7 @@ __export(src_exports, {
   setDebugRuntimeConfig: () => setDebugRuntimeConfig,
   setLogLevel: () => setLogLevel,
   setupIdeInstance: () => setupIdeInstance,
+  shouldAutoRestoreHostedSessionsOnStartup: () => shouldAutoRestoreHostedSessionsOnStartup,
   shouldCollectTraceCategory: () => shouldCollectTraceCategory,
   shutdownDaemonComponents: () => shutdownDaemonComponents,
   spawnDetachedDaemonUpgradeHelper: () => spawnDetachedDaemonUpgradeHelper,
@@ -41228,6 +41849,7 @@ var init_src = __esm({
     init_ide_provider_instance();
     init_cli_provider_instance();
     init_acp_provider_instance();
+    init_io_contracts();
     init_version_archive();
     init_dev_server();
     init_provider_cli_adapter();
@@ -41235,6 +41857,8 @@ var init_src = __esm({
     init_session_host_transport();
     init_app_name();
     init_runtime_support();
+    init_runtime_surface();
+    init_startup_restore_policy();
     init_installer();
     init_daemon_lifecycle();
   }
@@ -42278,12 +42902,12 @@ var init_peer_connection_manager = __esm({
 });
 
 // src/daemon-p2p/index.ts
-var fs15, path23, import_node_module2, esmRequire, DaemonP2PSender;
+var fs15, path24, import_node_module2, esmRequire, DaemonP2PSender;
 var init_daemon_p2p = __esm({
   "src/daemon-p2p/index.ts"() {
     "use strict";
     fs15 = __toESM(require("fs"));
-    path23 = __toESM(require("path"));
+    path24 = __toESM(require("path"));
     import_node_module2 = require("module");
     init_data_channel_router();
     init_screenshot_sender();
@@ -42356,15 +42980,15 @@ ${e?.stack || ""}`);
         const prebuildKey = `${platform12}-${arch3}`;
         try {
           const candidates = [
-            path23.join(__dirname, "node_modules", "node-datachannel"),
-            path23.join(__dirname, "..", "node_modules", "node-datachannel"),
-            path23.join(__dirname, "..", "..", "node_modules", "node-datachannel")
+            path24.join(__dirname, "node_modules", "node-datachannel"),
+            path24.join(__dirname, "..", "node_modules", "node-datachannel"),
+            path24.join(__dirname, "..", "..", "node_modules", "node-datachannel")
           ];
           for (const candidate of candidates) {
-            const prebuildPath = path23.join(candidate, "prebuilds", prebuildKey, "node_datachannel.node");
+            const prebuildPath = path24.join(candidate, "prebuilds", prebuildKey, "node_datachannel.node");
             if (fs15.existsSync(prebuildPath)) {
-              const targetDir = path23.join(candidate, "build", "Release");
-              const targetPath = path23.join(targetDir, "node_datachannel.node");
+              const targetDir = path24.join(candidate, "build", "Release");
+              const targetPath = path24.join(targetDir, "node_datachannel.node");
               fs15.mkdirSync(targetDir, { recursive: true });
               fs15.copyFileSync(prebuildPath, targetPath);
               try {
@@ -42682,27 +43306,27 @@ var require_process = __commonJS({
 var require_filesystem = __commonJS({
   "../../node_modules/detect-libc/lib/filesystem.js"(exports2, module2) {
     "use strict";
-    var fs18 = require("fs");
+    var fs19 = require("fs");
     var LDD_PATH = "/usr/bin/ldd";
     var SELF_PATH = "/proc/self/exe";
     var MAX_LENGTH = 2048;
-    var readFileSync17 = (path26) => {
-      const fd = fs18.openSync(path26, "r");
+    var readFileSync18 = (path28) => {
+      const fd = fs19.openSync(path28, "r");
       const buffer = Buffer.alloc(MAX_LENGTH);
-      const bytesRead = fs18.readSync(fd, buffer, 0, MAX_LENGTH, 0);
-      fs18.close(fd, () => {
+      const bytesRead = fs19.readSync(fd, buffer, 0, MAX_LENGTH, 0);
+      fs19.close(fd, () => {
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile = (path26) => new Promise((resolve16, reject) => {
-      fs18.open(path26, "r", (err, fd) => {
+    var readFile = (path28) => new Promise((resolve16, reject) => {
+      fs19.open(path28, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
           const buffer = Buffer.alloc(MAX_LENGTH);
-          fs18.read(fd, buffer, 0, MAX_LENGTH, 0, (_, bytesRead) => {
+          fs19.read(fd, buffer, 0, MAX_LENGTH, 0, (_, bytesRead) => {
             resolve16(buffer.subarray(0, bytesRead));
-            fs18.close(fd, () => {
+            fs19.close(fd, () => {
             });
           });
         }
@@ -42711,7 +43335,7 @@ var require_filesystem = __commonJS({
     module2.exports = {
       LDD_PATH,
       SELF_PATH,
-      readFileSync: readFileSync17,
+      readFileSync: readFileSync18,
       readFile
     };
   }
@@ -42760,7 +43384,7 @@ var require_detect_libc = __commonJS({
     "use strict";
     var childProcess = require("child_process");
     var { isLinux: isLinux2, getReport } = require_process();
-    var { LDD_PATH, SELF_PATH, readFile, readFileSync: readFileSync17 } = require_filesystem();
+    var { LDD_PATH, SELF_PATH, readFile, readFileSync: readFileSync18 } = require_filesystem();
     var { interpreterPath } = require_elf();
     var cachedFamilyInterpreter;
     var cachedFamilyFilesystem;
@@ -42814,11 +43438,11 @@ var require_detect_libc = __commonJS({
       }
       return null;
     };
-    var familyFromInterpreterPath = (path26) => {
-      if (path26) {
-        if (path26.includes("/ld-musl-")) {
+    var familyFromInterpreterPath = (path28) => {
+      if (path28) {
+        if (path28.includes("/ld-musl-")) {
           return MUSL;
-        } else if (path26.includes("/ld-linux-")) {
+        } else if (path28.includes("/ld-linux-")) {
           return GLIBC;
         }
       }
@@ -42852,7 +43476,7 @@ var require_detect_libc = __commonJS({
       }
       cachedFamilyFilesystem = null;
       try {
-        const lddContent = readFileSync17(LDD_PATH);
+        const lddContent = readFileSync18(LDD_PATH);
         cachedFamilyFilesystem = getFamilyFromLddContent(lddContent);
       } catch (e) {
       }
@@ -42865,8 +43489,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = await readFile(SELF_PATH);
-        const path26 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path26);
+        const path28 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path28);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -42877,9 +43501,9 @@ var require_detect_libc = __commonJS({
       }
       cachedFamilyInterpreter = null;
       try {
-        const selfContent = readFileSync17(SELF_PATH);
-        const path26 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path26);
+        const selfContent = readFileSync18(SELF_PATH);
+        const path28 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path28);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -42941,7 +43565,7 @@ var require_detect_libc = __commonJS({
       }
       cachedVersionFilesystem = null;
       try {
-        const lddContent = readFileSync17(LDD_PATH);
+        const lddContent = readFileSync18(LDD_PATH);
         const versionMatch = lddContent.match(RE_GLIBC_VERSION);
         if (versionMatch) {
           cachedVersionFilesystem = versionMatch[1];
@@ -44598,18 +45222,18 @@ var require_sharp = __commonJS({
       `@img/sharp-${runtimePlatform}/sharp.node`,
       "@img/sharp-wasm32/sharp.node"
     ];
-    var path26;
+    var path28;
     var sharp;
     var errors = [];
-    for (path26 of paths) {
+    for (path28 of paths) {
       try {
-        sharp = require(path26);
+        sharp = require(path28);
         break;
       } catch (err) {
         errors.push(err);
       }
     }
-    if (sharp && path26.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
+    if (sharp && path28.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
       const err = new Error("Prebuilt binaries for linux-x64 require v2 microarchitecture");
       err.code = "Unsupported CPU";
       errors.push(err);
@@ -44618,7 +45242,7 @@ var require_sharp = __commonJS({
     if (sharp) {
       module2.exports = sharp;
     } else {
-      const [isLinux2, isMacOs, isWindows2] = ["linux", "darwin", "win32"].map((os24) => runtimePlatform.startsWith(os24));
+      const [isLinux2, isMacOs, isWindows2] = ["linux", "darwin", "win32"].map((os25) => runtimePlatform.startsWith(os25));
       const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
       errors.forEach((err) => {
         if (err.code !== "MODULE_NOT_FOUND") {
@@ -44635,15 +45259,15 @@ var require_sharp = __commonJS({
           `    Requires ${expected}`
         );
       } else if (prebuiltPlatforms.includes(runtimePlatform)) {
-        const [os24, cpu] = runtimePlatform.split("-");
-        const libc = os24.endsWith("musl") ? " --libc=musl" : "";
+        const [os25, cpu] = runtimePlatform.split("-");
+        const libc = os25.endsWith("musl") ? " --libc=musl" : "";
         help.push(
           "- Ensure optional dependencies can be installed:",
           "    npm install --include=optional sharp",
           "- Ensure your package manager supports multi-platform installation:",
           "    See https://sharp.pixelplumbing.com/install#cross-platform",
           "- Add platform-specific dependencies:",
-          `    npm install --os=${os24.replace("musl", "")}${libc} --cpu=${cpu} sharp`
+          `    npm install --os=${os25.replace("musl", "")}${libc} --cpu=${cpu} sharp`
         );
       } else {
         help.push(
@@ -47518,15 +48142,15 @@ var require_color = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path26 = [graph[toModel].parent, toModel];
+      const path28 = [graph[toModel].parent, toModel];
       let fn = conversions_default[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path26.unshift(graph[cur].parent);
+        path28.unshift(graph[cur].parent);
         fn = link(conversions_default[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path26;
+      fn.conversion = path28;
       return fn;
     }
     function route(fromModel) {
@@ -48143,7 +48767,7 @@ var require_channel = __commonJS({
 var require_output = __commonJS({
   "../../node_modules/sharp/lib/output.js"(exports2, module2) {
     "use strict";
-    var path26 = require("path");
+    var path28 = require("path");
     var is = require_is();
     var sharp = require_sharp();
     var formats = /* @__PURE__ */ new Map([
@@ -48174,9 +48798,9 @@ var require_output = __commonJS({
       let err;
       if (!is.string(fileOut)) {
         err = new Error("Missing output file path");
-      } else if (is.string(this.options.input.file) && path26.resolve(this.options.input.file) === path26.resolve(fileOut)) {
+      } else if (is.string(this.options.input.file) && path28.resolve(this.options.input.file) === path28.resolve(fileOut)) {
         err = new Error("Cannot use same file for input and output");
-      } else if (jp2Regex.test(path26.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
+      } else if (jp2Regex.test(path28.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
         err = errJp2Save();
       }
       if (err) {
@@ -49373,6 +49997,98 @@ var init_screenshot_controller = __esm({
   }
 });
 
+// src/session-host-hygiene.ts
+function formatTimestamp(date5) {
+  const pad = (value) => String(value).padStart(2, "0");
+  return [
+    date5.getUTCFullYear(),
+    pad(date5.getUTCMonth() + 1),
+    pad(date5.getUTCDate()),
+    "-",
+    pad(date5.getUTCHours()),
+    pad(date5.getUTCMinutes()),
+    pad(date5.getUTCSeconds())
+  ].join("");
+}
+function defaultPidRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function shouldSkipForExplicitOverride(env) {
+  const explicit = typeof env?.ADHDEV_SESSION_HOST_NAME === "string" ? env.ADHDEV_SESSION_HOST_NAME.trim() : "";
+  return explicit.length > 0;
+}
+function isActiveStandaloneRecord(record2, isPidRunning) {
+  const managerTag = typeof record2?.meta?.managedBy === "string" ? record2.meta.managedBy.trim() : "";
+  if (managerTag !== LEGACY_STANDALONE_MANAGER_TAG) return false;
+  const lifecycle = typeof record2?.lifecycle === "string" ? record2.lifecycle.trim() : "";
+  const pid = Number(record2?.osPid);
+  if (!Number.isFinite(pid) || pid <= 0) return false;
+  if (lifecycle !== "running" && lifecycle !== "starting" && lifecycle !== "interrupted") return false;
+  return isPidRunning(pid);
+}
+function quarantineLegacyStandaloneSessions(options) {
+  const env = options.env || process.env;
+  if (options.appName !== DEFAULT_SESSION_HOST_APP_NAME) {
+    return { movedCount: 0, skippedActiveCount: 0, backupDir: null };
+  }
+  if (shouldSkipForExplicitOverride(env)) {
+    return { movedCount: 0, skippedActiveCount: 0, backupDir: null };
+  }
+  const homeDir = options.homeDir || os21.homedir();
+  const now = options.now || (() => /* @__PURE__ */ new Date());
+  const isPidRunning = options.isPidRunning || defaultPidRunning;
+  const runtimesDir = path25.join(homeDir, ".adhdev", "session-host", options.appName, "runtimes");
+  if (!fs16.existsSync(runtimesDir)) {
+    return { movedCount: 0, skippedActiveCount: 0, backupDir: null };
+  }
+  const candidates = fs16.readdirSync(runtimesDir).filter((name) => name.endsWith(".json")).map((name) => path25.join(runtimesDir, name));
+  let movedCount = 0;
+  let skippedActiveCount = 0;
+  let backupDir = null;
+  for (const sourcePath of candidates) {
+    let parsed;
+    try {
+      parsed = JSON.parse(fs16.readFileSync(sourcePath, "utf8"));
+    } catch {
+      continue;
+    }
+    const managerTag = typeof parsed?.meta?.managedBy === "string" ? parsed.meta.managedBy.trim() : "";
+    if (managerTag !== LEGACY_STANDALONE_MANAGER_TAG) continue;
+    if (isActiveStandaloneRecord(parsed, isPidRunning)) {
+      skippedActiveCount += 1;
+      continue;
+    }
+    if (!backupDir) {
+      backupDir = path25.join(
+        homeDir,
+        ".adhdev",
+        "session-host-backups",
+        `legacy-standalone-${options.appName}-${formatTimestamp(now())}`
+      );
+      fs16.mkdirSync(path25.join(backupDir, "runtimes"), { recursive: true });
+    }
+    fs16.renameSync(sourcePath, path25.join(backupDir, "runtimes", path25.basename(sourcePath)));
+    movedCount += 1;
+  }
+  return { movedCount, skippedActiveCount, backupDir };
+}
+var fs16, os21, path25, LEGACY_STANDALONE_MANAGER_TAG;
+var init_session_host_hygiene = __esm({
+  "src/session-host-hygiene.ts"() {
+    "use strict";
+    fs16 = __toESM(require("fs"));
+    os21 = __toESM(require("os"));
+    path25 = __toESM(require("path"));
+    init_src();
+    LEGACY_STANDALONE_MANAGER_TAG = "adhdev-standalone";
+  }
+});
+
 // src/session-host.ts
 function buildSessionHostEnv(baseEnv) {
   const env = sanitizeSpawnEnv(baseEnv);
@@ -49381,18 +50097,18 @@ function buildSessionHostEnv(baseEnv) {
 }
 function resolveSessionHostEntry() {
   const packagedCandidates = [
-    path24.resolve(__dirname, "../vendor/session-host-daemon/index.js"),
-    path24.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
+    path26.resolve(__dirname, "../vendor/session-host-daemon/index.js"),
+    path26.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
   ];
   for (const candidate of packagedCandidates) {
-    if (fs16.existsSync(candidate)) {
+    if (fs17.existsSync(candidate)) {
       return candidate;
     }
   }
   return require.resolve("@adhdev/session-host-daemon");
 }
 function getSessionHostPidFile() {
-  return path24.join(os21.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
+  return path26.join(os23.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
 }
 function killPid2(pid) {
   try {
@@ -49435,12 +50151,12 @@ function getWindowsProcessCommandLine(pid) {
   }
   return null;
 }
-function stopSessionHost() {
+function stopManagedSessionHostProcess() {
   let stopped = false;
   const pidFile = getSessionHostPidFile();
   try {
-    if (fs16.existsSync(pidFile)) {
-      const pid = Number.parseInt(fs16.readFileSync(pidFile, "utf8").trim(), 10);
+    if (fs17.existsSync(pidFile)) {
+      const pid = Number.parseInt(fs17.readFileSync(pidFile, "utf8").trim(), 10);
       if (Number.isFinite(pid) && pid !== process.pid) {
         stopped = killPid2(pid) || stopped;
       }
@@ -49448,10 +50164,14 @@ function stopSessionHost() {
   } catch {
   } finally {
     try {
-      fs16.unlinkSync(pidFile);
+      fs17.unlinkSync(pidFile);
     } catch {
     }
   }
+  return stopped;
+}
+function stopSessionHost() {
+  let stopped = stopManagedSessionHostProcess();
   if (process.platform === "win32") {
     try {
       const raw = (0, import_child_process11.execFileSync)("tasklist", ["/FO", "CSV", "/NH", "/FI", "IMAGENAME eq node.exe"], {
@@ -49487,11 +50207,27 @@ function stopSessionHost() {
   return stopped;
 }
 async function ensureSessionHostReady2() {
+  const quarantine = quarantineLegacyStandaloneSessions({
+    appName: SESSION_HOST_APP_NAME,
+    env: process.env
+  });
+  if (quarantine.movedCount > 0) {
+    LOG.warn(
+      "SessionHost",
+      `quarantined ${quarantine.movedCount} legacy standalone runtime file(s) from ${SESSION_HOST_APP_NAME}` + (quarantine.backupDir ? ` \u2192 ${quarantine.backupDir}` : "")
+    );
+  }
+  if (quarantine.skippedActiveCount > 0) {
+    LOG.warn(
+      "SessionHost",
+      `detected ${quarantine.skippedActiveCount} active standalone runtime(s) still using the ${SESSION_HOST_APP_NAME} namespace; leaving them untouched`
+    );
+  }
   const spawnHost = () => {
     const entry = resolveSessionHostEntry();
-    const logDir = path24.join(os21.homedir(), ".adhdev", "logs");
-    fs16.mkdirSync(logDir, { recursive: true });
-    const logFd = fs16.openSync(path24.join(logDir, "session-host.log"), "a");
+    const logDir = path26.join(os23.homedir(), ".adhdev", "logs");
+    fs17.mkdirSync(logDir, { recursive: true });
+    const logFd = fs17.openSync(path26.join(logDir, "session-host.log"), "a");
     const child = (0, import_child_process11.spawn)(process.execPath, [entry], {
       detached: true,
       stdio: ["ignore", logFd, logFd],
@@ -49500,7 +50236,7 @@ async function ensureSessionHostReady2() {
     });
     child.unref();
     try {
-      fs16.closeSync(logFd);
+      fs17.closeSync(logFd);
     } catch {
     }
   };
@@ -49526,17 +50262,18 @@ async function ensureSessionHostReady2() {
 async function listHostedCliRuntimes2(endpoint) {
   return listHostedCliRuntimes(endpoint);
 }
-var import_child_process11, fs16, os21, path24, SESSION_HOST_APP_NAME, SESSION_HOST_START_TIMEOUT_MS;
+var import_child_process11, fs17, os23, path26, SESSION_HOST_APP_NAME, SESSION_HOST_START_TIMEOUT_MS;
 var init_session_host = __esm({
   "src/session-host.ts"() {
     "use strict";
     import_child_process11 = require("child_process");
-    fs16 = __toESM(require("fs"));
-    os21 = __toESM(require("os"));
-    path24 = __toESM(require("path"));
+    fs17 = __toESM(require("fs"));
+    os23 = __toESM(require("os"));
+    path26 = __toESM(require("path"));
     init_src();
     init_dist();
-    SESSION_HOST_APP_NAME = process.env.ADHDEV_SESSION_HOST_NAME || "adhdev";
+    init_session_host_hygiene();
+    SESSION_HOST_APP_NAME = process.env.ADHDEV_SESSION_HOST_NAME || DEFAULT_SESSION_HOST_APP_NAME;
     SESSION_HOST_START_TIMEOUT_MS = 15e3;
   }
 });
@@ -49769,31 +50506,36 @@ function buildSessionModalDeliverySignature(payload) {
     Array.isArray(payload.modalButtons) ? payload.modalButtons.join("") : ""
   ]);
 }
-function getDaemonPidFile() {
-  const dir = path25.join(os23.homedir(), ".adhdev");
-  if (!fs17.existsSync(dir)) fs17.mkdirSync(dir, { recursive: true });
-  return path25.join(dir, "daemon.pid");
+function resolveDaemonPort(ref = {}) {
+  return Number.isFinite(ref.port) && Number(ref.port) > 0 ? Number(ref.port) : DEFAULT_DAEMON_PORT;
+}
+function getDaemonPidFile(ref = {}) {
+  const dir = path27.join(ref.homeDir || os24.homedir(), ".adhdev");
+  if (!fs18.existsSync(dir)) fs18.mkdirSync(dir, { recursive: true });
+  const port = resolveDaemonPort(ref);
+  return path27.join(dir, port === DEFAULT_DAEMON_PORT ? "daemon.pid" : `daemon-${port}.pid`);
 }
-function writeDaemonPid(pid) {
-  const pidFile = getDaemonPidFile();
+function writeDaemonPid(pid, ref = {}) {
+  const pidFile = getDaemonPidFile(ref);
   try {
-    fs17.writeFileSync(pidFile, String(pid), { encoding: "utf-8", flag: "wx" });
+    fs18.writeFileSync(pidFile, String(pid), { encoding: "utf-8", flag: "wx" });
   } catch {
-    fs17.writeFileSync(pidFile, String(pid), "utf-8");
+    fs18.writeFileSync(pidFile, String(pid), "utf-8");
   }
 }
-function removeDaemonPid() {
+function removeDaemonPid(ref = {}) {
   try {
-    fs17.unlinkSync(getDaemonPidFile());
+    fs18.unlinkSync(getDaemonPidFile(ref));
   } catch (e) {
   }
 }
-function isDaemonRunning() {
+function isDaemonRunning(ref = {}) {
+  const port = resolveDaemonPort(ref);
   try {
     const { execFileSync: execFileSync3 } = require("child_process");
     const probe = `
             const http = require('http');
-            const req = http.get('http://127.0.0.1:${DEFAULT_DAEMON_PORT}/health', { timeout: 1500 }, (res) => {
+            const req = http.get('http://127.0.0.1:${port}/health', { timeout: 1500 }, (res) => {
                 process.stdout.write(String(res.statusCode));
                 res.resume();
             });
@@ -49808,18 +50550,18 @@ function isDaemonRunning() {
     if (result === "200") return true;
   } catch {
   }
-  const pidFile = getDaemonPidFile();
+  const pidFile = getDaemonPidFile(ref);
   try {
-    if (!fs17.existsSync(pidFile)) return false;
-    const pid = parseInt(fs17.readFileSync(pidFile, "utf-8").trim());
+    if (!fs18.existsSync(pidFile)) return false;
+    const pid = parseInt(fs18.readFileSync(pidFile, "utf-8").trim());
     process.kill(pid, 0);
     if (!isAdhdevProcess(pid)) {
-      removeDaemonPid();
+      removeDaemonPid(ref);
       return false;
     }
     return true;
   } catch {
-    removeDaemonPid();
+    removeDaemonPid(ref);
     return false;
   }
 }
@@ -49853,30 +50595,30 @@ function isAdhdevProcess(pid) {
     return true;
   }
 }
-function getDaemonPid() {
-  const pidFile = getDaemonPidFile();
+function getDaemonPid(ref = {}) {
+  const pidFile = getDaemonPidFile(ref);
   try {
-    if (!fs17.existsSync(pidFile)) return null;
-    const pid = parseInt(fs17.readFileSync(pidFile, "utf-8").trim(), 10);
+    if (!fs18.existsSync(pidFile)) return null;
+    const pid = parseInt(fs18.readFileSync(pidFile, "utf-8").trim(), 10);
     return Number.isFinite(pid) ? pid : null;
   } catch {
     return null;
   }
 }
-function stopDaemon() {
-  const pidFile = getDaemonPidFile();
+function stopDaemon(ref = {}) {
+  const pidFile = getDaemonPidFile(ref);
   try {
-    if (!fs17.existsSync(pidFile)) return false;
-    const pid = parseInt(fs17.readFileSync(pidFile, "utf-8").trim());
+    if (!fs18.existsSync(pidFile)) return false;
+    const pid = parseInt(fs18.readFileSync(pidFile, "utf-8").trim());
     process.kill(pid, "SIGTERM");
-    removeDaemonPid();
+    removeDaemonPid(ref);
     return true;
   } catch {
-    removeDaemonPid();
+    removeDaemonPid(ref);
     return false;
   }
 }
-var os23, fs17, path25, import_http, import_ws3, import_chalk2, pkgVersion, ACTIVE_CHAT_POLL_STATUSES, AdhdevDaemon;
+var os24, fs18, path27, import_http, import_ws3, import_chalk2, pkgVersion, ACTIVE_CHAT_POLL_STATUSES, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
@@ -49885,16 +50627,17 @@ var init_adhdev_daemon = __esm({
     init_daemon_p2p2();
     init_screenshot_controller();
     init_session_host();
+    init_startup_restore_policy();
     init_dist();
     init_session_host_controller();
-    os23 = __toESM(require("os"));
-    fs17 = __toESM(require("fs"));
-    path25 = __toESM(require("path"));
+    os24 = __toESM(require("os"));
+    fs18 = __toESM(require("fs"));
+    path27 = __toESM(require("path"));
     import_http = require("http");
     import_ws3 = require("ws");
     import_chalk2 = __toESM(require("chalk"));
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.52" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.54" });
     ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
       "generating",
       "waiting_approval",
@@ -50323,13 +51066,13 @@ ${err?.stack || ""}`);
         const workingDir = options.workingDir || process.cwd();
         let pidWritten = false;
         try {
-          if (isDaemonRunning()) {
+          if (isDaemonRunning({ port: this.localPort })) {
             console.log(import_chalk2.default.yellow("\n\u26A0 ADHDev Daemon is already running."));
             console.log(import_chalk2.default.gray(`  Stop with: adhdev daemon:stop
 `));
             return;
           }
-          writeDaemonPid(process.pid);
+          writeDaemonPid(process.pid, { port: this.localPort });
           pidWritten = true;
           const config2 = loadConfig();
           const authToken = config2.machineSecret;
@@ -50402,7 +51145,9 @@ ${err?.stack || ""}`);
               forwardAgentStreamsToIdeInstance(this.components.instanceManager, ideType, streams);
             }
           });
-          await this.components.cliManager.restoreHostedSessions();
+          if (shouldAutoRestoreHostedSessionsOnStartup(process.env)) {
+            await this.components.cliManager.restoreHostedSessions();
+          }
           this.components.providerLoader.fetchLatest().then(({ updated }) => {
             if (updated) {
               this.components.providerLoader.reload();
@@ -50418,8 +51163,8 @@ ${err?.stack || ""}`);
             cliInfo: {
               type: "adhdev-daemon",
               version: pkgVersion,
-              platform: os23.platform(),
-              hostname: os23.hostname(),
+              platform: os24.platform(),
+              hostname: os24.hostname(),
               machineId: config2.machineId,
               instanceId
             }
@@ -50572,7 +51317,7 @@ ${err?.stack || ""}`);
           }
         } catch (error48) {
           if (!this.running && pidWritten) {
-            removeDaemonPid();
+            removeDaemonPid({ port: this.localPort });
           }
           throw error48;
         }
@@ -50882,6 +51627,18 @@ ${err?.stack || ""}`);
        * Daemon cleanup (release all resources)
        * @param exitProcess If true, exit after cleanup process.exit(0), if false, cleanup only
        */
+      async stopManagedSessionHost() {
+        try {
+          await this.sessionHostController?.stop();
+        } catch {
+        } finally {
+          this.sessionHostController = null;
+        }
+        try {
+          stopManagedSessionHostProcess();
+        } catch {
+        }
+      }
       async stop(exitProcess = true) {
         if (!this.running) return;
         this.running = false;
@@ -50909,11 +51666,7 @@ ${err?.stack || ""}`);
           this.serverConn?.disconnect();
         } catch {
         }
-        try {
-          await this.sessionHostController?.stop();
-          this.sessionHostController = null;
-        } catch {
-        }
+        await this.stopManagedSessionHost();
         try {
           for (const client of this.localClients) {
             client.close();
@@ -50931,7 +51684,7 @@ ${err?.stack || ""}`);
           });
         } catch {
         }
-        removeDaemonPid();
+        removeDaemonPid({ port: this.localPort });
         console.log(import_chalk2.default.green("  \u2713 ADHDev Daemon stopped.\n"));
         if (exitProcess) {
           process.exit(0);
@@ -51123,15 +51876,15 @@ async function loginFlow() {
   let verificationUrl;
   try {
     const config2 = loadConfig();
-    const os24 = await import("os");
+    const os25 = await import("os");
     const res = await fetch(`${SERVER_URL}/auth/cli/init`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
         clientMachineId: config2.machineId,
-        hostname: os24.hostname(),
-        platform: os24.platform(),
-        arch: os24.arch()
+        hostname: os25.hostname(),
+        platform: os25.platform(),
+        arch: os25.arch()
       })
     });
     if (!res.ok) {
@@ -51236,8 +51989,8 @@ async function startDaemonFlow() {
     const { execSync: execSync7 } = await import("child_process");
     const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2 } = await Promise.resolve().then(() => (init_src(), src_exports));
     const logPath = getCurrentDaemonLogPath2();
-    const os24 = await import("os");
-    const platform12 = os24.platform();
+    const os25 = await import("os");
+    const platform12 = os25.platform();
     try {
       if (platform12 === "win32") {
         execSync7("start /B adhdev daemon >NUL 2>&1", {