@adhdev/daemon-standalone 0.8.51 → 0.8.53

package/dist/index.js

@@ -9173,7 +9173,12 @@ var require_dist = __commonJS({
       ensureNodePtySpawnHelperPermissions: () => ensureNodePtySpawnHelperPermissions,
       formatRuntimeOwner: () => formatRuntimeOwner,
       getDefaultSessionHostEndpoint: () => getDefaultSessionHostEndpoint2,
+      getSessionHostRecoveryLabel: () => getSessionHostRecoveryLabel,
+      getSessionHostSurfaceKind: () => getSessionHostSurfaceKind,
       getWorkspaceLabel: () => getWorkspaceLabel,
+      isSessionHostLiveRuntime: () => isSessionHostLiveRuntime,
+      isSessionHostRecoverySnapshot: () => isSessionHostRecoverySnapshot,
+      resolveAttachableRuntimeRecord: () => resolveAttachableRuntimeRecord,
       resolveRuntimeRecord: () => resolveRuntimeRecord,
       sanitizeSpawnEnv: () => sanitizeSpawnEnv,
       writeEnvelope: () => writeEnvelope
@@ -9275,6 +9280,55 @@ var require_dist = __commonJS({
       }
       return candidate;
     }
+    var LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
+    function isSessionHostLiveRuntime(record2) {
+      if (!record2) return false;
+      if (record2.surfaceKind === "live_runtime") return true;
+      if (record2.surfaceKind === "recovery_snapshot" || record2.surfaceKind === "inactive_record") return false;
+      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 (record2.surfaceKind === "recovery_snapshot") return true;
+      if (record2.surfaceKind === "live_runtime" || record2.surfaceKind === "inactive_record") 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 (record2?.surfaceKind === "live_runtime" || record2?.surfaceKind === "recovery_snapshot" || record2?.surfaceKind === "inactive_record") {
+        return record2.surfaceKind;
+      }
+      if (isSessionHostLiveRuntime(record2)) return "live_runtime";
+      if (isSessionHostRecoverySnapshot(record2)) return "recovery_snapshot";
+      return "inactive_record";
+    }
+    function resolveAttachableRuntimeRecord(records, identifier) {
+      const record2 = resolveRuntimeRecord(records, identifier);
+      const surfaceKind = getSessionHostSurfaceKind(record2);
+      if (surfaceKind === "live_runtime") {
+        return record2;
+      }
+      if (surfaceKind === "recovery_snapshot") {
+        throw new Error(`Runtime ${record2.runtimeKey} is a recovery snapshot, not a live attach target. Resume or recover it first.`);
+      }
+      throw new Error(`Runtime ${record2.runtimeKey} is ${record2.lifecycle}, not a live attach target.`);
+    }
     function uniqueMatch(records, predicate) {
       const matches = records.filter(predicate);
       if (matches.length === 1) return matches[0] || null;
@@ -30836,6 +30890,7 @@ ${data.message || ""}`.trim();
       detectIDEs: () => detectIDEs,
       ensureSessionHostReady: () => ensureSessionHostReady2,
       findCdpManager: () => findCdpManager,
+      flattenMessageParts: () => flattenMessageParts,
       forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance2,
       getAIExtensions: () => getAIExtensions,
       getAvailableIdeIds: () => getAvailableIdeIds,
@@ -30849,6 +30904,8 @@ ${data.message || ""}`.trim();
       getRecentDebugTrace: () => getRecentDebugTrace,
       getRecentLogs: () => getRecentLogs,
       getSavedProviderSessions: () => getSavedProviderSessions,
+      getSessionHostRecoveryLabel: () => getSessionHostRecoveryLabel,
+      getSessionHostSurfaceKind: () => getSessionHostSurfaceKind,
       getWorkspaceState: () => getWorkspaceState2,
       hasCdpManager: () => hasCdpManager,
       initDaemonComponents: () => initDaemonComponents2,
@@ -30859,6 +30916,8 @@ ${data.message || ""}`.trim();
       isIdeRunning: () => isIdeRunning,
       isManagedStatusWaiting: () => isManagedStatusWaiting,
       isManagedStatusWorking: () => isManagedStatusWorking,
+      isSessionHostLiveRuntime: () => isSessionHostLiveRuntime,
+      isSessionHostRecoverySnapshot: () => isSessionHostRecoverySnapshot,
       isSetupComplete: () => isSetupComplete,
       killIdeProcess: () => killIdeProcess,
       launchIDE: () => launchIDE,
@@ -30870,7 +30929,11 @@ ${data.message || ""}`.trim();
       markSetupComplete: () => markSetupComplete,
       maybeRunDaemonUpgradeHelperFromEnv: () => maybeRunDaemonUpgradeHelperFromEnv2,
       normalizeActiveChatData: () => normalizeActiveChatData,
+      normalizeInputEnvelope: () => normalizeInputEnvelope,
       normalizeManagedStatus: () => normalizeManagedStatus,
+      normalizeMessageParts: () => normalizeMessageParts,
+      partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
+      partitionSessionHostRecords: () => partitionSessionHostRecords,
       probeCdpPort: () => probeCdpPort,
       readChatHistory: () => readChatHistory,
       recordDebugTrace: () => recordDebugTrace,
@@ -30885,6 +30948,7 @@ ${data.message || ""}`.trim();
       setDebugRuntimeConfig: () => setDebugRuntimeConfig,
       setLogLevel: () => setLogLevel,
       setupIdeInstance: () => setupIdeInstance,
+      shouldAutoRestoreHostedSessionsOnStartup: () => shouldAutoRestoreHostedSessionsOnStartup2,
       shouldCollectTraceCategory: () => shouldCollectTraceCategory,
       shutdownDaemonComponents: () => shutdownDaemonComponents2,
       spawnDetachedDaemonUpgradeHelper: () => spawnDetachedDaemonUpgradeHelper,
@@ -32956,6 +33020,61 @@ ${data.message || ""}`.trim();
       }
       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;
@@ -34927,50 +35046,6 @@ ${effect.notification.body || ""}`.trim();
       }
       return false;
     }
-    function buildFallbackControls(providerControls, serverModel, serverMode, acpConfigOptions, acpModes) {
-      if (providerControls && providerControls.length > 0) return providerControls;
-      const controls = [];
-      const isAcp = !!(acpConfigOptions || acpModes);
-      const modelFromAcp = acpConfigOptions?.find((c) => c.category === "model");
-      if (!isAcp || modelFromAcp) {
-        controls.push({
-          id: "model",
-          type: "select",
-          label: "Model",
-          icon: "\u{1F916}",
-          placement: "bar",
-          dynamic: !modelFromAcp,
-          listScript: "listModels",
-          setScript: "setModel",
-          readFrom: "model",
-          ...modelFromAcp && {
-            options: modelFromAcp.options.map((o) => ({ value: o.value, label: o.name || o.value }))
-          }
-        });
-      }
-      const modeFromAcp = acpModes && acpModes.length > 0;
-      const thoughtFromAcp = !modeFromAcp && acpConfigOptions?.find((c) => c.category !== "model");
-      if (!isAcp || modeFromAcp || thoughtFromAcp) {
-        controls.push({
-          id: "mode",
-          type: thoughtFromAcp ? "cycle" : "select",
-          label: thoughtFromAcp ? "Thinking" : "Mode",
-          icon: thoughtFromAcp ? "\u{1F9E0}" : "\u26A1",
-          placement: "bar",
-          dynamic: !modeFromAcp && !thoughtFromAcp,
-          listScript: "listModes",
-          setScript: thoughtFromAcp ? "setThinkingLevel" : "setMode",
-          readFrom: "mode",
-          ...modeFromAcp && {
-            options: acpModes.map((m) => ({ value: m.id, label: m.name || m.id }))
-          },
-          ...thoughtFromAcp && {
-            options: thoughtFromAcp.options.map((o) => ({ value: o.value, label: o.name || o.value }))
-          }
-        });
-      }
-      return controls;
-    }
     var IDE_SESSION_CAPABILITIES = [
       "read_chat",
       "send_message",
@@ -35039,11 +35114,7 @@ ${effect.notification.body || ""}`.trim();
         currentAutoApprove: state.currentAutoApprove,
         ...includeSessionControls && {
           controlValues: state.controlValues,
-          providerControls: buildFallbackControls(
-            state.providerControls,
-            state.currentModel,
-            state.currentPlan
-          )
+          providerControls: state.providerControls
         },
         errorMessage: state.errorMessage,
         errorReason: state.errorReason,
@@ -35073,11 +35144,7 @@ ${effect.notification.body || ""}`.trim();
         currentPlan: ext.currentPlan,
         ...includeSessionControls && {
           controlValues: ext.controlValues,
-          providerControls: buildFallbackControls(
-            ext.providerControls,
-            ext.currentModel,
-            ext.currentPlan
-          )
+          providerControls: ext.providerControls
         },
         errorMessage: ext.errorMessage,
         errorReason: ext.errorReason,
@@ -35118,9 +35185,7 @@ ${effect.notification.body || ""}`.trim();
         },
         ...includeSessionControls && {
           controlValues: state.controlValues,
-          providerControls: buildFallbackControls(
-            state.providerControls
-          )
+          providerControls: state.providerControls
         },
         errorMessage: state.errorMessage,
         errorReason: state.errorReason,
@@ -35152,13 +35217,7 @@ ${effect.notification.body || ""}`.trim();
           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,
@@ -35236,9 +35295,214 @@ ${effect.notification.body || ""}`.trim();
       }
     }
     init_logger();
