adhdev 0.5.7 → 0.5.11

package/dist/{cli-entrypoint.js → cli/index.js}

@@ -16558,10 +16558,10 @@ var require_dist = __commonJS({
       addCliHistory: () => addCliHistory,
       generateConnectionToken: () => generateConnectionToken,
       getConfigDir: () => getConfigDir,
-      isSetupComplete: () => isSetupComplete3,
-      loadConfig: () => loadConfig4,
+      isSetupComplete: () => isSetupComplete2,
+      loadConfig: () => loadConfig3,
       markSetupComplete: () => markSetupComplete2,
-      resetConfig: () => resetConfig2,
+      resetConfig: () => resetConfig,
       saveConfig: () => saveConfig2,
       updateConfig: () => updateConfig2
     });
@@ -16575,7 +16575,7 @@ var require_dist = __commonJS({
     function getConfigPath() {
       return (0, import_path2.join)(getConfigDir(), "config.json");
     }
-    function loadConfig4() {
+    function loadConfig3() {
       const configPath = getConfigPath();
       if (!(0, import_fs2.existsSync)(configPath)) {
         return { ...DEFAULT_CONFIG };
@@ -16614,7 +16614,7 @@ var require_dist = __commonJS({
       }
     }
     function updateConfig2(updates) {
-      const config2 = loadConfig4();
+      const config2 = loadConfig3();
       const updated = { ...config2, ...updates };
       saveConfig2(updated);
       return updated;
@@ -16629,11 +16629,11 @@ var require_dist = __commonJS({
         setupDate: (/* @__PURE__ */ new Date()).toISOString()
       });
     }
-    function isSetupComplete3() {
-      const config2 = loadConfig4();
+    function isSetupComplete2() {
+      const config2 = loadConfig3();
       return config2.setupCompleted;
     }
-    function resetConfig2() {
+    function resetConfig() {
       saveConfig2({ ...DEFAULT_CONFIG });
     }
     function generateConnectionToken() {
@@ -16645,7 +16645,7 @@ var require_dist = __commonJS({
       return token;
     }
     function addCliHistory(entry) {
-      const config2 = loadConfig4();
+      const config2 = loadConfig3();
       const history = config2.cliHistory || [];
       const argsKey = (entry.cliArgs || []).join(" ");
       const filtered = history.filter((h) => {
@@ -16723,10 +16723,10 @@ var require_dist = __commonJS({
       addCliHistory: () => addCliHistory,
       connectCdpManager: () => connectCdpManager,
       detectAllVersions: () => detectAllVersions2,
-      detectCLIs: () => detectCLIs2,
-      detectIDEs: () => detectIDEs3,
+      detectCLIs: () => detectCLIs,
+      detectIDEs: () => detectIDEs2,
       getAIExtensions: () => getAIExtensions2,
-      getAvailableIdeIds: () => getAvailableIdeIds2,
+      getAvailableIdeIds: () => getAvailableIdeIds,
       getHostMemorySnapshot: () => getHostMemorySnapshot,
       getLogLevel: () => getLogLevel,
       getRecentCommands: () => getRecentCommands,
@@ -16737,16 +16737,16 @@ var require_dist = __commonJS({
       installExtensions: () => installExtensions2,
       installGlobalInterceptor: () => installGlobalInterceptor,
       isExtensionInstalled: () => isExtensionInstalled,
-      isSetupComplete: () => isSetupComplete3,
+      isSetupComplete: () => isSetupComplete2,
       launchIDE: () => launchIDE2,
-      launchWithCdp: () => launchWithCdp2,
-      loadConfig: () => loadConfig4,
+      launchWithCdp: () => launchWithCdp,
+      loadConfig: () => loadConfig3,
       logCommand: () => logCommand2,
       markSetupComplete: () => markSetupComplete2,
       probeCdpPort: () => probeCdpPort,
       readChatHistory: () => readChatHistory2,
       registerExtensionProviders: () => registerExtensionProviders,
-      resetConfig: () => resetConfig2,
+      resetConfig: () => resetConfig,
       saveConfig: () => saveConfig2,
       setLogLevel: () => setLogLevel2,
       setupIdeInstance: () => setupIdeInstance,
@@ -16850,7 +16850,7 @@ var require_dist = __commonJS({
       }
       return null;
     }
-    async function detectIDEs3() {
+    async function detectIDEs2() {
       const os15 = (0, import_os2.platform)();
       const results = [];
       for (const def of getMergedDefinitions()) {
@@ -16908,7 +16908,7 @@ var require_dist = __commonJS({
         child.on("error", () => resolve7(null));
       });
     }
-    async function detectCLIs2(providerLoader) {
+    async function detectCLIs(providerLoader) {
       const platform8 = os22.platform();
       const whichCmd = platform8 === "win32" ? "where" : "which";
       const cliList = providerLoader ? providerLoader.getCliDetectionList() : [];
@@ -16937,7 +16937,7 @@ var require_dist = __commonJS({
     }
     async function detectCLI(cliId, providerLoader) {
       const resolvedId = providerLoader ? providerLoader.resolveAlias(cliId) : cliId;
-      const all = await detectCLIs2(providerLoader);
+      const all = await detectCLIs(providerLoader);
       return all.find((c) => c.id === resolvedId && c.installed) || null;
     }
     var os32 = __toESM2(require("os"));
@@ -18406,9 +18406,9 @@ var require_dist = __commonJS({
       // meta
       instanceId;
       ideType = "";
-      constructor(provider2) {
-        this.type = provider2.type;
-        this.provider = provider2;
+      constructor(provider) {
+        this.type = provider.type;
+        this.provider = provider;
         this.instanceId = crypto.randomUUID();
         this.monitor = new StatusMonitor();
       }
@@ -18655,13 +18655,12 @@ var require_dist = __commonJS({
       // IDE meta
       ideVersion = "";
       instanceId;
-      workspaceFolders = [];
-      activeFile = null;
+      workspace = "";
       // ─── Child Extension Instances ────────────────────
       extensions = /* @__PURE__ */ new Map();
-      constructor(provider2, instanceKey) {
-        this.type = provider2.type;
-        this.provider = provider2;
+      constructor(provider, instanceKey) {
+        this.type = provider.type;
+        this.provider = provider;
         this.instanceId = crypto22.randomUUID();
         this.monitor = new StatusMonitor();
         this.historyWriter = new ChatHistoryWriter();
@@ -18699,7 +18698,7 @@ var require_dist = __commonJS({
         }
       }
       getState() {
-        const cdp2 = this.context?.cdp;
+        const cdp = this.context?.cdp;
         const extensionStates = [];
         for (const ext of this.extensions.values()) {
           extensionStates.push(ext.getState());
@@ -18717,10 +18716,9 @@ var require_dist = __commonJS({
             activeModal: this.cachedChat.activeModal || null,
             inputContent: this.cachedChat.inputContent || ""
           } : null,
-          workspaceFolders: this.workspaceFolders,
-          activeFile: this.activeFile,
+          workspace: this.workspace || null,
           extensions: extensionStates,
-          cdpConnected: cdp2?.isConnected || false,
+          cdpConnected: cdp?.isConnected || false,
           currentModel: this.cachedChat?.model || void 0,
           currentPlan: this.cachedChat?.mode || void 0,
           currentAutoApprove: this.cachedChat?.autoApprove || void 0,
@@ -18735,11 +18733,6 @@ var require_dist = __commonJS({
         } else if (event === "cdp_disconnected") {
           this.cachedChat = null;
           this.currentStatus = "idle";
-        } else if (event === "extension_data") {
-          if (data?.workspaceFolders) this.workspaceFolders = data.workspaceFolders;
-          if (data?.activeFile) this.activeFile = data.activeFile;
-          if (data?.ideVersion) this.ideVersion = data.ideVersion;
-          if (data?.instanceId) this.instanceId = data.instanceId;
         } else if (event === "stream_update") {
           const extType = data?.extensionType;
           if (extType && this.extensions.has(extType)) {
@@ -18759,17 +18752,17 @@ var require_dist = __commonJS({
       }
       // ─── Extension manage ─────────────────────────────
       /** Extension Instance add */
-      async addExtension(provider2, settings) {
-        if (this.extensions.has(provider2.type)) return;
-        const ext = new ExtensionProviderInstance(provider2);
+      async addExtension(provider, settings) {
+        if (this.extensions.has(provider.type)) return;
+        const ext = new ExtensionProviderInstance(provider);
         await ext.init({
           cdp: this.context?.cdp,
           serverConn: this.context?.serverConn,
           settings: settings || {}
         });
         ext.onEvent("extension_connected", { ideType: this.type });
-        this.extensions.set(provider2.type, ext);
-        LOG5.info("IdeInstance", `[IdeInstance:${this.type}] Extension added: ${provider2.type}`);
+        this.extensions.set(provider.type, ext);
+        LOG5.info("IdeInstance", `[IdeInstance:${this.type}] Extension added: ${provider.type}`);
       }
       /** Extension Instance remove */
       removeExtension(type) {
@@ -18795,19 +18788,23 @@ var require_dist = __commonJS({
       getExtensionInstances() {
         return [...this.extensions.values()];
       }
+      /** Set workspace from daemon launch context */
+      setWorkspace(workspace) {
+        this.workspace = workspace;
+      }
       // ─── CDP readChat ───────────────────────────────
       async readChat() {
-        const { cdp: cdp2 } = this.context;
-        if (!cdp2?.isConnected) return;
+        const { cdp } = this.context;
+        if (!cdp?.isConnected) return;
         try {
           let raw = null;
           const webviewFn = this.provider.scripts?.webviewReadChat;
-          if (typeof webviewFn === "function" && cdp2.evaluateInWebviewFrame) {
+          if (typeof webviewFn === "function" && cdp.evaluateInWebviewFrame) {
             const webviewScript = webviewFn();
             if (webviewScript) {
               const matchText = this.provider.webviewMatchText;
               const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-              const webviewRaw = await cdp2.evaluateInWebviewFrame(webviewScript, matchFn);
+              const webviewRaw = await cdp.evaluateInWebviewFrame(webviewScript, matchFn);
               if (webviewRaw) {
                 raw = typeof webviewRaw === "string" ? (() => {
                   try {
@@ -18822,7 +18819,7 @@ var require_dist = __commonJS({
           if (!raw) {
             const readChatScript = this.getReadChatScript();
             if (!readChatScript) return;
-            raw = await cdp2.evaluate(readChatScript, 3e4);
+            raw = await cdp.evaluate(readChatScript, 3e4);
             if (typeof raw === "string") {
               try {
                 raw = JSON.parse(raw);
@@ -18943,8 +18940,8 @@ var require_dist = __commonJS({
         return events;
       }
       // ─── external access ─────────────────────────────────
-      updateCdp(cdp2) {
-        if (this.context) this.context.cdp = cdp2;
+      updateCdp(cdp) {
+        if (this.context) this.context.cdp = cdp;
       }
     };
     function registerExtensionProviders(providerLoader, manager, ideType) {
@@ -18984,12 +18981,12 @@ var require_dist = __commonJS({
       return ideInstance;
     }
     async function connectCdpManager(port, ideType, logFn, providerLoader, targetId) {
-      const provider2 = providerLoader.getMeta(ideType);
+      const provider = providerLoader.getMeta(ideType);
       const manager = new DaemonCdpManager2(
         port,
         logFn,
         targetId,
-        provider2?.targetFilter
+        provider?.targetFilter
       );
       const connected = await manager.connect();
       return connected ? manager : null;
@@ -19192,12 +19189,12 @@ var require_dist = __commonJS({
         const targets = await DaemonCdpManager2.listAllTargets(port);
         if (targets.length === 0) {
           if (!await probeCdpPort(port)) return;
-          const provider2 = providerLoader.getMeta(ide);
+          const provider = providerLoader.getMeta(ide);
           const manager = new DaemonCdpManager2(
             port,
             LOG5.forComponent(`CDP:${ide}`).asLogFn(),
             void 0,
-            provider2?.targetFilter
+            provider?.targetFilter
           );
           const connected = await manager.connect();
           if (connected) {
@@ -19218,12 +19215,12 @@ var require_dist = __commonJS({
             managerKey = `${ide}_${workspaceName}`;
           }
           if (cdpManagers.has(managerKey)) continue;
-          const provider2 = providerLoader.getMeta(ide);
+          const provider = providerLoader.getMeta(ide);
           const manager = new DaemonCdpManager2(
             port,
             LOG5.forComponent(`CDP:${managerKey}`).asLogFn(),
             target.id,
-            provider2?.targetFilter
+            provider?.targetFilter
           );
           const connected = await manager.connect();
           if (connected) {
@@ -19283,8 +19280,8 @@ var require_dist = __commonJS({
     async function handleChatHistory(h, args) {
       const { agentType, offset, limit, instanceId } = args;
       try {
-        const provider2 = h.getProvider(agentType);
-        const agentStr = provider2?.type || agentType || h.currentIdeType || "";
+        const provider = h.getProvider(agentType);
+        const agentStr = provider?.type || agentType || h.currentIdeType || "";
         const result = readChatHistory2(agentStr, offset || 0, limit || 30, instanceId);
         return { success: true, ...result, agent: agentStr };
       } catch (e) {
@@ -19292,20 +19289,20 @@ var require_dist = __commonJS({
       }
     }
     async function handleReadChat(h, args) {
-      const provider2 = h.getProvider();
+      const provider = h.getProvider();
       const _log = (msg) => LOG5.debug("Command", `[read_chat] ${msg}`);
-      if (provider2?.category === "cli" || provider2?.category === "acp") {
-        const adapter = h.getCliAdapter(provider2.type);
+      if (provider?.category === "cli" || provider?.category === "acp") {
+        const adapter = h.getCliAdapter(provider.type);
         if (adapter) {
-          _log(`${provider2.category} adapter: ${adapter.cliType}`);
+          _log(`${provider.category} adapter: ${adapter.cliType}`);
           const status = adapter.getStatus?.();
           if (status) {
             return { success: true, messages: status.messages || [], status: status.status, activeModal: status.activeModal };
           }
         }
-        return { success: false, error: `${provider2.category} adapter not found` };
+        return { success: false, error: `${provider.category} adapter not found` };
       }
-      if (provider2?.category === "extension") {
+      if (provider?.category === "extension") {
         try {
           const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
           if (evalResult?.result) {
@@ -19319,7 +19316,7 @@ var require_dist = __commonJS({
             if (parsed && typeof parsed === "object") {
               _log(`Extension OK: ${parsed.messages?.length || 0} msgs`);
               h.historyWriter.appendNewMessages(
-                provider2.type || "unknown_extension",
+                provider.type || "unknown_extension",
                 parsed.messages || [],
                 parsed.title,
                 args?.instanceId
@@ -19331,10 +19328,10 @@ var require_dist = __commonJS({
           _log(`Extension error: ${e.message}`);
         }
         if (h.agentStream) {
-          const cdp22 = h.getCdp();
-          if (cdp22) {
-            const streams = await h.agentStream.collectAgentStreams(cdp22);
-            const stream = streams.find((s) => s.agentType === provider2.type);
+          const cdp2 = h.getCdp();
+          if (cdp2) {
+            const streams = await h.agentStream.collectAgentStreams(cdp2);
+            const stream = streams.find((s) => s.agentType === provider.type);
             if (stream) {
               h.historyWriter.appendNewMessages(
                 stream.agentType,
@@ -19348,14 +19345,14 @@ var require_dist = __commonJS({
         }
         return { success: true, messages: [], status: "idle" };
       }
-      const cdp2 = h.getCdp();
-      if (!cdp2?.isConnected) return { success: false, error: "CDP not connected" };
+      const cdp = h.getCdp();
+      if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
       const webviewScript = h.getProviderScript("webviewReadChat") || h.getProviderScript("webview_read_chat");
       if (webviewScript) {
         try {
-          const matchText = provider2?.webviewMatchText;
+          const matchText = provider?.webviewMatchText;
           const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-          const raw = await cdp2.evaluateInWebviewFrame(webviewScript, matchFn);
+          const raw = await cdp.evaluateInWebviewFrame(webviewScript, matchFn);
           if (raw) {
             let parsed = raw;
             if (typeof parsed === "string") {
@@ -19367,7 +19364,7 @@ var require_dist = __commonJS({
             if (parsed && typeof parsed === "object") {
               _log(`Webview OK: ${parsed.messages?.length || 0} msgs`);
               h.historyWriter.appendNewMessages(
-                provider2?.type || h.currentIdeType || "unknown_webview",
+                provider?.type || h.currentIdeType || "unknown_webview",
                 parsed.messages || [],
                 parsed.title,
                 args?.instanceId
@@ -19383,7 +19380,7 @@ var require_dist = __commonJS({
       const script = h.getProviderScript("readChat") || h.getProviderScript("read_chat");
       if (script) {
         try {
-          const result = await cdp2.evaluate(script, 5e4);
+          const result = await cdp.evaluate(script, 5e4);
           let parsed = result;
           if (typeof parsed === "string") {
             try {
@@ -19394,7 +19391,7 @@ var require_dist = __commonJS({
           if (parsed && typeof parsed === "object" && parsed.messages?.length > 0) {
             _log(`OK: ${parsed.messages?.length} msgs`);
             h.historyWriter.appendNewMessages(
-              provider2?.type || h.currentIdeType || "unknown_ide",
+              provider?.type || h.currentIdeType || "unknown_ide",
               parsed.messages || [],
               parsed.title,
               args?.instanceId
@@ -19411,21 +19408,21 @@ var require_dist = __commonJS({
       const text = args?.text || args?.message;
       if (!text) return { success: false, error: "text required" };
       const _log = (msg) => LOG5.debug("Command", `[send_chat] ${msg}`);
-      const provider2 = h.getProvider();
-      if (provider2?.category === "cli" || provider2?.category === "acp") {
-        const adapter = h.getCliAdapter(provider2.type);
+      const provider = h.getProvider();
+      if (provider?.category === "cli" || provider?.category === "acp") {
+        const adapter = h.getCliAdapter(provider.type);
         if (adapter) {
-          _log(`${provider2.category} adapter: ${adapter.cliType}`);
+          _log(`${provider.category} adapter: ${adapter.cliType}`);
           try {
             await adapter.sendMessage(text);
-            return { success: true, sent: true, method: `${provider2.category}-adapter`, targetAgent: adapter.cliType };
+            return { success: true, sent: true, method: `${provider.category}-adapter`, targetAgent: adapter.cliType };
           } catch (e) {
-            return { success: false, error: `${provider2.category} send failed: ${e.message}` };
+            return { success: false, error: `${provider.category} send failed: ${e.message}` };
           }
         }
       }
-      if (provider2?.category === "extension") {
-        _log(`Extension: ${provider2.type}`);
+      if (provider?.category === "extension") {
+        _log(`Extension: ${provider.type}`);
         try {
           const evalResult = await h.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
           if (evalResult?.result) {
@@ -19448,13 +19445,13 @@ var require_dist = __commonJS({
           _log(`Extension script error: ${e.message}`);
         }
         if (h.agentStream && h.getCdp()) {
-          const ok = await h.agentStream.sendToAgent(h.getCdp(), provider2.type, text, h.currentIdeType);
+          const ok = await h.agentStream.sendToAgent(h.getCdp(), provider.type, text, h.currentIdeType);
           if (ok) {
             _log(`AgentStreamManager sent OK`);
             return { success: true, sent: true, method: "agent-stream" };
           }
         }
-        return { success: false, error: `Extension '${provider2.type}' send failed` };
+        return { success: false, error: `Extension '${provider.type}' send failed` };
       }
       const targetCdp = h.getCdp();
       if (!targetCdp?.isConnected) {
@@ -19462,11 +19459,11 @@ var require_dist = __commonJS({
         return { success: false, error: `CDP for ${h.currentIdeType || "unknown"} not connected` };
       }
       _log(`Targeting IDE: ${h.currentIdeType}`);
-      if (provider2?.webviewMatchText && provider2?.scripts?.webviewSendMessage) {
+      if (provider?.webviewMatchText && provider?.scripts?.webviewSendMessage) {
         try {
-          const webviewScript = provider2.scripts.webviewSendMessage(text);
+          const webviewScript = provider.scripts.webviewSendMessage(text);
           if (webviewScript && targetCdp.evaluateInWebviewFrame) {
-            const matchText = provider2.webviewMatchText;
+            const matchText = provider.webviewMatchText;
             const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
             const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
             let wvParsed = wvResult;
@@ -19486,11 +19483,11 @@ var require_dist = __commonJS({
           _log(`webviewSendMessage (priority) failed: ${e.message}, falling through`);
         }
       }
-      if (provider2?.inputMethod === "cdp-type-and-send" && provider2.inputSelector) {
+      if (provider?.inputMethod === "cdp-type-and-send" && provider.inputSelector) {
         try {
-          const sent = await targetCdp.typeAndSend(provider2.inputSelector, text);
+          const sent = await targetCdp.typeAndSend(provider.inputSelector, text);
           if (sent) {
-            _log(`typeAndSend(provider.inputSelector=${provider2.inputSelector}) success`);
+            _log(`typeAndSend(provider.inputSelector=${provider.inputSelector}) success`);
             return { success: true, sent: true, method: "typeAndSend-provider" };
           }
         } catch (e) {
@@ -19523,11 +19520,11 @@ var require_dist = __commonJS({
               _log(`typeAndSend(script.selector) failed: ${e.message}`);
             }
           }
-          if (parsed?.needsTypeAndSend && provider2?.scripts?.webviewSendMessage) {
+          if (parsed?.needsTypeAndSend && provider?.scripts?.webviewSendMessage) {
             try {
-              const webviewScript = provider2.scripts.webviewSendMessage(text);
+              const webviewScript = provider.scripts.webviewSendMessage(text);
               if (webviewScript && targetCdp.evaluateInWebviewFrame) {
-                const matchText = provider2.webviewMatchText;
+                const matchText = provider.webviewMatchText;
                 const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
                 const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
                 let wvParsed = wvResult;
@@ -19566,10 +19563,10 @@ var require_dist = __commonJS({
       return { success: false, error: "No provider method could send the message" };
     }
     async function handleListChats(h, args) {
-      const provider2 = h.getProvider();
-      if (provider2?.category === "extension" && h.agentStream && h.getCdp()) {
+      const provider = h.getProvider();
+      if (provider?.category === "extension" && h.agentStream && h.getCdp()) {
         try {
-          const chats = await h.agentStream.listAgentChats(h.getCdp(), provider2.type);
+          const chats = await h.agentStream.listAgentChats(h.getCdp(), provider.type);
           LOG5.info("Command", `[list_chats] Extension: ${chats.length} chats`);
           return { success: true, chats };
         } catch (e) {
@@ -19579,7 +19576,7 @@ var require_dist = __commonJS({
       try {
         const webviewScript = h.getProviderScript("webviewListSessions") || h.getProviderScript("webview_list_sessions");
         if (webviewScript) {
-          const matchText = provider2?.webviewMatchText;
+          const matchText = provider?.webviewMatchText;
           const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
           const raw = await h.getCdp()?.evaluateInWebviewFrame?.(webviewScript, matchFn);
           let parsed = raw;
@@ -19618,15 +19615,15 @@ var require_dist = __commonJS({
       return { success: false, error: "listSessions script not available for this provider" };
     }
     async function handleNewChat(h, args) {
-      const provider2 = h.getProvider();
-      if (provider2?.category === "extension" && h.agentStream && h.getCdp()) {
-        const ok = await h.agentStream.newAgentSession(h.getCdp(), provider2.type, h.currentIdeType);
+      const provider = h.getProvider();
+      if (provider?.category === "extension" && h.agentStream && h.getCdp()) {
+        const ok = await h.agentStream.newAgentSession(h.getCdp(), provider.type, h.currentIdeType);
         return { success: ok };
       }
       try {
         const webviewScript = h.getProviderScript("webviewNewSession") || h.getProviderScript("webview_new_session");
         if (webviewScript) {
-          const matchText = provider2?.webviewMatchText;
+          const matchText = provider?.webviewMatchText;
           const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
           const raw = await h.getCdp()?.evaluateInWebviewFrame?.(webviewScript, matchFn);
           if (raw) return { success: true, result: raw };
@@ -19643,23 +19640,23 @@ var require_dist = __commonJS({
       return { success: false, error: "newSession script not available for this provider" };
     }
     async function handleSwitchChat(h, args) {
-      const provider2 = h.getProvider();
+      const provider = h.getProvider();
       const ideType = h.currentIdeType;
       const sessionId = args?.sessionId || args?.id || args?.chatId;
       if (!sessionId) return { success: false, error: "sessionId required" };
       LOG5.info("Command", `[switch_chat] sessionId=${sessionId}, ideType=${ideType}`);
-      if (provider2?.category === "extension" && h.agentStream && h.getCdp()) {
-        const ok = await h.agentStream.switchAgentSession(h.getCdp(), provider2.type, sessionId);
+      if (provider?.category === "extension" && h.agentStream && h.getCdp()) {
+        const ok = await h.agentStream.switchAgentSession(h.getCdp(), provider.type, sessionId);
         return { success: ok, result: ok ? "switched" : "failed" };
       }
-      const cdp2 = h.getCdp(ideType);
-      if (!cdp2?.isConnected) return { success: false, error: "CDP not connected" };
+      const cdp = h.getCdp(ideType);
+      if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
       try {
         const webviewScript = h.getProviderScript("webviewSwitchSession", { SESSION_ID: JSON.stringify(sessionId) });
         if (webviewScript) {
-          const matchText = provider2?.webviewMatchText;
+          const matchText = provider?.webviewMatchText;
           const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-          const raw = await cdp2.evaluateInWebviewFrame?.(webviewScript, matchFn);
+          const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
           if (raw) return { success: true, result: raw };
         }
       } catch (e) {
@@ -19668,7 +19665,7 @@ var require_dist = __commonJS({
       const script = h.getProviderScript("switchSession", { SESSION_ID: JSON.stringify(sessionId) }) || h.getProviderScript("switch_session", { SESSION_ID: JSON.stringify(sessionId) });
       if (!script) return { success: false, error: "switch_session script not available" };
       try {
-        const raw = await cdp2.evaluate(script, 15e3);
+        const raw = await cdp.evaluate(script, 15e3);
         LOG5.info("Command", `[switch_chat] result: ${raw}`);
         let parsed = null;
         try {
@@ -19679,14 +19676,14 @@ var require_dist = __commonJS({
           const x = Math.round(parsed.clickX);
           const y = Math.round(parsed.clickY);
           LOG5.info("Command", `[switch_chat] CDP click at (${x}, ${y}) for "${parsed.title}"`);
-          await cdp2.send("Input.dispatchMouseEvent", {
+          await cdp.send("Input.dispatchMouseEvent", {
             type: "mousePressed",
             x,
             y,
             button: "left",
             clickCount: 1
           });
-          await cdp2.send("Input.dispatchMouseEvent", {
+          await cdp.send("Input.dispatchMouseEvent", {
             type: "mouseReleased",
             x,
             y,
@@ -19694,7 +19691,7 @@ var require_dist = __commonJS({
             clickCount: 1
           });
           await new Promise((r) => setTimeout(r, 2e3));
-          const wsResult = await cdp2.evaluate(`
+          const wsResult = await cdp.evaluate(`
                 (() => {
                     const inp = Array.from(document.querySelectorAll('input[type="text"]'))
                         .find(i => i.offsetWidth > 0 && (i.placeholder || '').includes('Select where'));
@@ -19710,14 +19707,14 @@ var require_dist = __commonJS({
           if (wsResult) {
             try {
               const ws = JSON.parse(wsResult);
-              await cdp2.send("Input.dispatchMouseEvent", {
+              await cdp.send("Input.dispatchMouseEvent", {
                 type: "mousePressed",
                 x: ws.x,
                 y: ws.y,
                 button: "left",
                 clickCount: 1
               });
-              await cdp2.send("Input.dispatchMouseEvent", {
+              await cdp.send("Input.dispatchMouseEvent", {
                 type: "mouseReleased",
                 x: ws.x,
                 y: ws.y,
@@ -19737,10 +19734,10 @@ var require_dist = __commonJS({
       }
     }
     async function handleSetMode(h, args) {
-      const provider2 = h.getProvider();
+      const provider = h.getProvider();
       const mode = args?.mode || "agent";
-      if (provider2?.category === "acp") {
-        const adapter = h.getCliAdapter(provider2.type);
+      if (provider?.category === "acp") {
+        const adapter = h.getCliAdapter(provider.type);
         if (adapter) {
           const acpInstance = adapter._acpInstance;
           if (acpInstance && typeof acpInstance.onEvent === "function") {
@@ -19752,12 +19749,12 @@ var require_dist = __commonJS({
       }
       const webviewScript = h.getProviderScript("webviewSetMode", { MODE: JSON.stringify(mode) });
       if (webviewScript) {
-        const cdp2 = h.getCdp();
-        if (cdp2?.isConnected) {
+        const cdp = h.getCdp();
+        if (cdp?.isConnected) {
           try {
-            const matchText = provider2?.webviewMatchText;
+            const matchText = provider?.webviewMatchText;
             const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-            const raw = await cdp2.evaluateInWebviewFrame?.(webviewScript, matchFn);
+            const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
             let result = raw;
             if (typeof raw === "string") {
               try {
@@ -19792,11 +19789,11 @@ var require_dist = __commonJS({
       return { success: false, error: `setMode '${mode}' not supported by this provider` };
     }
     async function handleChangeModel(h, args) {
-      const provider2 = h.getProvider();
+      const provider = h.getProvider();
       const model = args?.model;
-      LOG5.info("Command", `[change_model] model=${model} provider=${provider2?.type} category=${provider2?.category} ideType=${h.currentIdeType} providerType=${h.currentProviderType}`);
-      if (provider2?.category === "acp") {
-        const adapter = h.getCliAdapter(provider2.type);
+      LOG5.info("Command", `[change_model] model=${model} provider=${provider?.type} category=${provider?.category} ideType=${h.currentIdeType} providerType=${h.currentProviderType}`);
+      if (provider?.category === "acp") {
+        const adapter = h.getCliAdapter(provider.type);
         LOG5.info("Command", `[change_model] ACP adapter found: ${!!adapter}, type=${adapter?.cliType}, hasAcpInstance=${!!adapter?._acpInstance}`);
         if (adapter) {
           const acpInstance = adapter._acpInstance;
@@ -19810,12 +19807,12 @@ var require_dist = __commonJS({
       }
       const webviewScript = h.getProviderScript("webviewSetModel", { MODEL: JSON.stringify(model) });
       if (webviewScript) {
-        const cdp2 = h.getCdp();
-        if (cdp2?.isConnected) {
+        const cdp = h.getCdp();
+        if (cdp?.isConnected) {
           try {
-            const matchText = provider2?.webviewMatchText;
+            const matchText = provider?.webviewMatchText;
             const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-            const raw = await cdp2.evaluateInWebviewFrame?.(webviewScript, matchFn);
+            const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
             let result = raw;
             if (typeof raw === "string") {
               try {
@@ -19853,28 +19850,28 @@ var require_dist = __commonJS({
       const configId = args?.configId;
       const value = args?.value;
       if (!configId || !value) return { success: false, error: "configId and value required" };
-      const provider2 = h.getProvider();
-      if (!provider2 || provider2.category !== "acp") {
+      const provider = h.getProvider();
+      if (!provider || provider.category !== "acp") {
         return { success: false, error: "set_thought_level only for ACP providers" };
       }
-      const adapter = h.getCliAdapter(provider2.type);
+      const adapter = h.getCliAdapter(provider.type);
       const acpInstance = adapter?._acpInstance;
       if (!acpInstance) return { success: false, error: "ACP instance not found" };
       try {
         await acpInstance.setConfigOption(configId, value);
-        LOG5.info("Command", `[set_thought_level] ${configId}=${value} for ${provider2.type}`);
+        LOG5.info("Command", `[set_thought_level] ${configId}=${value} for ${provider.type}`);
         return { success: true, configId, value };
       } catch (e) {
         return { success: false, error: e?.message };
       }
     }
     async function handleResolveAction(h, args) {
-      const provider2 = h.getProvider();
+      const provider = h.getProvider();
       const action = args?.action || "approve";
       const button = args?.button || args?.buttonText || (action === "approve" ? "Accept" : action === "reject" ? "Reject" : "Accept");
-      LOG5.info("Command", `[resolveAction] action=${action} button="${button}" provider=${provider2?.type}`);
-      if (provider2?.category === "cli") {
-        const adapter = h.getCliAdapter(provider2.type);
+      LOG5.info("Command", `[resolveAction] action=${action} button="${button}" provider=${provider?.type}`);
+      if (provider?.category === "cli") {
+        const adapter = h.getCliAdapter(provider.type);
         if (!adapter) return { success: false, error: "CLI adapter not running" };
         const status = adapter.getStatus?.();
         if (status?.status !== "waiting_approval") {
@@ -19906,24 +19903,24 @@ var require_dist = __commonJS({
         LOG5.info("Command", `[resolveAction] CLI PTY \u2192 buttonIndex=${buttonIndex} "${buttons[buttonIndex] ?? "?"}"`);
         return { success: true, buttonIndex, button: buttons[buttonIndex] ?? button };
       }
-      if (provider2?.category === "extension" && h.agentStream && h.getCdp()) {
+      if (provider?.category === "extension" && h.agentStream && h.getCdp()) {
         const ok = await h.agentStream.resolveAgentAction(
           h.getCdp(),
-          provider2.type,
+          provider.type,
           action,
           h.currentIdeType
         );
         return { success: ok };
       }
-      if (provider2?.scripts?.webviewResolveAction || provider2?.scripts?.webview_resolve_action) {
+      if (provider?.scripts?.webviewResolveAction || provider?.scripts?.webview_resolve_action) {
         const script = h.getProviderScript("webviewResolveAction", { action, button, buttonText: button }) || h.getProviderScript("webview_resolve_action", { action, button, buttonText: button });
         if (script) {
-          const cdp2 = h.getCdp();
-          if (cdp2?.isConnected) {
+          const cdp = h.getCdp();
+          if (cdp?.isConnected) {
             try {
-              const matchText = provider2?.webviewMatchText;
+              const matchText = provider?.webviewMatchText;
               const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-              const raw = await cdp2.evaluateInWebviewFrame?.(script, matchFn);
+              const raw = await cdp.evaluateInWebviewFrame?.(script, matchFn);
               let result = raw;
               if (typeof raw === "string") {
                 try {
@@ -19943,13 +19940,13 @@ var require_dist = __commonJS({
           }
         }
       }
-      if (provider2?.scripts?.resolveAction) {
-        const script = provider2.scripts.resolveAction({ action, button, buttonText: button });
+      if (provider?.scripts?.resolveAction) {
+        const script = provider.scripts.resolveAction({ action, button, buttonText: button });
         if (script) {
-          const cdp2 = h.getCdp();
-          if (!cdp2?.isConnected) return { success: false, error: "CDP not connected" };
+          const cdp = h.getCdp();
+          if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
           try {
-            const raw = await cdp2.evaluate(script, 3e4);
+            const raw = await cdp.evaluate(script, 3e4);
             let result = raw;
             if (typeof raw === "string") {
               try {
@@ -19965,14 +19962,14 @@ var require_dist = __commonJS({
             if (result?.found && result.x != null && result.y != null) {
               const x = result.x;
               const y = result.y;
-              await cdp2.send("Input.dispatchMouseEvent", {
+              await cdp.send("Input.dispatchMouseEvent", {
                 type: "mousePressed",
                 x,
                 y,
                 button: "left",
                 clickCount: 1
               });
-              await cdp2.send("Input.dispatchMouseEvent", {
+              await cdp.send("Input.dispatchMouseEvent", {
                 type: "mouseReleased",
                 x,
                 y,
@@ -20376,25 +20373,25 @@ var require_dist = __commonJS({
       if (!agentType) return { success: false, error: "agentType is required" };
       const loader = h.ctx.providerLoader;
       if (!loader) return { success: false, error: "ProviderLoader not initialized" };
-      const provider2 = loader.resolve(agentType);
-      if (!provider2) return { success: false, error: `Provider not found: ${agentType}` };
+      const provider = loader.resolve(agentType);
+      if (!provider) return { success: false, error: `Provider not found: ${agentType}` };
       const webviewScriptName = `webview${scriptName.charAt(0).toUpperCase() + scriptName.slice(1)}`;
-      const hasWebviewScript = provider2.category === "ide" && !!provider2.scripts?.[webviewScriptName];
+      const hasWebviewScript = provider.category === "ide" && !!provider.scripts?.[webviewScriptName];
       const actualScriptName = hasWebviewScript ? webviewScriptName : scriptName;
-      if (!provider2.scripts?.[actualScriptName]) {
+      if (!provider.scripts?.[actualScriptName]) {
         return { success: false, error: `Script '${actualScriptName}' not available for ${agentType}` };
       }
-      const scriptFn = provider2.scripts[actualScriptName];
+      const scriptFn = provider.scripts[actualScriptName];
       const scriptCode = scriptFn(args);
       if (!scriptCode) return { success: false, error: `Script '${actualScriptName}' returned null` };
-      const cdpKey = provider2.category === "ide" ? h.currentIdeType || agentType : h.currentIdeType || ideType;
-      LOG5.info("Command", `[ExtScript] provider=${provider2.type} category=${provider2.category} cdpKey=${cdpKey}`);
-      const cdp2 = h.getCdp(cdpKey);
-      if (!cdp2?.isConnected) return { success: false, error: `No CDP connection for ${cdpKey || "any"}` };
+      const cdpKey = provider.category === "ide" ? h.currentIdeType || agentType : h.currentIdeType || ideType;
+      LOG5.info("Command", `[ExtScript] provider=${provider.type} category=${provider.category} cdpKey=${cdpKey}`);
+      const cdp = h.getCdp(cdpKey);
+      if (!cdp?.isConnected) return { success: false, error: `No CDP connection for ${cdpKey || "any"}` };
       try {
         let result;
-        if (provider2.category === "extension") {
-          const sessions = cdp2.getAgentSessions();
+        if (provider.category === "extension") {
+          const sessions = cdp.getAgentSessions();
           let targetSessionId = null;
           for (const [sessionId, target] of sessions) {
             if (target.agentType === agentType) {
@@ -20405,13 +20402,13 @@ var require_dist = __commonJS({
           if (!targetSessionId) {
             return { success: false, error: `No active session found for ${agentType}` };
           }
-          result = await cdp2.evaluateInSession(targetSessionId, scriptCode);
-        } else if (hasWebviewScript && cdp2.evaluateInWebviewFrame) {
-          const matchText = provider2.webviewMatchText;
+          result = await cdp.evaluateInSession(targetSessionId, scriptCode);
+        } else if (hasWebviewScript && cdp.evaluateInWebviewFrame) {
+          const matchText = provider.webviewMatchText;
           const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-          result = await cdp2.evaluateInWebviewFrame(scriptCode, matchFn);
+          result = await cdp.evaluateInWebviewFrame(scriptCode, matchFn);
         } else {
-          result = await cdp2.evaluate(scriptCode, 3e4);
+          result = await cdp.evaluate(scriptCode, 3e4);
         }
         if (typeof result === "string") {
           try {
@@ -20431,7 +20428,7 @@ var require_dist = __commonJS({
       const loader = h.ctx.providerLoader;
       if (!loader) return { success: false, error: "ProviderLoader not initialized" };
       const allExtProviders = loader.getByCategory?.("extension") || [];
-      const config2 = loadConfig4();
+      const config2 = loadConfig3();
       if (ideType) {
         const extensions = allExtProviders.map((p) => ({
           type: p.type,
@@ -20471,7 +20468,7 @@ var require_dist = __commonJS({
     init_config();
     init_workspaces();
     function handleWorkspaceList() {
-      const config2 = loadConfig4();
+      const config2 = loadConfig3();
       const state = getWorkspaceState(config2);
       return {
         success: true,
@@ -20486,7 +20483,7 @@ var require_dist = __commonJS({
       const rawPath = (args?.path || args?.dir || "").trim();
       const label = (args?.label || "").trim() || void 0;
       if (!rawPath) return { success: false, error: "path required" };
-      const config2 = loadConfig4();
+      const config2 = loadConfig3();
       const result = addWorkspaceEntry(config2, rawPath, label);
       if ("error" in result) return { success: false, error: result.error };
       let cfg = appendWorkspaceActivity(result.config, result.entry.path, {});
@@ -20497,7 +20494,7 @@ var require_dist = __commonJS({
     function handleWorkspaceRemove(args) {
       const id = (args?.id || "").trim();
       if (!id) return { success: false, error: "id required" };
-      const config2 = loadConfig4();
+      const config2 = loadConfig3();
       const removed = (config2.workspaces || []).find((w) => w.id === id);
       const result = removeWorkspaceEntry(config2, id);
       if ("error" in result) return { success: false, error: result.error };
@@ -20512,7 +20509,7 @@ var require_dist = __commonJS({
     function handleWorkspaceSetDefault(args) {
       const clear = args?.clear === true || args?.id === null || args?.id === "";
       if (clear) {
-        const config22 = loadConfig4();
+        const config22 = loadConfig3();
         const result2 = setDefaultWorkspaceId(config22, null);
         if ("error" in result2) return { success: false, error: result2.error };
         saveConfig2(result2.config);
@@ -20528,7 +20525,7 @@ var require_dist = __commonJS({
       if (!pathArg && !idArg) {
         return { success: false, error: "id or path required (or clear: true)" };
       }
-      let config2 = loadConfig4();
+      let config2 = loadConfig3();
       let nextId;
       if (pathArg) {
         let w = findWorkspaceByPath(config2, pathArg);
@@ -20607,9 +20604,9 @@ var require_dist = __commonJS({
       }
       /** Get a provider script by name from ProviderLoader. */
       getProviderScript(scriptName, params, ideType) {
-        const provider2 = this.getProvider(ideType);
-        if (provider2?.scripts) {
-          const fn = provider2.scripts[scriptName];
+        const provider = this.getProvider(ideType);
+        if (provider?.scripts) {
+          const fn = provider.scripts[scriptName];
           if (typeof fn === "function") {
             const firstVal = params ? Object.values(params)[0] : void 0;
             const script = firstVal ? fn(firstVal) : fn();
@@ -20624,24 +20621,24 @@ var require_dist = __commonJS({
        * Extension → cdp.evaluateInSession(sessionId, script) (webview)
        */
       async evaluateProviderScript(scriptName, params, timeout = 3e4) {
-        const provider2 = this.getProvider();
+        const provider = this.getProvider();
         const script = this.getProviderScript(scriptName, params);
         if (!script) return null;
-        const cdp2 = this.getCdp();
-        if (!cdp2?.isConnected) return null;
-        if (provider2?.category === "extension") {
-          let sessionId = this.getExtensionSessionId(provider2);
+        const cdp = this.getCdp();
+        if (!cdp?.isConnected) return null;
+        if (provider?.category === "extension") {
+          let sessionId = this.getExtensionSessionId(provider);
           if (!sessionId && this._agentStream) {
-            await this._agentStream.switchActiveAgent(cdp2, provider2.type);
-            await this._agentStream.syncAgentSessions(cdp2);
-            sessionId = this.getExtensionSessionId(provider2);
+            await this._agentStream.switchActiveAgent(cdp, provider.type);
+            await this._agentStream.syncAgentSessions(cdp);
+            sessionId = this.getExtensionSessionId(provider);
           }
           if (!sessionId) return null;
-          const result2 = await cdp2.evaluateInSession(sessionId, script, timeout);
+          const result2 = await cdp.evaluateInSession(sessionId, script, timeout);
           return { result: result2, category: "extension" };
         }
-        const result = await cdp2.evaluate(script, timeout);
-        return { result, category: provider2?.category || "ide" };
+        const result = await cdp.evaluate(script, timeout);
+        return { result, category: provider?.category || "ide" };
       }
       /** CLI adapter search */
       getCliAdapter(type) {
@@ -20655,9 +20652,9 @@ var require_dist = __commonJS({
         return null;
       }
       // ─── Private helpers ──────────────────────────────
-      getExtensionSessionId(provider2) {
-        if (provider2.category !== "extension" || !this._agentStream) return null;
-        const managed = this._agentStream.getManagedAgent(provider2.type);
+      getExtensionSessionId(provider) {
+        if (provider.category !== "extension" || !this._agentStream) return null;
+        const managed = this._agentStream.getManagedAgent(provider.type);
         return managed?.sessionId || null;
       }
       /** Extract ideType from _targetInstance */
@@ -20785,7 +20782,7 @@ var require_dist = __commonJS({
           case "get_recent_workspaces":
             return this.handleGetRecentWorkspaces(args);
           case "get_cli_history": {
-            const config2 = loadConfig4();
+            const config2 = loadConfig3();
             return { success: true, history: config2.cliHistory || [] };
           }
           case "workspace_list":
@@ -20847,7 +20844,7 @@ var require_dist = __commonJS({
       }
       // ─── Misc (kept in handler — too small to extract) ───────
       async handleGetRecentWorkspaces(_args) {
-        const config2 = loadConfig4();
+        const config2 = loadConfig3();
         const cliRecent = config2.recentCliWorkspaces || [];
         const ws = getWorkspaceState(config2);
         return {
@@ -21507,9 +21504,9 @@ var require_dist = __commonJS({
       * Get public settings schema for a provider (for dashboard UI rendering)
       */
       getPublicSettings(type) {
-        const provider2 = this.providers.get(type);
-        if (!provider2?.settings) return [];
-        return Object.entries(provider2.settings).filter(([, def]) => def.public === true).map(([key, def]) => ({ key, ...def }));
+        const provider = this.providers.get(type);
+        if (!provider?.settings) return [];
+        return Object.entries(provider.settings).filter(([, def]) => def.public === true).map(([key, def]) => ({ key, ...def }));
       }
       /**
       * Get public settings schema for all providers
@@ -21526,8 +21523,8 @@ var require_dist = __commonJS({
       * Resolved setting value for a provider (default + user override)
       */
       getSettingValue(type, key) {
-        const provider2 = this.providers.get(type);
-        const schemaDef = provider2?.settings?.[key];
+        const provider = this.providers.get(type);
+        const schemaDef = provider?.settings?.[key];
         const defaultVal = schemaDef ? schemaDef.default : void 0;
         try {
           const { loadConfig: loadConfig22 } = (init_config(), __toCommonJS2(config_exports));
@@ -21542,10 +21539,10 @@ var require_dist = __commonJS({
       * All resolved settings for a provider (default + user override)
       */
       getSettings(type) {
-        const provider2 = this.providers.get(type);
-        if (!provider2?.settings) return {};
+        const provider = this.providers.get(type);
+        if (!provider?.settings) return {};
         const result = {};
-        for (const [key, def] of Object.entries(provider2.settings)) {
+        for (const [key, def] of Object.entries(provider.settings)) {
           result[key] = this.getSettingValue(type, key);
         }
         return result;
@@ -21554,8 +21551,8 @@ var require_dist = __commonJS({
       * Save provider setting value (writes to config.json)
       */
       setSetting(type, key, value) {
-        const provider2 = this.providers.get(type);
-        const schemaDef = provider2?.settings?.[key];
+        const provider = this.providers.get(type);
+        const schemaDef = provider?.settings?.[key];
         if (!schemaDef) return false;
         if (!schemaDef.public) return false;
         if (schemaDef.type === "boolean" && typeof value !== "boolean") return false;
@@ -21585,9 +21582,9 @@ var require_dist = __commonJS({
        * Checks builtinDir, upstreamDir, userDir in order.
        */
       findProviderDir(type) {
-        const provider2 = this.providers.get(type);
-        if (!provider2) return null;
-        const cat = provider2.category;
+        const provider = this.providers.get(type);
+        if (!provider) return null;
+        const cat = provider.category;
         const searchRoots = [this.userDir, this.upstreamDir, ...this.builtinDirs];
         for (const root of searchRoots) {
           if (!fs5.existsSync(root)) continue;
@@ -21951,10 +21948,10 @@ var require_dist = __commonJS({
       }
       return void 0;
     }
-    async function launchWithCdp2(options = {}) {
+    async function launchWithCdp(options = {}) {
       const platform8 = os8.platform();
       let targetIde;
-      const ides = await detectIDEs3();
+      const ides = await detectIDEs2();
       if (options.ideId) {
         targetIde = ides.find((i) => i.id === options.ideId && i.installed);
         if (!targetIde) {
@@ -22093,7 +22090,7 @@ var require_dist = __commonJS({
       if (workspace) args.push(workspace);
       (0, import_child_process4.spawn)(cli, args, { detached: true, stdio: "ignore" }).unref();
     }
-    function getAvailableIdeIds2() {
+    function getAvailableIdeIds() {
       return getProviderLoader().getAvailableIdeTypes();
     }
     init_config();
@@ -22348,7 +22345,7 @@ var require_dist = __commonJS({
                 workspaceId: args?.workspaceId,
                 useDefaultWorkspace: args?.useDefaultWorkspace
               },
-              loadConfig4()
+              loadConfig3()
             );
             const launchArgs = {
               ideId: ideKey,
@@ -22356,11 +22353,11 @@ var require_dist = __commonJS({
               newWindow: args?.newWindow
             };
             LOG5.info("LaunchIDE", `target=${ideKey || "auto"}`);
-            const result = await launchWithCdp2(launchArgs);
+            const result = await launchWithCdp(launchArgs);
             if (result.success && result.port && result.ideId && !this.deps.cdpManagers.has(result.ideId)) {
               const logFn = this.deps.getCdpLogFn ? this.deps.getCdpLogFn(result.ideId) : LOG5.forComponent(`CDP:${result.ideId}`).asLogFn();
-              const provider2 = this.deps.providerLoader.getMeta(result.ideId);
-              const manager = new DaemonCdpManager2(result.port, logFn, void 0, provider2?.targetFilter);
+              const provider = this.deps.providerLoader.getMeta(result.ideId);
+              const manager = new DaemonCdpManager2(result.port, logFn, void 0, provider?.targetFilter);
               const connected = await manager.connect();
               if (connected) {
                 registerExtensionProviders(this.deps.providerLoader, manager, result.ideId);
@@ -22373,7 +22370,7 @@ var require_dist = __commonJS({
             this.deps.onIdeConnected?.();
             if (result.success && resolvedWorkspace) {
               try {
-                saveConfig2(appendWorkspaceActivity(loadConfig4(), resolvedWorkspace, {
+                saveConfig2(appendWorkspaceActivity(loadConfig3(), resolvedWorkspace, {
                   kind: "ide",
                   agentType: result.ideId
                 }));
@@ -22384,7 +22381,7 @@ var require_dist = __commonJS({
           }
           // ─── IDE detection ───
           case "detect_ides": {
-            this.deps.detectedIdes.value = await detectIDEs3();
+            this.deps.detectedIdes.value = await detectIDEs2();
             return { success: true, ides: this.deps.detectedIdes.value };
           }
           // ─── Machine Settings ───
@@ -22400,10 +22397,10 @@ var require_dist = __commonJS({
        * IDE stop: CDP disconnect + remove from InstanceManager + clean instanceIdMap
        */
       async stopIde(ideType) {
-        const cdp2 = this.deps.cdpManagers.get(ideType);
-        if (cdp2) {
+        const cdp = this.deps.cdpManagers.get(ideType);
+        if (cdp) {
           try {
-            cdp2.disconnect();
+            cdp.disconnect();
           } catch {
           }
           this.deps.cdpManagers.delete(ideType);
@@ -22516,7 +22513,7 @@ var require_dist = __commonJS({
         const acpStates = allStates.filter((s) => s.category === "acp");
         const ideSummary = ideStates.map((s) => {
           const msgs = s.activeChat?.messages?.length || 0;
-          const exts = (s.extensions || []).length;
+          const exts = s.extensions.length;
           return `${s.type}(${s.status},${msgs}msg,${exts}ext${s.currentModel ? ",model=" + s.currentModel : ""})`;
         }).join(", ");
         const cliSummary = cliStates.map((s) => `${s.type}(${s.status})`).join(", ");
@@ -22536,13 +22533,12 @@ var require_dist = __commonJS({
           ideType: s.type,
           ideVersion: "",
           instanceId: s.instanceId,
-          workspaceFolders: s.workspaceFolders || [],
-          activeFile: s.activeFile || null,
+          workspace: s.workspace || null,
           terminals: 0,
           aiAgents: [],
           activeChat: s.activeChat,
           chats: [],
-          agentStreams: (s.extensions || []).map((ext) => ({
+          agentStreams: s.extensions.map((ext) => ({
             agentType: ext.type,
             agentName: ext.name,
             extensionId: ext.type,
@@ -22551,7 +22547,7 @@ var require_dist = __commonJS({
             inputContent: ext.activeChat?.inputContent || "",
             activeModal: ext.activeChat?.activeModal || null
           })),
-          cdpConnected: s.cdpConnected || false,
+          cdpConnected: s.cdpConnected,
           currentModel: s.currentModel,
           currentPlan: s.currentPlan,
           currentAutoApprove: s.currentAutoApprove
@@ -22562,8 +22558,8 @@ var require_dist = __commonJS({
           cliType: s.type,
           cliName: s.name,
           status: s.status,
-          mode: s.mode || "terminal",
-          workingDir: s.workingDir || "",
+          mode: s.mode,
+          workspace: s.workspace || "",
           activeChat: s.activeChat
         }));
         const managedAcps = acpStates.map((s) => ({
@@ -22571,19 +22567,22 @@ var require_dist = __commonJS({
           acpType: s.type,
           acpName: s.name,
           status: s.status,
-          mode: "chat",
-          workingDir: s.workingDir || "",
+          mode: s.mode,
+          workspace: s.workspace || "",
           activeChat: s.activeChat,
           currentModel: s.currentModel,
           currentPlan: s.currentPlan,
           acpConfigOptions: s.acpConfigOptions,
-          acpModes: s.acpModes
+          acpModes: s.acpModes,
+          errorMessage: s.errorMessage,
+          errorReason: s.errorReason
         }));
-        const cfg = loadConfig4();
+        const cfg = loadConfig3();
         const wsState = getWorkspaceState(cfg);
         const memSnap = getHostMemorySnapshot();
         const payload = {
           daemonMode: true,
+          version: this.deps.daemonVersion || "unknown",
           machineNickname: cfg.machineNickname || null,
           workspaces: wsState.workspaces,
           defaultWorkspaceId: wsState.defaultWorkspaceId,
@@ -22685,7 +22684,7 @@ var require_dist = __commonJS({
     var os12 = __toESM2(require("os"));
     var path10 = __toESM2(require("path"));
     var crypto4 = __toESM2(require("crypto"));
-    var import_chalk4 = __toESM2(require("chalk"));
+    var import_chalk7 = __toESM2(require("chalk"));
     var os11 = __toESM2(require("os"));
     var path9 = __toESM2(require("path"));
     var import_child_process5 = require("child_process");
@@ -22786,12 +22785,14 @@ var require_dist = __commonJS({
       /Type your message/i,
       /^>\s*$/m,
       // '>' alone on its own line
-      /[›➤]\s*$/,
-      /for shortcuts/i,
-      /\?\s*for help/i,
+      /[›❯]\s*[\r\n]/,
+      // prompt char followed by line ending (ANSI-stripped may not have $ at end)
+      /[›❯]\s*$/m,
+      // prompt char at end of line (multiline)
+      /for\s*shortcuts/i,
+      // Claude Code prompt (ANSI strip may remove spaces → 'forshortcuts')
+      /\?\s*for\s*help/i,
       /Press enter/i
-      // NOTE: removed /^[\s\u2500-\u257f]*>\s*$/m — the box-drawing char range is too wide and
-      // can match dialog-clearing ANSI output, causing false prompt detection in approval state.
     ];
     var FALLBACK_GENERATING = [
       /[\u2800-\u28ff]/,
@@ -22803,13 +22804,18 @@ var require_dist = __commonJS({
       // Specific Claude Code status
     ];
     var FALLBACK_APPROVAL = [
-      /Allow\s+once/i,
-      /Always\s+allow/i,
+      /Allow\s*once/i,
+      // ANSI strip may remove spaces
+      /Always\s*allow/i,
       /\(y\/n\)/i,
       /\[Y\/n\]/i,
-      /Run\s+this\s+command/i
-      // NOTE: removed /Do you want to (?:run|execute|allow)/i — too broad, matches AI explanation
-      // text like "Do you want to allow this feature?" causing false approval notifications.
+      /Run\s*this\s*command/i,
+      /Allow\s*tool/i,
+      // Claude Code v2 approval
+      /Yes,?\s*don'?t\s*ask/i,
+      // "Yes, don't ask again" (Claude Code)
+      /Deny/i
+      // Deny button presence = approval dialog
     ];
     function defaultCleanOutput(raw, _lastUserInput) {
       return stripAnsi(raw).trim();
@@ -22828,13 +22834,13 @@ var require_dist = __commonJS({
       };
     }
     var ProviderCliAdapter = class {
-      constructor(provider2, workingDir, extraArgs = []) {
+      constructor(provider, workingDir, extraArgs = []) {
         this.extraArgs = extraArgs;
-        this.provider = normalizeCliProviderForRuntime(provider2);
-        this.cliType = provider2.type;
-        this.cliName = provider2.name;
+        this.provider = normalizeCliProviderForRuntime(provider);
+        this.cliType = provider.type;
+        this.cliName = provider.name;
         this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os11.homedir()) : workingDir;
-        const t = provider2.timeouts || {};
+        const t = provider.timeouts || {};
         this.timeouts = {
           ptyFlush: t.ptyFlush ?? 50,
           dialogAccept: t.dialogAccept ?? 300,
@@ -22844,6 +22850,8 @@ var require_dist = __commonJS({
           maxResponse: t.maxResponse ?? 3e5,
           shutdownGrace: t.shutdownGrace ?? 1e3
         };
+        const rawKeys = provider.approvalKeys;
+        this.approvalKeys = rawKeys && typeof rawKeys === "object" ? rawKeys : {};
       }
       cliType;
       cliName;
@@ -22875,8 +22883,20 @@ var require_dist = __commonJS({
       approvalExitTimeout = null;
       // Resize redraw suppression
       resizeSuppressUntil = 0;
+      // Debug: status transition history
+      statusHistory = [];
+      setStatus(status, trigger) {
+        const prev = this.currentStatus;
+        if (prev === status) return;
+        this.currentStatus = status;
+        this.statusHistory.push({ status, at: Date.now(), trigger });
+        if (this.statusHistory.length > 50) this.statusHistory.shift();
+        LOG5.info("CLI", `[${this.cliType}] status: ${prev} \u2192 ${status}${trigger ? ` (${trigger})` : ""}`);
+      }
       // Resolved timeouts (provider defaults + overrides)
       timeouts;
+      // Provider approval key mapping (e.g. { 0: '1', 1: '2', 2: '3' }) — loaded from provider.json
+      approvalKeys;
       // ─── Lifecycle ─────────────────────────────────
       setServerConn(serverConn) {
         this.serverConn = serverConn;
@@ -22956,11 +22976,11 @@ var require_dist = __commonJS({
         this.ptyProcess.onExit(({ exitCode }) => {
           LOG5.info("CLI", `[${this.cliType}] Exit code ${exitCode}`);
           this.ptyProcess = null;
-          this.currentStatus = "stopped";
+          this.setStatus("stopped", "pty_exit");
           this.ready = false;
           this.onStatusChange?.();
         });
-        this.currentStatus = "starting";
+        this.setStatus("starting", "spawn");
         this.onStatusChange?.();
       }
       // ─── Output state machine ────────────────────────────
@@ -22978,9 +22998,13 @@ var require_dist = __commonJS({
         this.recentOutputBuffer = (this.recentOutputBuffer + cleanData).slice(-1e3);
         if (!this.ready) {
           this.startupBuffer += cleanData;
+          LOG5.info("CLI", `[${this.cliType}] startup chunk (${cleanData.length} chars): ${cleanData.slice(0, 200).replace(/\n/g, "\\n")}`);
           const dialogPatterns = [
             /Do you want to connect/i,
-            /Do you trust the files/i
+            /Do you trust the files/i,
+            /Quick safety check/i,
+            /Is this a project/i,
+            /Enter to confirm/i
           ];
           if (dialogPatterns.some((p) => p.test(this.startupBuffer))) {
             setTimeout(() => this.ptyProcess?.write("\r"), this.timeouts.dialogAccept);
@@ -22989,7 +23013,7 @@ var require_dist = __commonJS({
           }
           if (patterns.prompt.some((p) => p.test(this.startupBuffer))) {
             this.ready = true;
-            this.currentStatus = "idle";
+            this.setStatus("idle", "prompt_matched");
             LOG5.info("CLI", `[${this.cliType}] \u2713 Ready`);
             this.onStatusChange?.();
           }
@@ -23000,12 +23024,12 @@ var require_dist = __commonJS({
           if (this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown) return;
           const ctxLines = this.recentOutputBuffer.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
           this.isWaitingForResponse = true;
-          this.currentStatus = "waiting_approval";
+          this.setStatus("waiting_approval", "approval_pattern");
           this.recentOutputBuffer = "";
           this.approvalTransitionBuffer = "";
           this.activeModal = {
             message: ctxLines.slice(-5).join(" ").slice(0, 200) || "Approval required",
-            buttons: ["Allow once", "Always allow", "Deny"]
+            buttons: this.cliType === "claude-cli" ? ["Yes (y)", "Always allow (a)", "Deny (Esc)"] : ["Allow once", "Always allow", "Deny"]
           };
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
           if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
@@ -23017,7 +23041,7 @@ var require_dist = __commonJS({
               this.recentOutputBuffer = "";
               this.approvalTransitionBuffer = "";
               this.approvalExitTimeout = null;
-              this.currentStatus = this.isWaitingForResponse ? "generating" : "idle";
+              this.setStatus(this.isWaitingForResponse ? "generating" : "idle", "approval_cleared");
               this.onStatusChange?.();
             }
           }, 6e4);
@@ -23033,7 +23057,7 @@ var require_dist = __commonJS({
               clearTimeout(this.approvalExitTimeout);
               this.approvalExitTimeout = null;
             }
-            this.currentStatus = "generating";
+            this.setStatus("generating", "approval_gen_resume");
             this.activeModal = null;
             this.recentOutputBuffer = "";
             this.approvalTransitionBuffer = "";
@@ -23056,7 +23080,7 @@ var require_dist = __commonJS({
           if (patterns.generating.some((p) => p.test(cleanData))) {
             this.isWaitingForResponse = true;
             this.responseBuffer = "";
-            this.currentStatus = "generating";
+            this.setStatus("generating", "autonomous_gen");
             this.onStatusChange?.();
           }
         }
@@ -23065,7 +23089,7 @@ var require_dist = __commonJS({
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
           const stillGenerating = patterns.generating.some((p) => p.test(cleanData));
           if (stillGenerating) {
-            this.currentStatus = "generating";
+            this.setStatus("generating", "still_generating");
             this.idleTimeout = setTimeout(() => {
               if (this.isWaitingForResponse) this.finishResponse();
             }, this.timeouts.generatingIdle);
@@ -23112,7 +23136,7 @@ var require_dist = __commonJS({
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
         this.activeModal = null;
-        this.currentStatus = "idle";
+        this.setStatus("idle", "response_finished");
         this.onStatusChange?.();
       }
       // ─── Public API (CliAdapter interface) ──────────
@@ -23131,7 +23155,7 @@ var require_dist = __commonJS({
         this.messages.push({ role: "user", content: text, timestamp: Date.now() });
         this.isWaitingForResponse = true;
         this.responseBuffer = "";
-        this.currentStatus = "generating";
+        this.setStatus("generating", "sendMessage");
         this.onStatusChange?.();
         this.ptyProcess.write(text + "\r");
         this.responseTimeout = setTimeout(() => {
@@ -23159,7 +23183,7 @@ var require_dist = __commonJS({
             } catch {
             }
             this.ptyProcess = null;
-            this.currentStatus = "stopped";
+            this.setStatus("stopped", "stop_cmd");
             this.ready = false;
             this.onStatusChange?.();
           }, this.timeouts.shutdownGrace);
@@ -23185,9 +23209,13 @@ var require_dist = __commonJS({
       */
       resolveModal(buttonIndex) {
         if (!this.ptyProcess || this.currentStatus !== "waiting_approval") return;
-        const DOWN = "\x1B[B";
-        const keys = DOWN.repeat(Math.max(0, buttonIndex)) + "\r";
-        this.ptyProcess.write(keys);
+        if (buttonIndex in this.approvalKeys) {
+          this.ptyProcess.write(this.approvalKeys[buttonIndex]);
+        } else {
+          const DOWN = "\x1B[B";
+          const keys = DOWN.repeat(Math.max(0, buttonIndex)) + "\r";
+          this.ptyProcess.write(keys);
+        }
       }
       resize(cols, rows) {
         if (this.ptyProcess) {
@@ -23198,18 +23226,56 @@ var require_dist = __commonJS({
           }
         }
       }
+      /**
+      * Full debug state — exposes all internal buffers, status, and patterns for debugging.
+      * Used by DevServer /api/cli/debug endpoint.
+      */
+      getDebugState() {
+        return {
+          type: this.cliType,
+          name: this.cliName,
+          status: this.currentStatus,
+          ready: this.ready,
+          workingDir: this.workingDir,
+          messages: this.messages.slice(-20),
+          messageCount: this.messages.length,
+          // Buffers
+          startupBuffer: this.startupBuffer.slice(-500),
+          recentOutputBuffer: this.recentOutputBuffer.slice(-500),
+          responseBuffer: this.responseBuffer.slice(-500),
+          approvalTransitionBuffer: this.approvalTransitionBuffer.slice(-500),
+          // State
+          isWaitingForResponse: this.isWaitingForResponse,
+          activeModal: this.activeModal,
+          lastApprovalResolvedAt: this.lastApprovalResolvedAt,
+          resizeSuppressUntil: this.resizeSuppressUntil,
+          // Provider patterns (serialized)
+          patterns: {
+            prompt: this.provider.patterns.prompt.map((p) => p.toString()),
+            generating: this.provider.patterns.generating.map((p) => p.toString()),
+            approval: this.provider.patterns.approval.map((p) => p.toString()),
+            ready: this.provider.patterns.ready.map((p) => p.toString())
+          },
+          // Status history
+          statusHistory: this.statusHistory.slice(-30),
+          // Timeouts config
+          timeouts: this.timeouts,
+          // PTY alive
+          ptyAlive: !!this.ptyProcess
+        };
+      }
     };
     init_config();
     init_workspaces();
     var crypto3 = __toESM2(require("crypto"));
     var CliProviderInstance = class {
-      constructor(provider2, workingDir, cliArgs = [], instanceId) {
-        this.provider = provider2;
+      constructor(provider, workingDir, cliArgs = [], instanceId) {
+        this.provider = provider;
         this.workingDir = workingDir;
         this.cliArgs = cliArgs;
-        this.type = provider2.type;
+        this.type = provider.type;
         this.instanceId = instanceId || crypto3.randomUUID();
-        this.adapter = new ProviderCliAdapter(provider2, workingDir, cliArgs);
+        this.adapter = new ProviderCliAdapter(provider, workingDir, cliArgs);
         this.monitor = new StatusMonitor();
         this.historyWriter = new ChatHistoryWriter();
       }
@@ -23222,6 +23288,8 @@ var require_dist = __commonJS({
       generatingStartedAt = 0;
       settings = {};
       monitor;
+      generatingDebounceTimer = null;
+      generatingDebouncePending = null;
       historyWriter;
       instanceId;
       // ─── Lifecycle ─────────────────────────────────
@@ -23288,7 +23356,7 @@ var require_dist = __commonJS({
             activeModal: adapterStatus.activeModal,
             inputContent: ""
           },
-          workingDir: this.workingDir,
+          workspace: this.workingDir,
           instanceId: this.instanceId,
           lastUpdated: Date.now(),
           settings: this.settings,
@@ -23317,8 +23385,24 @@ var require_dist = __commonJS({
           LOG5.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
           if (this.lastStatus === "idle" && newStatus === "generating") {
             this.generatingStartedAt = now;
-            this.pushEvent({ event: "agent:generating_started", chatTitle, timestamp: now });
+            if (this.generatingDebounceTimer) clearTimeout(this.generatingDebounceTimer);
+            this.generatingDebouncePending = { chatTitle, timestamp: now };
+            this.generatingDebounceTimer = setTimeout(() => {
+              if (this.generatingDebouncePending) {
+                this.pushEvent({ event: "agent:generating_started", ...this.generatingDebouncePending });
+                this.generatingDebouncePending = null;
+              }
+              this.generatingDebounceTimer = null;
+            }, 1e3);
           } else if (newStatus === "waiting_approval") {
+            if (this.generatingDebouncePending) {
+              if (this.generatingDebounceTimer) {
+                clearTimeout(this.generatingDebounceTimer);
+                this.generatingDebounceTimer = null;
+              }
+              this.pushEvent({ event: "agent:generating_started", ...this.generatingDebouncePending });
+              this.generatingDebouncePending = null;
+            }
             if (!this.generatingStartedAt) this.generatingStartedAt = now;
             const modal = adapterStatus.activeModal;
             LOG5.info("CLI", `[${this.type}] approval modal: "${modal?.message?.slice(0, 80) ?? "none"}"`);
@@ -23331,10 +23415,24 @@ var require_dist = __commonJS({
             });
           } else if (newStatus === "idle" && (this.lastStatus === "generating" || this.lastStatus === "waiting_approval")) {
             const duration3 = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
-            LOG5.info("CLI", `[${this.type}] completed in ${duration3}s`);
-            this.pushEvent({ event: "agent:generating_completed", chatTitle, duration: duration3, timestamp: now });
+            if (this.generatingDebouncePending) {
+              LOG5.info("CLI", `[${this.type}] suppressed short generating (${now - this.generatingStartedAt}ms)`);
+              if (this.generatingDebounceTimer) {
+                clearTimeout(this.generatingDebounceTimer);
+                this.generatingDebounceTimer = null;
+              }
+              this.generatingDebouncePending = null;
+            } else {
+              LOG5.info("CLI", `[${this.type}] completed in ${duration3}s`);
+              this.pushEvent({ event: "agent:generating_completed", chatTitle, duration: duration3, timestamp: now });
+            }
             this.generatingStartedAt = 0;
           } else if (newStatus === "stopped") {
+            if (this.generatingDebounceTimer) {
+              clearTimeout(this.generatingDebounceTimer);
+              this.generatingDebounceTimer = null;
+            }
+            this.generatingDebouncePending = null;
             this.pushEvent({ event: "agent:stopped", chatTitle, timestamp: now });
           }
           this.lastStatus = newStatus;
@@ -23373,10 +23471,10 @@ var require_dist = __commonJS({
       return content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
     }
     var AcpProviderInstance = class {
-      constructor(provider2, workingDir, cliArgs = []) {
+      constructor(provider, workingDir, cliArgs = []) {
         this.cliArgs = cliArgs;
-        this.type = provider2.type;
-        this.provider = provider2;
+        this.type = provider.type;
+        this.provider = provider;
         this.workingDir = workingDir;
         this.instanceId = crypto.randomUUID();
         this.monitor = new StatusMonitor();
@@ -23479,7 +23577,7 @@ var require_dist = __commonJS({
             } : null,
             inputContent: ""
           },
-          workingDir: this.workingDir,
+          workspace: this.workingDir,
           currentModel: this.currentModel,
           currentPlan: this.currentMode,
           instanceId: this.instanceId,
@@ -23490,8 +23588,8 @@ var require_dist = __commonJS({
           acpConfigOptions: this.configOptions,
           acpModes: this.availableModes,
           // Error details for dashboard display
-          errorMessage: this.errorMessage,
-          errorReason: this.errorReason
+          errorMessage: this.errorMessage || void 0,
+          errorReason: this.errorReason || void 0
         };
       }
       onEvent(event, data) {
@@ -23974,29 +24072,27 @@ var require_dist = __commonJS({
       handleSessionUpdate(params) {
         if (!params) return;
         const update = params.update;
-        this.log.debug(`[${this.type}] sessionUpdate: ${update.sessionUpdate} | keys=${Object.keys(update).join(",")}`);
+        this.log.debug(`[${this.type}] sessionUpdate: ${update.sessionUpdate}`);
         switch (update.sessionUpdate) {
           case "agent_message_chunk": {
             const content = update.content;
-            if (content?.type === "text" && content.text) {
+            if (content.type === "text") {
               this.partialContent += content.text;
-            } else if (content?.type === "image") {
+            } else if (content.type === "image") {
               this.partialBlocks.push({
                 type: "image",
-                data: content.data || "",
-                mimeType: content.mimeType || "image/png",
-                uri: content.uri
+                data: content.data,
+                mimeType: content.mimeType
               });
-            } else if (content?.type === "resource_link") {
+            } else if (content.type === "resource_link") {
               this.partialBlocks.push({
                 type: "resource_link",
-                uri: content.uri || "",
+                uri: content.uri,
                 name: content.name || "resource",
-                title: content.title,
-                mimeType: content.mimeType,
-                size: content.size
+                title: content.title ?? void 0,
+                mimeType: content.mimeType ?? void 0
               });
-            } else if (content?.type === "resource") {
+            } else if (content.type === "resource") {
               this.partialBlocks.push({
                 type: "resource",
                 resource: content.resource
@@ -24264,27 +24360,27 @@ var require_dist = __commonJS({
       persistRecentDir(cliType, dir) {
         try {
           const normalizedType = this.providerLoader.resolveAlias(cliType);
-          const provider2 = this.providerLoader.getByAlias(cliType);
-          const actKind = provider2?.category === "acp" ? "acp" : "cli";
-          let next = loadConfig4();
-          console.log(import_chalk4.default.cyan(`  \u{1F4C2} Saving recent workspace: ${dir}`));
+          const provider = this.providerLoader.getByAlias(cliType);
+          const actKind = provider?.category === "acp" ? "acp" : "cli";
+          let next = loadConfig3();
+          console.log(import_chalk7.default.cyan(`  \u{1F4C2} Saving recent workspace: ${dir}`));
           const recent = next.recentCliWorkspaces || [];
           if (!recent.includes(dir)) {
             next = { ...next, recentCliWorkspaces: [dir, ...recent].slice(0, 10) };
           }
           next = appendWorkspaceActivity(next, dir, { kind: actKind, agentType: normalizedType });
           saveConfig2(next);
-          console.log(import_chalk4.default.green(`  \u2713 Recent workspace saved: ${dir}`));
+          console.log(import_chalk7.default.green(`  \u2713 Recent workspace saved: ${dir}`));
         } catch (e) {
-          console.error(import_chalk4.default.red(`  \u2717 Failed to save recent workspace: ${e}`));
+          console.error(import_chalk7.default.red(`  \u2717 Failed to save recent workspace: ${e}`));
         }
       }
       createAdapter(cliType, workingDir, cliArgs) {
         const normalizedType = this.providerLoader.resolveAlias(cliType);
-        const provider2 = this.providerLoader.getMeta(normalizedType);
-        if (provider2 && provider2.category === "cli" && provider2.patterns && provider2.spawn) {
-          console.log(import_chalk4.default.cyan(`  \u{1F4E6} Using provider: ${provider2.name} (${provider2.type})`));
-          return new ProviderCliAdapter(provider2, workingDir, cliArgs);
+        const provider = this.providerLoader.getMeta(normalizedType);
+        if (provider && provider.category === "cli" && provider.patterns && provider.spawn) {
+          console.log(import_chalk7.default.cyan(`  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
+          return new ProviderCliAdapter(provider, workingDir, cliArgs);
         }
         throw new Error(`No CLI provider found for '${cliType}'. Create a provider.js in providers/cli/${cliType}/`);
       }
@@ -24294,28 +24390,28 @@ var require_dist = __commonJS({
         if (!trimmed) throw new Error("working directory required");
         const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os12.homedir()) : path10.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
-        const provider2 = this.providerLoader.getByAlias(cliType);
+        const provider = this.providerLoader.getByAlias(cliType);
         const key = crypto4.randomUUID();
-        if (provider2 && provider2.category === "acp") {
+        if (provider && provider.category === "acp") {
           const instanceManager2 = this.deps.getInstanceManager();
           if (!instanceManager2) throw new Error("InstanceManager not available");
-          const spawnCmd = provider2.spawn?.command;
+          const spawnCmd = provider.spawn?.command;
           if (spawnCmd) {
             try {
               const { execSync: execSync7 } = require("child_process");
               execSync7(`which ${spawnCmd}`, { stdio: "ignore" });
             } catch {
-              const installInfo = provider2.install || `Install: check ${provider2.displayName || provider2.name} documentation`;
+              const installInfo = provider.install || `Install: check ${provider.displayName || provider.name} documentation`;
               throw new Error(
-                `${provider2.displayName || provider2.name} is not installed.
+                `${provider.displayName || provider.name} is not installed.
 Command '${spawnCmd}' not found in PATH.
 
 ${installInfo}`
               );
             }
           }
-          console.log(import_chalk4.default.cyan(`  \u{1F50C} Starting ACP agent: ${provider2.name} (${provider2.type}) in ${resolvedDir}`));
-          const acpInstance = new AcpProviderInstance(provider2, resolvedDir, cliArgs);
+          console.log(import_chalk7.default.cyan(`  \u{1F50C} Starting ACP agent: ${provider.name} (${provider.type}) in ${resolvedDir}`));
+          const acpInstance = new AcpProviderInstance(provider, resolvedDir, cliArgs);
           await instanceManager2.addInstance(key, acpInstance, {
             settings: this.providerLoader.getSettings(normalizedType)
           });
@@ -24344,11 +24440,11 @@ ${installInfo}`
             setOnPtyData: () => {
             }
           });
-          console.log(import_chalk4.default.green(`  \u2713 ACP agent started: ${provider2.name} in ${resolvedDir}`));
+          console.log(import_chalk7.default.green(`  \u2713 ACP agent started: ${provider.name} in ${resolvedDir}`));
           if (initialModel) {
             try {
               await acpInstance.setConfigOption("model", initialModel);
-              console.log(import_chalk4.default.green(`  \u{1F916} Initial model set: ${initialModel}`));
+              console.log(import_chalk7.default.green(`  \u{1F916} Initial model set: ${initialModel}`));
             } catch (e) {
               LOG5.warn("CLI", `[ACP] Initial model set failed: ${e?.message}`);
             }
@@ -24363,13 +24459,13 @@ ${installInfo}`
         }
         const cliInfo = await detectCLI(cliType, this.providerLoader);
         if (!cliInfo) throw new Error(`${cliType} not found`);
-        console.log(import_chalk4.default.yellow(`  \u26A1 Starting CLI ${cliType} in ${resolvedDir}...`));
-        if (provider2) {
-          console.log(import_chalk4.default.cyan(`  \u{1F4E6} Using provider: ${provider2.name} (${provider2.type})`));
+        console.log(import_chalk7.default.yellow(`  \u26A1 Starting CLI ${cliType} in ${resolvedDir}...`));
+        if (provider) {
+          console.log(import_chalk7.default.cyan(`  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
         }
         const instanceManager = this.deps.getInstanceManager();
-        if (provider2 && instanceManager) {
-          const cliInstance = new CliProviderInstance(provider2, resolvedDir, cliArgs, key);
+        if (provider && instanceManager) {
+          const cliInstance = new CliProviderInstance(provider, resolvedDir, cliArgs, key);
           try {
             await instanceManager.addInstance(key, cliInstance, {
               serverConn: this.deps.getServerConn(),
@@ -24384,7 +24480,7 @@ ${installInfo}`
             throw new Error(`Failed to start ${cliInfo.displayName}: ${spawnErr?.message}`);
           }
           this.adapters.set(key, cliInstance.getAdapter());
-          console.log(import_chalk4.default.green(`  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
+          console.log(import_chalk7.default.green(`  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
           const checkStopped = setInterval(() => {
             try {
               const adapter = this.adapters.get(key);
@@ -24440,7 +24536,7 @@ ${installInfo}`
             });
           }
           this.adapters.set(key, adapter);
-          console.log(import_chalk4.default.green(`  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
+          console.log(import_chalk7.default.green(`  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
         }
         try {
           addCliHistory({ cliType, dir: resolvedDir, cliArgs });
@@ -24510,7 +24606,7 @@ ${installInfo}`
         switch (cmd) {
           case "launch_cli": {
             const cliType = args?.cliType;
-            const config2 = loadConfig4();
+            const config2 = loadConfig3();
             const resolved = resolveLaunchDirectory(
               {
                 dir: args?.dir,
@@ -24551,13 +24647,13 @@ ${installInfo}`
             if (found) {
               await this.stopSession(found.key);
             } else {
-              console.log(import_chalk4.default.yellow(`  \u26A0 No adapter found for ${cliType}`));
+              console.log(import_chalk7.default.yellow(`  \u26A0 No adapter found for ${cliType}`));
             }
             return { success: true, cliType, dir, stopped: true };
           }
           case "restart_session": {
             const cliType = args?.cliType || args?.agentType || args?.ideType;
-            const cfg = loadConfig4();
+            const cfg = loadConfig3();
             const rdir = resolveLaunchDirectory(
               {
                 dir: args?.dir,
@@ -24622,12 +24718,12 @@ ${installInfo}`
       extensionIdPattern;
       provider;
       lastSuccessState = null;
-      constructor(provider2) {
-        this.provider = provider2;
-        this.agentType = provider2.type;
-        this.agentName = provider2.displayName || provider2.name;
-        this.extensionId = provider2.extensionId || provider2.type;
-        this.extensionIdPattern = provider2.extensionIdPattern || new RegExp(`extensionId=${this.extensionId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "i");
+      constructor(provider) {
+        this.provider = provider;
+        this.agentType = provider.type;
+        this.agentName = provider.displayName || provider.name;
+        this.extensionId = provider.extensionId || provider.type;
+        this.extensionIdPattern = provider.extensionIdPattern || new RegExp(`extensionId=${this.extensionId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "i");
       }
       callScript(name, ...args) {
         const fn = this.provider.scripts?.[name];
@@ -24758,13 +24854,13 @@ ${installInfo}`
       /** Panel focus based on provider.js focusPanel or extensionId (currently no-op) */
       async ensureAgentPanelOpen(agentType, targetIdeType) {
       }
-      async switchActiveAgent(cdp2, agentType) {
+      async switchActiveAgent(cdp, agentType) {
         if (this._activeAgentType === agentType) return;
         if (this._activeAgentType) {
           const prev = this.managed.get(this._activeAgentType);
           if (prev) {
             try {
-              await cdp2.detachAgent(prev.sessionId);
+              await cdp.detachAgent(prev.sessionId);
             } catch {
             }
             this.managed.delete(this._activeAgentType);
@@ -24776,7 +24872,7 @@ ${installInfo}`
         this.logFn(`[AgentStream] Active agent: ${agentType || "none"}`);
       }
       /** Agent webview discovery + session connection */
-      async syncAgentSessions(cdp2) {
+      async syncAgentSessions(cdp) {
         if (!this.enabled || !this._activeAgentType) return;
         const now = Date.now();
         if (this.managed.has(this._activeAgentType) && now - this.lastDiscoveryTime < this.discoveryIntervalMs) {
@@ -24784,12 +24880,12 @@ ${installInfo}`
         }
         this.lastDiscoveryTime = now;
         try {
-          const targets = await cdp2.discoverAgentWebviews();
+          const targets = await cdp.discoverAgentWebviews();
           const activeTarget = targets.find((t) => t.agentType === this._activeAgentType);
           if (activeTarget && !this.managed.has(this._activeAgentType)) {
             const adapter = this.allAdapters.find((a) => a.agentType === this._activeAgentType);
             if (adapter) {
-              const sessionId = await cdp2.attachToAgent(activeTarget);
+              const sessionId = await cdp.attachToAgent(activeTarget);
               if (sessionId) {
                 this.managed.set(this._activeAgentType, {
                   adapter,
@@ -24805,7 +24901,7 @@ ${installInfo}`
           }
           for (const [type, agent] of this.managed) {
             if (type !== this._activeAgentType) {
-              await cdp2.detachAgent(agent.sessionId);
+              await cdp.detachAgent(agent.sessionId);
               this.managed.delete(type);
             }
           }
@@ -24815,7 +24911,7 @@ ${installInfo}`
         }
       }
       /** Collect active agent status */
-      async collectAgentStreams(cdp2) {
+      async collectAgentStreams(cdp) {
         if (!this.enabled) return [];
         const results = [];
         if (this._activeAgentType && this.managed.has(this._activeAgentType)) {
@@ -24827,7 +24923,7 @@ ${installInfo}`
             results.push(agent.lastState);
           } else {
             try {
-              const evaluate = (expr, timeout) => cdp2.evaluateInSession(agent.sessionId, expr, timeout);
+              const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
               const state = await agent.adapter.readChat(evaluate);
               agent.lastState = state;
               agent.lastError = null;
@@ -24849,7 +24945,7 @@ ${installInfo}`
               });
               if (errorMsg.includes("timeout") || errorMsg.includes("not connected") || errorMsg.includes("Session")) {
                 try {
-                  await cdp2.detachAgent(agent.sessionId);
+                  await cdp.detachAgent(agent.sessionId);
                 } catch {
                 }
                 this.managed.delete(type);
@@ -24860,12 +24956,12 @@ ${installInfo}`
         }
         return results;
       }
-      async sendToAgent(cdp2, agentType, text, targetIdeType) {
+      async sendToAgent(cdp, agentType, text, targetIdeType) {
         await this.ensureAgentPanelOpen(agentType, targetIdeType);
         const agent = this.managed.get(agentType);
         if (!agent) return false;
         try {
-          const evaluate = (expr, timeout) => cdp2.evaluateInSession(agent.sessionId, expr, timeout);
+          const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
           await agent.adapter.sendMessage(evaluate, text);
           return true;
         } catch (e) {
@@ -24873,24 +24969,24 @@ ${installInfo}`
           return false;
         }
       }
-      async resolveAgentAction(cdp2, agentType, action, targetIdeType) {
+      async resolveAgentAction(cdp, agentType, action, targetIdeType) {
         await this.ensureAgentPanelOpen(agentType, targetIdeType);
         const agent = this.managed.get(agentType);
         if (!agent) return false;
         try {
-          const evaluate = (expr, timeout) => cdp2.evaluateInSession(agent.sessionId, expr, timeout);
+          const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
           return await agent.adapter.resolveAction(evaluate, action);
         } catch (e) {
           this.logFn(`[AgentStream] resolveAction(${agentType}) error: ${e.message}`);
           return false;
         }
       }
-      async newAgentSession(cdp2, agentType, targetIdeType) {
+      async newAgentSession(cdp, agentType, targetIdeType) {
         await this.ensureAgentPanelOpen(agentType, targetIdeType);
         const agent = this.managed.get(agentType);
         if (!agent) return false;
         try {
-          const evaluate = (expr, timeout) => cdp2.evaluateInSession(agent.sessionId, expr, timeout);
+          const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
           await agent.adapter.newSession(evaluate);
           return true;
         } catch (e) {
@@ -24898,45 +24994,45 @@ ${installInfo}`
           return false;
         }
       }
-      async listAgentChats(cdp2, agentType) {
+      async listAgentChats(cdp, agentType) {
         let agent = this.managed.get(agentType);
         if (!agent) {
           this.logFn(`[AgentStream] listChats: ${agentType} not managed, trying on-demand activation`);
-          await this.switchActiveAgent(cdp2, agentType);
-          await this.syncAgentSessions(cdp2);
+          await this.switchActiveAgent(cdp, agentType);
+          await this.syncAgentSessions(cdp);
           agent = this.managed.get(agentType);
         }
         if (!agent || typeof agent.adapter.listChats !== "function") return [];
         try {
-          const evaluate = (expr, timeout) => cdp2.evaluateInSession(agent.sessionId, expr, timeout);
+          const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
           return await agent.adapter.listChats(evaluate);
         } catch (e) {
           this.logFn(`[AgentStream] listChats(${agentType}) error: ${e.message}`);
           return [];
         }
       }
-      async switchAgentSession(cdp2, agentType, sessionId) {
+      async switchAgentSession(cdp, agentType, sessionId) {
         let agent = this.managed.get(agentType);
         if (!agent) {
           this.logFn(`[AgentStream] switchSession: ${agentType} not managed, trying on-demand activation`);
-          await this.switchActiveAgent(cdp2, agentType);
-          await this.syncAgentSessions(cdp2);
+          await this.switchActiveAgent(cdp, agentType);
+          await this.syncAgentSessions(cdp);
           agent = this.managed.get(agentType);
         }
         if (!agent || typeof agent.adapter.switchSession !== "function") return false;
         try {
-          const evaluate = (expr, timeout) => cdp2.evaluateInSession(agent.sessionId, expr, timeout);
+          const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
           return await agent.adapter.switchSession(evaluate, sessionId);
         } catch (e) {
           this.logFn(`[AgentStream] switchSession(${agentType}) error: ${e.message}`);
           return false;
         }
       }
-      async focusAgentEditor(cdp2, agentType) {
+      async focusAgentEditor(cdp, agentType) {
         const agent = this.managed.get(agentType);
         if (!agent || typeof agent.adapter.focusEditor !== "function") return false;
         try {
-          const evaluate = (expr, timeout) => cdp2.evaluateInSession(agent.sessionId, expr, timeout);
+          const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
           await agent.adapter.focusEditor(evaluate);
           return true;
         } catch (e) {
@@ -24950,10 +25046,10 @@ ${installInfo}`
       getManagedAgent(agentType) {
         return this.managed.get(agentType);
       }
-      async dispose(cdp2) {
+      async dispose(cdp) {
         for (const [, agent] of this.managed) {
           try {
-            await cdp2.detachAgent(agent.sessionId);
+            await cdp.detachAgent(agent.sessionId);
           } catch {
           }
         }
@@ -25000,8 +25096,8 @@ ${installInfo}`
           cdpManagers
         } = this.deps;
         if (!agentStreamManager || cdpManagers.size === 0) return;
-        for (const [ideType, cdp2] of cdpManagers) {
-          registerExtensionProviders(providerLoader, cdp2, ideType);
+        for (const [ideType, cdp] of cdpManagers) {
+          registerExtensionProviders(providerLoader, cdp, ideType);
           const ideInstance = instanceManager.getInstance(`ide:${ideType}`);
           if (ideInstance?.getExtensionTypes && ideInstance?.addExtension && ideInstance?.removeExtension) {
             const currentExtTypes = new Set(ideInstance.getExtensionTypes());
@@ -25027,11 +25123,11 @@ ${installInfo}`
           }
         }
         if (this._activeIdeType) {
-          const cdp2 = cdpManagers.get(this._activeIdeType);
-          if (cdp2?.isConnected) {
+          const cdp = cdpManagers.get(this._activeIdeType);
+          if (cdp?.isConnected) {
             try {
-              await agentStreamManager.syncAgentSessions(cdp2);
-              const streams = await agentStreamManager.collectAgentStreams(cdp2);
+              await agentStreamManager.syncAgentSessions(cdp);
+              const streams = await agentStreamManager.collectAgentStreams(cdp);
               this.deps.onStreamsUpdated?.(this._activeIdeType, streams);
             } catch {
             }
@@ -25040,16 +25136,16 @@ ${installInfo}`
           this._activeIdeType = null;
         }
         if (!agentStreamManager.activeAgentType) {
-          for (const [ideType, cdp2] of cdpManagers) {
-            if (!cdp2.isConnected) continue;
+          for (const [ideType, cdp] of cdpManagers) {
+            if (!cdp.isConnected) continue;
             try {
-              const discovered = await cdp2.discoverAgentWebviews();
+              const discovered = await cdp.discoverAgentWebviews();
               if (discovered.length > 0) {
                 this._activeIdeType = ideType;
-                await agentStreamManager.switchActiveAgent(cdp2, discovered[0].agentType);
+                await agentStreamManager.switchActiveAgent(cdp, discovered[0].agentType);
                 LOG5.info("AgentStream", `Auto-activated: ${discovered[0].agentType} (${ideType})`);
-                await agentStreamManager.syncAgentSessions(cdp2);
-                const streams = await agentStreamManager.collectAgentStreams(cdp2);
+                await agentStreamManager.syncAgentSessions(cdp);
+                const streams = await agentStreamManager.collectAgentStreams(cdp);
                 this.deps.onStreamsUpdated?.(ideType, streams);
                 return;
               }
@@ -25321,26 +25417,26 @@ ${installInfo}`
     async function detectAllVersions2(loader, archive) {
       const results = [];
       const currentOs = (0, import_os3.platform)();
-      for (const provider2 of loader.getAll()) {
+      for (const provider of loader.getAll()) {
         const info = {
-          type: provider2.type,
-          name: provider2.name,
-          category: provider2.category,
+          type: provider.type,
+          name: provider.name,
+          category: provider.category,
           installed: false,
           version: null,
           path: null,
           binary: null,
           detectedAt: (/* @__PURE__ */ new Date()).toISOString()
         };
-        const versionCommand = provider2.versionCommand;
-        if (provider2.category === "ide") {
-          const osPaths = provider2.paths?.[currentOs] || [];
+        const versionCommand = provider.versionCommand;
+        if (provider.category === "ide") {
+          const osPaths = provider.paths?.[currentOs] || [];
           const appPath = checkPathExists2(osPaths);
-          const cliBin = provider2.cli ? findBinary2(provider2.cli) : null;
+          const cliBin = provider.cli ? findBinary2(provider.cli) : null;
           let resolvedBin = cliBin;
           if (!resolvedBin && appPath && currentOs === "darwin") {
-            const bundled = path11.join(appPath, "Contents", "Resources", "app", "bin", provider2.cli || "");
-            if (provider2.cli && fs8.existsSync(bundled)) resolvedBin = bundled;
+            const bundled = path11.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
+            if (provider.cli && fs8.existsSync(bundled)) resolvedBin = bundled;
           }
           info.installed = !!(appPath || resolvedBin);
           info.path = appPath || null;
@@ -25351,23 +25447,23 @@ ${installInfo}`
           if (!info.version && appPath) {
             info.version = getMacAppVersion(appPath);
           }
-        } else if (provider2.category === "cli" || provider2.category === "acp") {
-          const bin = provider2.binary || provider2.spawn?.command || provider2.cli || provider2.type;
+        } else if (provider.category === "cli" || provider.category === "acp") {
+          const bin = provider.binary || provider.spawn?.command || provider.cli || provider.type;
           const binPath = findBinary2(bin);
           info.installed = !!binPath;
           info.binary = binPath || null;
           if (binPath) {
             info.version = getVersion(binPath, versionCommand);
           }
-        } else if (provider2.category === "extension") {
+        } else if (provider.category === "extension") {
           info.installed = false;
           info.version = null;
         }
         if (info.version && archive) {
-          archive.record(provider2.type, info.version);
+          archive.record(provider.type, info.version);
         }
         if (info.version && info.installed) {
-          const testedVersions = provider2.testedVersions || [];
+          const testedVersions = provider.testedVersions || [];
           if (testedVersions.length > 0 && !testedVersions.includes(info.version)) {
             info.warning = `Version ${info.version} is not in testedVersions [${testedVersions.join(", ")}]. Scripts may not work correctly.`;
           }
@@ -25709,6 +25805,8 @@ async (params) => {
       server = null;
       providerLoader;
       cdpManagers;
+      instanceManager;
+      cliManager;
       logFn;
       sseClients = [];
       watchScriptPath = null;
@@ -25718,9 +25816,13 @@ async (params) => {
       autoImplProcess = null;
       autoImplSSEClients = [];
       autoImplStatus = { running: false, type: null, progress: [] };
+      // CLI debug SSE
+      cliSSEClients = [];
       constructor(options) {
         this.providerLoader = options.providerLoader;
         this.cdpManagers = options.cdpManagers;
+        this.instanceManager = options.instanceManager || null;
+        this.cliManager = options.cliManager || null;
         this.logFn = options.logFn || LOG5.forComponent("DevServer").asLogFn();
       }
       log(msg) {
@@ -25747,6 +25849,15 @@ async (params) => {
         { method: "POST", pattern: "/api/watch/stop", handler: (q, s) => this.handleWatchStop(q, s) },
         { method: "GET", pattern: "/api/watch/events", handler: (q, s) => this.handleSSE(q, s) },
         { method: "POST", pattern: "/api/scaffold", handler: (q, s) => this.handleScaffold(q, s) },
+        // CLI Debug routes
+        { method: "GET", pattern: "/api/cli/status", handler: (q, s) => this.handleCliStatus(q, s) },
+        { method: "POST", pattern: "/api/cli/launch", handler: (q, s) => this.handleCliLaunch(q, s) },
+        { method: "POST", pattern: "/api/cli/send", handler: (q, s) => this.handleCliSend(q, s) },
+        { method: "POST", pattern: "/api/cli/resolve", handler: (q, s) => this.handleCliResolve(q, s) },
+        { method: "POST", pattern: "/api/cli/raw", handler: (q, s) => this.handleCliRaw(q, s) },
+        { method: "POST", pattern: "/api/cli/stop", handler: (q, s) => this.handleCliStop(q, s) },
+        { method: "GET", pattern: "/api/cli/events", handler: (q, s) => this.handleCliSSE(q, s) },
+        { method: "GET", pattern: /^\/api\/cli\/debug\/([^/]+)$/, handler: (q, s, p) => this.handleCliDebug(p[0], q, s) },
         // Dynamic routes (provider :type param)
         { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/script$/, handler: (q, s, p) => this.handleRunScript(p[0], q, s) },
         { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/files$/, handler: (q, s, p) => this.handleListFiles(p[0], q, s) },
@@ -25862,12 +25973,12 @@ async (params) => {
         this.json(res, 200, { providers, count: providers.length });
       }
       async handleProviderConfig(type, _req, res) {
-        const provider2 = this.providerLoader.resolve(type);
-        if (!provider2) {
+        const provider = this.providerLoader.resolve(type);
+        if (!provider) {
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const config2 = { ...provider2 };
+        const config2 = { ...provider };
         if (config2.scripts) {
           config2.scriptNames = Object.keys(config2.scripts).filter((k) => typeof config2.scripts[k] === "function");
           delete config2.scripts;
@@ -25875,12 +25986,12 @@ async (params) => {
         this.json(res, 200, { type, config: config2 });
       }
       async handleSpawnTest(type, req, res) {
-        const provider2 = this.providerLoader.resolve(type);
-        if (!provider2) {
+        const provider = this.providerLoader.resolve(type);
+        if (!provider) {
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const spawn3 = provider2.spawn;
+        const spawn3 = provider.spawn;
         if (!spawn3) {
           this.json(res, 400, { error: `Provider ${type} has no spawn config` });
           return;
@@ -25940,18 +26051,18 @@ async (params) => {
       async handleRunScript(type, req, res) {
         const body = await this.readBody(req);
         const { script: scriptName, params, ideType: scriptIdeType } = body;
-        const provider2 = this.providerLoader.resolve(type);
-        if (!provider2) {
+        const provider = this.providerLoader.resolve(type);
+        if (!provider) {
           this.json(res, 404, { error: `Provider '${type}' not found` });
           return;
         }
-        const fn = provider2.scripts?.[scriptName];
+        const fn = provider.scripts?.[scriptName];
         if (typeof fn !== "function") {
-          this.json(res, 400, { error: `Script '${scriptName}' not found in provider '${type}'`, available: provider2.scripts ? Object.keys(provider2.scripts) : [] });
+          this.json(res, 400, { error: `Script '${scriptName}' not found in provider '${type}'`, available: provider.scripts ? Object.keys(provider.scripts) : [] });
           return;
         }
-        const cdp2 = this.getCdp(scriptIdeType);
-        if (!cdp2) {
+        const cdp = this.getCdp(scriptIdeType);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection available" });
           return;
         }
@@ -25964,11 +26075,11 @@ async (params) => {
           const isWebviewScript = scriptName.toLowerCase().includes("webview");
           let raw;
           if (isWebviewScript) {
-            const matchText = provider2.webviewMatchText;
+            const matchText = provider.webviewMatchText;
             const matchFn = matchText ? (body2) => body2.includes(matchText) : void 0;
-            raw = await cdp2.evaluateInWebviewFrame(scriptCode, matchFn);
+            raw = await cdp.evaluateInWebviewFrame(scriptCode, matchFn);
           } else {
-            raw = await cdp2.evaluate(scriptCode, 3e4);
+            raw = await cdp.evaluate(scriptCode, 3e4);
           }
           let result = raw;
           if (typeof raw === "string") {
@@ -25989,13 +26100,13 @@ async (params) => {
           this.json(res, 400, { error: "expression required" });
           return;
         }
-        const cdp2 = ideType ? this.cdpManagers.get(ideType) : this.getAnyCdp();
-        if (!cdp2?.isConnected) {
+        const cdp = ideType ? this.cdpManagers.get(ideType) : this.getAnyCdp();
+        if (!cdp?.isConnected) {
           this.json(res, 503, { error: "No CDP connection available" });
           return;
         }
         try {
-          const raw = await cdp2.evaluate(expression, timeout || 3e4);
+          const raw = await cdp.evaluate(expression, timeout || 3e4);
           let result = raw;
           if (typeof raw === "string") {
             try {
@@ -26015,8 +26126,8 @@ async (params) => {
           this.json(res, 400, { error: "selector required" });
           return;
         }
-        const cdp2 = this.getCdp(ideType);
-        if (!cdp2) {
+        const cdp = this.getCdp(ideType);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection available" });
           return;
         }
@@ -26041,7 +26152,7 @@ async (params) => {
       } catch (e) { return JSON.stringify({ error: e.message }); }
     })()`;
         try {
-          const raw = await cdp2.evaluate(expr, 1e4);
+          const raw = await cdp.evaluate(expr, 1e4);
           const result = typeof raw === "string" ? JSON.parse(raw) : raw;
           this.json(res, 200, result);
         } catch (e) {
@@ -26051,15 +26162,15 @@ async (params) => {
       async handleScreenshot(req, res) {
         const url2 = new URL(req.url || "/", "http://localhost");
         const ideType = url2.searchParams.get("ideType") || void 0;
-        const cdp2 = this.getCdp(ideType);
-        if (!cdp2) {
+        const cdp = this.getCdp(ideType);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection available" });
           return;
         }
         try {
           let vpW = 0, vpH = 0;
           try {
-            const metrics = await cdp2.send("Page.getLayoutMetrics", {}, 3e3);
+            const metrics = await cdp.send("Page.getLayoutMetrics", {}, 3e3);
             const vp = metrics?.cssVisualViewport || metrics?.visualViewport;
             if (vp) {
               vpW = Math.round(vp.clientWidth || vp.width || 0);
@@ -26067,7 +26178,7 @@ async (params) => {
             }
           } catch {
           }
-          const buf = await cdp2.captureScreenshot();
+          const buf = await cdp.captureScreenshot();
           if (buf) {
             res.writeHead(200, {
               "Content-Type": "image/webp",
@@ -26098,8 +26209,8 @@ async (params) => {
           category: p.category
         }));
         const cdpStatus = {};
-        for (const [key, cdp2] of this.cdpManagers.entries()) {
-          cdpStatus[key] = { connected: cdp2.isConnected };
+        for (const [key, cdp] of this.cdpManagers.entries()) {
+          cdpStatus[key] = { connected: cdp.isConnected };
         }
         this.json(res, 200, {
           devMode: true,
@@ -26219,25 +26330,25 @@ async (params) => {
         this.sendSSE({ type: "watch_started", provider: type, script: this.watchScriptName });
         const runWatch = async () => {
           if (!this.watchScriptPath) return;
-          const provider2 = this.providerLoader.resolve(this.watchScriptPath);
-          if (!provider2) {
+          const provider = this.providerLoader.resolve(this.watchScriptPath);
+          if (!provider) {
             this.sendSSE({ type: "watch_error", error: `Provider '${this.watchScriptPath}' not found` });
             return;
           }
-          const fn = provider2.scripts?.[this.watchScriptName];
+          const fn = provider.scripts?.[this.watchScriptName];
           if (typeof fn !== "function") {
             this.sendSSE({ type: "watch_error", error: `Script '${this.watchScriptName}' not found` });
             return;
           }
-          const cdp2 = this.getAnyCdp();
-          if (!cdp2) {
+          const cdp = this.getAnyCdp();
+          if (!cdp) {
             this.sendSSE({ type: "watch_error", error: "No CDP connection" });
             return;
           }
           try {
             const script = fn();
             const start = Date.now();
-            const raw = await cdp2.evaluate(script, 15e3);
+            const raw = await cdp.evaluate(script, 15e3);
             const elapsed = Date.now() - start;
             let result = raw;
             if (typeof raw === "string") {
@@ -26268,9 +26379,9 @@ async (params) => {
       // ─── Provider File Explorer ───
       /** Find the provider directory on disk */
       findProviderDir(type) {
-        const provider2 = this.providerLoader.getMeta(type);
-        if (!provider2) return null;
-        const cat = provider2.category;
+        const provider = this.providerLoader.getMeta(type);
+        if (!provider) return null;
+        const cat = provider.category;
         const builtinDir = this.providerLoader.builtinDir || path12.resolve(__dirname, "../providers/_builtin");
         const userDir = path12.join(os14.homedir(), ".adhdev", "providers");
         const directCandidates = [
@@ -26568,12 +26679,12 @@ async (params) => {
           this.json(res, 400, { error: "message required" });
           return;
         }
-        const provider2 = this.providerLoader.getMeta(type);
-        if (!provider2) {
+        const provider = this.providerLoader.getMeta(type);
+        if (!provider) {
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const spawn3 = provider2.spawn;
+        const spawn3 = provider.spawn;
         if (!spawn3) {
           this.json(res, 400, { error: `Provider ${type} has no spawn config` });
           return;
@@ -26626,8 +26737,8 @@ async (params) => {
       }
       async handleCdpTargets(_req, res) {
         const targets = [];
-        for (const [ide, cdp2] of this.cdpManagers.entries()) {
-          targets.push({ ide, connected: cdp2.isConnected, port: cdp2.getPort() });
+        for (const [ide, cdp] of this.cdpManagers.entries()) {
+          targets.push({ ide, connected: cdp.isConnected, port: cdp.getPort() });
         }
         this.json(res, 200, { targets });
       }
@@ -26703,8 +26814,8 @@ async (params) => {
       async handleDomInspect(req, res) {
         const body = await this.readBody(req);
         const { x, y, selector, ideType } = body;
-        const cdp2 = this.getCdp(ideType);
-        if (!cdp2) {
+        const cdp = this.getCdp(ideType);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection" });
           return;
         }
@@ -26757,7 +26868,7 @@ async (params) => {
       return JSON.stringify({ element: info, ancestors: ancestors.reverse(), children });
     })()`;
         try {
-          const raw = await cdp2.evaluate(inspectScript, 1e4);
+          const raw = await cdp.evaluate(inspectScript, 1e4);
           let result = raw;
           if (typeof raw === "string") {
             try {
@@ -26773,8 +26884,8 @@ async (params) => {
       async handleDomChildren(req, res) {
         const body = await this.readBody(req);
         const { selector, ideType } = body;
-        const cdp2 = this.getCdp(ideType);
-        if (!cdp2) {
+        const cdp = this.getCdp(ideType);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection" });
           return;
         }
@@ -26812,7 +26923,7 @@ async (params) => {
       return JSON.stringify({ selector: ${JSON.stringify(selector)}, childCount: el.children?.length||0, children });
     })()`;
         try {
-          const raw = await cdp2.evaluate(script, 1e4);
+          const raw = await cdp.evaluate(script, 1e4);
           let result = raw;
           if (typeof raw === "string") {
             try {
@@ -26828,8 +26939,8 @@ async (params) => {
       async handleDomAnalyze(req, res) {
         const body = await this.readBody(req);
         const { ideType, selector, x, y } = body;
-        const cdp2 = this.getCdp(ideType);
-        if (!cdp2) {
+        const cdp = this.getCdp(ideType);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection" });
           return;
         }
@@ -26951,7 +27062,7 @@ async (params) => {
       return JSON.stringify(result);
     })()`;
         try {
-          const raw = await cdp2.evaluate(analyzeScript, 15e3);
+          const raw = await cdp.evaluate(analyzeScript, 15e3);
           let result = raw;
           if (typeof raw === "string") {
             try {
@@ -26971,8 +27082,8 @@ async (params) => {
           this.json(res, 400, { error: "include[] is required" });
           return;
         }
-        const cdp2 = this.getCdp(ideType);
-        if (!cdp2) {
+        const cdp = this.getCdp(ideType);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection" });
           return;
         }
@@ -27160,7 +27271,7 @@ async (params) => {
       });
     })()`;
         try {
-          const raw = await cdp2.evaluate(script, 1e4);
+          const raw = await cdp.evaluate(script, 1e4);
           let result = raw;
           if (typeof raw === "string") {
             try {
@@ -27180,8 +27291,8 @@ async (params) => {
           this.json(res, 400, { error: "text is required" });
           return;
         }
-        const cdp2 = this.getCdp(ideType);
-        if (!cdp2) {
+        const cdp = this.getCdp(ideType);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection" });
           return;
         }
@@ -27286,7 +27397,7 @@ async (params) => {
       return JSON.stringify({ query: ${JSON.stringify(text)}, matches, total: matches.length });
     })()`;
         try {
-          const raw = await cdp2.evaluate(script, 1e4);
+          const raw = await cdp.evaluate(script, 1e4);
           let result = raw;
           if (typeof raw === "string") {
             try {
@@ -27303,20 +27414,20 @@ async (params) => {
       async handleDomContext(type, req, res) {
         const body = await this.readBody(req);
         const { ideType } = body;
-        const provider2 = this.providerLoader.resolve(type);
-        if (!provider2) {
+        const provider = this.providerLoader.resolve(type);
+        if (!provider) {
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const cdp2 = this.getCdp(ideType || type);
-        if (!cdp2) {
+        const cdp = this.getCdp(ideType || type);
+        if (!cdp) {
           this.json(res, 503, { error: "No CDP connection available. Target IDE must be running with CDP enabled." });
           return;
         }
         try {
           let screenshot = null;
           try {
-            const buf = await cdp2.captureScreenshot();
+            const buf = await cdp.captureScreenshot();
             if (buf) screenshot = buf.toString("base64");
           } catch {
           }
@@ -27417,7 +27528,7 @@ async (params) => {
 
         return JSON.stringify(result);
       })()`;
-          const raw = await cdp2.evaluate(domScript, 15e3);
+          const raw = await cdp.evaluate(domScript, 15e3);
           let domSnapshot = {};
           if (typeof raw === "string") {
             try {
@@ -27429,8 +27540,8 @@ async (params) => {
           this.json(res, 200, {
             screenshot: screenshot ? `base64:${screenshot}` : null,
             domSnapshot,
-            pageTitle: await cdp2.evaluate("document.title", 3e3).catch(() => ""),
-            pageUrl: await cdp2.evaluate("window.location.href", 3e3).catch(() => ""),
+            pageTitle: await cdp.evaluate("document.title", 3e3).catch(() => ""),
+            pageUrl: await cdp.evaluate("window.location.href", 3e3).catch(() => ""),
             providerType: type,
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           });
@@ -27450,8 +27561,8 @@ async (params) => {
           this.json(res, 409, { error: "Auto-implement already in progress", type: this.autoImplStatus.type });
           return;
         }
-        const provider2 = this.providerLoader.resolve(type);
-        if (!provider2) {
+        const provider = this.providerLoader.resolve(type);
+        if (!provider) {
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
@@ -27463,8 +27574,8 @@ async (params) => {
         try {
           this.sendAutoImplSSE({ event: "progress", data: { function: "_init", status: "analyzing", message: "DOM \uAD6C\uC870 \uC218\uC9D1 \uC911..." } });
           let domContext = null;
-          const cdp2 = this.getCdp(type);
-          if (cdp2) {
+          const cdp = this.getCdp(type);
+          if (cdp) {
             try {
               const domScript = `(() => {
             function fp(el) {
@@ -27499,7 +27610,7 @@ async (params) => {
             }));
             return JSON.stringify(r);
           })()`;
-              const raw = await cdp2.evaluate(domScript, 1e4);
+              const raw = await cdp.evaluate(domScript, 1e4);
               domContext = typeof raw === "string" ? JSON.parse(raw) : raw;
             } catch (e) {
               this.log(`DOM context collection failed (non-fatal): ${e.message}`);
@@ -27532,7 +27643,7 @@ async (params) => {
               }
             }
           }
-          const prompt = this.buildAutoImplPrompt(type, provider2, providerDir, functions, domContext, referenceScripts);
+          const prompt = this.buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts);
           const tmpDir = path12.join(os14.tmpdir(), "adhdev-autoimpl");
           if (!fs9.existsSync(tmpDir)) fs9.mkdirSync(tmpDir, { recursive: true });
           const promptFile = path12.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
@@ -27779,12 +27890,12 @@ async (params) => {
           this.json(res, 500, { error: `Auto-implement failed: ${e.message}` });
         }
       }
-      buildAutoImplPrompt(type, provider2, providerDir, functions, domContext, referenceScripts) {
+      buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts) {
         const lines = [];
         lines.push("You are implementing browser automation scripts for an IDE provider.");
         lines.push("Be concise. Do NOT explain your reasoning. Just edit files directly.");
         lines.push("");
-        lines.push(`# Target: ${provider2.name || type} (${type})`);
+        lines.push(`# Target: ${provider.name || type} (${type})`);
         lines.push(`Provider directory: \`${providerDir}\``);
         lines.push("");
         lines.push("## Current Target Files");
@@ -27985,11 +28096,11 @@ data: ${JSON.stringify(msg.data)}
       /** Get CDP manager — matching IDE when ideType specified, first connected one otherwise */
       getCdp(ideType) {
         if (ideType) {
-          const cdp2 = this.cdpManagers.get(ideType);
-          if (cdp2?.isConnected) return cdp2;
+          const cdp = this.cdpManagers.get(ideType);
+          if (cdp?.isConnected) return cdp;
         }
-        for (const cdp2 of this.cdpManagers.values()) {
-          if (cdp2.isConnected) return cdp2;
+        for (const cdp of this.cdpManagers.values()) {
+          if (cdp.isConnected) return cdp;
         }
         return null;
       }
@@ -28013,6 +28124,251 @@ data: ${JSON.stringify(msg.data)}
           });
         });
       }
+      // ─── CLI Debug Handlers ──────────────────────────────
+      /** GET /api/cli/status — list all running CLI/ACP instances with state */
+      async handleCliStatus(_req, res) {
+        if (!this.instanceManager) {
+          this.json(res, 503, { error: "InstanceManager not available (daemon not fully initialized)" });
+          return;
+        }
+        const allStates = this.instanceManager.collectAllStates();
+        const cliStates = allStates.filter((s) => s.category === "cli" || s.category === "acp");
+        const result = cliStates.map((s) => ({
+          instanceId: s.instanceId,
+          type: s.type,
+          name: s.name,
+          category: s.category,
+          status: s.status,
+          mode: s.mode,
+          workspace: s.workspace,
+          messageCount: s.activeChat?.messages?.length || 0,
+          lastMessage: s.activeChat?.messages?.slice(-1)[0] || null,
+          activeModal: s.activeChat?.activeModal || null,
+          pendingEvents: s.pendingEvents || [],
+          currentModel: s.currentModel,
+          settings: s.settings
+        }));
+        this.json(res, 200, { instances: result, count: result.length });
+      }
+      /** POST /api/cli/launch — launch a CLI agent { type, workingDir?, args? } */
+      async handleCliLaunch(req, res) {
+        if (!this.cliManager) {
+          this.json(res, 503, { error: "CliManager not available" });
+          return;
+        }
+        const body = await this.readBody(req);
+        const { type, workingDir, args } = body;
+        if (!type) {
+          this.json(res, 400, { error: "type required (e.g. claude-cli, gemini-cli)" });
+          return;
+        }
+        try {
+          await this.cliManager.startSession(type, workingDir || process.cwd(), args || []);
+          this.json(res, 200, { launched: true, type, workspace: workingDir || process.cwd() });
+        } catch (e) {
+          this.json(res, 500, { error: `Launch failed: ${e.message}` });
+        }
+      }
+      /** POST /api/cli/send — send message to a running CLI { type, text } */
+      async handleCliSend(req, res) {
+        if (!this.instanceManager) {
+          this.json(res, 503, { error: "InstanceManager not available" });
+          return;
+        }
+        const body = await this.readBody(req);
+        const { type, text, instanceId } = body;
+        if (!text) {
+          this.json(res, 400, { error: "text required" });
+          return;
+        }
+        const allStates = this.instanceManager.collectAllStates();
+        const target = allStates.find(
+          (s) => (s.category === "cli" || s.category === "acp") && (instanceId ? s.instanceId === instanceId : s.type === type)
+        );
+        if (!target) {
+          this.json(res, 404, { error: `No running instance found for: ${type || instanceId}` });
+          return;
+        }
+        try {
+          this.instanceManager.sendEvent(target.instanceId, "send_message", { text });
+          this.json(res, 200, { sent: true, type: target.type, instanceId: target.instanceId });
+        } catch (e) {
+          this.json(res, 500, { error: `Send failed: ${e.message}` });
+        }
+      }
+      /** POST /api/cli/stop — stop a running CLI { type } */
+      async handleCliStop(req, res) {
+        if (!this.instanceManager) {
+          this.json(res, 503, { error: "InstanceManager not available" });
+          return;
+        }
+        const body = await this.readBody(req);
+        const { type, instanceId } = body;
+        const allStates = this.instanceManager.collectAllStates();
+        const target = allStates.find(
+          (s) => (s.category === "cli" || s.category === "acp") && (instanceId ? s.instanceId === instanceId : s.type === type)
+        );
+        if (!target) {
+          this.json(res, 404, { error: `No running instance found for: ${type || instanceId}` });
+          return;
+        }
+        try {
+          this.instanceManager.removeInstance(target.instanceId);
+          this.json(res, 200, { stopped: true, type: target.type, instanceId: target.instanceId });
+        } catch (e) {
+          this.json(res, 500, { error: `Stop failed: ${e.message}` });
+        }
+      }
+      /** GET /api/cli/events — SSE stream of CLI status events */
+      handleCliSSE(_req, res) {
+        res.writeHead(200, {
+          "Content-Type": "text/event-stream",
+          "Cache-Control": "no-cache",
+          "Connection": "keep-alive",
+          "Access-Control-Allow-Origin": "*"
+        });
+        res.write('data: {"type":"connected"}\n\n');
+        this.cliSSEClients.push(res);
+        if (this.cliSSEClients.length === 1 && this.instanceManager) {
+          this.instanceManager.onEvent((event) => {
+            this.sendCliSSE(event);
+          });
+        }
+        if (this.instanceManager) {
+          const allStates = this.instanceManager.collectAllStates();
+          const cliStates = allStates.filter((s) => s.category === "cli" || s.category === "acp");
+          for (const s of cliStates) {
+            this.sendCliSSE({ event: "snapshot", providerType: s.type, status: s.status, instanceId: s.instanceId });
+          }
+        }
+        _req.on("close", () => {
+          this.cliSSEClients = this.cliSSEClients.filter((c) => c !== res);
+        });
+      }
+      sendCliSSE(data) {
+        const msg = `data: ${JSON.stringify({ ...data, timestamp: Date.now() })}
+
+`;
+        for (const client of this.cliSSEClients) {
+          try {
+            client.write(msg);
+          } catch {
+          }
+        }
+      }
+      /** GET /api/cli/debug/:type — full internal debug state of a CLI adapter */
+      async handleCliDebug(type, _req, res) {
+        if (!this.instanceManager) {
+          this.json(res, 503, { error: "InstanceManager not available" });
+          return;
+        }
+        const allStates = this.instanceManager.collectAllStates();
+        const target = allStates.find(
+          (s) => (s.category === "cli" || s.category === "acp") && s.type === type
+        );
+        if (!target) {
+          this.json(res, 404, { error: `No running instance for: ${type}`, available: allStates.filter((s) => s.category === "cli" || s.category === "acp").map((s) => s.type) });
+          return;
+        }
+        const instance = this.instanceManager.getInstance(target.instanceId);
+        if (!instance) {
+          this.json(res, 404, { error: `Instance not found: ${target.instanceId}` });
+          return;
+        }
+        try {
+          const adapter = instance.getAdapter?.() || instance.adapter;
+          if (adapter && typeof adapter.getDebugState === "function") {
+            const debugState = adapter.getDebugState();
+            this.json(res, 200, {
+              instanceId: target.instanceId,
+              providerState: {
+                type: target.type,
+                name: target.name,
+                status: target.status,
+                mode: "mode" in target ? target.mode : void 0
+              },
+              debug: debugState
+            });
+          } else {
+            this.json(res, 200, {
+              instanceId: target.instanceId,
+              providerState: target,
+              debug: null,
+              message: "No debug state available (adapter.getDebugState not found)"
+            });
+          }
+        } catch (e) {
+          this.json(res, 500, { error: `Debug state failed: ${e.message}` });
+        }
+      }
+      /** POST /api/cli/resolve — resolve an approval modal { type, buttonIndex } */
+      async handleCliResolve(req, res) {
+        const body = await this.readBody(req);
+        const { type, buttonIndex, instanceId } = body;
+        if (buttonIndex === void 0 || buttonIndex === null) {
+          this.json(res, 400, { error: "buttonIndex required (0=Yes, 1=Always, 2=Deny)" });
+          return;
+        }
+        if (!this.cliManager) {
+          this.json(res, 503, { error: "CliManager not available" });
+          return;
+        }
+        let adapter = null;
+        for (const [, a] of this.cliManager.adapters) {
+          if (type && a.cliType === type) {
+            adapter = a;
+            break;
+          }
+        }
+        if (!adapter) {
+          this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
+          return;
+        }
+        try {
+          if (typeof adapter.resolveModal === "function") {
+            adapter.resolveModal(buttonIndex);
+            this.json(res, 200, { resolved: true, type, buttonIndex });
+          } else {
+            this.json(res, 400, { error: "resolveModal not available on this adapter" });
+          }
+        } catch (e) {
+          this.json(res, 500, { error: `Resolve failed: ${e.message}` });
+        }
+      }
+      /** POST /api/cli/raw — send raw keystrokes to PTY { type, keys } */
+      async handleCliRaw(req, res) {
+        const body = await this.readBody(req);
+        const { type, keys, instanceId } = body;
+        if (!keys) {
+          this.json(res, 400, { error: "keys required (raw string to send to PTY)" });
+          return;
+        }
+        if (!this.cliManager) {
+          this.json(res, 503, { error: "CliManager not available" });
+          return;
+        }
+        let adapter = null;
+        for (const [, a] of this.cliManager.adapters) {
+          if (type && a.cliType === type) {
+            adapter = a;
+            break;
+          }
+        }
+        if (!adapter) {
+          this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
+          return;
+        }
+        try {
+          if (typeof adapter.writeRaw === "function") {
+            adapter.writeRaw(keys);
+            this.json(res, 200, { sent: true, type, keysLength: keys.length });
+          } else {
+            this.json(res, 400, { error: "writeRaw not available on this adapter" });
+          }
+        } catch (e) {
+          this.json(res, 500, { error: `Raw send failed: ${e.message}` });
+        }
+      }
     };
     var import_child_process8 = require("child_process");
     var EXTENSION_CATALOG = [
@@ -28208,7 +28564,7 @@ data: ${JSON.stringify(msg.data)}
         getInstanceManager: () => instanceManager
       }, providerLoader);
       LOG5.info("Init", "Detecting IDEs...");
-      detectedIdesRef.value = await detectIDEs3();
+      detectedIdesRef.value = await detectIDEs2();
       const installed = detectedIdesRef.value.filter((i) => i.installed);
       LOG5.info("Init", `Found ${installed.length} IDE(s): ${installed.map((i) => i.id).join(", ") || "none"}`);
       const cdpSetupContext = {
@@ -28220,7 +28576,7 @@ data: ${JSON.stringify(msg.data)}
       const cdpInitializer = new DaemonCdpInitializer({
         providerLoader,
         cdpManagers,
-        enabledIdes: config2.enabledIdes || loadConfig4().enabledIdes || void 0,
+        enabledIdes: config2.enabledIdes || loadConfig3().enabledIdes || void 0,
         onConnected: async (ideType, manager, managerKey) => {
           await setupIdeInstance(cdpSetupContext, { ideType, manager, managerKey });
           await config2.onCdpManagerSetup?.(ideType, manager, managerKey);
@@ -28357,7 +28713,8 @@ var init_server_connection = __esm({
           this.ws = new import_ws.default(fullUrl, {
             headers: {
               "X-ADHDev-Token": this.options.token,
-              "X-ADHDev-IDE": JSON.stringify(this.options.cliInfo)
+              "X-ADHDev-IDE": JSON.stringify(this.options.cliInfo),
+              "X-ADHDev-Version": this.options.daemonVersion || "unknown"
             }
           });
           this.ws.on("open", () => this.onOpen());
@@ -28455,6 +28812,19 @@ var init_server_connection = __esm({
             import_daemon_core.LOG.error("Server", `Auth failed: ${message.payload.reason}`);
             this.setState("error");
             return;
+          } else if (message.type === "version_mismatch") {
+            const p = message.payload;
+            import_daemon_core.LOG.info("Server", `
+  \u{1F504} Update available: v${p.current} \u2192 v${p.latest}`);
+            import_daemon_core.LOG.info("Server", `     Run: adhdev daemon:upgrade
+`);
+          } else if (message.type === "force_update_required") {
+            const p = message.payload;
+            import_daemon_core.LOG.error("Server", `
+  \u26D4 Daemon v${this.options.daemonVersion} is no longer compatible.`);
+            import_daemon_core.LOG.error("Server", `     Minimum required: v${p.minVersion}`);
+            import_daemon_core.LOG.error("Server", `     Run: adhdev daemon:upgrade
+`);
           }
           const handlers = this.messageHandlers.get(message.type);
           if (handlers) {
@@ -29376,7 +29746,7 @@ var init_screenshot_controller = __esm({
         if (!this.deps.isRunning()) return;
         const active = this.deps.isScreenshotActive();
         const ssIdeType = this.deps.getScreenshotIdeType();
-        const cdp2 = this.deps.getCdp(ssIdeType);
+        const cdp = this.deps.getCdp(ssIdeType);
         const isRelay = this.deps.isUsingRelay();
         const profile = isRelay ? this.profileRelay : this.profileDirect;
         this.checkBudgetReset();
@@ -29392,7 +29762,7 @@ var init_screenshot_controller = __esm({
             import_daemon_core3.LOG.info("Screenshot", `Daily budget exhausted: ${usedMin}/${this.dailyBudgetMinutes}min \u2014 pausing until midnight UTC`);
           }
         }
-        if (!active || !cdp2 || this.budgetExhausted) {
+        if (!active || !cdp || this.budgetExhausted) {
           this.staticFrameCount = 0;
           this.currentInterval = profile.maxInterval;
           if (!active) this.lastActiveTimestamp = 0;
@@ -29401,7 +29771,7 @@ var init_screenshot_controller = __esm({
         }
         this.debugCount++;
         try {
-          const buf = await cdp2.captureScreenshot({ quality: profile.quality });
+          const buf = await cdp.captureScreenshot({ quality: profile.quality });
           if (buf) {
             const hash2 = _ScreenshotController.fnvHash(buf);
             const sizeMatch = buf.length === this.lastSize;
@@ -29631,6 +30001,7 @@ var init_adhdev_daemon = __esm({
         this.serverConn = new ServerConnection({
           serverUrl: options.serverUrl || config2.serverUrl,
           token: config2.connectionToken,
+          daemonVersion: pkgVersion,
           cliInfo: {
             type: "adhdev-daemon",
             version: pkgVersion,
@@ -29716,6 +30087,7 @@ var init_adhdev_daemon = __esm({
           adapters: this.components.cliManager.adapters,
           detectedIdes: this.components.detectedIdes.value,
           ideType: this.ideType,
+          daemonVersion: pkgVersion,
           instanceManager: this.components.instanceManager
         });
         this.statusReporter.startReporting();
@@ -29726,7 +30098,12 @@ var init_adhdev_daemon = __esm({
         process.on("SIGINT", () => this.stop());
         process.on("SIGTERM", () => this.stop());
         if (options.dev) {
-          const devServer = new import_daemon_core4.DevServer({ providerLoader: this.components.providerLoader, cdpManagers: this.components.cdpManagers });
+          const devServer = new import_daemon_core4.DevServer({
+            providerLoader: this.components.providerLoader,
+            cdpManagers: this.components.cdpManagers,
+            instanceManager: this.components.instanceManager,
+            cliManager: this.components.cliManager
+          });
           await devServer.start();
         }
         this.printBanner(options, config2.serverUrl);
@@ -29977,24 +30354,11 @@ var init_adhdev_daemon = __esm({
   }
 });
 
-// src/cli-entrypoint.ts
-var import_commander = require("commander");
-var import_chalk3 = __toESM(require("chalk"));
-
 // src/wizard.ts
-var import_chalk2 = __toESM(require("chalk"));
-var import_inquirer = __toESM(require("inquirer"));
-var import_ora = __toESM(require("ora"));
-var import_open = __toESM(require("open"));
-var import_daemon_core5 = __toESM(require_dist());
-var SERVER_URL = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
-var LOGO = `
-${import_chalk2.default.cyan("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557")}
-${import_chalk2.default.cyan("\u2551")}  ${import_chalk2.default.bold.white("\u{1F9A6} ADHDev Setup Wizard")}               ${import_chalk2.default.cyan("\u2551")}
-${import_chalk2.default.cyan("\u2551")}  ${import_chalk2.default.gray("Agent Dashboard Hub for Dev")}               ${import_chalk2.default.cyan("\u2551")}
-${import_chalk2.default.cyan("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D")}
-`;
-var DIVIDER = import_chalk2.default.gray("\u2500".repeat(44));
+var wizard_exports = {};
+__export(wizard_exports, {
+  runWizard: () => runWizard
+});
 async function runWizard(options = {}) {
   const loader = new import_daemon_core5.ProviderLoader({ logFn: () => {
   } });
@@ -30069,54 +30433,56 @@ async function quickSetup() {
   console.log(import_chalk2.default.bold("\n\u{1F680} Quick Setup\n"));
   const spinner = (0, import_ora.default)("Detecting installed IDEs...").start();
   const ides = await (0, import_daemon_core5.detectIDEs)();
-  const installedIDEs = ides.filter((i) => i.installed && i.cliCommand);
+  const installedIDEs = ides.filter((i) => i.installed);
   spinner.stop();
+  let selectedIDEs = [];
   if (installedIDEs.length === 0) {
-    console.log(import_chalk2.default.red("\u2717 No supported IDE with CLI found."));
+    console.log(import_chalk2.default.yellow("\u26A0 No supported IDEs auto-detected."));
+    console.log(import_chalk2.default.gray("  This is fine \u2014 the daemon will detect IDEs at runtime via CDP."));
     console.log(import_chalk2.default.gray("  Supported: VS Code, Cursor, Antigravity, Windsurf, VSCodium"));
-    return;
-  }
-  console.log(import_chalk2.default.green(`Found ${installedIDEs.length} IDE(s):
+    console.log();
+  } else {
+    console.log(import_chalk2.default.green(`Found ${installedIDEs.length} IDE(s):
 `));
-  installedIDEs.forEach((ide) => {
-    const version2 = ide.version ? import_chalk2.default.gray(` v${ide.version}`) : "";
-    console.log(`  ${import_chalk2.default.green("\u2713")} ${ide.icon} ${import_chalk2.default.bold(ide.displayName)}${version2}`);
-  });
-  console.log();
-  let selectedIDEs;
-  if (installedIDEs.length === 1) {
-    selectedIDEs = installedIDEs;
-    console.log(import_chalk2.default.gray(`  Auto-selected: ${installedIDEs[0].displayName}
+    installedIDEs.forEach((ide) => {
+      const version2 = ide.version ? import_chalk2.default.gray(` v${ide.version}`) : "";
+      console.log(`  ${import_chalk2.default.green("\u2713")} ${ide.icon} ${import_chalk2.default.bold(ide.displayName)}${version2}`);
+    });
+    console.log();
+    if (installedIDEs.length === 1) {
+      selectedIDEs = installedIDEs;
+      console.log(import_chalk2.default.gray(`  Auto-selected: ${installedIDEs[0].displayName}
 `));
-  } else {
-    const { selectedIdeIds } = await import_inquirer.default.prompt([
-      {
-        type: "checkbox",
-        name: "selectedIdeIds",
-        message: "Select IDEs to set up (Space to toggle, Enter to confirm):",
-        choices: installedIDEs.map((ide) => ({
-          name: `${ide.icon} ${ide.displayName}${ide.version ? import_chalk2.default.gray(` v${ide.version}`) : ""}`,
-          value: ide.id,
-          checked: true
-          // All selected by default
-        })),
-        validate: (input) => input.length > 0 ? true : "Select at least one IDE"
-      }
-    ]);
-    selectedIDEs = installedIDEs.filter((i) => selectedIdeIds.includes(i.id));
+    } else {
+      const { selectedIdeIds } = await import_inquirer.default.prompt([
+        {
+          type: "checkbox",
+          name: "selectedIdeIds",
+          message: "Select IDEs to set up (Space to toggle, Enter to confirm):",
+          choices: installedIDEs.map((ide) => ({
+            name: `${ide.icon} ${ide.displayName}${ide.version ? import_chalk2.default.gray(` v${ide.version}`) : ""}`,
+            value: ide.id,
+            checked: true
+            // All selected by default
+          })),
+          validate: (input) => input.length > 0 ? true : "Select at least one IDE"
+        }
+      ]);
+      selectedIDEs = installedIDEs.filter((i) => selectedIdeIds.includes(i.id));
+    }
   }
   console.log(DIVIDER);
   const loginResult = await loginFlow();
   if (!loginResult) {
     console.log(import_chalk2.default.yellow("\u26A0 Setup completed without login. You can login later with `adhdev setup`."));
   }
-  if (loginResult?.connectionToken) {
+  if (loginResult?.connectionToken && selectedIDEs.length > 0) {
     for (const ide of selectedIDEs) {
       await injectTokenToIDE(ide, loginResult.connectionToken);
     }
   }
   const ideIds = selectedIDEs.map((i) => i.id);
-  (0, import_daemon_core5.markSetupComplete)(ideIds, ["adhdev"]);
+  (0, import_daemon_core5.markSetupComplete)(ideIds.length > 0 ? ideIds : ["daemon-only"], ["adhdev"]);
   if (loginResult) {
     (0, import_daemon_core5.updateConfig)({
       connectionToken: loginResult.connectionToken,
@@ -30126,10 +30492,14 @@ async function quickSetup() {
   }
   console.log(DIVIDER);
   console.log(import_chalk2.default.bold("\n\u{1F389} Setup Complete!\n"));
-  if (selectedIDEs.length === 1) {
-    console.log(`  ${import_chalk2.default.bold("IDE:")}     ${selectedIDEs[0].icon} ${selectedIDEs[0].displayName}`);
+  if (selectedIDEs.length > 0) {
+    if (selectedIDEs.length === 1) {
+      console.log(`  ${import_chalk2.default.bold("IDE:")}     ${selectedIDEs[0].icon} ${selectedIDEs[0].displayName}`);
+    } else {
+      console.log(`  ${import_chalk2.default.bold("IDEs:")}    ${selectedIDEs.map((i) => `${i.icon} ${i.displayName}`).join(", ")}`);
+    }
   } else {
-    console.log(`  ${import_chalk2.default.bold("IDEs:")}    ${selectedIDEs.map((i) => `${i.icon} ${i.displayName}`).join(", ")}`);
+    console.log(`  ${import_chalk2.default.bold("IDEs:")}    ${import_chalk2.default.gray("None detected (daemon will auto-detect at runtime)")}`);
   }
   console.log(`  ${import_chalk2.default.bold("User:")}    ${loginResult?.email || "not logged in"}`);
   console.log(`  ${import_chalk2.default.bold("Status:")}  ${import_chalk2.default.green("Ready to connect")}`);
@@ -30152,7 +30522,26 @@ async function customSetup() {
   const installedIDEs = ides.filter((i) => i.installed);
   spinner.stop();
   if (installedIDEs.length === 0) {
-    console.log(import_chalk2.default.yellow("\u26A0 No supported IDEs found."));
+    console.log(import_chalk2.default.yellow("\u26A0 No supported IDEs auto-detected."));
+    console.log(import_chalk2.default.gray("  The daemon will detect IDEs at runtime via CDP."));
+    console.log();
+    console.log(DIVIDER);
+    const loginResult2 = await loginFlow();
+    (0, import_daemon_core5.markSetupComplete)(["daemon-only"], ["adhdev"]);
+    if (loginResult2) {
+      (0, import_daemon_core5.updateConfig)({
+        connectionToken: loginResult2.connectionToken,
+        userEmail: loginResult2.email,
+        userName: loginResult2.name
+      });
+    }
+    console.log(DIVIDER);
+    console.log(import_chalk2.default.bold("\n\u{1F389} Setup Complete!\n"));
+    console.log(`  ${import_chalk2.default.bold("IDEs:")}    ${import_chalk2.default.gray("None detected (daemon will auto-detect at runtime)")}`);
+    console.log(`  ${import_chalk2.default.bold("User:")}    ${loginResult2?.email || "not logged in"}`);
+    console.log(`  ${import_chalk2.default.bold("Status:")}  ${import_chalk2.default.green("Ready to connect")}`);
+    console.log();
+    await startDaemonFlow();
     return;
   }
   console.log(import_chalk2.default.green(`Found ${installedIDEs.length} IDE(s):
@@ -30484,418 +30873,352 @@ async function installCliOnly() {
     console.log();
   }
 }
+var import_chalk2, import_inquirer, import_ora, import_open, import_daemon_core5, SERVER_URL, LOGO, DIVIDER;
+var init_wizard = __esm({
+  "src/wizard.ts"() {
+    "use strict";
+    import_chalk2 = __toESM(require("chalk"));
+    import_inquirer = __toESM(require("inquirer"));
+    import_ora = __toESM(require("ora"));
+    import_open = __toESM(require("open"));
+    import_daemon_core5 = __toESM(require_dist());
+    SERVER_URL = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
+    LOGO = `
+${import_chalk2.default.cyan("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557")}
+${import_chalk2.default.cyan("\u2551")}  ${import_chalk2.default.bold.white("\u{1F9A6} ADHDev Setup Wizard")}               ${import_chalk2.default.cyan("\u2551")}
+${import_chalk2.default.cyan("\u2551")}  ${import_chalk2.default.gray("Agent Dashboard Hub for Dev")}               ${import_chalk2.default.cyan("\u2551")}
+${import_chalk2.default.cyan("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D")}
+`;
+    DIVIDER = import_chalk2.default.gray("\u2500".repeat(44));
+  }
+});
 
-// src/cli-entrypoint.ts
-var import_daemon_core6 = __toESM(require_dist());
+// src/cli/index.ts
+var import_commander = require("commander");
+var import_chalk6 = __toESM(require("chalk"));
 var import_fs = require("fs");
 var import_path = require("path");
-var pkgVersion2 = "unknown";
-try {
-  const possiblePaths = [
-    (0, import_path.join)(__dirname, "..", "package.json"),
-    (0, import_path.join)(__dirname, "package.json")
-  ];
-  for (const p of possiblePaths) {
-    try {
-      const data = JSON.parse((0, import_fs.readFileSync)(p, "utf-8"));
-      if (data.version) {
-        pkgVersion2 = data.version;
-        break;
-      }
-    } catch {
-    }
-  }
-} catch {
-}
-var _cliProviderLoader = new import_daemon_core6.ProviderLoader({ logFn: () => {
-} });
-_cliProviderLoader.loadAll();
-_cliProviderLoader.registerToDetector();
-var program = new import_commander.Command();
-program.name("adhdev").description("\u{1F9A6} ADHDev \u2014 Agent Dashboard Hub for Dev").version(pkgVersion2);
-program.command("setup").description("Run the interactive setup wizard (detect IDEs, login)").option("-f, --force", "Force re-run setup even if already configured").action(async (options) => {
-  await runWizard({ force: options.force });
-});
-program.command("launch [target]").description("Launch IDE with CDP or start CLI agent (e.g. cursor, gemini, claude)").option("-w, --workspace <path>", "Workspace directory to open").option("-n, --new-window", "Open in a new window").option("-d, --dir <path>", "Working directory for CLI agent", process.cwd()).action(async (targetArg, options) => {
-  const resolvedType = targetArg ? _cliProviderLoader.resolveAlias(targetArg.toLowerCase()) : null;
-  const resolvedProvider = resolvedType ? _cliProviderLoader.get(resolvedType) : null;
-  const cliType = resolvedProvider && (resolvedProvider.category === "cli" || resolvedProvider.category === "acp") ? resolvedType : null;
-  if (cliType) {
-    const workingDir = options.dir || options.workspace || process.cwd();
-    const ora3 = await import("ora");
-    const spinner2 = ora3.default(`Launching ${targetArg}...`).start();
-    try {
-      const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-      if (isDaemonRunning2()) {
-        const result = await sendDaemonCommand("launch_cli", {
-          cliType,
-          dir: require("path").resolve(workingDir)
-        });
-        spinner2.stop();
-        if (result?.error) {
-          console.log(import_chalk3.default.red(`
-\u2717 ${result.error}
+var import_daemon_core6 = __toESM(require_dist());
+
+// src/cli/setup-commands.ts
+var import_chalk3 = __toESM(require("chalk"));
+function registerSetupCommands(program2, providerLoader) {
+  program2.command("setup").description("Run the interactive setup wizard (detect IDEs, login)").option("-f, --force", "Force re-run setup even if already configured").action(async (options) => {
+    const { runWizard: runWizard2 } = await Promise.resolve().then(() => (init_wizard(), wizard_exports));
+    await runWizard2({ force: options.force });
+  });
+  program2.command("launch [target]").description("Launch IDE with CDP or start CLI agent (e.g. cursor, gemini, claude)").option("-w, --workspace <path>", "Workspace directory to open").option("-n, --new-window", "Open in a new window").option("-d, --dir <path>", "Working directory for CLI agent", process.cwd()).action(async (targetArg, options) => {
+    const {
+      detectIDEs: detectIDEs2,
+      detectCLIs,
+      launchWithCdp
+    } = await Promise.resolve().then(() => __toESM(require_dist()));
+    const resolvedType = targetArg ? providerLoader.resolveAlias(targetArg.toLowerCase()) : null;
+    const resolvedProvider = resolvedType ? providerLoader.get(resolvedType) : null;
+    const cliType = resolvedProvider && (resolvedProvider.category === "cli" || resolvedProvider.category === "acp") ? resolvedType : null;
+    if (cliType) {
+      const workingDir = options.dir || options.workspace || process.cwd();
+      const ora3 = await import("ora");
+      const spinner2 = ora3.default(`Launching ${targetArg}...`).start();
+      try {
+        const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+        if (isDaemonRunning2()) {
+          const devServerPort = 19280;
+          const body = JSON.stringify({
+            type: cliType,
+            workingDir: require("path").resolve(workingDir)
+          });
+          const res = await fetch(`http://127.0.0.1:${devServerPort}/api/cli/launch`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body
+          });
+          const result = await res.json();
+          spinner2.stop();
+          if (!result?.launched) {
+            console.log(import_chalk3.default.red(`
+\u2717 ${result?.error || "Launch failed"}
+`));
+            process.exit(1);
+          }
+          console.log();
+          console.log(import_chalk3.default.bold(`  \u{1F680} CLI Agent Launched
+`));
+          console.log(`  ${import_chalk3.default.bold("Agent:")}  ${targetArg} (${cliType})`);
+          console.log(`  ${import_chalk3.default.bold("Dir:")}    ${workingDir}`);
+          console.log(`  ${import_chalk3.default.bold("Mode:")}   via running daemon`);
+          console.log();
+          console.log(import_chalk3.default.gray("  Open dashboard: https://adhf.dev/dashboard"));
+          console.log();
+        } else {
+          spinner2.stop();
+          console.log(import_chalk3.default.yellow(`
+  \u26A0 Daemon not running. Start with 'adhdev daemon' first.
 `));
+          console.log(import_chalk3.default.gray("  Then run: adhdev launch " + targetArg));
           process.exit(1);
         }
-        console.log();
-        console.log(import_chalk3.default.bold(`  \u{1F680} CLI Agent Launched
-`));
-        console.log(`  ${import_chalk3.default.bold("Agent:")}  ${targetArg} (${cliType})`);
-        console.log(`  ${import_chalk3.default.bold("Dir:")}    ${workingDir}`);
-        console.log(`  ${import_chalk3.default.bold("Mode:")}   via running daemon`);
-        console.log();
-        console.log(import_chalk3.default.gray("  Open dashboard: https://adhf.dev/dashboard"));
-        console.log();
-      } else {
+      } catch (e) {
         spinner2.stop();
-        console.log(import_chalk3.default.yellow(`
-  \u26A0 Daemon not running. Starting daemon with ${targetArg}...
+        console.log(import_chalk3.default.red(`
+\u2717 Launch failed: ${e?.message || e}
 `));
-        const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-        const daemon = new AdhdevDaemon2();
-        await daemon.start({
-          localPort: 19222,
-          foreground: true
-        });
-        setTimeout(async () => {
-          try {
-            const result = await sendDaemonCommand("launch_cli", {
-              cliType,
-              dir: require("path").resolve(workingDir)
-            });
-            if (result?.success) {
-              console.log(import_chalk3.default.green(`  \u2713 CLI ${targetArg} started`));
-            }
-          } catch (e) {
-            console.log(import_chalk3.default.yellow(`  \u26A0 CLI auto-start failed: ${e?.message}. Use dashboard to start.`));
-          }
-        }, 3e3);
+        if (e?.cause?.code === "ECONNREFUSED") {
+          console.log(import_chalk3.default.gray("  Is the daemon running with --dev? (adhdev daemon --dev)"));
+        }
+        process.exit(1);
       }
-    } catch (e) {
-      spinner2.stop();
+      return;
+    }
+    let targetIdeId = targetArg;
+    if (!targetIdeId) {
+      const ides = await detectIDEs2();
+      const installed = ides.filter((i) => i.installed && i.cliCommand);
+      if (installed.length === 0) {
+        console.log(import_chalk3.default.red("\n\u2717 No supported IDE found.\n"));
+        process.exit(1);
+      }
+      if (installed.length === 1) {
+        targetIdeId = installed[0].id;
+      } else {
+        const inquirer2 = await import("inquirer");
+        const { selectedIde } = await inquirer2.default.prompt([
+          {
+            type: "list",
+            name: "selectedIde",
+            message: "Which IDE to launch with CDP?",
+            choices: installed.map((ide) => ({
+              name: `${ide.icon} ${ide.displayName}${ide.version ? import_chalk3.default.gray(` v${ide.version}`) : ""}`,
+              value: ide.id
+            }))
+          }
+        ]);
+        targetIdeId = selectedIde;
+      }
+    }
+    const ora2 = await import("ora");
+    const spinner = ora2.default("Detecting IDE...").start();
+    try {
+      const result = await launchWithCdp({
+        ideId: targetIdeId,
+        workspace: options.workspace,
+        newWindow: options.newWindow
+      });
+      spinner.stop();
+      if (!result.success) {
+        console.log(import_chalk3.default.red(`
+\u2717 ${result.error}
+`));
+        console.log(import_chalk3.default.gray("  Available IDEs:"));
+        const ides = await detectIDEs2();
+        ides.forEach((ide) => {
+          if (ide.installed) {
+            console.log(`    ${import_chalk3.default.green("\u2713")} ${ide.icon} ${import_chalk3.default.bold(ide.id)} \u2014 ${ide.displayName}`);
+          }
+        });
+        console.log(import_chalk3.default.gray("\n  Available CLI Agents:"));
+        const clis = await detectCLIs(providerLoader);
+        clis.forEach((cli) => {
+          if (cli.installed) {
+            console.log(`    ${import_chalk3.default.green("\u2713")} ${cli.icon} ${import_chalk3.default.bold(cli.id)} \u2014 ${cli.displayName}`);
+          }
+        });
+        console.log(import_chalk3.default.gray(`
+  Usage: adhdev launch <ide-or-cli>
+`));
+        process.exit(1);
+      }
+      console.log();
+      console.log(import_chalk3.default.bold("  \u{1F680} IDE Launched with CDP\n"));
+      console.log(`  ${import_chalk3.default.bold("IDE:")}     ${result.ideName}`);
+      console.log(`  ${import_chalk3.default.bold("CDP:")}     ${import_chalk3.default.cyan(`ws://127.0.0.1:${result.port}`)}`);
+      switch (result.action) {
+        case "reused":
+          console.log(`  ${import_chalk3.default.bold("Action:")}  ${import_chalk3.default.yellow("CDP already active \u2014 reusing existing session")}`);
+          break;
+        case "restarted":
+          console.log(`  ${import_chalk3.default.bold("Action:")}  ${import_chalk3.default.green("\u2713 Killed existing process \u2192 Restarted with CDP")}`);
+          break;
+        case "started":
+          console.log(`  ${import_chalk3.default.bold("Action:")}  ${import_chalk3.default.green("\u2713 Started fresh with CDP")}`);
+          break;
+      }
+      console.log();
+      console.log(import_chalk3.default.gray("  Daemon will auto-detect and connect via CDP."));
+      console.log(import_chalk3.default.gray(`  Test: curl http://127.0.0.1:${result.port}/json/version
+`));
+    } catch (e) {
+      spinner.stop();
       console.log(import_chalk3.default.red(`
 \u2717 Launch failed: ${e?.message || e}
 `));
       process.exit(1);
     }
-    return;
-  }
-  let targetIdeId = targetArg;
-  if (!targetIdeId) {
-    const ides = await (0, import_daemon_core6.detectIDEs)();
-    const installed = ides.filter((i) => i.installed && i.cliCommand);
-    if (installed.length === 0) {
-      console.log(import_chalk3.default.red("\n\u2717 No supported IDE found.\n"));
-      process.exit(1);
+  });
+  program2.command("status").description("Show current ADHDev setup status").action(async () => {
+    const { loadConfig: loadConfig3, detectIDEs: detectIDEs2, detectCLIs } = await Promise.resolve().then(() => __toESM(require_dist()));
+    const config2 = loadConfig3();
+    console.log(import_chalk3.default.bold("\n\u{1F9A6} ADHDev Status\n"));
+    if (!config2.setupCompleted) {
+      console.log(import_chalk3.default.yellow("  Status: Not configured"));
+      console.log(import_chalk3.default.gray("  Run `adhdev setup` to get started.\n"));
+      return;
     }
-    if (installed.length === 1) {
-      targetIdeId = installed[0].id;
-    } else {
-      const inquirer2 = await import("inquirer");
-      const { selectedIde } = await inquirer2.default.prompt([
-        {
-          type: "list",
-          name: "selectedIde",
-          message: "Which IDE to launch with CDP?",
-          choices: installed.map((ide) => ({
-            name: `${ide.icon} ${ide.displayName}${ide.version ? import_chalk3.default.gray(` v${ide.version}`) : ""}`,
-            value: ide.id
-          }))
+    const ideList = config2.configuredIdes?.length ? config2.configuredIdes : config2.selectedIde ? [config2.selectedIde] : [];
+    console.log(`  ${import_chalk3.default.bold("Status:")}       ${import_chalk3.default.green("\u2713 Configured")}`);
+    if (ideList.length > 0) {
+      const ides = await detectIDEs2();
+      console.log(`  ${import_chalk3.default.bold("IDEs:")}`);
+      for (const ideId of ideList) {
+        const ide = ides.find((i) => i.id === ideId);
+        if (ide?.installed) {
+          const ver = ide.version ? import_chalk3.default.gray(` v${ide.version}`) : "";
+          console.log(`    ${import_chalk3.default.green("\u2713")} ${ide.icon} ${ide.displayName}${ver}`);
+        } else {
+          console.log(`    ${import_chalk3.default.yellow("?")} ${ideId}`);
         }
-      ]);
-      targetIdeId = selectedIde;
+      }
     }
-  }
-  const ora2 = await import("ora");
-  const spinner = ora2.default("Detecting IDE...").start();
-  try {
-    const result = await (0, import_daemon_core6.launchWithCdp)({
-      ideId: targetIdeId,
-      workspace: options.workspace,
-      newWindow: options.newWindow
+    const clis = await detectCLIs(providerLoader);
+    const installedClis = clis.filter((c) => c.installed);
+    if (installedClis.length > 0) {
+      console.log(`  ${import_chalk3.default.bold("CLI Agents:")}`);
+      installedClis.forEach((cli) => {
+        const ver = cli.version ? import_chalk3.default.gray(` v${cli.version}`) : "";
+        console.log(`    ${import_chalk3.default.green("\u2713")} ${cli.icon} ${cli.displayName}${ver}`);
+      });
+    }
+    console.log(`  ${import_chalk3.default.bold("Extensions:")}   ${config2.installedExtensions.length} installed`);
+    config2.installedExtensions.forEach((ext) => {
+      console.log(import_chalk3.default.gray(`                 \u2022 ${ext}`));
     });
-    spinner.stop();
-    if (!result.success) {
-      console.log(import_chalk3.default.red(`
-\u2717 ${result.error}
-`));
-      console.log(import_chalk3.default.gray("  Available IDEs:"));
-      const ides = await (0, import_daemon_core6.detectIDEs)();
-      ides.forEach((ide) => {
-        if (ide.installed) {
-          console.log(`    ${import_chalk3.default.green("\u2713")} ${ide.icon} ${import_chalk3.default.bold(ide.id)} \u2014 ${ide.displayName}`);
+    console.log(`  ${import_chalk3.default.bold("User:")}         ${config2.userEmail || import_chalk3.default.gray("not logged in")}`);
+    console.log(`  ${import_chalk3.default.bold("Auto-connect:")} ${config2.autoConnect ? import_chalk3.default.green("enabled") : import_chalk3.default.gray("disabled")}`);
+    console.log(`  ${import_chalk3.default.bold("Server:")}       ${config2.serverUrl}`);
+    console.log(`  ${import_chalk3.default.bold("Setup date:")}   ${config2.setupDate || "unknown"}`);
+    console.log();
+  });
+  program2.command("detect").description("Detect installed IDEs, CLI agents, and ACP agents").action(async () => {
+    const { detectIDEs: detectIDEs2, detectCLIs } = await Promise.resolve().then(() => __toESM(require_dist()));
+    console.log(import_chalk3.default.bold("\n\u{1F50D} Detecting installed IDEs...\n"));
+    const ides = await detectIDEs2();
+    ides.forEach((ide) => {
+      if (ide.installed) {
+        const version2 = ide.version ? import_chalk3.default.gray(` v${ide.version}`) : "";
+        console.log(`  ${import_chalk3.default.green("\u2713")} ${ide.icon} ${import_chalk3.default.bold(ide.displayName)}${version2}`);
+        if (ide.cliCommand) {
+          console.log(import_chalk3.default.gray(`     CLI: ${ide.cliCommand}`));
+        }
+        if (ide.path) {
+          console.log(import_chalk3.default.gray(`     Path: ${ide.path}`));
         }
-      });
-      console.log(import_chalk3.default.gray("\n  Available CLI Agents:"));
-      const clis = await (0, import_daemon_core6.detectCLIs)(_cliProviderLoader);
-      clis.forEach((cli) => {
+      } else {
+        console.log(`  ${import_chalk3.default.gray("\u2717")} ${ide.icon} ${import_chalk3.default.gray(ide.displayName)} \u2014 not found`);
+      }
+    });
+    console.log(import_chalk3.default.bold("\n\u{1F50D} Detecting CLI & ACP Agents...\n"));
+    const clis = await detectCLIs(providerLoader);
+    const cliAgents = clis.filter((c) => c.category === "cli");
+    const acpAgents = clis.filter((c) => c.category === "acp");
+    const installedCli = cliAgents.filter((c) => c.installed);
+    const installedAcp = acpAgents.filter((c) => c.installed);
+    if (cliAgents.length > 0) {
+      console.log(`  ${import_chalk3.default.bold("\u2328\uFE0F  CLI Agents")} (${installedCli.length}/${cliAgents.length})`);
+      cliAgents.forEach((cli) => {
         if (cli.installed) {
-          console.log(`    ${import_chalk3.default.green("\u2713")} ${cli.icon} ${import_chalk3.default.bold(cli.id)} \u2014 ${cli.displayName}`);
+          const version2 = cli.version ? import_chalk3.default.gray(` v${cli.version}`) : "";
+          console.log(`    ${import_chalk3.default.green("\u2713")} ${cli.icon} ${import_chalk3.default.bold(cli.displayName)}${version2}`);
+          console.log(import_chalk3.default.gray(`       Path: ${cli.path}`));
+        } else {
+          console.log(`    ${import_chalk3.default.gray("\u2717")} ${cli.icon} ${import_chalk3.default.gray(cli.displayName)} \u2014 not found`);
         }
       });
-      console.log(import_chalk3.default.gray(`
-  Usage: adhdev launch <ide-or-cli>
-`));
-      process.exit(1);
     }
-    console.log();
-    console.log(import_chalk3.default.bold("  \u{1F680} IDE Launched with CDP\n"));
-    console.log(`  ${import_chalk3.default.bold("IDE:")}     ${result.ideName}`);
-    console.log(`  ${import_chalk3.default.bold("CDP:")}     ${import_chalk3.default.cyan(`ws://127.0.0.1:${result.port}`)}`);
-    switch (result.action) {
-      case "reused":
-        console.log(`  ${import_chalk3.default.bold("Action:")}  ${import_chalk3.default.yellow("CDP already active \u2014 reusing existing session")}`);
-        break;
-      case "restarted":
-        console.log(`  ${import_chalk3.default.bold("Action:")}  ${import_chalk3.default.green("\u2713 Killed existing process \u2192 Restarted with CDP")}`);
-        break;
-      case "started":
-        console.log(`  ${import_chalk3.default.bold("Action:")}  ${import_chalk3.default.green("\u2713 Started fresh with CDP")}`);
-        break;
-    }
-    console.log();
-    console.log(import_chalk3.default.gray("  Daemon will auto-detect and connect via CDP."));
-    console.log(import_chalk3.default.gray(`  Test: curl http://127.0.0.1:${result.port}/json/version
-`));
-  } catch (e) {
-    spinner.stop();
-    console.log(import_chalk3.default.red(`
-\u2717 Launch failed: ${e?.message || e}
-`));
-    process.exit(1);
-  }
-});
-program.command("status").description("Show current ADHDev setup status").action(async () => {
-  const config2 = (0, import_daemon_core6.loadConfig)();
-  console.log(import_chalk3.default.bold("\n\u{1F9A6} ADHDev Status\n"));
-  if (!config2.setupCompleted) {
-    console.log(import_chalk3.default.yellow("  Status: Not configured"));
-    console.log(import_chalk3.default.gray("  Run `adhdev setup` to get started.\n"));
-    return;
-  }
-  const ideList = config2.configuredIdes?.length ? config2.configuredIdes : config2.selectedIde ? [config2.selectedIde] : [];
-  console.log(`  ${import_chalk3.default.bold("Status:")}       ${import_chalk3.default.green("\u2713 Configured")}`);
-  if (ideList.length > 0) {
-    const ides = await (0, import_daemon_core6.detectIDEs)();
-    console.log(`  ${import_chalk3.default.bold("IDEs:")}`);
-    for (const ideId of ideList) {
-      const ide = ides.find((i) => i.id === ideId);
-      if (ide?.installed) {
-        const ver = ide.version ? import_chalk3.default.gray(` v${ide.version}`) : "";
-        console.log(`    ${import_chalk3.default.green("\u2713")} ${ide.icon} ${ide.displayName}${ver}`);
-      } else {
-        console.log(`    ${import_chalk3.default.yellow("?")} ${ideId}`);
+    if (acpAgents.length > 0) {
+      console.log(`
+  ${import_chalk3.default.bold("\u{1F50C} ACP Agents")} (${installedAcp.length}/${acpAgents.length})`);
+      acpAgents.filter((c) => c.installed).forEach((cli) => {
+        const version2 = cli.version ? import_chalk3.default.gray(` v${cli.version}`) : "";
+        console.log(`    ${import_chalk3.default.green("\u2713")} ${cli.icon} ${import_chalk3.default.bold(cli.displayName)}${version2}`);
+        console.log(import_chalk3.default.gray(`       Path: ${cli.path}`));
+      });
+      const notInstalledAcp = acpAgents.filter((c) => !c.installed);
+      if (notInstalledAcp.length > 0) {
+        console.log(import_chalk3.default.gray(`    ... ${notInstalledAcp.length} more available (not installed)`));
       }
     }
-  }
-  const clis = await (0, import_daemon_core6.detectCLIs)(_cliProviderLoader);
-  const installedClis = clis.filter((c) => c.installed);
-  if (installedClis.length > 0) {
-    console.log(`  ${import_chalk3.default.bold("CLI Agents:")}`);
-    installedClis.forEach((cli) => {
-      const ver = cli.version ? import_chalk3.default.gray(` v${cli.version}`) : "";
-      console.log(`    ${import_chalk3.default.green("\u2713")} ${cli.icon} ${cli.displayName}${ver}`);
-    });
-  }
-  console.log(`  ${import_chalk3.default.bold("Extensions:")}   ${config2.installedExtensions.length} installed`);
-  config2.installedExtensions.forEach((ext) => {
-    console.log(import_chalk3.default.gray(`                 \u2022 ${ext}`));
+    console.log();
   });
-  console.log(`  ${import_chalk3.default.bold("User:")}         ${config2.userEmail || import_chalk3.default.gray("not logged in")}`);
-  console.log(`  ${import_chalk3.default.bold("Auto-connect:")} ${config2.autoConnect ? import_chalk3.default.green("enabled") : import_chalk3.default.gray("disabled")}`);
-  console.log(`  ${import_chalk3.default.bold("Server:")}       ${config2.serverUrl}`);
-  console.log(`  ${import_chalk3.default.bold("Setup date:")}   ${config2.setupDate || "unknown"}`);
-  console.log();
-});
-program.command("detect").description("Detect installed IDEs, CLI agents, and ACP agents").action(async () => {
-  console.log(import_chalk3.default.bold("\n\u{1F50D} Detecting installed IDEs...\n"));
-  const ides = await (0, import_daemon_core6.detectIDEs)();
-  ides.forEach((ide) => {
-    if (ide.installed) {
-      const version2 = ide.version ? import_chalk3.default.gray(` v${ide.version}`) : "";
-      console.log(`  ${import_chalk3.default.green("\u2713")} ${ide.icon} ${import_chalk3.default.bold(ide.displayName)}${version2}`);
-      if (ide.cliCommand) {
-        console.log(import_chalk3.default.gray(`     CLI: ${ide.cliCommand}`));
-      }
-      if (ide.path) {
-        console.log(import_chalk3.default.gray(`     Path: ${ide.path}`));
+  program2.command("reset").description("Reset ADHDev configuration").action(async () => {
+    const { resetConfig } = await Promise.resolve().then(() => __toESM(require_dist()));
+    const inquirer2 = await import("inquirer");
+    const { confirm } = await inquirer2.default.prompt([
+      {
+        type: "confirm",
+        name: "confirm",
+        message: "Are you sure you want to reset ADHDev configuration?",
+        default: false
       }
-    } else {
-      console.log(`  ${import_chalk3.default.gray("\u2717")} ${ide.icon} ${import_chalk3.default.gray(ide.displayName)} \u2014 not found`);
+    ]);
+    if (confirm) {
+      resetConfig();
+      console.log(import_chalk3.default.green("\n\u2713 Configuration reset successfully."));
+      console.log(import_chalk3.default.gray("  Run `adhdev setup` to reconfigure.\n"));
     }
   });
-  console.log(import_chalk3.default.bold("\n\u{1F50D} Detecting CLI & ACP Agents...\n"));
-  const clis = await (0, import_daemon_core6.detectCLIs)(_cliProviderLoader);
-  const cliAgents = clis.filter((c) => c.category === "cli");
-  const acpAgents = clis.filter((c) => c.category === "acp");
-  const installedCli = cliAgents.filter((c) => c.installed);
-  const installedAcp = acpAgents.filter((c) => c.installed);
-  if (cliAgents.length > 0) {
-    console.log(`  ${import_chalk3.default.bold("\u2328\uFE0F  CLI Agents")} (${installedCli.length}/${cliAgents.length})`);
-    cliAgents.forEach((cli) => {
-      if (cli.installed) {
-        const version2 = cli.version ? import_chalk3.default.gray(` v${cli.version}`) : "";
-        console.log(`    ${import_chalk3.default.green("\u2713")} ${cli.icon} ${import_chalk3.default.bold(cli.displayName)}${version2}`);
-        console.log(import_chalk3.default.gray(`       Path: ${cli.path}`));
-      } else {
-        console.log(`    ${import_chalk3.default.gray("\u2717")} ${cli.icon} ${import_chalk3.default.gray(cli.displayName)} \u2014 not found`);
-      }
-    });
-  }
-  if (acpAgents.length > 0) {
-    console.log(`
-  ${import_chalk3.default.bold("\u{1F50C} ACP Agents")} (${installedAcp.length}/${acpAgents.length})`);
-    acpAgents.filter((c) => c.installed).forEach((cli) => {
-      const version2 = cli.version ? import_chalk3.default.gray(` v${cli.version}`) : "";
-      console.log(`    ${import_chalk3.default.green("\u2713")} ${cli.icon} ${import_chalk3.default.bold(cli.displayName)}${version2}`);
-      console.log(import_chalk3.default.gray(`       Path: ${cli.path}`));
+}
+
+// src/cli/daemon-commands.ts
+var import_chalk4 = __toESM(require("chalk"));
+function registerDaemonCommands(program2, pkgVersion3) {
+  program2.command("daemon").description("\u{1F680} Start ADHDev Daemon \u2014 unified hub for IDE monitoring, agent management, and remote control").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL for testing").option("--dev", "Enable Dev Mode \u2014 HTTP API on :19280 for script debugging").action(async (options) => {
+    const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const daemon = new AdhdevDaemon2();
+    await daemon.start({
+      localPort: parseInt(options.port) || 19222,
+      serverUrl: options.server,
+      foreground: true,
+      dev: options.dev || false
     });
-    const notInstalledAcp = acpAgents.filter((c) => !c.installed);
-    if (notInstalledAcp.length > 0) {
-      console.log(import_chalk3.default.gray(`    ... ${notInstalledAcp.length} more available (not installed)`));
-    }
-  }
-  console.log();
-});
-program.command("reset").description("Reset ADHDev configuration").action(async () => {
-  const inquirer2 = await import("inquirer");
-  const { confirm } = await inquirer2.default.prompt([
-    {
-      type: "confirm",
-      name: "confirm",
-      message: "Are you sure you want to reset ADHDev configuration?",
-      default: false
-    }
-  ]);
-  if (confirm) {
-    (0, import_daemon_core6.resetConfig)();
-    console.log(import_chalk3.default.green("\n\u2713 Configuration reset successfully."));
-    console.log(import_chalk3.default.gray("  Run `adhdev setup` to reconfigure.\n"));
-  }
-});
-program.command("daemon").description("\u{1F680} Start ADHDev Daemon \u2014 unified hub for IDE monitoring, agent management, and remote control").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL for testing").option("--dev", "Enable Dev Mode \u2014 HTTP API on :19280 for script debugging").action(async (options) => {
-  const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-  const daemon = new AdhdevDaemon2();
-  await daemon.start({
-    localPort: parseInt(options.port) || 19222,
-    serverUrl: options.server,
-    foreground: true,
-    dev: options.dev || false
   });
-});
-program.command("daemon:status").description("Check ADHDev Daemon status").action(async () => {
-  const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-  if (isDaemonRunning2()) {
-    console.log(import_chalk3.default.green(`
+  program2.command("daemon:status").description("Check ADHDev Daemon status").action(async () => {
+    const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    if (isDaemonRunning2()) {
+      console.log(import_chalk4.default.green(`
   \u2713 ADHDev Daemon is running.
 `));
-  } else {
-    console.log(import_chalk3.default.gray(`
+    } else {
+      console.log(import_chalk4.default.gray(`
   \u2717 ADHDev Daemon is not running.`));
-    console.log(import_chalk3.default.gray(`  Start with: adhdev daemon
+      console.log(import_chalk4.default.gray(`  Start with: adhdev daemon
 `));
-  }
-});
-program.command("daemon:stop").description("Stop ADHDev Daemon").action(async () => {
-  const { stopDaemon: stopDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-  if (stopDaemon2()) {
-    console.log(import_chalk3.default.green(`
+    }
+  });
+  program2.command("daemon:stop").description("Stop ADHDev Daemon").action(async () => {
+    const { stopDaemon: stopDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    if (stopDaemon2()) {
+      console.log(import_chalk4.default.green(`
   \u2713 ADHDev Daemon stopped.
 `));
-  } else {
-    console.log(import_chalk3.default.gray(`
+    } else {
+      console.log(import_chalk4.default.gray(`
   \u2717 No running daemon found.
 `));
-  }
-});
-program.command("daemon:restart").description("Restart ADHDev Daemon (stop \u2192 start)").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL").option("--dev", "Enable Dev Mode").action(async (options) => {
-  const { stopDaemon: stopDaemon2, isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-  const { spawn } = await import("child_process");
-  if (isDaemonRunning2()) {
-    console.log(import_chalk3.default.yellow("\n  Stopping existing daemon..."));
-    stopDaemon2();
-    await new Promise((r) => setTimeout(r, 2e3));
-  }
-  console.log(import_chalk3.default.cyan("  Starting new daemon..."));
-  const args = ["daemon", "-p", options.port || "19222"];
-  if (options.server) args.push("--server", options.server);
-  if (options.dev) args.push("--dev");
-  const child = spawn(process.execPath, [process.argv[1], ...args], {
-    detached: true,
-    stdio: "ignore",
-    env: { ...process.env }
-  });
-  child.unref();
-  await new Promise((r) => setTimeout(r, 3e3));
-  if (isDaemonRunning2()) {
-    console.log(import_chalk3.default.green(`  \u2713 ADHDev Daemon restarted (PID: ${child.pid})
-`));
-  } else {
-    console.log(import_chalk3.default.red(`  \u2717 Daemon failed to start. Check logs: ~/.adhdev/daemon.log
-`));
-    process.exit(1);
-  }
-});
-program.command("daemon:upgrade").description("Upgrade ADHDev to latest version and restart daemon").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
-  const { isDaemonRunning: isDaemonRunning2, stopDaemon: stopDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-  const { execSync, spawn } = await import("child_process");
-  const fsMod = await import("fs");
-  const pathMod = await import("path");
-  console.log(import_chalk3.default.bold("\n  \u{1F504} ADHDev Upgrade\n"));
-  const adhdevPath = process.argv[1];
-  const realPath = fsMod.realpathSync(adhdevPath);
-  const isLinked = realPath.includes(".openclaw") || realPath.includes("/src/");
-  const currentVersion = pkgVersion2;
-  console.log(`  ${import_chalk3.default.bold("Current:")}  v${currentVersion}`);
-  console.log(`  ${import_chalk3.default.bold("Install:")}  ${isLinked ? "npm link (dev)" : "npm global"}`);
-  if (isLinked) {
-    const projectRoot = pathMod.resolve(pathMod.dirname(realPath), "..");
-    const launcherDir = pathMod.join(projectRoot);
-    console.log(`  ${import_chalk3.default.bold("Path:")}     ${launcherDir}`);
-    console.log(import_chalk3.default.cyan("\n  Pulling latest..."));
-    try {
-      let gitRoot = launcherDir;
-      while (!fsMod.existsSync(pathMod.join(gitRoot, ".git")) && gitRoot !== "/") {
-        gitRoot = pathMod.dirname(gitRoot);
-      }
-      execSync("git pull --rebase", { cwd: gitRoot, stdio: "inherit" });
-      console.log(import_chalk3.default.cyan("\n  Building..."));
-      execSync("npm run build", { cwd: launcherDir, stdio: "inherit" });
-      execSync("npm link", { cwd: launcherDir, stdio: "inherit" });
-      console.log(import_chalk3.default.green("\n  \u2713 Build complete"));
-    } catch (e) {
-      console.log(import_chalk3.default.red(`
-  \u2717 Build failed: ${e?.message}
-`));
-      process.exit(1);
     }
-  } else {
-    console.log(import_chalk3.default.cyan("\n  Checking for updates..."));
-    try {
-      const latest = execSync("npm view adhdev version", { encoding: "utf-8" }).trim();
-      console.log(`  ${import_chalk3.default.bold("Latest:")}   v${latest}`);
-      if (latest === currentVersion) {
-        console.log(import_chalk3.default.green("\n  \u2713 Already on latest version.\n"));
-        if (!options.restart) return;
-      } else {
-        console.log(import_chalk3.default.cyan(`
-  Upgrading v${currentVersion} \u2192 v${latest}...`));
-        execSync("npm install -g adhdev@latest", { stdio: "inherit" });
-        console.log(import_chalk3.default.green("\n  \u2713 Upgrade complete"));
-      }
-    } catch (e) {
-      console.log(import_chalk3.default.red(`
-  \u2717 Upgrade failed: ${e?.message}
-`));
-      process.exit(1);
-    }
-  }
-  if (options.restart !== false && isDaemonRunning2()) {
-    console.log(import_chalk3.default.yellow("\n  Restarting daemon..."));
-    stopDaemon2();
-    await new Promise((r) => setTimeout(r, 2e3));
-    const child = spawn(process.execPath, [process.argv[1], "daemon", "-p", "19222"], {
+  });
+  program2.command("daemon:restart").description("Restart ADHDev Daemon (stop \u2192 start)").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL").option("--dev", "Enable Dev Mode").action(async (options) => {
+    const { stopDaemon: stopDaemon2, isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const { spawn } = await import("child_process");
+    if (isDaemonRunning2()) {
+      console.log(import_chalk4.default.yellow("\n  Stopping existing daemon..."));
+      stopDaemon2();
+      await new Promise((r) => setTimeout(r, 2e3));
+    }
+    console.log(import_chalk4.default.cyan("  Starting new daemon..."));
+    const args = ["daemon", "-p", options.port || "19222"];
+    if (options.server) args.push("--server", options.server);
+    if (options.dev) args.push("--dev");
+    const child = spawn(process.execPath, [process.argv[1], ...args], {
       detached: true,
       stdio: "ignore",
       env: { ...process.env }
@@ -30903,18 +31226,102 @@ program.command("daemon:upgrade").description("Upgrade ADHDev to latest version
     child.unref();
     await new Promise((r) => setTimeout(r, 3e3));
     if (isDaemonRunning2()) {
-      console.log(import_chalk3.default.green(`  \u2713 Daemon restarted with new version
+      console.log(import_chalk4.default.green(`  \u2713 ADHDev Daemon restarted (PID: ${child.pid})
+`));
+    } else {
+      console.log(import_chalk4.default.red(`  \u2717 Daemon failed to start. Check logs: ~/.adhdev/daemon.log
+`));
+      process.exit(1);
+    }
+  });
+  program2.command("daemon:upgrade").description("Upgrade ADHDev to latest version and restart daemon").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
+    const { isDaemonRunning: isDaemonRunning2, stopDaemon: stopDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const { execSync, spawn } = await import("child_process");
+    const fsMod = await import("fs");
+    const pathMod = await import("path");
+    console.log(import_chalk4.default.bold("\n  \u{1F504} ADHDev Upgrade\n"));
+    const adhdevPath = process.argv[1];
+    const realPath = fsMod.realpathSync(adhdevPath);
+    const isLinked = realPath.includes(".openclaw") || realPath.includes("/src/");
+    const currentVersion = pkgVersion3;
+    console.log(`  ${import_chalk4.default.bold("Current:")}  v${currentVersion}`);
+    console.log(`  ${import_chalk4.default.bold("Install:")}  ${isLinked ? "npm link (dev)" : "npm global"}`);
+    if (isLinked) {
+      const projectRoot = pathMod.resolve(pathMod.dirname(realPath), "..");
+      const launcherDir = pathMod.join(projectRoot);
+      console.log(`  ${import_chalk4.default.bold("Path:")}     ${launcherDir}`);
+      console.log(import_chalk4.default.cyan("\n  Pulling latest..."));
+      try {
+        let gitRoot = launcherDir;
+        while (!fsMod.existsSync(pathMod.join(gitRoot, ".git")) && gitRoot !== "/") {
+          gitRoot = pathMod.dirname(gitRoot);
+        }
+        execSync("git pull --rebase", { cwd: gitRoot, stdio: "inherit" });
+        console.log(import_chalk4.default.cyan("\n  Building..."));
+        execSync("npm run build", { cwd: launcherDir, stdio: "inherit" });
+        execSync("npm link", { cwd: launcherDir, stdio: "inherit" });
+        console.log(import_chalk4.default.green("\n  \u2713 Build complete"));
+      } catch (e) {
+        console.log(import_chalk4.default.red(`
+  \u2717 Build failed: ${e?.message}
 `));
+        process.exit(1);
+      }
     } else {
-      console.log(import_chalk3.default.yellow(`  \u26A0 Daemon not detected. Start manually: adhdev daemon
+      console.log(import_chalk4.default.cyan("\n  Checking for updates..."));
+      try {
+        const latest = execSync("npm view adhdev version", { encoding: "utf-8" }).trim();
+        console.log(`  ${import_chalk4.default.bold("Latest:")}   v${latest}`);
+        if (latest === currentVersion) {
+          console.log(import_chalk4.default.green("\n  \u2713 Already on latest version.\n"));
+          if (!options.restart) return;
+        } else {
+          console.log(import_chalk4.default.cyan(`
+  Upgrading v${currentVersion} \u2192 v${latest}...`));
+          execSync("npm install -g adhdev@latest", { stdio: "inherit" });
+          console.log(import_chalk4.default.green("\n  \u2713 Upgrade complete"));
+        }
+      } catch (e) {
+        console.log(import_chalk4.default.red(`
+  \u2717 Upgrade failed: ${e?.message}
 `));
+        process.exit(1);
+      }
     }
-  } else if (options.restart !== false) {
-    console.log(import_chalk3.default.gray("\n  Daemon was not running. Start with: adhdev daemon\n"));
-  } else {
-    console.log(import_chalk3.default.green("\n  \u2713 Upgrade complete (daemon not restarted)\n"));
-  }
-});
+    if (options.restart !== false && isDaemonRunning2()) {
+      console.log(import_chalk4.default.yellow("\n  Restarting daemon..."));
+      stopDaemon2();
+      await new Promise((r) => setTimeout(r, 2e3));
+      const child = spawn(process.execPath, [process.argv[1], "daemon", "-p", "19222"], {
+        detached: true,
+        stdio: "ignore",
+        env: { ...process.env }
+      });
+      child.unref();
+      await new Promise((r) => setTimeout(r, 3e3));
+      if (isDaemonRunning2()) {
+        console.log(import_chalk4.default.green(`  \u2713 Daemon restarted with new version
+`));
+      } else {
+        console.log(import_chalk4.default.yellow(`  \u26A0 Daemon not detected. Start manually: adhdev daemon
+`));
+      }
+    } else if (options.restart !== false) {
+      console.log(import_chalk4.default.gray("\n  Daemon was not running. Start with: adhdev daemon\n"));
+    } else {
+      console.log(import_chalk4.default.green("\n  \u2713 Upgrade complete (daemon not restarted)\n"));
+    }
+  });
+  program2.command("update").description("\u{1F504} Update ADHDev to latest version and restart daemon (alias for daemon:upgrade)").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
+    process.argv = [process.argv[0], process.argv[1], "daemon:upgrade", ...options.restart === false ? ["--no-restart"] : []];
+    await program2.parseAsync(process.argv);
+  });
+}
+
+// src/cli/provider-commands.ts
+var import_chalk5 = __toESM(require("chalk"));
+
+// src/cli/cdp-utils.ts
 async function sendDaemonCommand(cmd, args = {}, port = 19222) {
   const WebSocket2 = (await import("ws")).default;
   const { DAEMON_WS_PATH } = await Promise.resolve().then(() => __toESM(require_dist()));
@@ -31021,138 +31428,141 @@ async function directCdpEval(expression, port = 9222) {
     });
   });
 }
-var provider = program.command("provider").description("\u{1F50C} Provider management \u2014 list, test, reload providers");
-provider.command("list").description("List all loaded providers").option("-j, --json", "Output raw JSON").action(async (options) => {
-  try {
-    const { ProviderLoader: ProviderLoader3 } = await Promise.resolve().then(() => __toESM(require_dist()));
-    const loader = new ProviderLoader3();
-    loader.loadAll();
-    const providers = loader.getAll();
-    if (options.json) {
-      console.log(JSON.stringify(providers.map((p) => ({
-        type: p.type,
-        name: p.name,
-        category: p.category,
-        scripts: p.scripts ? Object.keys(p.scripts).filter((k) => typeof p.scripts[k] === "function") : [],
-        extensionId: p.extensionId || null,
-        inputMethod: p.inputMethod || null
-      })), null, 2));
-      return;
-    }
-    console.log(import_chalk3.default.bold("\n\u{1F50C} ADHDev Providers\n"));
-    const categories = ["ide", "extension", "cli", "acp"];
-    for (const cat of categories) {
-      const catProviders = providers.filter((p) => p.category === cat);
-      if (catProviders.length === 0) continue;
-      const icons = { ide: "\u{1F4BB}", extension: "\u{1F9E9}", cli: "\u2328\uFE0F ", acp: "\u{1F50C}" };
-      console.log(`  ${icons[cat] || ""} ${import_chalk3.default.bold(cat.toUpperCase())} (${catProviders.length})`);
-      for (const p of catProviders) {
-        const scripts = p.scripts ? Object.keys(p.scripts).filter((k) => typeof p.scripts[k] === "function") : [];
-        console.log(`    ${import_chalk3.default.green("\u2713")} ${import_chalk3.default.bold(p.type)} \u2014 ${p.name}`);
-        console.log(import_chalk3.default.gray(`      scripts: ${scripts.join(", ")}`));
-        if (p.extensionId) console.log(import_chalk3.default.gray(`      extensionId: ${p.extensionId}`));
-        if (p.inputMethod) console.log(import_chalk3.default.gray(`      inputMethod: ${p.inputMethod}`));
+
+// src/cli/provider-commands.ts
+function registerProviderCommands(program2) {
+  const provider = program2.command("provider").description("\u{1F50C} Provider management \u2014 list, test, reload providers");
+  provider.command("list").description("List all loaded providers").option("-j, --json", "Output raw JSON").action(async (options) => {
+    try {
+      const { ProviderLoader: ProviderLoader3 } = await Promise.resolve().then(() => __toESM(require_dist()));
+      const loader = new ProviderLoader3();
+      loader.loadAll();
+      const providers = loader.getAll();
+      if (options.json) {
+        console.log(JSON.stringify(providers.map((p) => ({
+          type: p.type,
+          name: p.name,
+          category: p.category,
+          scripts: p.scripts ? Object.keys(p.scripts).filter((k) => typeof p.scripts[k] === "function") : [],
+          extensionId: p.extensionId || null,
+          inputMethod: p.inputMethod || null
+        })), null, 2));
+        return;
       }
-      console.log();
-    }
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+      console.log(import_chalk5.default.bold("\n\u{1F50C} ADHDev Providers\n"));
+      const categories = ["ide", "extension", "cli", "acp"];
+      for (const cat of categories) {
+        const catProviders = providers.filter((p) => p.category === cat);
+        if (catProviders.length === 0) continue;
+        const icons = { ide: "\u{1F4BB}", extension: "\u{1F9E9}", cli: "\u2328\uFE0F ", acp: "\u{1F50C}" };
+        console.log(`  ${icons[cat] || ""} ${import_chalk5.default.bold(cat.toUpperCase())} (${catProviders.length})`);
+        for (const p of catProviders) {
+          const scripts = p.scripts ? Object.keys(p.scripts).filter((k) => typeof p.scripts[k] === "function") : [];
+          console.log(`    ${import_chalk5.default.green("\u2713")} ${import_chalk5.default.bold(p.type)} \u2014 ${p.name}`);
+          console.log(import_chalk5.default.gray(`      scripts: ${scripts.join(", ")}`));
+          if (p.extensionId) console.log(import_chalk5.default.gray(`      extensionId: ${p.extensionId}`));
+          if (p.inputMethod) console.log(import_chalk5.default.gray(`      inputMethod: ${p.inputMethod}`));
+        }
+        console.log();
+      }
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-provider.command("reload").description("Hot-reload all providers (requires daemon --dev)").action(async () => {
-  try {
-    const http = await import("http");
-    const result = await new Promise((resolve, reject) => {
-      const req = http.request({
-        hostname: "127.0.0.1",
-        port: 19280,
-        path: "/api/providers/reload",
-        method: "POST",
-        headers: { "Content-Type": "application/json", "Content-Length": "2" }
-      }, (res) => {
-        let data = "";
-        res.on("data", (c) => data += c);
-        res.on("end", () => {
-          try {
-            resolve(JSON.parse(data));
-          } catch {
-            resolve({ raw: data });
-          }
+      process.exit(1);
+    }
+  });
+  provider.command("reload").description("Hot-reload all providers (requires daemon --dev)").action(async () => {
+    try {
+      const http = await import("http");
+      const result = await new Promise((resolve, reject) => {
+        const req = http.request({
+          hostname: "127.0.0.1",
+          port: 19280,
+          path: "/api/providers/reload",
+          method: "POST",
+          headers: { "Content-Type": "application/json", "Content-Length": "2" }
+        }, (res) => {
+          let data = "";
+          res.on("data", (c) => data += c);
+          res.on("end", () => {
+            try {
+              resolve(JSON.parse(data));
+            } catch {
+              resolve({ raw: data });
+            }
+          });
         });
+        req.on("error", () => reject(new Error("DevServer not reachable. Run: adhdev daemon --dev")));
+        req.write("{}");
+        req.end();
       });
-      req.on("error", () => reject(new Error("DevServer not reachable. Run: adhdev daemon --dev")));
-      req.write("{}");
-      req.end();
-    });
-    if (result.reloaded) {
-      console.log(import_chalk3.default.green(`
+      if (result.reloaded) {
+        console.log(import_chalk5.default.green(`
   \u2713 Providers reloaded: ${result.providers?.length || 0} loaded
 `));
-      for (const p of result.providers || []) {
-        console.log(`    ${import_chalk3.default.green("\u2713")} ${p.type} (${p.category}) \u2014 ${p.name}`);
-      }
-      console.log();
-    } else {
-      console.log(import_chalk3.default.red(`
+        for (const p of result.providers || []) {
+          console.log(`    ${import_chalk5.default.green("\u2713")} ${p.type} (${p.category}) \u2014 ${p.name}`);
+        }
+        console.log();
+      } else {
+        console.log(import_chalk5.default.red(`
   \u2717 Reload failed: ${result.error || "unknown"}
 `));
-    }
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+      }
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-provider.command("create <type>").description("Scaffold a new provider.js from template").option("-n, --name <name>", "Display name").option("-c, --category <cat>", "Category: ide, extension, cli", "ide").option("--builtin", "Create in builtin directory (default: ~/.adhdev/providers/)").action(async (type, options) => {
-  try {
-    const name = options.name || type.split("-").map((s) => s[0].toUpperCase() + s.slice(1)).join(" ");
-    const category = options.category;
-    const location = options.builtin ? "builtin" : "user";
-    const http = await import("http");
-    const result = await new Promise((resolve, reject) => {
-      const postData = JSON.stringify({ type, name, category, location });
-      const req = http.request({
-        hostname: "127.0.0.1",
-        port: 19280,
-        path: "/api/scaffold",
-        method: "POST",
-        headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
-      }, (res) => {
-        let data = "";
-        res.on("data", (c) => data += c);
-        res.on("end", () => {
-          try {
-            resolve(JSON.parse(data));
-          } catch {
-            resolve({ raw: data });
-          }
+      process.exit(1);
+    }
+  });
+  provider.command("create <type>").description("Scaffold a new provider.js from template").option("-n, --name <name>", "Display name").option("-c, --category <cat>", "Category: ide, extension, cli", "ide").option("--builtin", "Create in builtin directory (default: ~/.adhdev/providers/)").action(async (type, options) => {
+    try {
+      const name = options.name || type.split("-").map((s) => s[0].toUpperCase() + s.slice(1)).join(" ");
+      const category = options.category;
+      const location = options.builtin ? "builtin" : "user";
+      const http = await import("http");
+      const result = await new Promise((resolve, reject) => {
+        const postData = JSON.stringify({ type, name, category, location });
+        const req = http.request({
+          hostname: "127.0.0.1",
+          port: 19280,
+          path: "/api/scaffold",
+          method: "POST",
+          headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
+        }, (res) => {
+          let data = "";
+          res.on("data", (c) => data += c);
+          res.on("end", () => {
+            try {
+              resolve(JSON.parse(data));
+            } catch {
+              resolve({ raw: data });
+            }
+          });
         });
-      });
-      req.on("error", () => {
-        reject(new Error("DevServer not reachable"));
-      });
-      req.write(postData);
-      req.end();
-    }).catch(async () => {
-      const pathMod = await import("path");
-      const fsMod = await import("fs");
-      const osMod = await import("os");
-      let targetDir;
-      if (location === "builtin") {
-        targetDir = pathMod.resolve(__dirname, "../providers/_builtin", category, type);
-      } else {
-        targetDir = pathMod.join(osMod.homedir(), ".adhdev", "providers", type);
-      }
-      const targetFile = pathMod.join(targetDir, "provider.js");
-      if (fsMod.existsSync(targetFile)) {
-        return { error: `Provider already exists at ${targetFile}`, path: targetFile };
-      }
-      const isExtension = category === "extension";
-      const template = `/**
+        req.on("error", () => {
+          reject(new Error("DevServer not reachable"));
+        });
+        req.write(postData);
+        req.end();
+      }).catch(async () => {
+        const pathMod = await import("path");
+        const fsMod = await import("fs");
+        const osMod = await import("os");
+        let targetDir;
+        if (location === "builtin") {
+          targetDir = pathMod.resolve(__dirname, "../../providers/_builtin", category, type);
+        } else {
+          targetDir = pathMod.join(osMod.homedir(), ".adhdev", "providers", type);
+        }
+        const targetFile = pathMod.join(targetDir, "provider.js");
+        if (fsMod.existsSync(targetFile)) {
+          return { error: `Provider already exists at ${targetFile}`, path: targetFile };
+        }
+        const isExtension = category === "extension";
+        const template = `/**
  * ${name} \u2014 Provider
  */
 module.exports = {
@@ -31170,151 +31580,153 @@ ${isExtension ? `  extensionId: 'publisher.${type}',
   },
 };
 `;
-      fsMod.mkdirSync(targetDir, { recursive: true });
-      fsMod.writeFileSync(targetFile, template, "utf-8");
-      return { created: true, path: targetFile, type, name, category };
-    });
-    if (result.error) {
-      console.log(import_chalk3.default.red(`
+        fsMod.mkdirSync(targetDir, { recursive: true });
+        fsMod.writeFileSync(targetFile, template, "utf-8");
+        return { created: true, path: targetFile, type, name, category };
+      });
+      if (result.error) {
+        console.log(import_chalk5.default.red(`
   \u2717 ${result.error}
 `));
-      if (result.path) console.log(import_chalk3.default.gray(`    Path: ${result.path}
+        if (result.path) console.log(import_chalk5.default.gray(`    Path: ${result.path}
 `));
-      process.exit(1);
-    }
-    console.log(import_chalk3.default.green(`
+        process.exit(1);
+      }
+      console.log(import_chalk5.default.green(`
   \u2713 Provider scaffolded!
 `));
-    console.log(`    ${import_chalk3.default.bold("Type:")}     ${result.type}`);
-    console.log(`    ${import_chalk3.default.bold("Name:")}     ${result.name}`);
-    console.log(`    ${import_chalk3.default.bold("Category:")} ${result.category}`);
-    console.log(`    ${import_chalk3.default.bold("Path:")}     ${import_chalk3.default.cyan(result.path)}`);
-    console.log();
-    console.log(import_chalk3.default.gray("  Next steps:"));
-    console.log(import_chalk3.default.gray(`    1. Edit ${result.path}`));
-    console.log(import_chalk3.default.gray("    2. Run: adhdev provider reload"));
-    console.log(import_chalk3.default.gray(`    3. Test: adhdev provider test ${type}`));
-    console.log(import_chalk3.default.gray("    4. Open DevConsole: http://127.0.0.1:19280"));
-    console.log();
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+      console.log(`    ${import_chalk5.default.bold("Type:")}     ${result.type}`);
+      console.log(`    ${import_chalk5.default.bold("Name:")}     ${result.name}`);
+      console.log(`    ${import_chalk5.default.bold("Category:")} ${result.category}`);
+      console.log(`    ${import_chalk5.default.bold("Path:")}     ${import_chalk5.default.cyan(result.path)}`);
+      console.log();
+      console.log(import_chalk5.default.gray("  Next steps:"));
+      console.log(import_chalk5.default.gray(`    1. Edit ${result.path}`));
+      console.log(import_chalk5.default.gray("    2. Run: adhdev provider reload"));
+      console.log(import_chalk5.default.gray(`    3. Test: adhdev provider test ${type}`));
+      console.log(import_chalk5.default.gray("    4. Open DevConsole: http://127.0.0.1:19280"));
+      console.log();
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-provider.command("run <type> <script>").description("Run a specific provider script (requires daemon --dev)").option("-p, --param <value>", "Parameter value (for sendMessage, switchSession, etc.)").option("-j, --json", "Output raw JSON").action(async (type, script, options) => {
-  try {
-    const http = await import("http");
-    const postData = JSON.stringify({
-      script,
-      params: options.param ? { text: options.param, sessionId: options.param, buttonText: options.param } : {}
-    });
-    const result = await new Promise((resolve, reject) => {
-      const req = http.request({
-        hostname: "127.0.0.1",
-        port: 19280,
-        path: `/api/providers/${type}/script`,
-        method: "POST",
-        headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
-      }, (res) => {
-        let data = "";
-        res.on("data", (c) => data += c);
-        res.on("end", () => {
-          try {
-            resolve(JSON.parse(data));
-          } catch {
-            resolve({ raw: data });
-          }
+      process.exit(1);
+    }
+  });
+  provider.command("run <type> <script>").description("Run a specific provider script (requires daemon --dev)").option("-p, --param <value>", "Parameter value (for sendMessage, switchSession, etc.)").option("-j, --json", "Output raw JSON").action(async (type, script, options) => {
+    try {
+      const http = await import("http");
+      const postData = JSON.stringify({
+        script,
+        params: options.param ? { text: options.param, sessionId: options.param, buttonText: options.param } : {}
+      });
+      const result = await new Promise((resolve, reject) => {
+        const req = http.request({
+          hostname: "127.0.0.1",
+          port: 19280,
+          path: `/api/providers/${type}/script`,
+          method: "POST",
+          headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
+        }, (res) => {
+          let data = "";
+          res.on("data", (c) => data += c);
+          res.on("end", () => {
+            try {
+              resolve(JSON.parse(data));
+            } catch {
+              resolve({ raw: data });
+            }
+          });
         });
+        req.on("error", () => reject(new Error("DevServer not reachable. Run: adhdev daemon --dev")));
+        req.write(postData);
+        req.end();
       });
-      req.on("error", () => reject(new Error("DevServer not reachable. Run: adhdev daemon --dev")));
-      req.write(postData);
-      req.end();
-    });
-    if (options.json) {
-      console.log(JSON.stringify(result, null, 2));
-      return;
-    }
-    if (result.error) {
-      console.log(import_chalk3.default.red(`
+      if (options.json) {
+        console.log(JSON.stringify(result, null, 2));
+        return;
+      }
+      if (result.error) {
+        console.log(import_chalk5.default.red(`
   \u2717 ${result.error}
 `));
-      if (result.available) console.log(import_chalk3.default.gray(`  Available scripts: ${result.available.join(", ")}
+        if (result.available) console.log(import_chalk5.default.gray(`  Available scripts: ${result.available.join(", ")}
 `));
-      process.exit(1);
-    }
-    console.log(import_chalk3.default.bold(`
-\u25B6 ${import_chalk3.default.cyan(type)} \u2192 ${import_chalk3.default.yellow(script)}
+        process.exit(1);
+      }
+      console.log(import_chalk5.default.bold(`
+\u25B6 ${import_chalk5.default.cyan(type)} \u2192 ${import_chalk5.default.yellow(script)}
 `));
-    const output = result.result !== void 0 ? result.result : result;
-    console.log(typeof output === "string" ? output : JSON.stringify(output, null, 2));
-    console.log();
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+      const output = result.result !== void 0 ? result.result : result;
+      console.log(typeof output === "string" ? output : JSON.stringify(output, null, 2));
+      console.log();
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-provider.command("source <type>").description("View source code of a provider").action(async (type) => {
-  try {
-    const http = await import("http");
-    const result = await new Promise((resolve, reject) => {
-      http.get(`http://127.0.0.1:19280/api/providers/${type}/source`, (res) => {
-        let data = "";
-        res.on("data", (c) => data += c);
-        res.on("end", () => {
-          try {
-            resolve(JSON.parse(data));
-          } catch {
-            resolve({ raw: data });
-          }
+      process.exit(1);
+    }
+  });
+  provider.command("source <type>").description("View source code of a provider").action(async (type) => {
+    try {
+      const http = await import("http");
+      const result = await new Promise((resolve, reject) => {
+        http.get(`http://127.0.0.1:19280/api/providers/${type}/source`, (res) => {
+          let data = "";
+          res.on("data", (c) => data += c);
+          res.on("end", () => {
+            try {
+              resolve(JSON.parse(data));
+            } catch {
+              resolve({ raw: data });
+            }
+          });
+        }).on("error", () => {
+          reject(new Error("Use --offline or start daemon --dev"));
         });
-      }).on("error", () => {
-        reject(new Error("Use --offline or start daemon --dev"));
-      });
-    }).catch(async () => {
-      const pathMod = await import("path");
-      const fsMod = await import("fs");
-      const osMod = await import("os");
-      const possiblePaths = [
-        pathMod.join(osMod.homedir(), ".adhdev", "providers", type, "provider.js"),
-        pathMod.resolve(__dirname, "../providers/_builtin/ide", type, "provider.js"),
-        pathMod.resolve(__dirname, "../providers/_builtin/extension", type, "provider.js")
-      ];
-      for (const p of possiblePaths) {
-        if (fsMod.existsSync(p)) {
-          return { type, path: p, source: fsMod.readFileSync(p, "utf-8") };
+      }).catch(async () => {
+        const pathMod = await import("path");
+        const fsMod = await import("fs");
+        const osMod = await import("os");
+        const possiblePaths = [
+          pathMod.join(osMod.homedir(), ".adhdev", "providers", type, "provider.js"),
+          pathMod.resolve(__dirname, "../../providers/_builtin/ide", type, "provider.js"),
+          pathMod.resolve(__dirname, "../../providers/_builtin/extension", type, "provider.js")
+        ];
+        for (const p of possiblePaths) {
+          if (fsMod.existsSync(p)) {
+            return { type, path: p, source: fsMod.readFileSync(p, "utf-8") };
+          }
         }
-      }
-      return { error: `Provider '${type}' not found` };
-    });
-    if (result.error) {
-      console.log(import_chalk3.default.red(`
+        return { error: `Provider '${type}' not found` };
+      });
+      if (result.error) {
+        console.log(import_chalk5.default.red(`
   \u2717 ${result.error}
 `));
-      process.exit(1);
-    }
-    console.log(import_chalk3.default.bold(`
+        process.exit(1);
+      }
+      console.log(import_chalk5.default.bold(`
 \u{1F4C4} ${type} \u2014 ${result.path}
 `));
-    console.log(result.source);
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+      console.log(result.source);
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-var cdp = program.command("cdp").description("\u{1F50D} CDP debugging tools \u2014 analyze IDE DOM for script development");
-cdp.command("debug").description("Analyze IDE AI panel \u2014 find inputs, buttons, textareas, iframes").option("-p, --port <port>", "CDP port (direct mode)", "9222").option("-d, --daemon", "Use running daemon instead of direct CDP").option("--session <id>", "Agent webview session ID").option("-j, --json", "Output raw JSON").action(async (options) => {
-  try {
-    let result;
-    if (options.daemon) {
-      result = await sendDaemonCommand("cdp_dom_debug", { sessionId: options.session });
-    } else {
-      const expression = `(() => {
+      process.exit(1);
+    }
+  });
+}
+function registerCdpCommands(program2) {
+  const cdp = program2.command("cdp").description("\u{1F50D} CDP debugging tools \u2014 analyze IDE DOM for script development");
+  cdp.command("debug").description("Analyze IDE AI panel \u2014 find inputs, buttons, textareas, iframes").option("-p, --port <port>", "CDP port (direct mode)", "9222").option("-d, --daemon", "Use running daemon instead of direct CDP").option("--session <id>", "Agent webview session ID").option("-j, --json", "Output raw JSON").action(async (options) => {
+    try {
+      let result;
+      if (options.daemon) {
+        result = await sendDaemonCommand("cdp_dom_debug", { sessionId: options.session });
+      } else {
+        const expression = `(() => {
                     const result = { url: location.href, title: document.title, viewport: { w: window.innerWidth, h: window.innerHeight }, inputs: [], textareas: [], editables: [], buttons: [], iframes: [], textboxes: [] };
                     document.querySelectorAll('input[type="text"], input:not([type])').forEach((el, i) => { if (i >= 10) return; result.inputs.push({ id: el.id||null, class: (el.className||'').toString().slice(0,150), placeholder: el.getAttribute('placeholder')||null, visible: el.offsetParent!==null, rect: (() => { try { const r=el.getBoundingClientRect(); return {x:Math.round(r.x),y:Math.round(r.y),w:Math.round(r.width),h:Math.round(r.height)}; } catch{return null;} })() }); });
                     document.querySelectorAll('textarea').forEach((el, i) => { if (i >= 10) return; result.textareas.push({ id: el.id||null, class: (el.className||'').toString().slice(0,150), placeholder: el.getAttribute('placeholder')||null, rows: el.rows, visible: el.offsetParent!==null }); });
@@ -31325,213 +31737,245 @@ cdp.command("debug").description("Analyze IDE AI panel \u2014 find inputs, butto
                     document.querySelectorAll('iframe, webview').forEach((el, i) => { if (i >= 20) return; result.iframes.push({ tag: el.tagName?.toLowerCase(), src: el.getAttribute('src')?.slice(0,200)||null, title: el.getAttribute('title')||null }); });
                     return JSON.stringify(result);
                 })()`;
-      const raw = await directCdpEval(expression, parseInt(options.port));
-      result = typeof raw === "string" ? JSON.parse(raw) : raw;
-    }
-    if (options.json) {
-      console.log(JSON.stringify(result, null, 2));
-      return;
-    }
-    console.log(import_chalk3.default.bold("\n\u{1F50D} CDP DOM Debug\n"));
-    console.log(`  ${import_chalk3.default.bold("URL:")}      ${result.url || "N/A"}`);
-    console.log(`  ${import_chalk3.default.bold("Title:")}    ${result.title || "N/A"}`);
-    if (result.viewport) console.log(`  ${import_chalk3.default.bold("Viewport:")} ${result.viewport.w}\xD7${result.viewport.h}`);
-    const sections = [
-      { key: "inputs", label: "\u{1F4DD} Inputs", fields: ["id", "placeholder", "class"] },
-      { key: "textareas", label: "\u{1F4DD} Textareas", fields: ["id", "placeholder", "rows"] },
-      { key: "editables", label: "\u270F\uFE0F  ContentEditable", fields: ["tag", "role", "class", "text"] },
-      { key: "textboxes", label: '\u{1F4E6} role="textbox"', fields: ["tag", "class", "text"] },
-      { key: "buttons", label: "\u{1F518} Buttons", fields: ["text", "disabled"] },
-      { key: "iframes", label: "\u{1F5BC}  Iframes/Webviews", fields: ["tag", "src", "title"] }
-    ];
-    for (const { key, label, fields } of sections) {
-      const items = result[key] || [];
-      if (items.length === 0) continue;
-      console.log(`
-  ${import_chalk3.default.bold(label)} (${items.length})`);
-      for (const item of items) {
-        const vis = item.visible === false ? import_chalk3.default.red(" [hidden]") : "";
-        const parts = fields.map((f) => item[f] ? `${f}=${import_chalk3.default.cyan(String(item[f]).slice(0, 60))}` : null).filter(Boolean);
-        console.log(`    ${import_chalk3.default.gray("\u2022")} ${parts.join(" ")}${vis}`);
+        const raw = await directCdpEval(expression, parseInt(options.port));
+        result = typeof raw === "string" ? JSON.parse(raw) : raw;
       }
-    }
-    console.log();
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+      if (options.json) {
+        console.log(JSON.stringify(result, null, 2));
+        return;
+      }
+      console.log(import_chalk5.default.bold("\n\u{1F50D} CDP DOM Debug\n"));
+      console.log(`  ${import_chalk5.default.bold("URL:")}      ${result.url || "N/A"}`);
+      console.log(`  ${import_chalk5.default.bold("Title:")}    ${result.title || "N/A"}`);
+      if (result.viewport) console.log(`  ${import_chalk5.default.bold("Viewport:")} ${result.viewport.w}\xD7${result.viewport.h}`);
+      const sections = [
+        { key: "inputs", label: "\u{1F4DD} Inputs", fields: ["id", "placeholder", "class"] },
+        { key: "textareas", label: "\u{1F4DD} Textareas", fields: ["id", "placeholder", "rows"] },
+        { key: "editables", label: "\u270F\uFE0F  ContentEditable", fields: ["tag", "role", "class", "text"] },
+        { key: "textboxes", label: '\u{1F4E6} role="textbox"', fields: ["tag", "class", "text"] },
+        { key: "buttons", label: "\u{1F518} Buttons", fields: ["text", "disabled"] },
+        { key: "iframes", label: "\u{1F5BC}  Iframes/Webviews", fields: ["tag", "src", "title"] }
+      ];
+      for (const { key, label, fields } of sections) {
+        const items = result[key] || [];
+        if (items.length === 0) continue;
+        console.log(`
+  ${import_chalk5.default.bold(label)} (${items.length})`);
+        for (const item of items) {
+          const vis = item.visible === false ? import_chalk5.default.red(" [hidden]") : "";
+          const parts = fields.map((f) => item[f] ? `${f}=${import_chalk5.default.cyan(String(item[f]).slice(0, 60))}` : null).filter(Boolean);
+          console.log(`    ${import_chalk5.default.gray("\u2022")} ${parts.join(" ")}${vis}`);
+        }
+      }
+      console.log();
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-cdp.command("dump [selector]").description("Dump DOM tree (default: body)").option("-p, --port <port>", "CDP port (direct mode)", "9222").option("-d, --daemon", "Use running daemon").option("-f, --format <fmt>", "Format: html, tree, summary", "tree").option("--depth <n>", "Max depth", "6").option("--session <id>", "Agent webview session ID").option("-o, --output <file>", "Save to file").action(async (selector, options) => {
-  try {
-    const sel = selector || "body";
-    const depth = parseInt(options.depth) || 6;
-    let result;
-    if (options.daemon) {
-      const resp = await sendDaemonCommand("cdp_dom_dump", {
-        selector: sel,
-        format: options.format,
-        depth,
-        sessionId: options.session
-      });
-      result = resp?.result || resp;
-    } else {
-      let expr;
-      if (options.format === "tree") {
-        expr = `(() => { const root = document.querySelector('${sel.replace(/'/g, "\\'")}'); if (!root) return 'Not found: ${sel}'; function tree(el, indent, d, maxD) { if (d > maxD) return indent + '...\\n'; let line = indent + '<' + (el.tagName?.toLowerCase()||'?'); if (el.id) line += ' #' + el.id; if (el.className && typeof el.className === 'string') { const cls = el.className.trim().split(' ').filter(c=>c).slice(0,3).join('.'); if(cls) line += ' .' + cls; } const role = el.getAttribute?.('role'); if(role) line += ' [role=' + role + ']'; line += '> (' + (el.children?.length||0) + ')\\n'; let r = line; if (el.children?.length > 0 && d < maxD) { for (let i = 0; i < Math.min(el.children.length, 30); i++) { r += tree(el.children[i], indent + '  ', d+1, maxD); } if (el.children.length > 30) r += indent + '  ... +' + (el.children.length-30) + ' more\\n'; } return r; } return tree(root, '', 0, ${depth}); })()`;
-      } else if (options.format === "summary") {
-        expr = `(() => { const root = document.querySelector('${sel.replace(/'/g, "\\'")}'); if (!root) return JSON.stringify({error:'Not found'}); function s(el, d, maxD) { if (d > maxD) return {tag:'...',note:'max depth'}; const n = {tag:el.tagName?.toLowerCase(),id:el.id||undefined,class:el.className&&typeof el.className==='string'?el.className.split(' ').filter(c=>c).slice(0,5).join(' '):undefined,role:el.getAttribute?.('role')||undefined,childCount:el.children?.length||0}; if (el.children?.length > 0 && d < maxD) { n.children = Array.from(el.children).slice(0,30).map(c=>s(c,d+1,maxD)); } return n; } return JSON.stringify(s(root,0,${depth})); })()`;
+      process.exit(1);
+    }
+  });
+  cdp.command("dump [selector]").description("Dump DOM tree (default: body)").option("-p, --port <port>", "CDP port (direct mode)", "9222").option("-d, --daemon", "Use running daemon").option("-f, --format <fmt>", "Format: html, tree, summary", "tree").option("--depth <n>", "Max depth", "6").option("--session <id>", "Agent webview session ID").option("-o, --output <file>", "Save to file").action(async (selector, options) => {
+    try {
+      const sel = selector || "body";
+      const depth = parseInt(options.depth) || 6;
+      let result;
+      if (options.daemon) {
+        const resp = await sendDaemonCommand("cdp_dom_dump", {
+          selector: sel,
+          format: options.format,
+          depth,
+          sessionId: options.session
+        });
+        result = resp?.result || resp;
       } else {
-        expr = `(() => { const root = document.querySelector('${sel.replace(/'/g, "\\'")}'); if (!root) return 'Not found: ${sel}'; let html = root.outerHTML; if (html.length > 200000) html = html.slice(0, 200000) + '\\n<!-- TRUNCATED -->'; return html; })()`;
-      }
-      result = await directCdpEval(expr, parseInt(options.port));
-      if (options.format === "summary" && typeof result === "string") {
-        try {
-          result = JSON.parse(result);
-        } catch {
+        let expr;
+        if (options.format === "tree") {
+          expr = `(() => { const root = document.querySelector('${sel.replace(/'/g, "\\'")}'); if (!root) return 'Not found: ${sel}'; function tree(el, indent, d, maxD) { if (d > maxD) return indent + '...\\n'; let line = indent + '<' + (el.tagName?.toLowerCase()||'?'); if (el.id) line += ' #' + el.id; if (el.className && typeof el.className === 'string') { const cls = el.className.trim().split(' ').filter(c=>c).slice(0,3).join('.'); if(cls) line += ' .' + cls; } const role = el.getAttribute?.('role'); if(role) line += ' [role=' + role + ']'; line += '> (' + (el.children?.length||0) + ')\\n'; let r = line; if (el.children?.length > 0 && d < maxD) { for (let i = 0; i < Math.min(el.children.length, 30); i++) { r += tree(el.children[i], indent + '  ', d+1, maxD); } if (el.children.length > 30) r += indent + '  ... +' + (el.children.length-30) + ' more\\n'; } return r; } return tree(root, '', 0, ${depth}); })()`;
+        } else if (options.format === "summary") {
+          expr = `(() => { const root = document.querySelector('${sel.replace(/'/g, "\\'")}'); if (!root) return JSON.stringify({error:'Not found'}); function s(el, d, maxD) { if (d > maxD) return {tag:'...',note:'max depth'}; const n = {tag:el.tagName?.toLowerCase(),id:el.id||undefined,class:el.className&&typeof el.className==='string'?el.className.split(' ').filter(c=>c).slice(0,5).join(' '):undefined,role:el.getAttribute?.('role')||undefined,childCount:el.children?.length||0}; if (el.children?.length > 0 && d < maxD) { n.children = Array.from(el.children).slice(0,30).map(c=>s(c,d+1,maxD)); } return n; } return JSON.stringify(s(root,0,${depth})); })()`;
+        } else {
+          expr = `(() => { const root = document.querySelector('${sel.replace(/'/g, "\\'")}'); if (!root) return 'Not found: ${sel}'; let html = root.outerHTML; if (html.length > 200000) html = html.slice(0, 200000) + '\\n<!-- TRUNCATED -->'; return html; })()`;
+        }
+        result = await directCdpEval(expr, parseInt(options.port));
+        if (options.format === "summary" && typeof result === "string") {
+          try {
+            result = JSON.parse(result);
+          } catch {
+          }
         }
       }
-    }
-    const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
-    if (options.output) {
-      const fs3 = await import("fs");
-      fs3.writeFileSync(options.output, output, "utf-8");
-      console.log(import_chalk3.default.green(`
+      const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
+      if (options.output) {
+        const fs3 = await import("fs");
+        fs3.writeFileSync(options.output, output, "utf-8");
+        console.log(import_chalk5.default.green(`
   \u2713 Saved to ${options.output} (${output.length} chars)
 `));
-    } else {
-      console.log(output);
-    }
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+      } else {
+        console.log(output);
+      }
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-cdp.command("query <selector>").description("Test a CSS selector \u2014 count matches, show elements").option("-p, --port <port>", "CDP port (direct mode)", "9222").option("-d, --daemon", "Use running daemon").option("-l, --limit <n>", "Max results", "10").option("--session <id>", "Agent webview session ID").option("-j, --json", "Output raw JSON").action(async (selector, options) => {
-  try {
-    const limit = parseInt(options.limit) || 10;
-    let result;
-    if (options.daemon) {
-      result = await sendDaemonCommand("cdp_dom_query", {
-        selector,
-        limit,
-        sessionId: options.session
-      });
-    } else {
-      const expr = `(() => { try { const els = document.querySelectorAll('${selector.replace(/'/g, "\\'")}'); const results = []; for (let i = 0; i < Math.min(els.length, ${limit}); i++) { const el = els[i]; results.push({ index: i, tag: el.tagName?.toLowerCase(), id: el.id||null, class: el.className&&typeof el.className==='string'?el.className.trim().slice(0,200):null, role: el.getAttribute?.('role')||null, text: (el.textContent||'').trim().slice(0,100), visible: el.offsetParent!==null||el.offsetWidth>0, rect: (()=>{try{const r=el.getBoundingClientRect();return{x:Math.round(r.x),y:Math.round(r.y),w:Math.round(r.width),h:Math.round(r.height)};}catch{return null;}})() }); } return JSON.stringify({ total: els.length, results }); } catch(e) { return JSON.stringify({ error: e.message }); } })()`;
-      const raw = await directCdpEval(expr, parseInt(options.port));
-      result = typeof raw === "string" ? JSON.parse(raw) : raw;
-    }
-    if (options.json) {
-      console.log(JSON.stringify(result, null, 2));
-      return;
+      process.exit(1);
     }
-    const total = result.total || 0;
-    console.log(import_chalk3.default.bold(`
-\u{1F50D} Selector: ${import_chalk3.default.cyan(selector)}`));
-    console.log(`   Matches: ${total === 0 ? import_chalk3.default.red("0") : import_chalk3.default.green(total)}
+  });
+  cdp.command("query <selector>").description("Test a CSS selector \u2014 count matches, show elements").option("-p, --port <port>", "CDP port (direct mode)", "9222").option("-d, --daemon", "Use running daemon").option("-l, --limit <n>", "Max results", "10").option("--session <id>", "Agent webview session ID").option("-j, --json", "Output raw JSON").action(async (selector, options) => {
+    try {
+      const limit = parseInt(options.limit) || 10;
+      let result;
+      if (options.daemon) {
+        result = await sendDaemonCommand("cdp_dom_query", {
+          selector,
+          limit,
+          sessionId: options.session
+        });
+      } else {
+        const expr = `(() => { try { const els = document.querySelectorAll('${selector.replace(/'/g, "\\'")}'); const results = []; for (let i = 0; i < Math.min(els.length, ${limit}); i++) { const el = els[i]; results.push({ index: i, tag: el.tagName?.toLowerCase(), id: el.id||null, class: el.className&&typeof el.className==='string'?el.className.trim().slice(0,200):null, role: el.getAttribute?.('role')||null, text: (el.textContent||'').trim().slice(0,100), visible: el.offsetParent!==null||el.offsetWidth>0, rect: (()=>{try{const r=el.getBoundingClientRect();return{x:Math.round(r.x),y:Math.round(r.y),w:Math.round(r.width),h:Math.round(r.height)};}catch{return null;}})() }); } return JSON.stringify({ total: els.length, results }); } catch(e) { return JSON.stringify({ error: e.message }); } })()`;
+        const raw = await directCdpEval(expr, parseInt(options.port));
+        result = typeof raw === "string" ? JSON.parse(raw) : raw;
+      }
+      if (options.json) {
+        console.log(JSON.stringify(result, null, 2));
+        return;
+      }
+      const total = result.total || 0;
+      console.log(import_chalk5.default.bold(`
+\u{1F50D} Selector: ${import_chalk5.default.cyan(selector)}`));
+      console.log(`   Matches: ${total === 0 ? import_chalk5.default.red("0") : import_chalk5.default.green(total)}
 `);
-    for (const item of result.results || []) {
-      const vis = item.visible === false ? import_chalk3.default.red(" [hidden]") : import_chalk3.default.green(" [visible]");
-      const rect = item.rect ? import_chalk3.default.gray(` ${item.rect.x},${item.rect.y} ${item.rect.w}\xD7${item.rect.h}`) : "";
-      console.log(`  ${import_chalk3.default.yellow(`[${item.index}]`)} <${import_chalk3.default.bold(item.tag)}>${vis}${rect}`);
-      if (item.id) console.log(`       id: ${import_chalk3.default.cyan(item.id)}`);
-      if (item.class) console.log(`       class: ${import_chalk3.default.gray(item.class.slice(0, 80))}`);
-      if (item.text) console.log(`       text: "${import_chalk3.default.white(item.text.slice(0, 80))}"`);
-      if (item.role) console.log(`       role: ${import_chalk3.default.magenta(item.role)}`);
-    }
-    console.log();
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+      for (const item of result.results || []) {
+        const vis = item.visible === false ? import_chalk5.default.red(" [hidden]") : import_chalk5.default.green(" [visible]");
+        const rect = item.rect ? import_chalk5.default.gray(` ${item.rect.x},${item.rect.y} ${item.rect.w}\xD7${item.rect.h}`) : "";
+        console.log(`  ${import_chalk5.default.yellow(`[${item.index}]`)} <${import_chalk5.default.bold(item.tag)}>${vis}${rect}`);
+        if (item.id) console.log(`       id: ${import_chalk5.default.cyan(item.id)}`);
+        if (item.class) console.log(`       class: ${import_chalk5.default.gray(item.class.slice(0, 80))}`);
+        if (item.text) console.log(`       text: "${import_chalk5.default.white(item.text.slice(0, 80))}"`);
+        if (item.role) console.log(`       role: ${import_chalk5.default.magenta(item.role)}`);
+      }
+      console.log();
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-cdp.command("eval <expression>").description("Execute JavaScript expression via CDP").option("-p, --port <port>", "CDP port", "9222").option("-d, --daemon", "Use running daemon").action(async (expression, options) => {
-  try {
-    let result;
-    if (options.daemon) {
-      const resp = await sendDaemonCommand("cdp_eval", { expression });
-      result = resp?.result !== void 0 ? resp.result : resp;
-    } else {
-      result = await directCdpEval(expression, parseInt(options.port));
+      process.exit(1);
     }
-    const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
-    console.log(output);
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+  });
+  cdp.command("eval <expression>").description("Execute JavaScript expression via CDP").option("-p, --port <port>", "CDP port", "9222").option("-d, --daemon", "Use running daemon").action(async (expression, options) => {
+    try {
+      let result;
+      if (options.daemon) {
+        const resp = await sendDaemonCommand("cdp_eval", { expression });
+        result = resp?.result !== void 0 ? resp.result : resp;
+      } else {
+        result = await directCdpEval(expression, parseInt(options.port));
+      }
+      const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
+      console.log(output);
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
-  }
-});
-cdp.command("screenshot").description("Capture IDE screenshot").option("-p, --port <port>", "CDP port", "9222").option("-o, --output <file>", "Output file path", "/tmp/cdp_screenshot.jpg").action(async (options) => {
-  try {
-    const http = await import("http");
-    const targets = await new Promise((resolve, reject) => {
-      http.get(`http://127.0.0.1:${options.port}/json`, (res) => {
-        let data = "";
-        res.on("data", (c) => data += c);
-        res.on("end", () => {
-          try {
-            resolve(JSON.parse(data));
-          } catch {
-            reject(new Error("Invalid JSON"));
-          }
-        });
-      }).on("error", (e) => reject(e));
-    });
-    const isNonMain = (title) => !title || /extension-output|ADHDev CDP|Debug Console|Output\s*$|Launchpad/i.test(title);
-    const pages = targets.filter((t) => (t.type === "page" || t.type === "Page") && t.webSocketDebuggerUrl);
-    const mainPages = pages.filter((t) => !isNonMain(t.title || ""));
-    const target = (mainPages.length > 0 ? mainPages[0] : pages[0]) || targets[0];
-    if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target");
-    const WebSocket2 = (await import("ws")).default;
-    const ws = new WebSocket2(target.webSocketDebuggerUrl);
-    await new Promise((resolve, reject) => {
-      ws.on("open", () => {
-        ws.send(JSON.stringify({ id: 1, method: "Page.captureScreenshot", params: { format: "jpeg", quality: 50 } }));
+      process.exit(1);
+    }
+  });
+  cdp.command("screenshot").description("Capture IDE screenshot").option("-p, --port <port>", "CDP port", "9222").option("-o, --output <file>", "Output file path", "/tmp/cdp_screenshot.jpg").action(async (options) => {
+    try {
+      const http = await import("http");
+      const targets = await new Promise((resolve, reject) => {
+        http.get(`http://127.0.0.1:${options.port}/json`, (res) => {
+          let data = "";
+          res.on("data", (c) => data += c);
+          res.on("end", () => {
+            try {
+              resolve(JSON.parse(data));
+            } catch {
+              reject(new Error("Invalid JSON"));
+            }
+          });
+        }).on("error", (e) => reject(e));
       });
-      ws.on("message", async (data) => {
-        const msg = JSON.parse(data.toString());
-        if (msg.id === 1 && msg.result?.data) {
-          const fs3 = await import("fs");
-          fs3.writeFileSync(options.output, Buffer.from(msg.result.data, "base64"));
-          console.log(import_chalk3.default.green(`
+      const isNonMain = (title) => !title || /extension-output|ADHDev CDP|Debug Console|Output\s*$|Launchpad/i.test(title);
+      const pages = targets.filter((t) => (t.type === "page" || t.type === "Page") && t.webSocketDebuggerUrl);
+      const mainPages = pages.filter((t) => !isNonMain(t.title || ""));
+      const target = (mainPages.length > 0 ? mainPages[0] : pages[0]) || targets[0];
+      if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target");
+      const WebSocket2 = (await import("ws")).default;
+      const ws = new WebSocket2(target.webSocketDebuggerUrl);
+      await new Promise((resolve, reject) => {
+        ws.on("open", () => {
+          ws.send(JSON.stringify({ id: 1, method: "Page.captureScreenshot", params: { format: "jpeg", quality: 50 } }));
+        });
+        ws.on("message", async (data) => {
+          const msg = JSON.parse(data.toString());
+          if (msg.id === 1 && msg.result?.data) {
+            const fs3 = await import("fs");
+            fs3.writeFileSync(options.output, Buffer.from(msg.result.data, "base64"));
+            console.log(import_chalk5.default.green(`
   \u2713 Screenshot saved to ${options.output}
 `));
-          ws.close();
-          resolve();
-        }
+            ws.close();
+            resolve();
+          }
+        });
+        ws.on("error", (e) => reject(e));
       });
-      ws.on("error", (e) => reject(e));
-    });
-  } catch (e) {
-    console.error(import_chalk3.default.red(`
+    } catch (e) {
+      console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-    process.exit(1);
+      process.exit(1);
+    }
+  });
+}
+
+// src/cli/index.ts
+var pkgVersion2 = "unknown";
+try {
+  const possiblePaths = [
+    (0, import_path.join)(__dirname, "..", "..", "package.json"),
+    (0, import_path.join)(__dirname, "..", "package.json"),
+    (0, import_path.join)(__dirname, "package.json")
+  ];
+  for (const p of possiblePaths) {
+    try {
+      const data = JSON.parse((0, import_fs.readFileSync)(p, "utf-8"));
+      if (data.version) {
+        pkgVersion2 = data.version;
+        break;
+      }
+    } catch {
+    }
   }
-});
+} catch {
+}
+var _cliProviderLoader = new import_daemon_core6.ProviderLoader({ logFn: () => {
+} });
+_cliProviderLoader.loadAll();
+_cliProviderLoader.registerToDetector();
+var program = new import_commander.Command();
+program.name("adhdev").description("\u{1F9A6} ADHDev \u2014 Agent Dashboard Hub for Dev").version(pkgVersion2);
+registerSetupCommands(program, _cliProviderLoader);
+registerDaemonCommands(program, pkgVersion2);
+registerProviderCommands(program);
+registerCdpCommands(program);
 if (process.argv.length <= 2) {
   program.outputHelp();
   console.log();
-  console.log(import_chalk3.default.gray("  Quick start:"));
-  console.log(import_chalk3.default.gray("    adhdev daemon            \u2014 Start unified daemon (Required)"));
-  console.log(import_chalk3.default.gray("    adhdev launch cursor     \u2014 Launch IDE with CDP (e.g. cursor, windsurf)"));
-  console.log(import_chalk3.default.gray("    adhdev launch claude     \u2014 Launch CLI agent (e.g. gemini, claude)"));
-  console.log(import_chalk3.default.gray("    adhdev setup             \u2014 First-time setup & configuration"));
-  console.log(import_chalk3.default.gray("    adhdev status            \u2014 Check current setup"));
+  console.log(import_chalk6.default.gray("  Quick start:"));
+  console.log(import_chalk6.default.gray("    adhdev daemon            \u2014 Start unified daemon (Required)"));
+  console.log(import_chalk6.default.gray("    adhdev launch cursor     \u2014 Launch IDE with CDP (e.g. cursor, windsurf)"));
+  console.log(import_chalk6.default.gray("    adhdev launch claude     \u2014 Launch CLI agent (e.g. gemini, claude)"));
+  console.log(import_chalk6.default.gray("    adhdev setup             \u2014 First-time setup & configuration"));
+  console.log(import_chalk6.default.gray("    adhdev status            \u2014 Check current setup"));
   console.log();
 } else {
   program.parseAsync(process.argv).catch((err) => {
-    console.error(import_chalk3.default.red(`
+    console.error(import_chalk6.default.red(`
 \u2717 ${err.message}`));
     process.exit(1);
   });
 }
-//# sourceMappingURL=cli-entrypoint.js.map
+//# sourceMappingURL=index.js.map