adhdev 0.4.0 → 0.4.1

package/dist/cli-entrypoint.js

@@ -16382,14 +16382,14 @@ var require_dist = __commonJS({
       updateConfig: () => updateConfig2
     });
     function getConfigDir() {
-      const dir = (0, import_path3.join)((0, import_os.homedir)(), ".adhdev");
+      const dir = (0, import_path2.join)((0, import_os.homedir)(), ".adhdev");
       if (!(0, import_fs2.existsSync)(dir)) {
         (0, import_fs2.mkdirSync)(dir, { recursive: true });
       }
       return dir;
     }
     function getConfigPath() {
-      return (0, import_path3.join)(getConfigDir(), "config.json");
+      return (0, import_path2.join)(getConfigDir(), "config.json");
     }
     function loadConfig4() {
       const configPath = getConfigPath();
@@ -16464,14 +16464,14 @@ var require_dist = __commonJS({
       saveConfig2(config2);
     }
     var import_os;
-    var import_path3;
+    var import_path2;
     var import_fs2;
     var DEFAULT_CONFIG;
     var init_config = __esm2({
       "src/config/config.ts"() {
         "use strict";
         import_os = require("os");
-        import_path3 = require("path");
+        import_path2 = require("path");
         import_fs2 = require("fs");
         DEFAULT_CONFIG = {
           serverUrl: "https://api.adhf.dev",
@@ -16915,13 +16915,44 @@ var require_dist = __commonJS({
       // Connect to specific targetId (multi-window support)
       _pageTitle = "";
       // Connected page title
-      constructor(port = 9333, logFn, targetId) {
+      _targetFilter;
+      // Provider-configurable target selection
+      constructor(port = 9333, logFn, targetId, targetFilter) {
         this.port = port;
         this._targetId = targetId || null;
+        this._targetFilter = targetFilter || {};
         this.logFn = logFn || ((msg) => {
           LOG4.info("CDP", msg);
         });
       }
+      /** Set target filter (can be updated after construction) */
+      setTargetFilter(filter) {
+        this._targetFilter = filter;
+      }
+      /**
+       * Check if a page title should be excluded (non-main page).
+       * Uses provider-configured titleExcludes, falls back to default pattern.
+       */
+      isNonMainTitle(title) {
+        if (!title) return true;
+        const pattern = this._targetFilter.titleExcludes || "extension-output|ADHDev CDP|Debug Console|Output\\s*$|Launchpad";
+        return new RegExp(pattern, "i").test(title);
+      }
+      /**
+       * Check if a page URL matches the main window criteria.
+       * Uses provider-configured urlIncludes/urlExcludes.
+       */
+      isMainPageUrl(url2) {
+        if (!url2) return true;
+        const { urlIncludes, urlExcludes } = this._targetFilter;
+        if (urlIncludes && !url2.includes(urlIncludes)) return false;
+        if (urlExcludes) {
+          for (const exc of urlExcludes) {
+            if (url2.includes(exc)) return false;
+          }
+        }
+        return true;
+      }
       /** Connected page title (includes workspace name) */
       get pageTitle() {
         return this._pageTitle;
@@ -16941,7 +16972,8 @@ var require_dist = __commonJS({
                 const pages = targets.filter(
                   (t) => t.type === "page" && t.webSocketDebuggerUrl
                 );
-                const isNonMain = (title) => !title || /extension-output|ADHDev CDP|Debug Console|Output\s*$|Launchpad/i.test(title);
+                const defaultExclude = /extension-output|ADHDev CDP|Debug Console|Output\s*$|Launchpad/i;
+                const isNonMain = (title) => !title || defaultExclude.test(title);
                 const mainPages = pages.filter(
                   (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
                 );
@@ -17009,8 +17041,7 @@ var require_dist = __commonJS({
                   resolve5(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
-                const isNonMain = (title) => !title || /extension-output|ADHDev CDP|Debug Console|Output\s*$|Launchpad/i.test(title);
-                const mainPages = pages.filter((t) => !isNonMain(t.title || ""));
+                const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
                 const list = mainPages.length > 0 ? mainPages : pages;
                 this.log(`[CDP] pages(${list.length}): ${list.map((t) => `"${t.title}"`).join(", ")}`);
                 if (this._targetId) {
@@ -21577,7 +21608,7 @@ ${installInfo}`
     var os9 = __toESM2(require("os"));
     var ProviderLoader4 = class _ProviderLoader {
       providers = /* @__PURE__ */ new Map();
-      builtinDir;
+      builtinDirs;
       userDir;
       upstreamDir;
       watchers = [];
@@ -21590,7 +21621,11 @@ ${installInfo}`
       static GITHUB_TARBALL_URL = "https://github.com/vilmire/adhdev-providers/archive/refs/heads/main.tar.gz";
       static META_FILE = ".meta.json";
       constructor(options) {
-        this.builtinDir = options?.builtinDir || path6.resolve(__dirname, "../providers/_builtin");
+        if (options?.builtinDir) {
+          this.builtinDirs = Array.isArray(options.builtinDir) ? options.builtinDir : [options.builtinDir];
+        } else {
+          this.builtinDirs = [path6.resolve(__dirname, "../providers/_builtin")];
+        }
         this.userDir = options?.userDir || path6.join(os9.homedir(), ".adhdev", "providers");
         this.upstreamDir = path6.join(this.userDir, ".upstream");
         this.logFn = options?.logFn || LOG4.forComponent("Provider").asLogFn();
@@ -21601,14 +21636,19 @@ ${installInfo}`
       // ─── Public API ────────────────────────────────
       /**
       * Load all providers (3-tier priority)
-      * 1. _builtin/ (bundled fallback)
+      * 1. _builtin/ (bundled fallback, or multiple array dirs)
       * 2. .upstream/ (GitHub auto-download)
       * 3. User custom (~/.adhdev/providers/ excluding _upstream)
       * Later loads override earlier ones, so user custom always wins.
       */
       loadAll() {
         this.providers.clear();
-        const builtinCount = this.loadDir(this.builtinDir);
+        let builtinCount = 0;
+        for (const dir of this.builtinDirs) {
+          if (fs5.existsSync(dir)) {
+            builtinCount += this.loadDir(dir);
+          }
+        }
         this.log(`Loaded ${builtinCount} builtin providers`);
         let upstreamCount = 0;
         if (fs5.existsSync(this.upstreamDir)) {
@@ -21628,7 +21668,7 @@ ${installInfo}`
           this.log(`\u26A0 Using bundled providers only (upstream not available). Run 'adhdev daemon' with internet to auto-update.`);
         }
         if (this.providers.size === 0) {
-          this.log(`\u274C No providers loaded! Check builtinDir: ${this.builtinDir}`);
+          this.log(`\u274C No providers loaded! Check builtinDirs.`);
         }
       }
       /**
@@ -21812,14 +21852,15 @@ ${installInfo}`
       /**
       * Return final provider with OS/version overrides applied.
       *
-      * Version resolution order:
-      *   1. context.version (explicit)
-      *   2. VersionArchive latest (auto-detected at daemon startup)
-      *   3. No version override applied
+      * Script resolution order:
+      *   1. compatibility array (new format — preferred)
+      *      Provider.json defines: "compatibility": [{ "ideVersion": ">=1.107.0", "scriptDir": "scripts/1.107" }]
+      *      First matching range wins. Fallback: defaultScriptDir.
+      *   2. versions field (legacy format — backward compat)
+      *      "versions": { "< 1.107.0": { "__dir": "scripts/legacy" } }
+      *   3. Root scripts.js (original format — no versioning)
       *
-      * versions override in provider.json:
-      *   "versions": { "< 1.107.0": { "__dir": "scripts/legacy" } }
-      *   When __dir is set, the scripts.js is re-required from that subdirectory.
+      * Version source: context.version → VersionArchive → undefined
       */
       resolve(type, context) {
         const base = this.providers.get(type);
@@ -21842,36 +21883,51 @@ ${installInfo}`
           if (osOverride.inputSelector) resolved.inputSelector = osOverride.inputSelector;
           resolved._resolvedOs = currentOs;
         }
-        if (currentVersion && base.versions) {
-          for (const [range, override] of Object.entries(base.versions)) {
-            if (!this.matchesVersion(currentVersion, range)) continue;
-            resolved._resolvedVersion = currentVersion;
-            const dirOverride = override.__dir;
-            if (dirOverride) {
-              const providerDir = this.findProviderDir(type);
-              if (providerDir) {
-                const altScriptsPath = path6.join(providerDir, dirOverride, "scripts.js");
-                if (fs5.existsSync(altScriptsPath)) {
-                  try {
-                    delete require.cache[require.resolve(altScriptsPath)];
-                    resolved.scripts = require(altScriptsPath);
-                    this.log(`  [version override] ${type} ${range} \u2192 scripts from ${dirOverride}/scripts.js`);
-                  } catch (e) {
-                    this.log(`  \u26A0 version override scripts load failed: ${altScriptsPath}: ${e.message}`);
-                  }
-                } else {
-                  const altDir = path6.join(providerDir, dirOverride);
-                  if (fs5.existsSync(altDir)) {
-                    const wrappers = this.buildScriptWrappersFromDir(altDir);
-                    resolved.scripts = { ...resolved.scripts, ...wrappers };
-                    this.log(`  [version override] ${type} ${range} \u2192 individual scripts from ${dirOverride}/`);
-                  }
+        if (currentVersion) {
+          resolved._resolvedVersion = currentVersion;
+          if (Array.isArray(base.compatibility)) {
+            const compat = base.compatibility;
+            let matched = false;
+            for (const entry of compat) {
+              if (this.matchesVersion(currentVersion, entry.ideVersion)) {
+                const loaded = this.loadScriptsFromDir(type, entry.scriptDir);
+                if (loaded) {
+                  resolved.scripts = loaded;
+                  this.log(`  [compatibility] ${type} v${currentVersion} \u2192 ${entry.scriptDir}`);
+                  matched = true;
                 }
+                break;
+              }
+            }
+            if (!matched && base.defaultScriptDir) {
+              const loaded = this.loadScriptsFromDir(type, base.defaultScriptDir);
+              if (loaded) {
+                resolved.scripts = loaded;
+                this.log(`  [compatibility] ${type} v${currentVersion} \u2192 default: ${base.defaultScriptDir}`);
+              }
+              resolved._versionWarning = `Version ${currentVersion} not in compatibility matrix. Using default scripts.`;
+            }
+          } else if (base.versions) {
+            for (const [range, override] of Object.entries(base.versions)) {
+              if (!this.matchesVersion(currentVersion, range)) continue;
+              const dirOverride = override.__dir;
+              if (dirOverride) {
+                const loaded = this.loadScriptsFromDir(type, dirOverride);
+                if (loaded) {
+                  resolved.scripts = loaded;
+                  this.log(`  [version override] ${type} ${range} \u2192 ${dirOverride}`);
+                }
+              } else if (override.scripts) {
+                resolved.scripts = { ...resolved.scripts, ...override.scripts };
               }
-            } else if (override.scripts) {
-              resolved.scripts = { ...resolved.scripts, ...override.scripts };
             }
           }
+        } else if (Array.isArray(base.compatibility) && base.defaultScriptDir) {
+          const loaded = this.loadScriptsFromDir(type, base.defaultScriptDir);
+          if (loaded) {
+            resolved.scripts = loaded;
+            this.log(`  [compatibility] ${type} no version detected \u2192 default: ${base.defaultScriptDir}`);
+          }
         }
         if (base.overrides) {
           for (const override of base.overrides) {
@@ -21884,6 +21940,36 @@ ${installInfo}`
         }
         return resolved;
       }
+      /**
+       * Load scripts from a scriptDir within a provider directory.
+       * Tries scripts.js first, then individual .js files.
+       */
+      loadScriptsFromDir(type, scriptDir) {
+        const providerDir = this.findProviderDir(type);
+        if (!providerDir) {
+          this.log(`  [loadScriptsFromDir] ${type}: providerDir not found`);
+          return null;
+        }
+        const dir = path6.join(providerDir, scriptDir);
+        if (!fs5.existsSync(dir)) {
+          this.log(`  [loadScriptsFromDir] ${type}: dir not found: ${dir}`);
+          return null;
+        }
+        const scriptsJs = path6.join(dir, "scripts.js");
+        if (fs5.existsSync(scriptsJs)) {
+          try {
+            delete require.cache[require.resolve(scriptsJs)];
+            const loaded = require(scriptsJs);
+            this.log(`  [loadScriptsFromDir] ${type}: loaded scripts.js from ${dir} (${Object.keys(loaded).length} exports)`);
+            return loaded;
+          } catch (e) {
+            this.log(`  \u26A0 scripts.js load failed: ${scriptsJs}: ${e.message}`);
+          }
+        }
+        const result = this.buildScriptWrappersFromDir(dir);
+        this.log(`  [loadScriptsFromDir] ${type}: built wrappers from ${dir} (${Object.keys(result).length} scripts)`);
+        return result;
+      }
       /**
       * Hot-reload: start watching for file changes
       */
@@ -21909,7 +21995,7 @@ ${installInfo}`
             this.log(`Watch failed for ${dir}: ${e.message}`);
           }
         };
-        watchDir(this.builtinDir);
+        this.builtinDirs.forEach((dir) => watchDir(dir));
         watchDir(this.userDir);
       }
       /**
@@ -22217,7 +22303,7 @@ ${installInfo}`
         const provider2 = this.providers.get(type);
         if (!provider2) return null;
         const cat = provider2.category;
-        const searchRoots = [this.userDir, this.upstreamDir, this.builtinDir];
+        const searchRoots = [this.userDir, this.upstreamDir, ...this.builtinDirs];
         for (const root of searchRoots) {
           if (!fs5.existsSync(root)) continue;
           for (const candidate of [path6.join(root, type), path6.join(root, cat, type)]) {
@@ -22307,8 +22393,9 @@ ${installInfo}`
                   mod.extensionIdPattern = new RegExp(mod.extensionIdPattern, flags);
                   delete mod.extensionIdPattern_flags;
                 }
+                const hasCompatibility = Array.isArray(mod.compatibility);
                 const scriptsPath = path6.join(d, "scripts.js");
-                if (fs5.existsSync(scriptsPath)) {
+                if (!hasCompatibility && fs5.existsSync(scriptsPath)) {
                   try {
                     delete require.cache[require.resolve(scriptsPath)];
                     const scripts = require(scriptsPath);
@@ -23811,7 +23898,7 @@ ${installInfo}`
     var path9 = __toESM2(require("path"));
     var os12 = __toESM2(require("os"));
     function generateFiles(type, name, category, opts = {}) {
-      const { cdpPorts, cli, processName, installPath, binary, extensionId } = opts;
+      const { cdpPorts, cli, processName, installPath, binary, extensionId, version: version2 = "0.1" } = opts;
       if (category === "cli" || category === "acp") {
         const bin = binary || type;
         const meta22 = {
@@ -23835,6 +23922,7 @@ ${installInfo}`
         return { "provider.json": JSON.stringify(meta22, null, 2) + "\n" };
       }
       const isExtension = category === "extension";
+      const scriptDir = `scripts/${version2}`;
       const meta3 = {
         type,
         name,
@@ -23853,159 +23941,284 @@ ${installInfo}`
       } else {
         meta3.inputMethod = "cdp-type-and-send";
         meta3.inputSelector = '[contenteditable="true"][role="textbox"]';
+        meta3.providerVersion = "1.0.0";
+        meta3.compatibility = [
+          { ideVersion: `>=${version2}.0`, scriptDir }
+        ];
+        meta3.defaultScriptDir = scriptDir;
       }
-      const scripts = `/**
- * CDP Scripts for ${name}
- *
- * Each exported function receives a params object and returns
- * a JavaScript expression string to be evaluated in the IDE's DOM.
+      const files = {};
+      files[`${scriptDir}/scripts.js`] = `/**
+ * ${name} CDP Scripts \u2014 Router
  *
- * Use the DevServer Wizard (http://127.0.0.1:19280) to discover
- * selectors and test scripts against the running IDE.
+ * Loads individual .js files and invokes with params.
+ * Pattern:
+ *   - No-params scripts: loaded as-is (IIFE)
+ *   - With-params scripts: \`(\${script})(\${JSON.stringify(params)})\`
  */
 
-module.exports.readChat = function readChat(params) {
-  return \`(() => {
-    try {
-      const messages = [];
-      let status = 'idle';
-      let activeModal = null;
+'use strict';
 
-      // TODO: Query chat container and extract messages
-      // Example for VS Code-based IDEs:
-      //   document.querySelectorAll('.chat-message').forEach(el => {
-      //     const role = el.classList.contains('user') ? 'user' : 'assistant';
-      //     messages.push({ role, content: el.innerText.trim(), index: messages.length });
-      //   });
+const fs   = require('fs');
+const path = require('path');
 
-      // TODO: Detect approval dialogs -> status = 'waiting_approval'
-      // const approvalBtns = [...document.querySelectorAll('button')].filter(b =>
-      //   b.offsetWidth > 0 && /accept|approve|run/i.test(b.textContent)
-      // );
-      // if (approvalBtns.length > 0) {
-      //   status = 'waiting_approval';
-      //   activeModal = { message: 'Action required', buttons: approvalBtns.map(b => b.textContent.trim()) };
-      // }
+function load(name) {
+    try { return fs.readFileSync(path.join(__dirname, name), 'utf-8'); }
+    catch { return null; }
+}
 
-      const inputEl = document.querySelector('[contenteditable="true"]');
-      const inputContent = inputEl?.innerText?.trim() || '';
-      return JSON.stringify({ id: 'active', status, title: document.title, messages, inputContent, activeModal });
-    } catch(e) {
-      return JSON.stringify({ id: '', status: 'error', messages: [], error: e.message });
-    }
-  })()\`;
-};
+function withParams(name, params) {
+    const script = load(name);
+    if (!script) return null;
+    return \`(\${script})(\${JSON.stringify(params)})\`;
+}
 
-module.exports.sendMessage = function sendMessage(params) {
-  const text = typeof params === 'string' ? params : params?.text;
-  return \`(() => {
-    try {
-      // Most VS Code-based IDEs use needsTypeAndSend for reliable input
-      return JSON.stringify({
-        sent: false,
-        needsTypeAndSend: true,
-        selector: '[contenteditable="true"]',
-      });
-    } catch(e) {
-      return JSON.stringify({ sent: false, error: e.message });
-    }
-  })()\`;
-};
+// \u2500\u2500\u2500 Core (no params \u2014 IIFE) \u2500\u2500\u2500
 
-module.exports.listSessions = function listSessions(params) {
-  return \`(() => {
-    try {
-      const sessions = [];
-      // TODO: Query session/chat list sidebar
-      return JSON.stringify({ sessions });
-    } catch(e) {
-      return JSON.stringify({ sessions: [], error: e.message });
-    }
-  })()\`;
-};
+module.exports.readChat       = () => load('read_chat.js');
+module.exports.sendMessage    = () => load('send_message.js');
+module.exports.listSessions   = () => load('list_sessions.js');
+module.exports.newSession     = () => load('new_session.js');
+module.exports.focusEditor    = () => load('focus_editor.js');
+module.exports.openPanel      = () => load('open_panel.js');
+module.exports.listModels     = () => load('list_models.js');
+module.exports.listModes      = () => load('list_modes.js');
 
-module.exports.newSession = function newSession(params) {
-  return \`(() => {
-    try {
-      // TODO: Click "New Chat" button
-      // const btn = document.querySelector('[aria-label*="New Chat"]');
-      // if (btn) { btn.click(); return JSON.stringify({ created: true }); }
-      return JSON.stringify({ created: false, error: 'New Chat button not found' });
-    } catch(e) {
-      return JSON.stringify({ created: false, error: e.message });
-    }
-  })()\`;
-};
+// \u2500\u2500\u2500 With params (function expression) \u2500\u2500\u2500
 
-module.exports.openPanel = function openPanel(params) {
-  return \`(() => {
-    try {
-      // TODO: Open the chat/AI panel
-      return 'not_found';
-    } catch(e) { return 'error'; }
-  })()\`;
+module.exports.switchSession = (params) => {
+    const index = typeof params === 'number' ? params : params?.index ?? 0;
+    const title = typeof params === 'string' ? params : params?.title || null;
+    return withParams('switch_session.js', { index, title });
 };
 
-module.exports.focusEditor = function focusEditor(params) {
-  return \`(() => {
-    try {
-      const input = document.querySelector('[contenteditable="true"]');
-      if (input) { input.focus(); return 'focused'; }
-      return 'not_found';
-    } catch(e) { return 'error'; }
-  })()\`;
+module.exports.resolveAction = (params) => {
+    const action = typeof params === 'string' ? params : params?.action || 'approve';
+    const buttonText = params?.button || params?.buttonText
+        || (action === 'approve' ? 'Accept' : action === 'reject' ? 'Reject' : action);
+    return withParams('resolve_action.js', { buttonText });
 };
 
-module.exports.resolveAction = function resolveAction(params) {
-  const action = typeof params === 'string' ? params : params?.action || 'approve';
-  const buttonText = params?.button || params?.buttonText
-    || (action === 'approve' ? 'Accept' : action === 'reject' ? 'Reject' : action);
-  return \`(() => {
-    try {
-      const btns = [...document.querySelectorAll('button, [role="button"]')].filter(b => b.offsetWidth > 0);
-      const target = btns.find(b => (b.textContent||'').trim().toLowerCase().includes(\${JSON.stringify((buttonText||'').toLowerCase())}));
-      if (target) { target.click(); return JSON.stringify({ resolved: true, clicked: target.textContent.trim() }); }
-      return JSON.stringify({ resolved: false, available: btns.map(b => b.textContent.trim()).filter(Boolean).slice(0, 10) });
-    } catch(e) { return JSON.stringify({ resolved: false, error: e.message }); }
-  })()\`;
+module.exports.setModel = (params) => {
+    const model = typeof params === 'string' ? params : params?.model;
+    return withParams('set_model.js', { model });
 };
 
-module.exports.listNotifications = function listNotifications(params) {
-  return \`(() => {
-    try {
-      const toasts = [...document.querySelectorAll('.notifications-toasts .notification-toast, .notification-list-item')];
-      return JSON.stringify(toasts.filter(t => t.offsetWidth > 0).map((t, i) => ({
-        index: i,
-        message: t.querySelector('.notification-list-item-message')?.textContent?.trim() || t.textContent?.trim().substring(0, 200),
-        severity: t.querySelector('.codicon-error') ? 'error' : t.querySelector('.codicon-warning') ? 'warning' : 'info',
-        buttons: [...t.querySelectorAll('.notification-list-item-buttons-container button')].map(b => b.textContent?.trim()).filter(Boolean),
-      })));
-    } catch(e) { return JSON.stringify([]); }
-  })()\`;
+module.exports.setMode = (params) => {
+    const mode = typeof params === 'string' ? params : params?.mode;
+    return withParams('set_mode.js', { mode });
 };
+`;
+      files[`${scriptDir}/read_chat.js`] = `/**
+ * ${name} \u2014 read_chat
+ *
+ * Extract chat messages, status, and approval state from DOM.
+ *
+ * TODO: Identify via CDP/DevConsole:
+ *   1. Chat container selector
+ *   2. User message selector + class pattern
+ *   3. Assistant message selector + class pattern
+ *   4. Status detection (generating/idle/waiting_approval)
+ *   5. Approval dialog detection (buttons, modal)
+ *   6. Input field selector
+ *
+ * \u2192 { id, status, title, messages[], inputContent, activeModal }
+ */
+(() => {
+  try {
+    const messages = [];
+    let status = 'idle';
+    let activeModal = null;
 
-module.exports.dismissNotification = function dismissNotification(params) {
-  const idx = typeof params === 'number' ? params : params?.index ?? 0;
-  const button = typeof params === 'string' ? params : params?.button;
-  return \`(() => {
-    try {
-      const toasts = [...document.querySelectorAll('.notifications-toasts .notification-toast, .notification-list-item')].filter(t => t.offsetWidth > 0);
-      const toast = toasts[\${idx}];
-      if (!toast) return JSON.stringify({ dismissed: false, count: toasts.length });
-      if (\${JSON.stringify(button)}) {
-        const btn = [...toast.querySelectorAll('button')].find(b => b.textContent?.trim().toLowerCase().includes(\${JSON.stringify((button||'').toLowerCase())}));
-        if (btn) { btn.click(); return JSON.stringify({ dismissed: true, clicked: btn.textContent.trim() }); }
-      }
-      const closeBtn = toast.querySelector('.codicon-notifications-clear, .codicon-close');
-      if (closeBtn) { closeBtn.click(); return JSON.stringify({ dismissed: true }); }
-      return JSON.stringify({ dismissed: false, error: 'Close button not found' });
-    } catch(e) { return JSON.stringify({ dismissed: false, error: e.message }); }
-  })()\`;
-};
+    // TODO: Query chat container and extract messages
+    // Example:
+    //   document.querySelectorAll('.chat-message').forEach(el => {
+    //     const role = el.classList.contains('user') ? 'user' : 'assistant';
+    //     messages.push({ role, content: el.innerText.trim(), index: messages.length });
+    //   });
+
+    // TODO: Detect generating state
+    // TODO: Detect approval dialogs -> status = 'waiting_approval'
+
+    const inputEl = document.querySelector('[contenteditable="true"]');
+    const inputContent = inputEl?.innerText?.trim() || '';
+
+    return JSON.stringify({
+      id: 'active',
+      status,
+      title: document.title,
+      messages,
+      inputContent,
+      activeModal,
+    });
+  } catch(e) {
+    return JSON.stringify({ id: '', status: 'error', messages: [], error: e.message });
+  }
+})()
+`;
+      files[`${scriptDir}/send_message.js`] = `/**
+ * ${name} \u2014 send_message
+ *
+ * For cdp-type-and-send IDEs: returns selector for daemon to type into.
+ * \u2192 { sent: false, needsTypeAndSend: true, selector }
+ */
+(() => {
+  try {
+    const input = document.querySelector('${meta3.inputSelector || '[contenteditable="true"]'}');
+    if (!input) return JSON.stringify({ sent: false, error: 'Input not found' });
+    return JSON.stringify({
+      sent: false,
+      needsTypeAndSend: true,
+      selector: '${meta3.inputSelector || '[contenteditable="true"]'}',
+    });
+  } catch(e) {
+    return JSON.stringify({ sent: false, error: e.message });
+  }
+})()
+`;
+      files[`${scriptDir}/list_sessions.js`] = `/**
+ * ${name} \u2014 list_sessions
+ *
+ * TODO: Query session/chat list from sidebar.
+ * \u2192 { sessions: [{ id, title, active, index }] }
+ */
+(() => {
+  try {
+    const sessions = [];
+    // TODO: Find session list container and parse items
+    return JSON.stringify({ sessions });
+  } catch(e) {
+    return JSON.stringify({ sessions: [], error: e.message });
+  }
+})()
+`;
+      files[`${scriptDir}/switch_session.js`] = `/**
+ * ${name} \u2014 switch_session
+ *
+ * params.index: number, params.title: string|null
+ * TODO: Click on session in sidebar by title or index.
+ * \u2192 { switched: true/false }
+ */
+(params) => {
+  try {
+    // TODO: Find session list and click target
+    return JSON.stringify({ switched: false, error: 'Not implemented' });
+  } catch(e) {
+    return JSON.stringify({ switched: false, error: e.message });
+  }
+}
+`;
+      files[`${scriptDir}/new_session.js`] = `/**
+ * ${name} \u2014 new_session
+ *
+ * TODO: Click "New Chat" button.
+ * \u2192 { created: true/false }
+ */
+(() => {
+  try {
+    const btn = document.querySelector('[aria-label*="New Chat"], [aria-label*="New Composer"]');
+    if (btn) { btn.click(); return JSON.stringify({ created: true }); }
+    return JSON.stringify({ created: false, error: 'New Chat button not found' });
+  } catch(e) {
+    return JSON.stringify({ created: false, error: e.message });
+  }
+})()
+`;
+      files[`${scriptDir}/focus_editor.js`] = `/**
+ * ${name} \u2014 focus_editor
+ */
+(() => {
+  try {
+    const input = document.querySelector('${meta3.inputSelector || '[contenteditable="true"]'}');
+    if (input) { input.focus(); return 'focused'; }
+    return 'not_found';
+  } catch(e) { return 'error'; }
+})()
+`;
+      files[`${scriptDir}/open_panel.js`] = `/**
+ * ${name} \u2014 open_panel
+ *
+ * TODO: Open chat/AI panel if not visible.
+ */
+(() => {
+  try {
+    // TODO: Check if panel visible, if not find toggle button
+    return 'not_found';
+  } catch(e) { return 'error'; }
+})()
+`;
+      files[`${scriptDir}/resolve_action.js`] = `/**
+ * ${name} \u2014 resolve_action
+ *
+ * params.buttonText: string \u2014 button text to find and click.
+ * \u2192 { resolved: true/false, clicked? }
+ */
+(params) => {
+  try {
+    const btns = [...document.querySelectorAll('button, [role="button"]')].filter(b => b.offsetWidth > 0);
+    const searchText = (params.buttonText || '').toLowerCase();
+    const target = btns.find(b => (b.textContent||'').trim().toLowerCase().includes(searchText));
+    if (target) {
+      target.click();
+      return JSON.stringify({ resolved: true, clicked: target.textContent.trim() });
+    }
+    return JSON.stringify({ resolved: false, available: btns.map(b => b.textContent.trim()).filter(Boolean).slice(0, 10) });
+  } catch(e) { return JSON.stringify({ resolved: false, error: e.message }); }
+}
+`;
+      files[`${scriptDir}/list_models.js`] = `/**
+ * ${name} \u2014 list_models
+ *
+ * TODO: Open model dropdown and extract model list.
+ * \u2192 { models[], current }
+ */
+(() => {
+  try {
+    return JSON.stringify({ models: [], current: '' });
+  } catch(e) { return JSON.stringify({ models: [], current: '', error: e.message }); }
+})()
+`;
+      files[`${scriptDir}/list_modes.js`] = `/**
+ * ${name} \u2014 list_modes
+ *
+ * TODO: Open mode dropdown and extract mode list.
+ * \u2192 { modes[], current }
+ */
+(() => {
+  try {
+    return JSON.stringify({ modes: [], current: '' });
+  } catch(e) { return JSON.stringify({ modes: [], current: '', error: e.message }); }
+})()
+`;
+      files[`${scriptDir}/set_model.js`] = `/**
+ * ${name} \u2014 set_model
+ *
+ * params.model: string
+ * TODO: Open model dropdown and select target model.
+ * \u2192 { success: true/false }
+ */
+async (params) => {
+  try {
+    return JSON.stringify({ success: false, error: 'Not implemented' });
+  } catch(e) { return JSON.stringify({ success: false, error: e.message }); }
+}
+`;
+      files[`${scriptDir}/set_mode.js`] = `/**
+ * ${name} \u2014 set_mode
+ *
+ * params.mode: string
+ * TODO: Open mode dropdown and select target mode.
+ * \u2192 { success: true/false }
+ */
+async (params) => {
+  try {
+    return JSON.stringify({ success: false, error: 'Not implemented' });
+  } catch(e) { return JSON.stringify({ success: false, error: e.message }); }
+}
 `;
       return {
         "provider.json": JSON.stringify(meta3, null, 2) + "\n",
-        "scripts.js": scripts
+        files
       };
     }
     var DEV_SERVER_PORT = 19280;
@@ -24099,6 +24312,15 @@ module.exports.dismissNotification = function dismissNotification(params) {
             } else if (pathname.match(/^\/api\/providers\/([^/]+)\/spawn-test$/) && req.method === "POST") {
               const type = pathname.match(/^\/api\/providers\/([^/]+)\/spawn-test$/)[1];
               await this.handleSpawnTest(type, req, res);
+            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/validate$/) && req.method === "POST") {
+              const type = pathname.match(/^\/api\/providers\/([^/]+)\/validate$/)[1];
+              await this.handleValidate(type, req, res);
+            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/acp-chat$/) && req.method === "POST") {
+              const type = pathname.match(/^\/api\/providers\/([^/]+)\/acp-chat$/)[1];
+              await this.handleAcpChat(type, req, res);
+            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/script-hints$/) && req.method === "GET") {
+              const type = pathname.match(/^\/api\/providers\/([^/]+)\/script-hints$/)[1];
+              await this.handleScriptHints(type, req, res);
             } else if (pathname.startsWith("/assets/") || pathname === "/favicon.ico") {
               await this.serveStaticAsset(pathname, res);
             } else if (pathname === "/" || pathname === "/console" || !pathname.startsWith("/api")) {
@@ -24179,7 +24401,7 @@ module.exports.dismissNotification = function dismissNotification(params) {
         this.json(res, 200, { providers, count: providers.length });
       }
       async handleProviderConfig(type, _req, res) {
-        const provider2 = this.providerLoader.get(type);
+        const provider2 = this.providerLoader.resolve(type);
         if (!provider2) {
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
@@ -24192,7 +24414,7 @@ module.exports.dismissNotification = function dismissNotification(params) {
         this.json(res, 200, { type, config: config2 });
       }
       async handleSpawnTest(type, req, res) {
-        const provider2 = this.providerLoader.get(type);
+        const provider2 = this.providerLoader.resolve(type);
         if (!provider2) {
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
@@ -24739,6 +24961,208 @@ module.exports.dismissNotification = function dismissNotification(params) {
           this.json(res, 500, { error: `Save failed: ${e.message}` });
         }
       }
+      async handleScriptHints(type, _req, res) {
+        const dir = this.findProviderDir(type);
+        if (!dir) {
+          this.json(res, 404, { error: `Provider not found: ${type}` });
+          return;
+        }
+        let scriptsPath = "";
+        const directScripts = path9.join(dir, "scripts.js");
+        if (fs7.existsSync(directScripts)) {
+          scriptsPath = directScripts;
+        } else {
+          const scriptsDir = path9.join(dir, "scripts");
+          if (fs7.existsSync(scriptsDir)) {
+            const versions = fs7.readdirSync(scriptsDir).filter((d) => {
+              return fs7.statSync(path9.join(scriptsDir, d)).isDirectory();
+            }).sort().reverse();
+            for (const ver of versions) {
+              const p = path9.join(scriptsDir, ver, "scripts.js");
+              if (fs7.existsSync(p)) {
+                scriptsPath = p;
+                break;
+              }
+            }
+          }
+        }
+        if (!scriptsPath) {
+          this.json(res, 200, { hints: {} });
+          return;
+        }
+        try {
+          const source = fs7.readFileSync(scriptsPath, "utf-8");
+          const hints = {};
+          const funcRegex = /module\.exports\.(\w+)\s*=\s*function\s+\w+\s*\(params\)/g;
+          let match;
+          while ((match = funcRegex.exec(source)) !== null) {
+            const name = match[1];
+            const startIdx = match.index;
+            const nextFunc = source.indexOf("module.exports.", startIdx + 1);
+            const funcBody = source.substring(startIdx, nextFunc > 0 ? nextFunc : source.length);
+            const paramFields = {};
+            const dotRegex = /params\?\.([a-zA-Z_]+)|params\.([a-zA-Z_]+)/g;
+            let dm;
+            while ((dm = dotRegex.exec(funcBody)) !== null) {
+              const field = dm[1] || dm[2];
+              if (field === "length") continue;
+              if (!(field in paramFields)) {
+                if (/index|count|port|timeout/i.test(field)) paramFields[field] = 0;
+                else if (/action|text|title|message|model|mode|button|name|filter/i.test(field)) paramFields[field] = "";
+                else paramFields[field] = "";
+              }
+            }
+            const typeofRegex = /typeof params === 'string' \? params : params\?\.([a-zA-Z_]+)/g;
+            let tm;
+            while ((tm = typeofRegex.exec(funcBody)) !== null) {
+              const field = tm[1];
+              if (!(field in paramFields)) paramFields[field] = "";
+            }
+            const numRegex = /typeof params === 'number' \? params : params\?\.([a-zA-Z_]+)/g;
+            let nm;
+            while ((nm = numRegex.exec(funcBody)) !== null) {
+              const field = nm[1];
+              if (!(field in paramFields)) paramFields[field] = 0;
+            }
+            const descriptions = {
+              readChat: "No params required",
+              sendMessage: "Text to send to the chat",
+              listSessions: "No params required",
+              switchSession: "Switch by index or title",
+              newSession: "No params required",
+              focusEditor: "No params required",
+              openPanel: "No params required",
+              resolveAction: "Approve/reject action buttons",
+              listNotifications: "Optional message filter",
+              dismissNotification: "Dismiss by index, message, or button",
+              listModels: "No params required",
+              setModel: "Model name to select",
+              listModes: "No params required",
+              setMode: "Mode name to select"
+            };
+            hints[name] = {
+              template: Object.keys(paramFields).length > 0 ? paramFields : {},
+              description: descriptions[name] || (Object.keys(paramFields).length > 0 ? "Params: " + Object.keys(paramFields).join(", ") : "No params")
+            };
+          }
+          this.json(res, 200, { hints });
+        } catch (e) {
+          this.json(res, 500, { error: e.message });
+        }
+      }
+      // ─── Validate provider.json ───
+      async handleValidate(type, req, res) {
+        const body = await this.readBody(req);
+        const { content } = body;
+        const errors = [];
+        const warnings = [];
+        try {
+          const config2 = typeof content === "string" ? JSON.parse(content) : content;
+          if (!config2.type) errors.push("Missing required field: type");
+          if (!config2.name) errors.push("Missing required field: name");
+          if (!config2.category) errors.push("Missing required field: category");
+          else if (!["ide", "extension", "cli", "acp"].includes(config2.category)) errors.push(`Invalid category: ${config2.category}`);
+          if (config2.category === "ide" || config2.category === "extension") {
+            if (!config2.cdpPorts || !Array.isArray(config2.cdpPorts) || config2.cdpPorts.length === 0)
+              warnings.push("IDE/Extension providers should have cdpPorts");
+            if (config2.category === "extension" && !config2.extensionId)
+              warnings.push("Extension providers should have extensionId");
+          }
+          if (config2.category === "acp" || config2.category === "cli") {
+            if (!config2.spawn) errors.push("ACP/CLI providers must have spawn config");
+            else {
+              if (!config2.spawn.command) errors.push("spawn.command is required");
+            }
+          }
+          if (config2.settings) {
+            for (const [key, val] of Object.entries(config2.settings)) {
+              const s = val;
+              if (!s.type) errors.push(`settings.${key}: missing type`);
+              else if (!["boolean", "number", "string", "select"].includes(s.type))
+                errors.push(`settings.${key}: invalid type '${s.type}'`);
+              if (s.default === void 0) warnings.push(`settings.${key}: no default value`);
+              if (s.type === "number" && s.min !== void 0 && s.max !== void 0 && s.min > s.max)
+                errors.push(`settings.${key}: min (${s.min}) > max (${s.max})`);
+              if (s.type === "select" && (!s.options || !Array.isArray(s.options) || s.options.length === 0))
+                errors.push(`settings.${key}: select type requires options[]`);
+            }
+          }
+          if (config2.cdpPorts && Array.isArray(config2.cdpPorts)) {
+            const allProviders = this.providerLoader.getAll();
+            for (const port of config2.cdpPorts) {
+              const conflict = allProviders.find((p) => p.type !== type && p.cdpPorts?.includes(port));
+              if (conflict) warnings.push(`CDP port ${port} conflicts with provider '${conflict.type}'`);
+            }
+          }
+          this.json(res, 200, { valid: errors.length === 0, errors, warnings });
+        } catch (e) {
+          this.json(res, 200, { valid: false, errors: [`Invalid JSON: ${e.message}`], warnings: [] });
+        }
+      }
+      // ─── ACP Chat Test ───
+      async handleAcpChat(type, req, res) {
+        const body = await this.readBody(req);
+        const { message, timeout = 3e4 } = body;
+        if (!message) {
+          this.json(res, 400, { error: "message required" });
+          return;
+        }
+        const provider2 = this.providerLoader.get(type);
+        if (!provider2) {
+          this.json(res, 404, { error: `Provider not found: ${type}` });
+          return;
+        }
+        const spawn3 = provider2.spawn;
+        if (!spawn3) {
+          this.json(res, 400, { error: `Provider ${type} has no spawn config` });
+          return;
+        }
+        const { spawn: spawnFn } = await import("child_process");
+        const start = Date.now();
+        try {
+          const args = [...spawn3.args || [], message];
+          const child = spawnFn(spawn3.command, args, {
+            shell: spawn3.shell ?? false,
+            timeout,
+            stdio: ["pipe", "pipe", "pipe"],
+            env: { ...process.env, ...spawn3.env || {} }
+          });
+          let stdout = "";
+          let stderr = "";
+          child.stdout?.on("data", (d) => {
+            stdout += d.toString();
+          });
+          child.stderr?.on("data", (d) => {
+            stderr += d.toString();
+          });
+          await new Promise((resolve5) => {
+            const timer = setTimeout(() => {
+              child.kill();
+              resolve5();
+            }, timeout);
+            child.on("exit", () => {
+              clearTimeout(timer);
+              resolve5();
+            });
+          });
+          const elapsed = Date.now() - start;
+          this.json(res, 200, {
+            success: true,
+            message,
+            response: stdout.trim(),
+            stderr: stderr.trim(),
+            exitCode: child.exitCode,
+            elapsed
+          });
+        } catch (e) {
+          this.json(res, 200, {
+            success: false,
+            message,
+            error: e.message,
+            elapsed: Date.now() - start
+          });
+        }
+      }
       async handleCdpTargets(_req, res) {
         const targets = [];
         for (const [ide, cdp2] of this.cdpManagers.entries()) {
@@ -24759,7 +25183,8 @@ module.exports.dismissNotification = function dismissNotification(params) {
           processName,
           installPath,
           binary,
-          extensionId
+          extensionId,
+          version: version2
         } = body;
         if (!type || !name) {
           this.json(res, 400, { error: "type and name required" });
@@ -24778,15 +25203,19 @@ module.exports.dismissNotification = function dismissNotification(params) {
           return;
         }
         try {
-          const files = generateFiles(type, name, category, { cdpPorts, cli, processName, installPath, binary, extensionId });
+          const result = generateFiles(type, name, category, { cdpPorts, cli, processName, installPath, binary, extensionId, version: version2 });
           fs7.mkdirSync(targetDir, { recursive: true });
-          fs7.writeFileSync(jsonPath, files["provider.json"], "utf-8");
+          fs7.writeFileSync(jsonPath, result["provider.json"], "utf-8");
           const createdFiles = ["provider.json"];
-          if (files["scripts.js"]) {
-            fs7.writeFileSync(path9.join(targetDir, "scripts.js"), files["scripts.js"], "utf-8");
-            createdFiles.push("scripts.js");
+          if (result.files) {
+            for (const [relPath, content] of Object.entries(result.files)) {
+              const fullPath = path9.join(targetDir, relPath);
+              fs7.mkdirSync(path9.dirname(fullPath), { recursive: true });
+              fs7.writeFileSync(fullPath, content, "utf-8");
+              createdFiles.push(relPath);
+            }
           }
-          this.log(`Scaffolded provider: ${targetDir} (${createdFiles.join(", ")})`);
+          this.log(`Scaffolded provider: ${targetDir} (${createdFiles.length} files)`);
           this.json(res, 201, { created: true, path: targetDir, files: createdFiles, type, name, category });
         } catch (e) {
           this.json(res, 500, { error: e.message });
@@ -25980,7 +26409,7 @@ var init_daemon_p2p = __esm({
       /** Fetch TURN credentials */
       async fetchTurnCredentials() {
         try {
-          const serverUrl = "https://api.adhf.dev";
+          const serverUrl = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
           const configPath = path.join(os.homedir(), ".adhdev", "config.json");
           let token = "";
           try {
@@ -26612,7 +27041,7 @@ function stopDaemon() {
     return false;
   }
 }
-var import_daemon_core3, os2, fs2, path2, crypto2, import_chalk, DANGEROUS_PATTERNS, AdhdevDaemon;
+var import_daemon_core3, os2, fs2, path2, crypto2, import_chalk, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
@@ -26624,6 +27053,24 @@ var init_adhdev_daemon = __esm({
     path2 = __toESM(require("path"));
     crypto2 = __toESM(require("crypto"));
     import_chalk = __toESM(require("chalk"));
+    pkgVersion = "unknown";
+    try {
+      const possiblePaths = [
+        path2.join(__dirname, "..", "package.json"),
+        path2.join(__dirname, "package.json")
+      ];
+      for (const p of possiblePaths) {
+        try {
+          const data = JSON.parse(fs2.readFileSync(p, "utf-8"));
+          if (data.version) {
+            pkgVersion = data.version;
+            break;
+          }
+        } catch {
+        }
+      }
+    } catch {
+    }
     DANGEROUS_PATTERNS = [
       /\brm\s+(-[a-z]*f|-[a-z]*r|--force|--recursive)/i,
       /\bsudo\b/i,
@@ -26658,7 +27105,6 @@ var init_adhdev_daemon = __esm({
       constructor() {
         this.localPort = 19222;
         this.providerLoader = new import_daemon_core3.ProviderLoader({
-          builtinDir: path2.join(__dirname, "..", "providers", "_builtin"),
           logFn: import_daemon_core3.LOG.forComponent("Provider").asLogFn()
         });
         this.providerLoader.loadAll();
@@ -26734,7 +27180,7 @@ var init_adhdev_daemon = __esm({
           token: config2.connectionToken,
           cliInfo: {
             type: "adhdev-daemon",
-            version: "0.2.0",
+            version: pkgVersion,
             platform: os2.platform(),
             instanceId
           }
@@ -27080,29 +27526,6 @@ var init_adhdev_daemon = __esm({
               const history = getRecentCommands(count);
               return { success: true, history };
             }
-            // get_acp_auth / set_acp_auth removed — ADHDev does not manage API keys.
-            // Each CLI/ACP tool handles its own auth. ADHDev focuses on install detection + error reporting.
-            case "get_daemon_logs": {
-              const count = parseInt(data.lines) || 100;
-              const minLevel = data.minLevel || "info";
-              try {
-                const { getRecentLogs, LOG_PATH } = require("./logging/logger");
-                const entries = getRecentLogs(count, minLevel);
-                if (entries.length > 0) {
-                  return { success: true, entries, totalBuffered: entries.length };
-                }
-                const logFs = require("fs");
-                if (logFs.existsSync(LOG_PATH)) {
-                  const content = logFs.readFileSync(LOG_PATH, "utf-8");
-                  const allLines = content.split("\n");
-                  const recent = allLines.slice(-count).join("\n");
-                  return { success: true, logs: recent, totalLines: allLines.length };
-                }
-                return { success: true, entries: [], totalBuffered: 0 };
-              } catch (e) {
-                return { success: false, error: e.message };
-              }
-            }
           }
           const result = await this.executeDaemonCommand(cmdType, data);
           if (result) {
@@ -27134,6 +27557,31 @@ var init_adhdev_daemon = __esm({
           case "agent_command": {
             return this.cliManager.handleCliCommand(cmd, args);
           }
+          case "get_logs": {
+            const count = parseInt(args?.count) || parseInt(args?.lines) || 100;
+            const minLevel = args?.minLevel || "info";
+            const sinceTs = args?.since || 0;
+            try {
+              const { getRecentLogs, LOG_PATH } = require("./logging/logger");
+              let logs = getRecentLogs(count, minLevel);
+              if (sinceTs > 0) {
+                logs = logs.filter((l) => l.ts > sinceTs);
+              }
+              if (logs.length > 0) {
+                return { success: true, logs, totalBuffered: logs.length };
+              }
+              const logFs = require("fs");
+              if (logFs.existsSync(LOG_PATH)) {
+                const content = logFs.readFileSync(LOG_PATH, "utf-8");
+                const allLines = content.split("\n");
+                const recent = allLines.slice(-count).join("\n");
+                return { success: true, logs: recent, totalLines: allLines.length };
+              }
+              return { success: true, logs: [], totalBuffered: 0 };
+            } catch (e) {
+              return { success: false, error: e.message };
+            }
+          }
           // ─── restart_session: IDE / CLI / ACP unified ───
           case "restart_session": {
             const targetType = args?.cliType || args?.agentType || args?.ideType;
@@ -27169,7 +27617,8 @@ var init_adhdev_daemon = __esm({
             if (result.success && result.port && result.ideId && !this.cdpManagers.has(result.ideId)) {
               const cdpLog = import_daemon_core3.LOG.forComponent(`CDP:${result.ideId}`);
               console.log(import_chalk.default.cyan(`[launch_ide] Connecting CDP for ${result.ideId} on port ${result.port}...`));
-              const manager = new import_daemon_core3.DaemonCdpManager(result.port, cdpLog.asLogFn());
+              const provider2 = this.providerLoader.get(result.ideId);
+              const manager = new import_daemon_core3.DaemonCdpManager(result.port, cdpLog.asLogFn(), void 0, provider2?.targetFilter);
               const connected = await manager.connect();
               if (connected) {
                 const enabledExtProviders = this.providerLoader.getEnabledExtensionProviders(result.ideId).map((p) => ({
@@ -27442,7 +27891,8 @@ var init_adhdev_daemon = __esm({
         for (const { port, ide } of filteredPorts) {
           const allTargets = await import_daemon_core3.DaemonCdpManager.listAllTargets(port);
           if (allTargets.length === 0) {
-            const manager = new import_daemon_core3.DaemonCdpManager(port, import_daemon_core3.LOG.forComponent(`CDP:${ide}`).asLogFn());
+            const provider2 = this.providerLoader.get(ide);
+            const manager = new import_daemon_core3.DaemonCdpManager(port, import_daemon_core3.LOG.forComponent(`CDP:${ide}`).asLogFn(), void 0, provider2?.targetFilter);
             const connected = await manager.connect();
             if (connected) {
               this.cdpManagers.set(ide, manager);
@@ -27461,7 +27911,8 @@ var init_adhdev_daemon = __esm({
               managerKey = `${ide}_${workspaceName}`;
             }
             if (this.cdpManagers.has(managerKey)) continue;
-            const manager = new import_daemon_core3.DaemonCdpManager(port, import_daemon_core3.LOG.forComponent(`CDP:${managerKey}`).asLogFn(), target.id);
+            const provider2 = this.providerLoader.get(ide);
+            const manager = new import_daemon_core3.DaemonCdpManager(port, import_daemon_core3.LOG.forComponent(`CDP:${managerKey}`).asLogFn(), target.id, provider2?.targetFilter);
             const connected = await manager.connect();
             if (connected) {
               this.cdpManagers.set(managerKey, manager);
@@ -27504,7 +27955,8 @@ var init_adhdev_daemon = __esm({
                 managerKey = `${ide}_${workspaceName}`;
               }
               if (this.cdpManagers.has(managerKey)) continue;
-              const manager = new import_daemon_core3.DaemonCdpManager(primaryPort, import_daemon_core3.LOG.forComponent(`CDP:${managerKey}`).asLogFn(), target.id);
+              const provider2 = this.providerLoader.get(ide);
+              const manager = new import_daemon_core3.DaemonCdpManager(primaryPort, import_daemon_core3.LOG.forComponent(`CDP:${managerKey}`).asLogFn(), target.id, provider2?.targetFilter);
               const connected = await manager.connect();
               if (connected) {
                 this.cdpManagers.set(managerKey, manager);
@@ -27530,9 +27982,7 @@ var import_inquirer = __toESM(require("inquirer"));
 var import_ora = __toESM(require("ora"));
 var import_open = __toESM(require("open"));
 var import_daemon_core4 = __toESM(require_dist());
-var import_path = require("path");
-var BUILTIN_PROVIDERS_DIR = (0, import_path.join)(__dirname, "..", "providers", "_builtin");
-var SERVER_URL = "https://api.adhf.dev";
+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")}
@@ -27541,7 +27991,7 @@ ${import_chalk2.default.cyan("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u
 `;
 var DIVIDER = import_chalk2.default.gray("\u2500".repeat(44));
 async function runWizard(options = {}) {
-  const loader = new import_daemon_core4.ProviderLoader({ builtinDir: BUILTIN_PROVIDERS_DIR, logFn: () => {
+  const loader = new import_daemon_core4.ProviderLoader({ logFn: () => {
   } });
   loader.loadAll();
   loader.registerToDetector();
@@ -27868,7 +28318,7 @@ async function injectTokenToIDE(ide, connectionToken) {
         return path3.join(home, ".config", appName2, "User", "settings.json");
       }
     };
-    const loader = new import_daemon_core4.ProviderLoader({ builtinDir: BUILTIN_PROVIDERS_DIR, logFn: () => {
+    const loader = new import_daemon_core4.ProviderLoader({ logFn: () => {
     } });
     loader.loadAll();
     const appNameMap = loader.getMacAppIdentifiers();
@@ -28033,18 +28483,18 @@ async function installCliOnly() {
 // src/cli-entrypoint.ts
 var import_daemon_core5 = __toESM(require_dist());
 var import_fs = require("fs");
-var import_path2 = require("path");
-var pkgVersion = "unknown";
+var import_path = require("path");
+var pkgVersion2 = "unknown";
 try {
   const possiblePaths = [
-    (0, import_path2.join)(__dirname, "..", "package.json"),
-    (0, import_path2.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) {
-        pkgVersion = data.version;
+        pkgVersion2 = data.version;
         break;
       }
     } catch {
@@ -28052,13 +28502,12 @@ try {
   }
 } catch {
 }
-var BUILTIN_PROVIDERS_DIR2 = (0, import_path2.join)((0, import_path2.dirname)(__dirname), "providers", "_builtin");
-var _cliProviderLoader = new import_daemon_core5.ProviderLoader({ builtinDir: BUILTIN_PROVIDERS_DIR2, logFn: () => {
+var _cliProviderLoader = new import_daemon_core5.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(pkgVersion);
+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 });
 });
@@ -28392,7 +28841,7 @@ program.command("daemon:upgrade").description("Upgrade ADHDev to latest version
   const adhdevPath = process.argv[1];
   const realPath = fsMod.realpathSync(adhdevPath);
   const isLinked = realPath.includes(".openclaw") || realPath.includes("/src/");
-  const currentVersion = pkgVersion;
+  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) {
@@ -28571,7 +29020,7 @@ var provider = program.command("provider").description("\u{1F50C} Provider manag
 provider.command("list").description("List all loaded providers").option("-j, --json", "Output raw JSON").action(async (options) => {
   try {
     const { ProviderLoader: ProviderLoader4 } = await Promise.resolve().then(() => __toESM(require_dist()));
-    const loader = new ProviderLoader4({ builtinDir: BUILTIN_PROVIDERS_DIR2 });
+    const loader = new ProviderLoader4();
     loader.loadAll();
     const providers = loader.getAll();
     if (options.json) {