+    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");
+    }
     function flattenContent(content) {
       if (typeof content === "string") return content;
-      return content.filter((b2) => b2.type === "text").map((b2) => b2.text).join("\n");
+      return flattenMessageParts(normalizeMessageParts(content));
     }
     init_logger();
     var NORMAL_TRACE_BUFFER_SIZE = 200;
@@ -35419,6 +35683,9 @@ ${effect.notification.body || ""}`.trim();
       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;
@@ -35823,7 +36090,8 @@ ${effect.notification.body || ""}`.trim();
       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) => LOG2.debug("Command", `[send_chat] ${msg}`);
       const provider = h.getProvider(args?.agentType);
@@ -36761,6 +37029,21 @@ ${effect.notification.body || ""}`.trim();
       }
       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 (!fs42.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);
@@ -36793,11 +37076,48 @@ ${effect.notification.body || ""}`.trim();
       try {
         const dirPath = resolveSafePath(args?.path || ".");
         const files = listDirectoryEntriesSafe(dirPath).filter((entry) => entry.type === "directory").sort((a, b2) => a.name.localeCompare(b2.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 };
       }
     }
+    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 };
+    }
     init_logger();
     function getCliPresentationMode(h, targetSessionId) {
       if (!targetSessionId) return null;
@@ -36887,34 +37207,19 @@ ${effect.notification.body || ""}`.trim();
       }
       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;
@@ -36948,7 +37253,7 @@ ${effect.notification.body || ""}`.trim();
         }
         try {
           const raw = await adapter.invokeScript(actualScriptName, normalizedArgs);
-          const parsed = parseScriptResult(raw);
+          const parsed = parseCliScriptResult(raw);
           if (!parsed.success) {
             return { success: false, ...parsed.payload || {} };
           }
@@ -36959,7 +37264,11 @@ ${effect.notification.body || ""}`.trim();
             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}` };
         }
@@ -37022,7 +37331,7 @@ ${effect.notification.body || ""}`.trim();
             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 };
           }
@@ -37033,9 +37342,6 @@ ${effect.notification.body || ""}`.trim();
         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" };
@@ -37474,11 +37780,7 @@ ${effect.notification.body || ""}`.trim();
           "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 = {
@@ -37590,17 +37892,9 @@ ${effect.notification.body || ""}`.trim();
             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");
@@ -37715,7 +38009,7 @@ ${effect.notification.body || ""}`.trim();
       }
     };
     var os12 = __toESM2(require("os"));
-    var path12 = __toESM2(require("path"));
+    var path13 = __toESM2(require("path"));
     var crypto4 = __toESM2(require("crypto"));
     var import_chalk = __toESM2(require("chalk"));
     init_provider_cli_adapter();
@@ -37738,6 +38032,23 @@ ${effect.notification.body || ""}`.trim();
       }
       return CachedDatabaseSync;
     }
+    function getForcedNewSessionScriptName(provider, launchMode) {
+      if (!provider || launchMode !== "new") return null;
+      const resume = provider.resume;
+      if (!resume?.supported) return null;
+      if (Array.isArray(resume.newSessionArgs) && resume.newSessionArgs.length > 0) return null;
+      const controls = Array.isArray(provider.controls) ? provider.controls : [];
+      for (const control of controls) {
+        if (control?.type !== "action") continue;
+        const invokeScript = typeof control?.invokeScript === "string" ? control.invokeScript.trim() : "";
+        if (!invokeScript) continue;
+        const controlId = typeof control?.id === "string" ? control.id.trim() : "";
+        if (controlId === "new_session" || /^new.?session$/i.test(invokeScript)) {
+          return invokeScript;
+        }
+      }
+      return null;
+    }
     var CliProviderInstance = class {
       constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
         this.provider = provider;
@@ -37796,6 +38107,7 @@ ${effect.notification.body || ""}`.trim();
           this.detectStatusTransition();
         });
         await this.adapter.spawn();
+        await this.enforceFreshSessionLaunchIfNeeded();
         this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
         if (this.providerSessionId) {
           this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
@@ -37987,10 +38299,13 @@ ${effect.notification.body || ""}`.trim();
         });
       }
       onEvent(event, data) {
-        if (event === "send_message" && data?.text) {
-          void this.adapter.sendMessage(data.text).catch((e) => {
-            LOG2.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) => {
+              LOG2.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) {
@@ -38008,6 +38323,23 @@ ${effect.notification.body || ""}`.trim();
       }
       completedDebounceTimer = null;
       completedDebouncePending = null;
+      async enforceFreshSessionLaunchIfNeeded() {
+        const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
+        if (!scriptName) return;
+        LOG2.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();
@@ -38389,10 +38721,106 @@ ${effect.notification.body || ""}`.trim();
         }
       }
     };
+    var path12 = __toESM2(require("path"));
     var import_stream = require("stream");
     var import_child_process5 = require("child_process");
     var import_sdk = (init_acp(), __toCommonJS(acp_exports));
     init_logger();
+    function getPromptCapabilityFlags(agentCapabilities) {
+      const prompt = agentCapabilities?.promptCapabilities || {};
+      return {
+        image: prompt.image === true,
+        audio: prompt.audio === true,
+        embeddedContext: prompt.embeddedContext === true
+      };
+    }
+    function getResourceNameFromUri(uri, fallback) {
+      try {
+        if (uri.startsWith("file://")) {
+          return path12.basename(new URL(uri).pathname) || fallback;
+        }
+        return path12.basename(uri) || fallback;
+      } catch {
+        return fallback;
+      }
+    }
+    function inputPartToResourceLink(part, fallbackName) {
+      if (!part.uri) return null;
+      return {
+        type: "resource_link",
+        uri: part.uri,
+        name: getResourceNameFromUri(part.uri, fallbackName),
+        ...part.mimeType ? { mimeType: part.mimeType } : {}
+      };
+    }
+    function appendPromptText(promptParts, text) {
+      const normalized = typeof text === "string" ? text.trim() : "";
+      if (!normalized) return;
+      const last = promptParts[promptParts.length - 1];
+      if (last?.type === "text" && last.text === normalized) return;
+      promptParts.push({ type: "text", text: normalized });
+    }
+    function buildAcpPromptParts(input, agentCapabilities) {
+      const caps = getPromptCapabilityFlags(agentCapabilities);
+      const promptParts = [];
+      for (const part of input.parts) {
+        if (part.type === "text") {
+          promptParts.push({ type: "text", text: part.text });
+          continue;
+        }
+        if (part.type === "image") {
+          if (caps.image && part.data) {
+            promptParts.push({
+              type: "image",
+              data: part.data,
+              mimeType: part.mimeType,
+              ...part.uri ? { uri: part.uri } : {}
+            });
+            continue;
+          }
+          const fallback = inputPartToResourceLink(part, "image");
+          if (fallback) promptParts.push(fallback);
+          appendPromptText(promptParts, part.alt || (!part.uri ? `Attached image (${part.mimeType})` : void 0));
+          continue;
+        }
+        if (part.type === "audio") {
+          if (caps.audio && part.data) {
+            promptParts.push({
+              type: "audio",
+              data: part.data,
+              mimeType: part.mimeType
+            });
+            continue;
+          }
+          const fallback = inputPartToResourceLink(part, "audio");
+          if (fallback) promptParts.push(fallback);
+          appendPromptText(promptParts, part.transcript || (!part.uri ? `Attached audio (${part.mimeType})` : void 0));
+          continue;
+        }
+        if (part.type === "resource") {
+          if (caps.embeddedContext && (part.text || part.data)) {
+            promptParts.push({
+              type: "resource",
+              resource: part.text ? { uri: part.uri, text: part.text, mimeType: part.mimeType ?? null } : { uri: part.uri, blob: part.data || "", mimeType: part.mimeType ?? null }
+            });
+            continue;
+          }
+          const fallback = inputPartToResourceLink(part, part.name || "resource");
+          if (fallback) promptParts.push(fallback);
+          appendPromptText(promptParts, part.text || (!part.uri && part.name ? part.name : void 0));
+          continue;
+        }
+        if (part.type === "video") {
+          const fallback = inputPartToResourceLink(part, "video");
+          if (fallback) promptParts.push(fallback);
+          appendPromptText(promptParts, !part.uri ? `Attached video (${part.mimeType})` : void 0);
+        }
+      }
+      if (!promptParts.some((part) => part.type === "text") && input.textFallback) {
+        promptParts.unshift({ type: "text", text: input.textFallback });
+      }
+      return promptParts;
+    }
     var AcpProviderInstance = class {
       constructor(provider, workingDir, cliArgs = []) {
         this.cliArgs = cliArgs;
@@ -38521,8 +38949,10 @@ ${effect.notification.body || ""}`.trim();
         };
       }
       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") {
@@ -38947,18 +39377,34 @@ ${effect.notification.body || ""}`.trim();
           this.log.warn(`[${this.type}] Cannot send prompt: no active connection/session`);
           return;
         }
-        let promptParts;
-        if (contentBlocks && contentBlocks.length > 0) {
-          promptParts = contentBlocks.map((b2) => {
-            if (b2.type === "text") return { type: "text", text: b2.text };
-            if (b2.type === "image") return { type: "image", data: b2.data, mimeType: b2.mimeType };
-            if (b2.type === "resource_link") return { type: "resource_link", uri: b2.uri, name: b2.name };
-            if (b2.type === "resource") return { type: "resource", resource: b2.resource };
-            return { type: "text", text: flattenContent([b2]) };
-          });
-        } else {
-          promptParts = [{ type: "text", text }];
-        }
+        const promptParts = contentBlocks && contentBlocks.length > 0 ? contentBlocks.map((b2) => {
+          if (b2.type === "text") return { type: "text", text: b2.text };
+          if (b2.type === "image") {
+            return {
+              type: "image",
+              data: b2.data,
+              mimeType: b2.mimeType,
+              ...b2.uri ? { uri: b2.uri } : {}
+            };
+          }
+          if (b2.type === "audio") {
+            return {
+              type: "audio",
+              data: b2.data,
+              mimeType: b2.mimeType
+            };
+          }
+          if (b2.type === "resource_link") {
+            return {
+              type: "resource_link",
+              uri: b2.uri,
+              name: b2.name,
+              ...b2.mimeType ? { mimeType: b2.mimeType } : {}
+            };
+          }
+          if (b2.type === "resource") return { type: "resource", resource: b2.resource };
+          return { type: "text", text: flattenContent([b2]) };
+        }) : [{ type: "text", text }];
         this.messages.push({
           role: "user",
           content: contentBlocks && contentBlocks.length > 0 ? contentBlocks : text,
@@ -39022,6 +39468,13 @@ ${effect.notification.body || ""}`.trim();
               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") {
@@ -39407,7 +39860,7 @@ ${effect.notification.body || ""}`.trim();
         };
       }
       if (!supportsExplicitSessionStart(resume)) {
-        return { cliArgs: baseArgs, launchMode: "manual" };
+        return { cliArgs: baseArgs, launchMode: "new" };
       }
       const providerSessionId = crypto4.randomUUID();
       const newSessionArgs = expandResumeArgs(resume.newSessionArgs, providerSessionId);
@@ -39555,7 +40008,7 @@ ${effect.notification.body || ""}`.trim();
       async startSession(cliType, workingDir, cliArgs, initialModel, options) {
         const trimmed = (workingDir || "").trim();
         if (!trimmed) throw new Error("working directory required");
-        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os12.homedir()) : path12.resolve(trimmed);
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os12.homedir()) : path13.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
         const provider = this.providerLoader.getByAlias(cliType);
         const key = crypto4.randomUUID();
@@ -39603,7 +40056,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();
@@ -40012,7 +40466,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" };
@@ -40032,12 +40487,138 @@ Run 'adhdev doctor' for detailed diagnostics.`
     var import_child_process6 = require("child_process");
     var net3 = __toESM2(require("net"));
     var os14 = __toESM2(require("os"));
-    var path14 = __toESM2(require("path"));
+    var path15 = __toESM2(require("path"));
     var fs6 = __toESM2(require("fs"));
-    var path13 = __toESM2(require("path"));
+    var path14 = __toESM2(require("path"));
     var os13 = __toESM2(require("os"));
     var chokidar = __toESM2((init_chokidar(), __toCommonJS(chokidar_exports)));
     init_logger();
+    var KNOWN_PROVIDER_FIELDS = /* @__PURE__ */ new Set([
+      "type",
+      "name",
+      "category",
+      "aliases",
+      "cdpPorts",
+      "targetFilter",
+      "cli",
+      "icon",
+      "displayName",
+      "install",
+      "versionCommand",
+      "testedVersions",
+      "processNames",
+      "launch",
+      "paths",
+      "extensionId",
+      "extensionIdPattern",
+      "extensionIdPattern_flags",
+      "compatibility",
+      "defaultScriptDir",
+      "binary",
+      "spawn",
+      "approvalKeys",
+      "patterns",
+      "cleanOutput",
+      "resume",
+      "sessionProbe",
+      "approvalPositiveHints",
+      "scripts",
+      "vscodeCommands",
+      "inputMethod",
+      "inputSelector",
+      "webviewMatchText",
+      "os",
+      "versions",
+      "overrides",
+      "settings",
+      "controls",
+      "staticConfigOptions",
+      "spawnArgBuilder",
+      "auth",
+      "contractVersion",
+      "capabilities",
+      "providerVersion",
+      "status",
+      "details",
+      "sendDelayMs",
+      "sendKey",
+      "submitStrategy",
+      "disableUpstream"
+    ]);
+    var VALUE_CONTROL_TYPES = /* @__PURE__ */ new Set(["select", "toggle", "cycle", "slider"]);
+    function validateProviderDefinition(raw) {
+      const errors = [];
+      const warnings = [];
+      if (!raw || typeof raw !== "object") {
+        return { errors: ["Provider definition must be an object"], warnings };
+      }
+      const provider = raw;
+      if (!provider.type) errors.push("Missing required field: type");
+      if (!provider.name) errors.push("Missing required field: name");
+      if (!provider.category) {
+        errors.push("Missing required field: category");
+      } else if (!["ide", "extension", "cli", "acp"].includes(String(provider.category))) {
+        errors.push(`Invalid category: ${String(provider.category)}`);
+      }
+      for (const key of Object.keys(provider)) {
+        if (!KNOWN_PROVIDER_FIELDS.has(key)) {
+          warnings.push(`Unknown provider field: ${key}`);
+        }
+      }
+      const category = provider.category;
+      if (category === "cli" || category === "acp") {
+        const spawn4 = provider.spawn;
+        const command = spawn4 && typeof spawn4 === "object" ? spawn4.command : void 0;
+        if (!spawn4 || typeof spawn4 !== "object") {
+          errors.push(`${String(category).toUpperCase()}/CLI providers must have spawn config`);
+        } else if (typeof command !== "string" || !command.trim()) {
+          errors.push("spawn.command is required");
+        }
+      }
+      if ((category === "ide" || category === "extension") && provider.cdpPorts !== void 0) {
+        if (!Array.isArray(provider.cdpPorts) || provider.cdpPorts.length === 0) {
+          warnings.push("IDE/Extension providers should have cdpPorts");
+        }
+      }
+      if (category === "extension" && !provider.extensionId) {
+        warnings.push("Extension providers should have extensionId");
+      }
+      for (const control of Array.isArray(provider.controls) ? provider.controls : []) {
+        validateControl(control, errors);
+      }
+      return { errors, warnings };
+    }
+    function validateControl(control, errors) {
+      if (!control || typeof control !== "object") {
+        errors.push("controls: each control must be an object");
+        return;
+      }
+      const id = typeof control.id === "string" && control.id.trim() ? control.id.trim() : "unknown";
+      const prefix = `controls.${id}`;
+      if (!control.id || !String(control.id).trim()) errors.push(`${prefix}: id is required`);
+      if (!control.type) errors.push(`${prefix}: type is required`);
+      if (!control.label || !String(control.label).trim()) errors.push(`${prefix}: label is required`);
+      if (!control.placement) errors.push(`${prefix}: placement is required`);
+      if (control.dynamic && !control.listScript) {
+        errors.push(`${prefix}: dynamic controls require listScript`);
+      }
+      if (VALUE_CONTROL_TYPES.has(control.type) && !control.setScript) {
+        errors.push(`${prefix}: ${control.type} controls require setScript`);
+      }
+      if (control.type === "action" && !control.invokeScript) {
+        errors.push(`${prefix}: action controls require invokeScript`);
+      }
+      if (control.type === "slider") {
+        if (typeof control.min !== "number" || typeof control.max !== "number") {
+          errors.push(`${prefix}: slider controls require numeric min and max`);
+        } else if (control.min > control.max) {
+          errors.push(`${prefix}: slider min cannot exceed max`);
+        }
+      }
+      if (control.readFrom !== void 0 && (typeof control.readFrom !== "string" || !control.readFrom.trim())) {
+        errors.push(`${prefix}: readFrom must be a non-empty string when provided`);
+      }
+    }
     var ProviderLoader = class _ProviderLoader {
       providers = /* @__PURE__ */ new Map();
       providerAvailability = /* @__PURE__ */ new Map();
@@ -40056,12 +40637,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG2.forComponent("Provider").asLogFn();
-        const defaultProvidersDir = path13.join(os13.homedir(), ".adhdev", "providers");
+        const defaultProvidersDir = path14.join(os13.homedir(), ".adhdev", "providers");
         if (options?.userDir) {
           this.userDir = options.userDir;
           this.log(`Config 'providerDir' applied: ${this.userDir}`);
         } else {
-          const localRepoPath = path13.resolve(__dirname, "../../../../../adhdev-providers");
+          const localRepoPath = path14.resolve(__dirname, "../../../../../adhdev-providers");
           if (fs6.existsSync(localRepoPath)) {
             this.userDir = localRepoPath;
             this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
@@ -40070,7 +40651,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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) {
@@ -40100,7 +40681,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       * 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.
@@ -40127,7 +40708,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       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)
@@ -40166,7 +40747,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         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;
@@ -40481,8 +41062,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   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;
                 }
@@ -40497,8 +41078,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 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.`;
@@ -40515,8 +41096,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   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) {
@@ -40532,8 +41113,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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;
             }
           }
         }
@@ -40558,14 +41139,14 @@ Run 'adhdev doctor' for detailed diagnostics.`
           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)];
@@ -40607,7 +41188,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 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();
               }
             };
@@ -40662,7 +41243,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
         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 {
@@ -40722,17 +41303,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
             return { updated: false };
           }
           this.log("Downloading latest providers from GitHub...");
-          const tmpTar = path13.join(os13.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-          const tmpExtract = path13.join(os13.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+          const tmpTar = path14.join(os13.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+          const tmpExtract = path14.join(os13.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
           await this.downloadFile(_ProviderLoader.GITHUB_TARBALL_URL, tmpTar);
           fs6.mkdirSync(tmpExtract, { recursive: true });
           execSync7(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
           const extracted = fs6.readdirSync(tmpExtract);
           const rootDir = extracted.find(
-            (d) => fs6.statSync(path13.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
+            (d) => fs6.statSync(path14.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
           );
           if (!rootDir) throw new Error("Unexpected tarball structure");
-          const sourceDir = path13.join(tmpExtract, rootDir);
+          const sourceDir = path14.join(tmpExtract, rootDir);
           const backupDir = this.upstreamDir + ".bak";
           if (fs6.existsSync(this.upstreamDir)) {
             if (fs6.existsSync(backupDir)) fs6.rmSync(backupDir, { recursive: true, force: true });
@@ -40807,8 +41388,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
       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 {
@@ -40819,7 +41400,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       /** .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,
@@ -40836,7 +41417,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         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 {
@@ -41021,17 +41602,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
         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 {
                   }
                 }
@@ -41048,7 +41629,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
        * (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)];
@@ -41062,7 +41643,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           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");
@@ -41122,24 +41703,28 @@ Run 'adhdev doctor' for detailed diagnostics.`
           }
           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)];
@@ -41165,7 +41750,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               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));
             }
           }
         };
@@ -41421,8 +42006,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
           const appNameMap = getMacAppIdentifiers();
           const appName = appNameMap[ideId];
           if (appName) {
-            const storagePath = path14.join(
-              process.env.APPDATA || path14.join(os14.homedir(), "AppData", "Roaming"),
+            const storagePath = path15.join(
+              process.env.APPDATA || path15.join(os14.homedir(), "AppData", "Roaming"),
               appName,
               "storage.json"
             );
@@ -41596,9 +42181,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
     init_config();
     init_logger();
     var fs7 = __toESM2(require("fs"));
-    var path15 = __toESM2(require("path"));
+    var path16 = __toESM2(require("path"));
     var os15 = __toESM2(require("os"));
-    var LOG_DIR2 = process.platform === "win32" ? path15.join(process.env.LOCALAPPDATA || process.env.APPDATA || path15.join(os15.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path15.join(os15.homedir(), "Library", "Logs", "adhdev") : path15.join(os15.homedir(), ".local", "share", "adhdev", "logs");
+    var LOG_DIR2 = process.platform === "win32" ? path16.join(process.env.LOCALAPPDATA || process.env.APPDATA || path16.join(os15.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path16.join(os15.homedir(), "Library", "Logs", "adhdev") : path16.join(os15.homedir(), ".local", "share", "adhdev", "logs");
     var MAX_FILE_SIZE = 5 * 1024 * 1024;
     var MAX_DAYS = 7;
     try {
@@ -41636,13 +42221,13 @@ Run 'adhdev doctor' for detailed diagnostics.`
       return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
     }
     var currentDate2 = getDateStr2();
-    var currentFile = path15.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+    var currentFile = path16.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
     var writeCount2 = 0;
     function checkRotation() {
       const today = getDateStr2();
       if (today !== currentDate2) {
         currentDate2 = today;
-        currentFile = path15.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+        currentFile = path16.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
         cleanOldFiles();
       }
     }
@@ -41656,7 +42241,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           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 {
             }
           }
@@ -41967,13 +42552,13 @@ Run 'adhdev doctor' for detailed diagnostics.`
     var import_child_process8 = require("child_process");
     var fs8 = __toESM2(require("fs"));
     var os17 = __toESM2(require("os"));
-    var path16 = __toESM2(require("path"));
+    var path17 = __toESM2(require("path"));
     var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
     function getUpgradeLogPath() {
       const home = os17.homedir();
-      const dir = path16.join(home, ".adhdev");
+      const dir = path17.join(home, ".adhdev");
       fs8.mkdirSync(dir, { recursive: true });
-      return path16.join(dir, "daemon-upgrade.log");
+      return path17.join(dir, "daemon-upgrade.log");
     }
     function appendUpgradeLog(message) {
       const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${message}
@@ -42013,7 +42598,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     }
     function stopSessionHostProcesses(appName) {
-      const pidFile = path16.join(os17.homedir(), ".adhdev", `${appName}-session-host.pid`);
+      const pidFile = path17.join(os17.homedir(), ".adhdev", `${appName}-session-host.pid`);
       try {
         if (fs8.existsSync(pidFile)) {
           const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
@@ -42042,7 +42627,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     }
     function removeDaemonPidFile() {
-      const pidFile = path16.join(os17.homedir(), ".adhdev", "daemon.pid");
+      const pidFile = path17.join(os17.homedir(), ".adhdev", "daemon.pid");
       try {
         fs8.unlinkSync(pidFile);
       } catch {
@@ -42053,7 +42638,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       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") {
@@ -42061,25 +42646,25 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
       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)}`);
         }
       }
     }
@@ -43937,11 +44522,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     };
     var fs10 = __toESM2(require("fs"));
-    var path17 = __toESM2(require("path"));
+    var path18 = __toESM2(require("path"));
     var os18 = __toESM2(require("os"));
     var import_child_process9 = require("child_process");
     var import_os3 = require("os");
-    var ARCHIVE_PATH = path17.join(os18.homedir(), ".adhdev", "version-history.json");
+    var ARCHIVE_PATH = path18.join(os18.homedir(), ".adhdev", "version-history.json");
     var MAX_ENTRIES_PER_PROVIDER = 20;
     var VersionArchive = class {
       history = {};
@@ -43988,7 +44573,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
       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 {
         }
@@ -44045,7 +44630,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       for (const p of paths) {
         if (p.includes("*")) {
           const home = os18.homedir();
-          const resolved = p.replace(/\*/g, home.split(path17.sep).pop() || "");
+          const resolved = p.replace(/\*/g, home.split(path18.sep).pop() || "");
           if (fs10.existsSync(resolved)) return resolved;
         } else {
           if (fs10.existsSync(p)) return p;
@@ -44055,7 +44640,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     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;
@@ -44081,7 +44666,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           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);
@@ -44120,7 +44705,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     var http2 = __toESM2(require("http"));
     var fs14 = __toESM2(require("fs"));
-    var path21 = __toESM2(require("path"));
+    var path222 = __toESM2(require("path"));
     function generateFiles(type, name, category, opts = {}) {
       const { cdpPorts, cli, processName, installPath, binary, extensionId, version: version2 = "0.1" } = opts;
       if (category === "cli" || category === "acp") {
@@ -44450,7 +45035,7 @@ async (params) => {
     }
     init_logger();
     var fs11 = __toESM2(require("fs"));
-    var path18 = __toESM2(require("path"));
+    var path19 = __toESM2(require("path"));
     init_logger();
     async function handleCdpEvaluate(ctx, req, res) {
       const body = await ctx.readBody(req);
@@ -44629,17 +45214,17 @@ async (params) => {
         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;
@@ -45466,7 +46051,7 @@ async (params) => {
       }
     }
     var fs12 = __toESM2(require("fs"));
-    var path19 = __toESM2(require("path"));
+    var path20 = __toESM2(require("path"));
     function slugifyFixtureName(value) {
       const normalized = String(value || "").trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
       return normalized || `fixture-${Date.now()}`;
@@ -45476,11 +46061,11 @@ async (params) => {
       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}`);
       }
@@ -46248,7 +46833,7 @@ async (params) => {
           },
           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,
@@ -46272,7 +46857,7 @@ async (params) => {
           return;
         }
         const fixtures = fs12.readdirSync(fixtureDir).filter((file2) => file2.endsWith(".json")).sort((a, b2) => b2.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 {
@@ -46406,7 +46991,7 @@ async (params) => {
       }
     }
     var fs13 = __toESM2(require("fs"));
-    var path20 = __toESM2(require("path"));
+    var path21 = __toESM2(require("path"));
     var os19 = __toESM2(require("os"));
     function getAutoImplPid(ctx) {
       const pid = ctx.autoImplProcess?.pid;
@@ -46463,22 +47048,22 @@ async (params) => {
       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, b2) => b2.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);
@@ -46486,11 +47071,11 @@ async (params) => {
         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}` };
       }
@@ -46513,13 +47098,13 @@ async (params) => {
       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 {
         }
       }
@@ -46627,9 +47212,9 @@ async (params) => {
         });
         const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
         const prompt = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-        const tmpDir = path20.join(os19.tmpdir(), "adhdev-autoimpl");
+        const tmpDir = path21.join(os19.tmpdir(), "adhdev-autoimpl");
         if (!fs13.existsSync(tmpDir)) fs13.mkdirSync(tmpDir, { recursive: true });
-        const promptFile = path20.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
+        const promptFile = path21.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
         fs13.writeFileSync(promptFile, prompt, "utf-8");
         ctx.log(`Auto-implement prompt written to ${promptFile} (${prompt.length} chars)`);
         const agentProvider = ctx.providerLoader.resolve(agent) || ctx.providerLoader.getMeta(agent);
@@ -47066,7 +47651,7 @@ async (params) => {
         setMode: "set_mode.js"
       };
       const targetFileNames = new Set(functions.map((fn2) => funcToFile[fn2]).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}\``);
@@ -47077,7 +47662,7 @@ async (params) => {
         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);
@@ -47094,7 +47679,7 @@ async (params) => {
           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);
@@ -47135,10 +47720,10 @@ async (params) => {
           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 {
         }
@@ -47375,7 +47960,7 @@ async (params) => {
         parseApproval: "parse_approval.js"
       };
       const targetFileNames = new Set(functions.map((fn2) => funcToFile[fn2]).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}\``);
@@ -47387,7 +47972,7 @@ async (params) => {
           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);
@@ -47403,7 +47988,7 @@ async (params) => {
           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);
@@ -47436,10 +48021,10 @@ async (params) => {
           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 {
         }
@@ -47880,8 +48465,8 @@ data: ${JSON.stringify(msg.data)}
       }
       getEndpointList() {
         return this.routes.map((r) => {
-          const path222 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-          return `${r.method.padEnd(5)} ${path222}`;
+          const path23 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path23}`;
         });
       }
       async start(port = DEV_SERVER_PORT) {
@@ -48136,12 +48721,12 @@ data: ${JSON.stringify(msg.data)}
       // ─── 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")
+          path222.resolve(__dirname, "../../web-devconsole/dist"),
+          path222.resolve(__dirname, "../../../web-devconsole/dist"),
+          path222.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(path222.join(dir, "index.html"))) return dir;
         }
         return null;
       }
@@ -48151,7 +48736,7 @@ data: ${JSON.stringify(msg.data)}
           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 = path222.join(distDir, "index.html");
         try {
           const html = fs14.readFileSync(htmlPath, "utf-8");
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -48176,15 +48761,15 @@ data: ${JSON.stringify(msg.data)}
           this.json(res, 404, { error: "Not found" });
           return;
         }
-        const safePath = path21.normalize(pathname).replace(/^\.\.\//, "");
-        const filePath = path21.join(distDir, safePath);
+        const safePath = path222.normalize(pathname).replace(/^\.\.\//, "");
+        const filePath = path222.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 = path222.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);
@@ -48297,9 +48882,9 @@ data: ${JSON.stringify(msg.data)}
               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(path222.join(d, entry.name), rel);
               } else {
-                const stat4 = fs14.statSync(path21.join(d, entry.name));
+                const stat4 = fs14.statSync(path222.join(d, entry.name));
                 files.push({ path: rel, size: stat4.size, type: "file" });
               }
             }
@@ -48322,7 +48907,7 @@ data: ${JSON.stringify(msg.data)}
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path21.resolve(dir, path21.normalize(filePath));
+        const fullPath = path222.resolve(dir, path222.normalize(filePath));
         if (!fullPath.startsWith(dir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
@@ -48347,14 +48932,14 @@ data: ${JSON.stringify(msg.data)}
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path21.resolve(dir, path21.normalize(filePath));
+        const fullPath = path222.resolve(dir, path222.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(path222.dirname(fullPath), { recursive: true });
           fs14.writeFileSync(fullPath, content, "utf-8");
           this.log(`File saved: ${fullPath} (${content.length} chars)`);
           this.providerLoader.reload();
@@ -48371,7 +48956,7 @@ data: ${JSON.stringify(msg.data)}
           return;
         }
         for (const name of ["scripts.js", "provider.json"]) {
-          const p = path21.join(dir, name);
+          const p = path222.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 });
@@ -48392,8 +48977,8 @@ data: ${JSON.stringify(msg.data)}
           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(path222.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
+        const targetPath = path222.join(dir, target);
         try {
           if (fs14.existsSync(targetPath)) fs14.copyFileSync(targetPath, targetPath + ".bak");
           fs14.writeFileSync(targetPath, source, "utf-8");
@@ -48421,22 +49006,9 @@ data: ${JSON.stringify(msg.data)}
         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 s15 = val;
@@ -48553,7 +49125,7 @@ data: ${JSON.stringify(msg.data)}
         }
         let targetDir;
         targetDir = this.providerLoader.getUserProviderDir(category, type);
-        const jsonPath = path21.join(targetDir, "provider.json");
+        const jsonPath = path222.join(targetDir, "provider.json");
         if (fs14.existsSync(jsonPath)) {
           this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
           return;
@@ -48565,8 +49137,8 @@ data: ${JSON.stringify(msg.data)}
           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 = path222.join(targetDir, relPath);
+              fs14.mkdirSync(path222.dirname(fullPath), { recursive: true });
               fs14.writeFileSync(fullPath, content, "utf-8");
               createdFiles.push(relPath);
             }
@@ -48619,22 +49191,22 @@ data: ${JSON.stringify(msg.data)}
         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(path222.join(scriptsDir, d)).isDirectory();
           } catch {
             return false;
           }
         }).sort((a, b2) => b2.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
         if (versions.length === 0) return null;
-        return path21.join(scriptsDir, versions[0]);
+        return path222.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 = path222.resolve(this.providerLoader.getUserProviderDir(category, type));
+        const desiredDir = requestedDir ? path222.resolve(requestedDir) : canonicalUserDir;
+        const upstreamRoot = path222.resolve(this.providerLoader.getUpstreamDir());
+        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path222.sep}`)) {
           return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
         }
-        if (path21.basename(desiredDir) !== type) {
+        if (path222.basename(desiredDir) !== type) {
           return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
         }
         const sourceDir = this.findProviderDir(type);
@@ -48642,11 +49214,11 @@ data: ${JSON.stringify(msg.data)}
           return { dir: null, reason: `Provider source directory not found for '${type}'` };
         }
         if (!fs14.existsSync(desiredDir)) {
-          fs14.mkdirSync(path21.dirname(desiredDir), { recursive: true });
+          fs14.mkdirSync(path222.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 = path222.join(desiredDir, "provider.json");
         if (!fs14.existsSync(providerJson)) {
           return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
         }
@@ -48694,7 +49266,7 @@ data: ${JSON.stringify(msg.data)}
           setMode: "set_mode.js"
         };
         const targetFileNames = new Set(functions.map((fn2) => funcToFile[fn2]).filter(Boolean));
-        const scriptsDir = path21.join(providerDir, "scripts");
+        const scriptsDir = path222.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -48705,7 +49277,7 @@ data: ${JSON.stringify(msg.data)}
           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(path222.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -48722,7 +49294,7 @@ data: ${JSON.stringify(msg.data)}
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path222.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -48763,10 +49335,10 @@ data: ${JSON.stringify(msg.data)}
             lines.push("");
           }
         }
-        const docsDir = path21.join(providerDir, "../../docs");
+        const docsDir = path222.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path21.join(docsDir, name);
+            const p = path222.join(docsDir, name);
             if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
           } catch {
           }
@@ -48940,7 +49512,7 @@ data: ${JSON.stringify(msg.data)}
           parseApproval: "parse_approval.js"
         };
         const targetFileNames = new Set(functions.map((fn2) => funcToFile[fn2]).filter(Boolean));
-        const scriptsDir = path21.join(providerDir, "scripts");
+        const scriptsDir = path222.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -48952,7 +49524,7 @@ data: ${JSON.stringify(msg.data)}
             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(path222.join(latestScriptsDir, file2), "utf-8");
               lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
               lines.push("```javascript");
               lines.push(content);
@@ -48968,7 +49540,7 @@ data: ${JSON.stringify(msg.data)}
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs14.readFileSync(path21.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path222.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -49001,10 +49573,10 @@ data: ${JSON.stringify(msg.data)}
             lines.push("");
           }
         }
-        const docsDir = path21.join(providerDir, "../../docs");
+        const docsDir = path222.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path21.join(docsDir, name);
+            const p = path222.join(docsDir, name);
             if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
           } catch {
           }
@@ -49703,6 +50275,63 @@ data: ${JSON.stringify(msg.data)}
         });
       }
     }
+    var LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
+    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 || []);
+    }
+    function shouldAutoRestoreHostedSessionsOnStartup2(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 import_child_process10 = require("child_process");
     var EXTENSION_CATALOG = [
       // AI Agent extensions
@@ -50321,6 +50950,12 @@ async function proxySessionHostAttach(target, options = {}) {
   return runSessionHostCli(args);
 }
 
+// src/startup-restore-policy.ts
+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";
+}
+
 // ../session-host-core/dist/index.mjs
 var os3 = __toESM(require("os"), 1);
 var path2 = __toESM(require("path"), 1);
@@ -50892,7 +51527,9 @@ var StandaloneServer = class {
       tickIntervalMs: 3e3,
       cdpScanIntervalMs: 15e3
     });
-    await this.components.cliManager.restoreHostedSessions();
+    if (shouldAutoRestoreHostedSessionsOnStartup(process.env)) {
+      await this.components.cliManager.restoreHostedSessions();
+    }
     if (options.dev) {
       this.devServer = await (0, import_daemon_core2.startDaemonDevSupport)({
         components: this.components,
@@ -51913,7 +52550,7 @@ async function main() {
   if (primaryCommand === "attach") {
     const target = args[1];
     if (!target) {
-      console.error("Usage: adhdev attach <sessionId> [--read-only|--takeover]");
+      console.error("Usage: adhdev-standalone attach <sessionId> [--read-only|--takeover]");
       process.exit(1);
     }
     const readOnly = args.includes("--read-only");