adhdev 0.5.2 → 0.5.3

package/dist/index.js

@@ -16514,7 +16514,7 @@ var require_dist = __commonJS({
       DaemonStatusReporter: () => DaemonStatusReporter2,
       DevServer: () => DevServer2,
       IdeProviderInstance: () => IdeProviderInstance,
-      LOG: () => LOG4,
+      LOG: () => LOG5,
       ProviderCliAdapter: () => ProviderCliAdapter,
       ProviderInstanceManager: () => ProviderInstanceManager,
       ProviderLoader: () => ProviderLoader2,
@@ -16818,7 +16818,7 @@ var require_dist = __commonJS({
         origConsoleLog(line);
       }
     }
-    var LOG4 = {
+    var LOG5 = {
       debug: (category, msg) => daemonLog(category, msg, "debug"),
       info: (category, msg) => daemonLog(category, msg, "info"),
       warn: (category, msg) => daemonLog(category, msg, "warn"),
@@ -16932,7 +16932,7 @@ var require_dist = __commonJS({
         this._targetId = targetId || null;
         this._targetFilter = targetFilter || {};
         this.logFn = logFn || ((msg) => {
-          LOG4.info("CDP", msg);
+          LOG5.info("CDP", msg);
         });
       }
       /** Set target filter (can be updated after construction) */
@@ -17705,7 +17705,7 @@ var require_dist = __commonJS({
           } catch {
           }
           const result = await this.sendInternal("Page.captureScreenshot", {
-            format: "jpeg",
+            format: "webp",
             quality,
             ...clip ? { clip } : {},
             optimizeForSpeed: true,
@@ -18402,14 +18402,14 @@ var require_dist = __commonJS({
             try {
               await ext.onTick();
             } catch (e) {
-              LOG4.warn("IdeInstance", `[IdeInstance:${this.type}] Extension ${id} tick error: ${e?.message}`);
+              LOG5.warn("IdeInstance", `[IdeInstance:${this.type}] Extension ${id} tick error: ${e?.message}`);
             }
           }
           this.tickErrorCount = 0;
         } catch (e) {
           this.tickErrorCount++;
           if (this.tickErrorCount <= 3 || this.tickErrorCount % 10 === 0) {
-            LOG4.warn("IdeInstance", `[IdeInstance:${this.type}] onTick error (${this.tickErrorCount}): ${e?.message || e}`);
+            LOG5.warn("IdeInstance", `[IdeInstance:${this.type}] onTick error (${this.tickErrorCount}): ${e?.message || e}`);
           }
         } finally {
           this.tickBusy = false;
@@ -18486,7 +18486,7 @@ var require_dist = __commonJS({
         });
         ext.onEvent("extension_connected", { ideType: this.type });
         this.extensions.set(provider.type, ext);
-        LOG4.info("IdeInstance", `[IdeInstance:${this.type}] Extension added: ${provider.type}`);
+        LOG5.info("IdeInstance", `[IdeInstance:${this.type}] Extension added: ${provider.type}`);
       }
       /** Extension Instance remove */
       removeExtension(type) {
@@ -18596,7 +18596,7 @@ var require_dist = __commonJS({
           const msg = e?.message || String(e);
           if (msg.includes("Timeout") || msg.includes("timeout") || msg.includes("Target closed")) {
           } else {
-            LOG4.warn("IdeInstance", `[IdeInstance:${this.type}] readChat internal error: ${msg}`);
+            LOG5.warn("IdeInstance", `[IdeInstance:${this.type}] readChat internal error: ${msg}`);
           }
         }
       }
@@ -18791,7 +18791,7 @@ var require_dist = __commonJS({
       // ── Internal ────────────────────────────
       getLogFn(ideType) {
         if (this.opts.logFn) return this.opts.logFn(ideType);
-        return (msg) => LOG4.info(`CDP:${ideType}`, msg);
+        return (msg) => LOG5.info(`CDP:${ideType}`, msg);
       }
       /**
        * Single-window connection (standalone mode).
@@ -18810,7 +18810,7 @@ var require_dist = __commonJS({
         if (!manager) return;
         registerExtensionProviders(this.ctx.providerLoader, manager, ide);
         this.ctx.cdpManagers.set(ide, manager);
-        LOG4.info("CDP", `Connected: ${ide} (port ${port})`);
+        LOG5.info("CDP", `Connected: ${ide} (port ${port})`);
         await setupIdeInstance(this.ctx, { ideType: ide, manager });
         this.opts.onConnected?.(ide, ide, manager);
       }
@@ -18843,7 +18843,7 @@ var require_dist = __commonJS({
           );
           if (!manager) continue;
           this.ctx.cdpManagers.set(managerKey, manager);
-          LOG4.info("CDP", `Connected: ${managerKey} (port ${port}, page "${target.title}")`);
+          LOG5.info("CDP", `Connected: ${managerKey} (port ${port}, page "${target.title}")`);
           await setupIdeInstance(this.ctx, {
             ideType: ide,
             manager,
@@ -18885,9 +18885,9 @@ var require_dist = __commonJS({
           await this.connectIdePort(port, ide);
         }
         if (cdpManagers.size > 0) {
-          LOG4.info("CDP", `${cdpManagers.size} IDE(s) connected: ${[...cdpManagers.entries()].map(([k, m]) => `${k}:${m.getPort()}`).join(", ")}`);
+          LOG5.info("CDP", `${cdpManagers.size} IDE(s) connected: ${[...cdpManagers.entries()].map(([k, m]) => `${k}:${m.getPort()}`).join(", ")}`);
         } else {
-          LOG4.warn("CDP", `No IDEs connected \u2014 tried: ${filtered.map((p) => `${p.ide}:${p.port}`).join(", ")}`);
+          LOG5.warn("CDP", `No IDEs connected \u2014 tried: ${filtered.map((p) => `${p.ide}:${p.port}`).join(", ")}`);
         }
       }
       // ─── Per-port connection (multi-window aware) ───
@@ -18903,7 +18903,7 @@ var require_dist = __commonJS({
           const provider = providerLoader.getMeta(ide);
           const manager = new DaemonCdpManager2(
             port,
-            LOG4.forComponent(`CDP:${ide}`).asLogFn(),
+            LOG5.forComponent(`CDP:${ide}`).asLogFn(),
             void 0,
             provider?.targetFilter
           );
@@ -18911,7 +18911,7 @@ var require_dist = __commonJS({
           if (connected) {
             registerExtensionProviders(providerLoader, manager, ide);
             cdpManagers.set(ide, manager);
-            LOG4.info("CDP", `Connected: ${ide} (port ${port})`);
+            LOG5.info("CDP", `Connected: ${ide} (port ${port})`);
             await this.config.onConnected?.(ide, manager, ide);
           }
           return;
@@ -18929,7 +18929,7 @@ var require_dist = __commonJS({
           const provider = providerLoader.getMeta(ide);
           const manager = new DaemonCdpManager2(
             port,
-            LOG4.forComponent(`CDP:${managerKey}`).asLogFn(),
+            LOG5.forComponent(`CDP:${managerKey}`).asLogFn(),
             target.id,
             provider?.targetFilter
           );
@@ -18937,7 +18937,7 @@ var require_dist = __commonJS({
           if (connected) {
             registerExtensionProviders(providerLoader, manager, ide);
             cdpManagers.set(managerKey, manager);
-            LOG4.info("CDP", `Connected: ${managerKey} (port ${port}${targets.length > 1 ? `, page "${target.title}"` : ""})`);
+            LOG5.info("CDP", `Connected: ${managerKey} (port ${port}${targets.length > 1 ? `, page "${target.title}"` : ""})`);
             await this.config.onConnected?.(ide, manager, managerKey);
           }
         }
@@ -18987,1475 +18987,1438 @@ var require_dist = __commonJS({
         }
       }
     };
-    var fs32 = __toESM2(require("fs"));
-    var path32 = __toESM2(require("path"));
-    var os4 = __toESM2(require("os"));
     init_config();
-    var DaemonCommandHandler = class {
-      ctx;
-      agentStream = null;
-      domHandlers;
-      /** Get CDP manager for a specific ideType.
-      * Returns null if no match — never falls back to another IDE.
-      */
-      getCdp(ideType) {
-        const key = ideType || this._currentIdeType;
-        if (!key) {
-          return null;
-        }
-        const m = this.ctx.cdpManagers.get(key.toLowerCase());
-        if (m?.isConnected) return m;
-        return null;
-      }
-      /** Current IDE type extracted from command args (per-request) */
-      _currentIdeType;
-      /** Current provider type — agentType priority, ideType use */
-      _currentProviderType;
-      historyWriter;
-      /** Extract ideType from _targetInstance
-      * UUID-based: query directly from instanceIdMap
-      * Legacy: composite ID parsing ('doId:ide:uuid' → uuid → map lookup)
-      */
-      extractIdeType(args) {
-        if (args?._targetInstance) {
-          let raw = args._targetInstance;
-          const ideMatch = raw.match(/:ide:(.+)$/);
-          const cliMatch = raw.match(/:cli:(.+)$/);
-          const acpMatch = raw.match(/:acp:(.+)$/);
-          if (ideMatch) raw = ideMatch[1];
-          else if (cliMatch) raw = cliMatch[1];
-          else if (acpMatch) raw = acpMatch[1];
-          if (this.ctx.instanceIdMap?.has(raw)) {
-            return this.ctx.instanceIdMap.get(raw);
-          }
-          const lastUnderscore = raw.lastIndexOf("_");
-          if (lastUnderscore > 0) return raw.substring(0, lastUnderscore);
-          return raw;
-        }
-        return void 0;
-      }
-      constructor(ctx) {
-        this.ctx = ctx;
-        this.domHandlers = new CdpDomHandlers((ideType) => this.getCdp(ideType));
-        this.historyWriter = new ChatHistoryWriter();
-      }
-      /**
-      * Get provider module — _currentProviderType (agentType priority) use.
-      * Extension: agentType='cline' → provider.type='cline' (category=extension)
-      * CLI: ideType='gemini-cli' → provider.type='gemini-cli' (category=cli)
-      * IDE: ideType='cursor' → provider.type='cursor' (category=ide)
-      */
-      getProvider(overrideType) {
-        const key = overrideType || this._currentProviderType || this._currentIdeType;
-        if (!key || !this.ctx.providerLoader) return void 0;
-        const result = this.ctx.providerLoader.resolve(key);
-        if (result) return result;
-        const baseType = key.split("_")[0];
-        if (baseType !== key) return this.ctx.providerLoader.resolve(baseType);
-        return void 0;
-      }
-      /** Get a provider script by name from ProviderLoader.
-      * Returns the script string or null. */
-      getProviderScript(scriptName, params, ideType) {
-        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();
-            if (script) return script;
-          }
-        }
-        return null;
-      }
-      // ─── Category dispatch engine ───────────────────
-      /**
-      * Look up Extension provider webview session ID from AgentStreamManager.
-      * provider.type (e.g. 'cline') → ManagedAgent sessionId
-      */
-      getExtensionSessionId(provider) {
-        if (provider.category !== "extension" || !this.agentStream) return null;
-        const managed = this.agentStream.getManagedAgent(provider.type);
-        return managed?.sessionId || null;
-      }
-      /**
-      * per-category CDP script execute:
-      * IDE → cdp.evaluate(script) (main window)
-      * Extension → cdp.evaluateInSession(sessionId, script) (webview)
-      * CLI → null (separate handling needed)
-      */
-      async evaluateProviderScript(scriptName, params, timeout = 3e4) {
-        const provider = this.getProvider();
-        const script = this.getProviderScript(scriptName, params);
-        if (!script) return null;
-        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(cdp, provider.type);
-            await this.agentStream.syncAgentSessions(cdp);
-            sessionId = this.getExtensionSessionId(provider);
-          }
-          if (!sessionId) return null;
-          const result2 = await cdp.evaluateInSession(sessionId, script, timeout);
-          return { result: result2, category: "extension" };
-        }
-        const result = await cdp.evaluate(script, timeout);
-        return { result, category: provider?.category || "ide" };
+    async function handleChatHistory(h, args) {
+      const { agentType, offset, limit, instanceId } = args;
+      try {
+        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) {
+        return { success: false, error: e.message };
       }
-      /**
-      * CLI adapter search: provider.type or agentTypeas match
-      */
-      getCliAdapter(type) {
-        const target = type || this._currentIdeType;
-        if (!target || !this.ctx.adapters) return null;
-        for (const [key, adapter] of this.ctx.adapters.entries()) {
-          if (adapter.cliType === target || key.startsWith(target)) {
-            return adapter;
+    }
+    async function handleReadChat(h, args) {
+      const provider = h.getProvider();
+      const _log = (msg) => LOG5.debug("Command", `[read_chat] ${msg}`);
+      if (provider?.category === "cli" || provider?.category === "acp") {
+        const adapter = h.getCliAdapter(provider.type);
+        if (adapter) {
+          _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 null;
+        return { success: false, error: `${provider.category} adapter not found` };
       }
-      setAgentStreamManager(manager) {
-        this.agentStream = manager;
-      }
-      async handle(cmd, args) {
-        this._currentIdeType = this.extractIdeType(args);
-        this._currentProviderType = args?.agentType || args?.providerType || this._currentIdeType;
-        if (!this._currentIdeType && !this._currentProviderType) {
-          const cdpCommands = ["send_chat", "read_chat", "list_chats", "new_chat", "switch_chat", "set_mode", "change_model", "set_thought_level", "resolve_action"];
-          if (cdpCommands.includes(cmd)) {
-            return { success: false, error: "No ideType specified \u2014 cannot route command" };
-          }
-        }
-        switch (cmd) {
-          // ─── CDP directly handle ───────────────────
-          case "read_chat":
-            return this.handleReadChat(args);
-          case "chat_history":
-            return this.handleChatHistory(args);
-          case "send_chat":
-            return this.handleSendChat(args);
-          case "list_chats":
-            return this.handleListChats(args);
-          case "new_chat":
-            return this.handleNewChat(args);
-          case "switch_chat":
-            return this.handleSwitchChat(args);
-          case "set_mode":
-            return this.handleSetMode(args);
-          case "change_model":
-            return this.handleChangeModel(args);
-          case "set_thought_level":
-            return this.handleSetThoughtLevel(args);
-          case "resolve_action":
-            return this.handleResolveAction(args);
-          case "cdp_eval":
-            return this.handleCdpEval(args);
-          case "cdp_screenshot":
-          case "screenshot":
-            return this.handleScreenshot(args);
-          case "cdp_command_exec":
-            return this.handleCdpCommand(args);
-          case "cdp_batch":
-            return this.handleCdpBatch(args);
-          case "cdp_remote_action":
-            return this.handleCdpRemoteAction(args);
-          case "cdp_discover_agents":
-            return this.handleDiscoverAgents(args);
-          case "cdp_dom_dump":
-            return this.domHandlers.handleDomDump(args);
-          case "cdp_dom_query":
-            return this.domHandlers.handleDomQuery(args);
-          case "cdp_dom_debug":
-            return this.domHandlers.handleDomDebug(args);
-          // ─── file directly handle ──────────────────
-          case "file_read":
-            return this.handleFileRead(args);
-          case "file_write":
-            return this.handleFileWrite(args);
-          case "file_list":
-            return this.handleFileList(args);
-          case "file_list_browse":
-            return this.handleFileListBrowse(args);
-          // ─── vscode API → Extension delegate ────
-          case "vscode_command_exec":
-          case "execute_vscode_command": {
-            const resolvedCmd = args?.commandId || args?.command;
-            if (resolvedCmd === "adhdev.captureCdpScreenshot") {
-              return this.handleScreenshot(args);
-            }
-            return this.delegateToExtension(resolvedCmd || cmd, args?.args);
-          }
-          case "get_open_editors":
-            return this.delegateToExtension("adhdev.getOpenEditors", [args]);
-          case "open_tab":
-            return this.delegateToExtension("vscode.open", [args?.uri || args?.path]);
-          case "close_tab":
-            return this.delegateToExtension("workbench.action.closeActiveEditor", []);
-          case "open_folder":
-            return this.delegateToExtension("vscode.openFolder", [args?.path]);
-          case "open_folder_picker":
-            return this.delegateToExtension("workbench.action.files.openFolder", []);
-          case "open_recent":
-            return this.delegateToExtension("workbench.action.openRecent", []);
-          case "get_commands":
-            return this.delegateToExtension("adhdev.getCommands", []);
-          case "get_recent_workspaces":
-            return this.handleGetRecentWorkspaces(args);
-          // ─── script manage ───────────────────
-          case "refresh_scripts":
-            return this.handleRefreshScripts(args);
-          // ─── Agent Stream commands ───────────────
-          case "agent_stream_switch":
-            return this.handleAgentStreamSwitch(args);
-          case "agent_stream_read":
-            return this.handleAgentStreamRead(args);
-          case "agent_stream_send":
-            return this.handleAgentStreamSend(args);
-          case "agent_stream_resolve":
-            return this.handleAgentStreamResolve(args);
-          case "agent_stream_new":
-            return this.handleAgentStreamNew(args);
-          case "agent_stream_list_chats":
-            return this.handleAgentStreamListChats(args);
-          case "agent_stream_switch_session":
-            return this.handleAgentStreamSwitchSession(args);
-          case "agent_stream_focus":
-            return this.handleAgentStreamFocus(args);
-          // ─── PTY Raw I/O (terminal view) ─────────
-          case "pty_input":
-            return this.handlePtyInput(args);
-          case "pty_resize":
-            return this.handlePtyResize(args);
-          // ─── Provider Settings ──────────────
-          case "get_provider_settings":
-            return this.handleGetProviderSettings(args);
-          case "set_provider_setting":
-            return this.handleSetProviderSetting(args);
-          // ─── IDE Extension Settings (per-IDE on/off) ──────────────
-          case "get_ide_extensions":
-            return this.handleGetIdeExtensions(args);
-          case "set_ide_extension":
-            return this.handleSetIdeExtension(args);
-          // ─── Extension Model / Mode Control ──────────────
-          case "list_extension_models":
-            return await this.handleExtensionScript(args, "listModels");
-          case "set_extension_model":
-            return await this.handleExtensionScript(args, "setModel");
-          case "list_extension_modes":
-            return await this.handleExtensionScript(args, "listModes");
-          case "set_extension_mode":
-            return await this.handleExtensionScript(args, "setMode");
-          default:
-            return { success: false, error: `Unknown command: ${cmd}` };
-        }
-      }
-      // ─── CDP-based chat commands ──────────────────────
-      async handleChatHistory(args) {
-        const { agentType, offset, limit, instanceId } = args;
+      if (provider?.category === "extension") {
         try {
-          const provider = this.getProvider(agentType);
-          const agentStr = provider?.type || agentType || this._currentIdeType || "";
-          const result = readChatHistory2(agentStr, offset || 0, limit || 30, instanceId);
-          return { success: true, ...result, agent: agentStr };
-        } catch (e) {
-          return { success: false, error: e.message };
-        }
-      }
-      async handleReadChat(args) {
-        const provider = this.getProvider();
-        const _log = (msg) => LOG4.debug("Command", `[read_chat] ${msg}`);
-        if (provider?.category === "cli" || provider?.category === "acp") {
-          const adapter = this.getCliAdapter(provider.type);
-          if (adapter) {
-            _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: `${provider.category} adapter not found` };
-        }
-        if (provider?.category === "extension") {
-          try {
-            const evalResult = await this.evaluateProviderScript("readChat", void 0, 5e4);
-            if (evalResult?.result) {
-              let parsed = evalResult.result;
-              if (typeof parsed === "string") {
-                try {
-                  parsed = JSON.parse(parsed);
-                } catch {
-                }
-              }
-              if (parsed && typeof parsed === "object") {
-                _log(`Extension OK: ${parsed.messages?.length || 0} msgs`);
-                this.historyWriter.appendNewMessages(
-                  provider.type || "unknown_extension",
-                  parsed.messages || [],
-                  parsed.title,
-                  args?.instanceId
-                );
-                return { success: true, ...parsed };
-              }
-            }
-          } catch (e) {
-            _log(`Extension error: ${e.message}`);
-          }
-          if (this.agentStream) {
-            const cdp2 = this.getCdp();
-            if (cdp2) {
-              const streams = await this.agentStream.collectAgentStreams(cdp2);
-              const stream = streams.find((s) => s.agentType === provider.type);
-              if (stream) {
-                this.historyWriter.appendNewMessages(
-                  stream.agentType,
-                  stream.messages || [],
-                  void 0,
-                  args?.instanceId
-                );
-                return { success: true, messages: stream.messages || [], status: stream.status, agentType: stream.agentType };
-              }
-            }
-          }
-          return { success: true, messages: [], status: "idle" };
-        }
-        const cdp = this.getCdp();
-        if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
-        const webviewScript = this.getProviderScript("webviewReadChat") || this.getProviderScript("webview_read_chat");
-        if (webviewScript) {
-          try {
-            const matchText = provider?.webviewMatchText;
-            const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-            const raw = await cdp.evaluateInWebviewFrame(webviewScript, matchFn);
-            if (raw) {
-              let parsed = raw;
-              if (typeof parsed === "string") {
-                try {
-                  parsed = JSON.parse(parsed);
-                } catch {
-                }
-              }
-              if (parsed && typeof parsed === "object") {
-                _log(`Webview OK: ${parsed.messages?.length || 0} msgs`);
-                this.historyWriter.appendNewMessages(
-                  provider?.type || this._currentIdeType || "unknown_webview",
-                  parsed.messages || [],
-                  parsed.title,
-                  args?.instanceId
-                );
-                return { success: true, ...parsed };
-              }
-            }
-          } catch (e) {
-            _log(`Webview readChat error: ${e.message}`);
-          }
-          return { success: true, messages: [], status: "idle" };
-        }
-        const script = this.getProviderScript("readChat") || this.getProviderScript("read_chat");
-        if (script) {
-          try {
-            const result = await cdp.evaluate(script, 5e4);
-            let parsed = result;
+          const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
+          if (evalResult?.result) {
+            let parsed = evalResult.result;
             if (typeof parsed === "string") {
               try {
                 parsed = JSON.parse(parsed);
               } catch {
               }
             }
-            if (parsed && typeof parsed === "object" && parsed.messages?.length > 0) {
-              _log(`OK: ${parsed.messages?.length} msgs`);
-              this.historyWriter.appendNewMessages(
-                provider?.type || this._currentIdeType || "unknown_ide",
+            if (parsed && typeof parsed === "object") {
+              _log(`Extension OK: ${parsed.messages?.length || 0} msgs`);
+              h.historyWriter.appendNewMessages(
+                provider.type || "unknown_extension",
                 parsed.messages || [],
                 parsed.title,
                 args?.instanceId
               );
               return { success: true, ...parsed };
             }
-          } catch (e) {
-            LOG4.info("Command", `[read_chat] Script error: ${e.message}`);
-          }
-        }
-        return { success: true, messages: [], status: "idle" };
-      }
-      async handleSendChat(args) {
-        const text = args?.text || args?.message;
-        if (!text) return { success: false, error: "text required" };
-        const _log = (msg) => LOG4.debug("Command", `[send_chat] ${msg}`);
-        const provider = this.getProvider();
-        if (provider?.category === "cli" || provider?.category === "acp") {
-          const adapter = this.getCliAdapter(provider.type);
-          if (adapter) {
-            _log(`${provider.category} adapter: ${adapter.cliType}`);
-            try {
-              await adapter.sendMessage(text);
-              return { success: true, sent: true, method: `${provider.category}-adapter`, targetAgent: adapter.cliType };
-            } catch (e) {
-              return { success: false, error: `${provider.category} send failed: ${e.message}` };
-            }
           }
-        }
-        if (provider?.category === "extension") {
-          _log(`Extension: ${provider.type}`);
-          try {
-            const evalResult = await this.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
-            if (evalResult?.result) {
-              let parsed = evalResult.result;
-              if (typeof parsed === "string") {
-                try {
-                  parsed = JSON.parse(parsed);
-                } catch {
-                }
-              }
-              if (parsed?.sent) {
-                _log(`Extension script sent OK`);
-                return { success: true, sent: true, method: "extension-script" };
-              }
-              if (parsed?.needsTypeAndSend) {
-                _log(`Extension needsTypeAndSend \u2192 AgentStreamManager`);
-              }
-            }
-          } catch (e) {
-            _log(`Extension script error: ${e.message}`);
-          }
-          if (this.agentStream && this.getCdp()) {
-            const ok = await this.agentStream.sendToAgent(this.getCdp(), provider.type, text, this._currentIdeType);
-            if (ok) {
-              _log(`AgentStreamManager sent OK`);
-              return { success: true, sent: true, method: "agent-stream" };
-            }
-          }
-          return { success: false, error: `Extension '${provider.type}' send failed` };
-        }
-        const targetCdp = this.getCdp();
-        if (!targetCdp?.isConnected) {
-          _log(`No CDP for ${this._currentIdeType}`);
-          return { success: false, error: `CDP for ${this._currentIdeType || "unknown"} not connected` };
-        }
-        _log(`Targeting IDE: ${this._currentIdeType}`);
-        if (provider?.webviewMatchText && provider?.scripts?.webviewSendMessage) {
-          try {
-            const webviewScript = provider.scripts.webviewSendMessage(text);
-            if (webviewScript && targetCdp.evaluateInWebviewFrame) {
-              const matchText = provider.webviewMatchText;
-              const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-              const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
-              let wvParsed = wvResult;
-              if (typeof wvResult === "string") {
-                try {
-                  wvParsed = JSON.parse(wvResult);
-                } catch {
-                }
-              }
-              if (wvParsed?.sent) {
-                _log(`webviewSendMessage (priority) OK`);
-                return { success: true, sent: true, method: "webview-script-priority" };
-              }
-              _log(`webviewSendMessage (priority) did not confirm sent, falling through`);
+        } catch (e) {
+          _log(`Extension error: ${e.message}`);
+        }
+        if (h.agentStream) {
+          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,
+                stream.messages || [],
+                void 0,
+                args?.instanceId
+              );
+              return { success: true, messages: stream.messages || [], status: stream.status, agentType: stream.agentType };
             }
-          } catch (e) {
-            _log(`webviewSendMessage (priority) failed: ${e.message}, falling through`);
           }
         }
-        if (provider?.inputMethod === "cdp-type-and-send" && provider.inputSelector) {
-          try {
-            const sent = await targetCdp.typeAndSend(provider.inputSelector, text);
-            if (sent) {
-              _log(`typeAndSend(provider.inputSelector=${provider.inputSelector}) success`);
-              return { success: true, sent: true, method: "typeAndSend-provider" };
-            }
-          } catch (e) {
-            _log(`typeAndSend(provider) failed: ${e.message}`);
-          }
-        }
-        const sendScript = this.getProviderScript("sendMessage", { MESSAGE: text });
-        if (sendScript) {
-          try {
-            const result = await targetCdp.evaluate(sendScript, 3e4);
-            let parsed = result;
-            if (typeof result === "string") {
+        return { success: true, messages: [], status: "idle" };
+      }
+      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 = provider?.webviewMatchText;
+          const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
+          const raw = await cdp.evaluateInWebviewFrame(webviewScript, matchFn);
+          if (raw) {
+            let parsed = raw;
+            if (typeof parsed === "string") {
               try {
-                parsed = JSON.parse(result);
+                parsed = JSON.parse(parsed);
               } catch {
               }
             }
-            if (parsed?.sent) {
-              _log(`sendMessage script OK`);
-              return { success: true, sent: true, method: "script" };
-            }
-            if (parsed?.needsTypeAndSend && parsed?.selector) {
-              try {
-                const sent = await targetCdp.typeAndSend(parsed.selector, text);
-                if (sent) {
-                  _log(`typeAndSend(script.selector=${parsed.selector}) success`);
-                  return { success: true, sent: true, method: "typeAndSend-script" };
-                }
-              } catch (e) {
-                _log(`typeAndSend(script.selector) failed: ${e.message}`);
-              }
-            }
-            if (parsed?.needsTypeAndSend && provider?.scripts?.webviewSendMessage) {
-              try {
-                const webviewScript = provider.scripts.webviewSendMessage(text);
-                if (webviewScript && targetCdp.evaluateInWebviewFrame) {
-                  const matchText = provider.webviewMatchText;
-                  const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-                  const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
-                  let wvParsed = wvResult;
-                  if (typeof wvResult === "string") {
-                    try {
-                      wvParsed = JSON.parse(wvResult);
-                    } catch {
-                    }
-                  }
-                  if (wvParsed?.sent) {
-                    _log(`webviewSendMessage OK`);
-                    return { success: true, sent: true, method: "webview-script" };
-                  }
-                }
-              } catch (e) {
-                _log(`webviewSendMessage failed: ${e.message}`);
-              }
+            if (parsed && typeof parsed === "object") {
+              _log(`Webview OK: ${parsed.messages?.length || 0} msgs`);
+              h.historyWriter.appendNewMessages(
+                provider?.type || h.currentIdeType || "unknown_webview",
+                parsed.messages || [],
+                parsed.title,
+                args?.instanceId
+              );
+              return { success: true, ...parsed };
             }
-            if (parsed?.needsTypeAndSend && parsed?.clickCoords) {
-              try {
-                const { x, y } = parsed.clickCoords;
-                const sent = await targetCdp.typeAndSendAt(x, y, text);
-                if (sent) {
-                  _log(`typeAndSendAt(${x},${y}) success`);
-                  return { success: true, sent: true, method: "typeAndSendAt-script" };
-                }
-              } catch (e) {
-                _log(`typeAndSendAt failed: ${e.message}`);
-              }
+          }
+        } catch (e) {
+          _log(`Webview readChat error: ${e.message}`);
+        }
+        return { success: true, messages: [], status: "idle" };
+      }
+      const script = h.getProviderScript("readChat") || h.getProviderScript("read_chat");
+      if (script) {
+        try {
+          const result = await cdp.evaluate(script, 5e4);
+          let parsed = result;
+          if (typeof parsed === "string") {
+            try {
+              parsed = JSON.parse(parsed);
+            } catch {
             }
-          } catch (e) {
-            _log(`sendMessage script failed: ${e.message}`);
           }
+          if (parsed && typeof parsed === "object" && parsed.messages?.length > 0) {
+            _log(`OK: ${parsed.messages?.length} msgs`);
+            h.historyWriter.appendNewMessages(
+              provider?.type || h.currentIdeType || "unknown_ide",
+              parsed.messages || [],
+              parsed.title,
+              args?.instanceId
+            );
+            return { success: true, ...parsed };
+          }
+        } catch (e) {
+          LOG5.info("Command", `[read_chat] Script error: ${e.message}`);
         }
-        _log("All methods failed");
-        return { success: false, error: "No provider method could send the message" };
       }
-      async handleListChats(args) {
-        const provider = this.getProvider();
-        if (provider?.category === "extension" && this.agentStream && this.getCdp()) {
+      return { success: true, messages: [], status: "idle" };
+    }
+    async function handleSendChat(h, args) {
+      const text = args?.text || args?.message;
+      if (!text) return { success: false, error: "text required" };
+      const _log = (msg) => LOG5.debug("Command", `[send_chat] ${msg}`);
+      const provider = h.getProvider();
+      if (provider?.category === "cli" || provider?.category === "acp") {
+        const adapter = h.getCliAdapter(provider.type);
+        if (adapter) {
+          _log(`${provider.category} adapter: ${adapter.cliType}`);
           try {
-            const chats = await this.agentStream.listAgentChats(this.getCdp(), provider.type);
-            LOG4.info("Command", `[list_chats] Extension: ${chats.length} chats`);
-            return { success: true, chats };
+            await adapter.sendMessage(text);
+            return { success: true, sent: true, method: `${provider.category}-adapter`, targetAgent: adapter.cliType };
           } catch (e) {
-            LOG4.info("Command", `[list_chats] Extension error: ${e.message}`);
+            return { success: false, error: `${provider.category} send failed: ${e.message}` };
           }
         }
+      }
+      if (provider?.category === "extension") {
+        _log(`Extension: ${provider.type}`);
         try {
-          const webviewScript = this.getProviderScript("webviewListSessions") || this.getProviderScript("webview_list_sessions");
-          if (webviewScript) {
-            const matchText = provider?.webviewMatchText;
-            const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-            const raw = await this.getCdp()?.evaluateInWebviewFrame?.(webviewScript, matchFn);
-            let parsed = raw;
+          const evalResult = await h.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
+          if (evalResult?.result) {
+            let parsed = evalResult.result;
             if (typeof parsed === "string") {
               try {
                 parsed = JSON.parse(parsed);
               } catch {
               }
             }
-            if (parsed?.sessions) {
-              LOG4.info("Command", `[list_chats] Webview OK: ${parsed.sessions.length} chats`);
-              return { success: true, chats: parsed.sessions };
+            if (parsed?.sent) {
+              _log(`Extension script sent OK`);
+              return { success: true, sent: true, method: "extension-script" };
+            }
+            if (parsed?.needsTypeAndSend) {
+              _log(`Extension needsTypeAndSend \u2192 AgentStreamManager`);
             }
           }
         } catch (e) {
-          LOG4.info("Command", `[list_chats] Webview error: ${e.message}`);
+          _log(`Extension script error: ${e.message}`);
+        }
+        if (h.agentStream && h.getCdp()) {
+          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 '${provider.type}' send failed` };
+      }
+      const targetCdp = h.getCdp();
+      if (!targetCdp?.isConnected) {
+        _log(`No CDP for ${h.currentIdeType}`);
+        return { success: false, error: `CDP for ${h.currentIdeType || "unknown"} not connected` };
+      }
+      _log(`Targeting IDE: ${h.currentIdeType}`);
+      if (provider?.webviewMatchText && provider?.scripts?.webviewSendMessage) {
         try {
-          const evalResult = await this.evaluateProviderScript("listSessions");
-          if (evalResult) {
-            let parsed = evalResult.result;
-            if (typeof parsed === "string") {
+          const webviewScript = provider.scripts.webviewSendMessage(text);
+          if (webviewScript && targetCdp.evaluateInWebviewFrame) {
+            const matchText = provider.webviewMatchText;
+            const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
+            const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
+            let wvParsed = wvResult;
+            if (typeof wvResult === "string") {
               try {
-                parsed = JSON.parse(parsed);
+                wvParsed = JSON.parse(wvResult);
               } catch {
               }
             }
-            if (Array.isArray(parsed)) {
-              LOG4.info("Command", `[list_chats] OK: ${parsed.length} chats`);
-              return { success: true, chats: parsed };
+            if (wvParsed?.sent) {
+              _log(`webviewSendMessage (priority) OK`);
+              return { success: true, sent: true, method: "webview-script-priority" };
             }
+            _log(`webviewSendMessage (priority) did not confirm sent, falling through`);
           }
         } catch (e) {
-          LOG4.info("Command", `[list_chats] error: ${e.message}`);
+          _log(`webviewSendMessage (priority) failed: ${e.message}, falling through`);
         }
-        return { success: false, error: "listSessions script not available for this provider" };
       }
-      async handleNewChat(args) {
-        const provider = this.getProvider();
-        if (provider?.category === "extension" && this.agentStream && this.getCdp()) {
-          const ok = await this.agentStream.newAgentSession(this.getCdp(), provider.type, this._currentIdeType);
-          return { success: ok };
-        }
+      if (provider?.inputMethod === "cdp-type-and-send" && provider.inputSelector) {
         try {
-          const webviewScript = this.getProviderScript("webviewNewSession") || this.getProviderScript("webview_new_session");
-          if (webviewScript) {
-            const matchText = provider?.webviewMatchText;
-            const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-            const raw = await this.getCdp()?.evaluateInWebviewFrame?.(webviewScript, matchFn);
-            if (raw) return { success: true, result: raw };
+          const sent = await targetCdp.typeAndSend(provider.inputSelector, text);
+          if (sent) {
+            _log(`typeAndSend(provider.inputSelector=${provider.inputSelector}) success`);
+            return { success: true, sent: true, method: "typeAndSend-provider" };
           }
         } catch (e) {
-          return { success: false, error: `webviewNewSession failed: ${e.message}` };
+          _log(`typeAndSend(provider) failed: ${e.message}`);
         }
+      }
+      const sendScript = h.getProviderScript("sendMessage", { MESSAGE: text });
+      if (sendScript) {
         try {
-          const evalResult = await this.evaluateProviderScript("newSession");
-          if (evalResult) return { success: true };
+          const result = await targetCdp.evaluate(sendScript, 3e4);
+          let parsed = result;
+          if (typeof result === "string") {
+            try {
+              parsed = JSON.parse(result);
+            } catch {
+            }
+          }
+          if (parsed?.sent) {
+            _log(`sendMessage script OK`);
+            return { success: true, sent: true, method: "script" };
+          }
+          if (parsed?.needsTypeAndSend && parsed?.selector) {
+            try {
+              const sent = await targetCdp.typeAndSend(parsed.selector, text);
+              if (sent) {
+                _log(`typeAndSend(script.selector=${parsed.selector}) success`);
+                return { success: true, sent: true, method: "typeAndSend-script" };
+              }
+            } catch (e) {
+              _log(`typeAndSend(script.selector) failed: ${e.message}`);
+            }
+          }
+          if (parsed?.needsTypeAndSend && provider?.scripts?.webviewSendMessage) {
+            try {
+              const webviewScript = provider.scripts.webviewSendMessage(text);
+              if (webviewScript && targetCdp.evaluateInWebviewFrame) {
+                const matchText = provider.webviewMatchText;
+                const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
+                const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
+                let wvParsed = wvResult;
+                if (typeof wvResult === "string") {
+                  try {
+                    wvParsed = JSON.parse(wvResult);
+                  } catch {
+                  }
+                }
+                if (wvParsed?.sent) {
+                  _log(`webviewSendMessage OK`);
+                  return { success: true, sent: true, method: "webview-script" };
+                }
+              }
+            } catch (e) {
+              _log(`webviewSendMessage failed: ${e.message}`);
+            }
+          }
+          if (parsed?.needsTypeAndSend && parsed?.clickCoords) {
+            try {
+              const { x, y } = parsed.clickCoords;
+              const sent = await targetCdp.typeAndSendAt(x, y, text);
+              if (sent) {
+                _log(`typeAndSendAt(${x},${y}) success`);
+                return { success: true, sent: true, method: "typeAndSendAt-script" };
+              }
+            } catch (e) {
+              _log(`typeAndSendAt failed: ${e.message}`);
+            }
+          }
         } catch (e) {
-          return { success: false, error: `newSession failed: ${e.message}` };
+          _log(`sendMessage script failed: ${e.message}`);
         }
-        return { success: false, error: "newSession script not available for this provider" };
       }
-      async handleSwitchChat(args) {
-        const provider = this.getProvider();
-        const ideType = this._currentIdeType;
-        const sessionId = args?.sessionId || args?.id || args?.chatId;
-        if (!sessionId) return { success: false, error: "sessionId required" };
-        LOG4.info("Command", `[switch_chat] sessionId=${sessionId}, ideType=${ideType}`);
-        if (provider?.category === "extension" && this.agentStream && this.getCdp()) {
-          const ok = await this.agentStream.switchAgentSession(this.getCdp(), provider.type, sessionId);
-          return { success: ok, result: ok ? "switched" : "failed" };
-        }
-        const cdp = this.getCdp(ideType);
-        if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
+      _log("All methods failed");
+      return { success: false, error: "No provider method could send the message" };
+    }
+    async function handleListChats(h, args) {
+      const provider = h.getProvider();
+      if (provider?.category === "extension" && h.agentStream && h.getCdp()) {
         try {
-          const webviewScript = this.getProviderScript("webviewSwitchSession", { SESSION_ID: JSON.stringify(sessionId) });
-          if (webviewScript) {
-            const matchText = provider?.webviewMatchText;
-            const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-            const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
-            if (raw) return { success: true, result: raw };
-          }
+          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) {
-          return { success: false, error: `webviewSwitchSession failed: ${e.message}` };
+          LOG5.info("Command", `[list_chats] Extension error: ${e.message}`);
         }
-        const script = this.getProviderScript("switchSession", { SESSION_ID: JSON.stringify(sessionId) }) || this.getProviderScript("switch_session", { SESSION_ID: JSON.stringify(sessionId) });
-        if (!script) return { success: false, error: "switch_session script not available" };
-        try {
-          const raw = await cdp.evaluate(script, 15e3);
-          LOG4.info("Command", `[switch_chat] result: ${raw}`);
-          let parsed = null;
-          try {
-            parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
-          } catch {
-          }
-          if (parsed?.action === "click" && parsed.clickX && parsed.clickY) {
-            const x = Math.round(parsed.clickX);
-            const y = Math.round(parsed.clickY);
-            LOG4.info("Command", `[switch_chat] CDP click at (${x}, ${y}) for "${parsed.title}"`);
-            await cdp.send("Input.dispatchMouseEvent", {
-              type: "mousePressed",
-              x,
-              y,
-              button: "left",
-              clickCount: 1
-            });
-            await cdp.send("Input.dispatchMouseEvent", {
-              type: "mouseReleased",
-              x,
-              y,
-              button: "left",
-              clickCount: 1
-            });
-            await new Promise((r) => setTimeout(r, 2e3));
-            const wsResult = await cdp.evaluate(`
-                    (() => {
-                        const inp = Array.from(document.querySelectorAll('input[type="text"]'))
-                            .find(i => i.offsetWidth > 0 && (i.placeholder || '').includes('Select where'));
-                        if (!inp) return null;
-                        const rows = inp.closest('[class*="quickInput"]')?.querySelectorAll('[class*="cursor-pointer"]');
-                        if (rows && rows.length > 0) {
-                            const r = rows[0].getBoundingClientRect();
-                            return JSON.stringify({ x: Math.round(r.left + r.width/2), y: Math.round(r.top + r.height/2) });
-                        }
-                        return null;
-                    })()
-                `, 5e3);
-            if (wsResult) {
-              try {
-                const ws = JSON.parse(wsResult);
-                await cdp.send("Input.dispatchMouseEvent", {
-                  type: "mousePressed",
-                  x: ws.x,
-                  y: ws.y,
-                  button: "left",
-                  clickCount: 1
-                });
-                await cdp.send("Input.dispatchMouseEvent", {
-                  type: "mouseReleased",
-                  x: ws.x,
-                  y: ws.y,
-                  button: "left",
-                  clickCount: 1
-                });
-              } catch {
-              }
+      }
+      try {
+        const webviewScript = h.getProviderScript("webviewListSessions") || h.getProviderScript("webview_list_sessions");
+        if (webviewScript) {
+          const matchText = provider?.webviewMatchText;
+          const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
+          const raw = await h.getCdp()?.evaluateInWebviewFrame?.(webviewScript, matchFn);
+          let parsed = raw;
+          if (typeof parsed === "string") {
+            try {
+              parsed = JSON.parse(parsed);
+            } catch {
             }
-            return { success: true, result: "switched" };
           }
-          if (parsed?.error) {
-            return { success: false, error: parsed.error };
+          if (parsed?.sessions) {
+            LOG5.info("Command", `[list_chats] Webview OK: ${parsed.sessions.length} chats`);
+            return { success: true, chats: parsed.sessions };
           }
-          return { success: true, result: raw };
-        } catch (e) {
-          LOG4.error("Command", `[switch_chat] error: ${e.message}`);
-          return { success: false, error: e.message };
         }
+      } catch (e) {
+        LOG5.info("Command", `[list_chats] Webview error: ${e.message}`);
       }
-      async handleSetMode(args) {
-        const provider = this.getProvider();
-        const mode = args?.mode || "agent";
-        if (provider?.category === "acp") {
-          const adapter = this.getCliAdapter(provider.type);
-          if (adapter) {
-            const acpInstance = adapter._acpInstance;
-            if (acpInstance && typeof acpInstance.onEvent === "function") {
-              acpInstance.onEvent("set_mode", { mode });
-              return { success: true, mode };
+      try {
+        const evalResult = await h.evaluateProviderScript("listSessions");
+        if (evalResult) {
+          let parsed = evalResult.result;
+          if (typeof parsed === "string") {
+            try {
+              parsed = JSON.parse(parsed);
+            } catch {
             }
           }
-          return { success: false, error: "ACP adapter not found" };
+          if (Array.isArray(parsed)) {
+            LOG5.info("Command", `[list_chats] OK: ${parsed.length} chats`);
+            return { success: true, chats: parsed };
+          }
         }
-        const webviewScript = this.getProviderScript("webviewSetMode", { MODE: JSON.stringify(mode) });
+      } catch (e) {
+        LOG5.info("Command", `[list_chats] error: ${e.message}`);
+      }
+      return { success: false, error: "listSessions script not available for this provider" };
+    }
+    async function handleNewChat(h, args) {
+      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 cdp = this.getCdp();
-          if (cdp?.isConnected) {
+          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 };
+        }
+      } catch (e) {
+        return { success: false, error: `webviewNewSession failed: ${e.message}` };
+      }
+      try {
+        const evalResult = await h.evaluateProviderScript("newSession");
+        if (evalResult) return { success: true };
+      } catch (e) {
+        return { success: false, error: `newSession failed: ${e.message}` };
+      }
+      return { success: false, error: "newSession script not available for this provider" };
+    }
+    async function handleSwitchChat(h, args) {
+      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 (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 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 = provider?.webviewMatchText;
+          const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
+          const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
+          if (raw) return { success: true, result: raw };
+        }
+      } catch (e) {
+        return { success: false, error: `webviewSwitchSession failed: ${e.message}` };
+      }
+      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 cdp.evaluate(script, 15e3);
+        LOG5.info("Command", `[switch_chat] result: ${raw}`);
+        let parsed = null;
+        try {
+          parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
+        } catch {
+        }
+        if (parsed?.action === "click" && parsed.clickX && parsed.clickY) {
+          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 cdp.send("Input.dispatchMouseEvent", {
+            type: "mousePressed",
+            x,
+            y,
+            button: "left",
+            clickCount: 1
+          });
+          await cdp.send("Input.dispatchMouseEvent", {
+            type: "mouseReleased",
+            x,
+            y,
+            button: "left",
+            clickCount: 1
+          });
+          await new Promise((r) => setTimeout(r, 2e3));
+          const wsResult = await cdp.evaluate(`
+                (() => {
+                    const inp = Array.from(document.querySelectorAll('input[type="text"]'))
+                        .find(i => i.offsetWidth > 0 && (i.placeholder || '').includes('Select where'));
+                    if (!inp) return null;
+                    const rows = inp.closest('[class*="quickInput"]')?.querySelectorAll('[class*="cursor-pointer"]');
+                    if (rows && rows.length > 0) {
+                        const r = rows[0].getBoundingClientRect();
+                        return JSON.stringify({ x: Math.round(r.left + r.width/2), y: Math.round(r.top + r.height/2) });
+                    }
+                    return null;
+                })()
+            `, 5e3);
+          if (wsResult) {
             try {
-              const matchText = provider?.webviewMatchText;
-              const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-              const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
-              let result = raw;
-              if (typeof raw === "string") {
-                try {
-                  result = JSON.parse(raw);
-                } catch {
-                }
-              }
-              if (result?.success) return { success: true, mode, method: "webview-script" };
-            } catch (e) {
-              LOG4.info("Command", `[set_mode] webview script error: ${e.message}`);
+              const ws = JSON.parse(wsResult);
+              await cdp.send("Input.dispatchMouseEvent", {
+                type: "mousePressed",
+                x: ws.x,
+                y: ws.y,
+                button: "left",
+                clickCount: 1
+              });
+              await cdp.send("Input.dispatchMouseEvent", {
+                type: "mouseReleased",
+                x: ws.x,
+                y: ws.y,
+                button: "left",
+                clickCount: 1
+              });
+            } catch {
             }
           }
+          return { success: true, result: "switched" };
+        }
+        if (parsed?.error) return { success: false, error: parsed.error };
+        return { success: true, result: raw };
+      } catch (e) {
+        LOG5.error("Command", `[switch_chat] error: ${e.message}`);
+        return { success: false, error: e.message };
+      }
+    }
+    async function handleSetMode(h, args) {
+      const provider = h.getProvider();
+      const mode = args?.mode || "agent";
+      if (provider?.category === "acp") {
+        const adapter = h.getCliAdapter(provider.type);
+        if (adapter) {
+          const acpInstance = adapter._acpInstance;
+          if (acpInstance && typeof acpInstance.onEvent === "function") {
+            acpInstance.onEvent("set_mode", { mode });
+            return { success: true, mode };
+          }
         }
-        const mainScript = this.getProviderScript("setMode", { MODE: JSON.stringify(mode) });
-        if (mainScript) {
+        return { success: false, error: "ACP adapter not found" };
+      }
+      const webviewScript = h.getProviderScript("webviewSetMode", { MODE: JSON.stringify(mode) });
+      if (webviewScript) {
+        const cdp = h.getCdp();
+        if (cdp?.isConnected) {
           try {
-            const evalResult = await this.evaluateProviderScript("setMode", { MODE: JSON.stringify(mode) }, 15e3);
-            if (evalResult?.result) {
-              let parsed = evalResult.result;
-              if (typeof parsed === "string") {
-                try {
-                  parsed = JSON.parse(parsed);
-                } catch {
-                }
+            const matchText = provider?.webviewMatchText;
+            const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
+            const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
+            let result = raw;
+            if (typeof raw === "string") {
+              try {
+                result = JSON.parse(raw);
+              } catch {
               }
-              if (parsed?.success) return { success: true, mode, method: "script" };
             }
+            if (result?.success) return { success: true, mode, method: "webview-script" };
           } catch (e) {
-            LOG4.info("Command", `[set_mode] script error: ${e.message}`);
+            LOG5.info("Command", `[set_mode] webview script error: ${e.message}`);
           }
         }
-        return this.delegateToExtension(`composerMode.${mode}`, []);
       }
-      async handleChangeModel(args) {
-        const provider = this.getProvider();
-        const model = args?.model;
-        LOG4.info("Command", `[change_model] model=${model} provider=${provider?.type} category=${provider?.category} ideType=${this._currentIdeType} providerType=${this._currentProviderType}`);
-        if (provider?.category === "acp") {
-          const adapter = this.getCliAdapter(provider.type);
-          LOG4.info("Command", `[change_model] ACP adapter found: ${!!adapter}, type=${adapter?.cliType}, hasAcpInstance=${!!adapter?._acpInstance}`);
-          if (adapter) {
-            const acpInstance = adapter._acpInstance;
-            if (acpInstance && typeof acpInstance.onEvent === "function") {
-              acpInstance.onEvent("change_model", { model });
-              LOG4.info("Command", `[change_model] Dispatched change_model event to ACP instance`);
-              return { success: true, model };
-            }
-          }
-          return { success: false, error: "ACP adapter not found" };
-        }
-        const webviewScript = this.getProviderScript("webviewSetModel", { MODEL: JSON.stringify(model) });
-        if (webviewScript) {
-          const cdp = this.getCdp();
-          if (cdp?.isConnected) {
-            try {
-              const matchText = provider?.webviewMatchText;
-              const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-              const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
-              let result = raw;
-              if (typeof raw === "string") {
-                try {
-                  result = JSON.parse(raw);
-                } catch {
-                }
+      const mainScript = h.getProviderScript("setMode", { MODE: JSON.stringify(mode) });
+      if (mainScript) {
+        try {
+          const evalResult = await h.evaluateProviderScript("setMode", { MODE: JSON.stringify(mode) }, 15e3);
+          if (evalResult?.result) {
+            let parsed = evalResult.result;
+            if (typeof parsed === "string") {
+              try {
+                parsed = JSON.parse(parsed);
+              } catch {
               }
-              if (result?.success) return { success: true, model, method: "webview-script" };
-            } catch (e) {
-              LOG4.info("Command", `[change_model] webview script error: ${e.message}`);
             }
+            if (parsed?.success) return { success: true, mode, method: "script" };
+          }
+        } catch (e) {
+          LOG5.info("Command", `[set_mode] script error: ${e.message}`);
+        }
+      }
+      return { success: false, error: `setMode '${mode}' not supported by this provider` };
+    }
+    async function handleChangeModel(h, args) {
+      const provider = h.getProvider();
+      const model = args?.model;
+      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;
+          if (acpInstance && typeof acpInstance.onEvent === "function") {
+            acpInstance.onEvent("change_model", { model });
+            LOG5.info("Command", `[change_model] Dispatched change_model event to ACP instance`);
+            return { success: true, model };
           }
         }
-        const mainScript = this.getProviderScript("setModel", { MODEL: JSON.stringify(model) });
-        if (mainScript) {
+        return { success: false, error: "ACP adapter not found" };
+      }
+      const webviewScript = h.getProviderScript("webviewSetModel", { MODEL: JSON.stringify(model) });
+      if (webviewScript) {
+        const cdp = h.getCdp();
+        if (cdp?.isConnected) {
           try {
-            const evalResult = await this.evaluateProviderScript("setModel", { MODEL: JSON.stringify(model) }, 15e3);
-            if (evalResult?.result) {
-              let parsed = evalResult.result;
-              if (typeof parsed === "string") {
-                try {
-                  parsed = JSON.parse(parsed);
-                } catch {
-                }
+            const matchText = provider?.webviewMatchText;
+            const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
+            const raw = await cdp.evaluateInWebviewFrame?.(webviewScript, matchFn);
+            let result = raw;
+            if (typeof raw === "string") {
+              try {
+                result = JSON.parse(raw);
+              } catch {
               }
-              if (parsed?.success) return { success: true, model, method: "script" };
             }
+            if (result?.success) return { success: true, model, method: "webview-script" };
           } catch (e) {
-            LOG4.info("Command", `[change_model] script error: ${e.message}`);
+            LOG5.info("Command", `[change_model] webview script error: ${e.message}`);
           }
         }
-        const settingsKey = provider?.vscodeCommands?.changeModel;
-        if (settingsKey) {
-          return this.delegateToExtension("workbench.action.openSettings", [settingsKey]);
-        }
-        return { success: false, error: "changeModel not supported by this IDE provider" };
       }
-      /** set_thought_level — ACP configOption change */
-      async handleSetThoughtLevel(args) {
-        const configId = args?.configId;
-        const value = args?.value;
-        if (!configId || !value) return { success: false, error: "configId and value required" };
-        const provider = this.getProvider();
-        if (!provider || provider.category !== "acp") {
-          return { success: false, error: "set_thought_level only for ACP providers" };
-        }
-        const adapter = this.getCliAdapter(provider.type);
-        const acpInstance = adapter?._acpInstance;
-        if (!acpInstance) return { success: false, error: "ACP instance not found" };
+      const mainScript = h.getProviderScript("setModel", { MODEL: JSON.stringify(model) });
+      if (mainScript) {
         try {
-          await acpInstance.setConfigOption(configId, value);
-          LOG4.info("Command", `[set_thought_level] ${configId}=${value} for ${provider.type}`);
-          return { success: true, configId, value };
-        } catch (e) {
-          return { success: false, error: e?.message };
-        }
-      }
-      /** resolveAction — unified (common for IDE/Extension) */
-      async handleResolveAction(args) {
-        const provider = this.getProvider();
-        const action = args?.action || "approve";
-        const button = args?.button || args?.buttonText || (action === "approve" ? "Accept" : action === "reject" ? "Reject" : "Accept");
-        LOG4.info("Command", `[resolveAction] action=${action} button="${button}" provider=${provider?.type}`);
-        if (provider?.category === "extension" && this.agentStream && this.getCdp()) {
-          const ok = await this.agentStream.resolveAgentAction(
-            this.getCdp(),
-            provider.type,
-            action,
-            this._currentIdeType
-          );
-          return { success: ok };
-        }
-        if (provider?.scripts?.webviewResolveAction || provider?.scripts?.webview_resolve_action) {
-          const script = this.getProviderScript("webviewResolveAction", { action, button, buttonText: button }) || this.getProviderScript("webview_resolve_action", { action, button, buttonText: button });
-          if (script) {
-            const cdp = this.getCdp();
-            if (cdp?.isConnected) {
+          const evalResult = await h.evaluateProviderScript("setModel", { MODEL: JSON.stringify(model) }, 15e3);
+          if (evalResult?.result) {
+            let parsed = evalResult.result;
+            if (typeof parsed === "string") {
               try {
-                const matchText = provider?.webviewMatchText;
-                const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
-                const raw = await cdp.evaluateInWebviewFrame?.(script, matchFn);
-                let result = raw;
-                if (typeof raw === "string") {
-                  try {
-                    result = JSON.parse(raw);
-                  } catch {
-                  }
-                }
-                LOG4.info("Command", `[resolveAction] webview script result: ${JSON.stringify(result)}`);
-                if (result?.resolved) {
-                  return { success: true, clicked: result.clicked };
-                }
-                if (result?.found && result.x != null && result.y != null) {
-                  LOG4.info("Command", `[resolveAction] Webview coordinate click not fully supported via CDP. Click directly in script.`);
-                }
-                if (result?.found || result?.resolved) return { success: true };
-              } catch (e) {
-                return { success: false, error: `webviewResolveAction failed: ${e.message}` };
+                parsed = JSON.parse(parsed);
+              } catch {
               }
             }
+            if (parsed?.success) return { success: true, model, method: "script" };
           }
+        } catch (e) {
+          LOG5.info("Command", `[change_model] script error: ${e.message}`);
         }
-        if (provider?.scripts?.resolveAction) {
-          const script = provider.scripts.resolveAction({ action, button, buttonText: button });
-          if (script) {
-            const cdp = this.getCdp();
-            if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
+      }
+      return { success: false, error: "changeModel not supported by this IDE provider" };
+    }
+    async function handleSetThoughtLevel(h, args) {
+      const configId = args?.configId;
+      const value = args?.value;
+      if (!configId || !value) return { success: false, error: "configId and value required" };
+      const provider = h.getProvider();
+      if (!provider || provider.category !== "acp") {
+        return { success: false, error: "set_thought_level only for ACP providers" };
+      }
+      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 ${provider.type}`);
+        return { success: true, configId, value };
+      } catch (e) {
+        return { success: false, error: e?.message };
+      }
+    }
+    async function handleResolveAction(h, args) {
+      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=${provider?.type}`);
+      if (provider?.category === "extension" && h.agentStream && h.getCdp()) {
+        const ok = await h.agentStream.resolveAgentAction(
+          h.getCdp(),
+          provider.type,
+          action,
+          h.currentIdeType
+        );
+        return { success: ok };
+      }
+      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 cdp = h.getCdp();
+          if (cdp?.isConnected) {
             try {
-              const raw = await cdp.evaluate(script, 3e4);
+              const matchText = provider?.webviewMatchText;
+              const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
+              const raw = await cdp.evaluateInWebviewFrame?.(script, matchFn);
               let result = raw;
               if (typeof raw === "string") {
                 try {
                   result = JSON.parse(raw);
                 } catch {
-                }
-              }
-              LOG4.info("Command", `[resolveAction] script result: ${JSON.stringify(result)}`);
-              if (result?.resolved) {
-                LOG4.info("Command", `[resolveAction] script-click resolved \u2014 "${result.clicked}"`);
-                return { success: true, clicked: result.clicked };
-              }
-              if (result?.found && result.x != null && result.y != null) {
-                const x = result.x;
-                const y = result.y;
-                await cdp.send("Input.dispatchMouseEvent", {
-                  type: "mousePressed",
-                  x,
-                  y,
-                  button: "left",
-                  clickCount: 1
-                });
-                await cdp.send("Input.dispatchMouseEvent", {
-                  type: "mouseReleased",
-                  x,
-                  y,
-                  button: "left",
-                  clickCount: 1
-                });
-                LOG4.info("Command", `[resolveAction] CDP click at (${x}, ${y}) \u2014 "${result.text}"`);
-                return { success: true, clicked: result.text };
-              }
-              return { success: false, error: result?.found === false ? `Button not found: ${button}` : "No coordinates" };
-            } catch (e) {
-              return { success: false, error: `resolveAction failed: ${e.message}` };
-            }
-          }
-        }
-        return { success: false, error: "resolveAction script not available for this provider" };
-      }
-      // ─── CDP direct commands ──────────────────────────
-      async handleCdpEval(args) {
-        if (!this.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
-        const expression = args?.expression || args?.script;
-        if (!expression) return { success: false, error: "expression required" };
-        try {
-          const result = await this.getCdp().evaluate(expression, 5e4);
-          return { success: true, result };
-        } catch (e) {
-          return { success: false, error: e.message };
-        }
-      }
-      async handleScreenshot(args) {
-        if (!this.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
-        try {
-          const buf = await this.getCdp().captureScreenshot();
-          if (buf) {
-            const b64 = buf.toString("base64");
-            return { success: true, result: b64, base64: b64, screenshot: b64, format: "jpeg" };
+                }
+              }
+              LOG5.info("Command", `[resolveAction] webview script result: ${JSON.stringify(result)}`);
+              if (result?.resolved) return { success: true, clicked: result.clicked };
+              if (result?.found && result.x != null && result.y != null) {
+                LOG5.info("Command", `[resolveAction] Webview coordinate click not fully supported via CDP. Click directly in script.`);
+              }
+              if (result?.found || result?.resolved) return { success: true };
+            } catch (e) {
+              return { success: false, error: `webviewResolveAction failed: ${e.message}` };
+            }
           }
-          return { success: false, error: "Screenshot failed" };
-        } catch (e) {
-          return { success: false, error: e.message };
         }
       }
-      async handleCdpCommand(args) {
-        if (!this.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
-        const method = args?.method;
-        const params = args?.params || {};
-        if (!method) return { success: false, error: "method required" };
-        try {
-          const result = await this.getCdp().sendCdpCommand(method, params);
-          return { success: true, result };
-        } catch (e) {
-          return { success: false, error: e.message };
-        }
-      }
-      async handleCdpBatch(args) {
-        if (!this.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
-        const commands = args?.commands;
-        const stopOnError = args?.stopOnError !== false;
-        if (!commands?.length) return { success: false, error: "commands array required" };
-        const results = [];
-        for (const cmd of commands) {
+      if (provider?.scripts?.resolveAction) {
+        const script = provider.scripts.resolveAction({ action, button, buttonText: button });
+        if (script) {
+          const cdp = h.getCdp();
+          if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
           try {
-            const result = await this.getCdp().sendCdpCommand(cmd.method, cmd.params || {});
-            results.push({ method: cmd.method, success: true, result });
-          } catch (e) {
-            results.push({ method: cmd.method, success: false, error: e.message });
-            if (stopOnError) break;
-          }
-        }
-        return { success: true, results };
-      }
-      async handleCdpRemoteAction(args) {
-        if (!this.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
-        const action = args?.action;
-        const params = args?.params || args;
-        try {
-          switch (action) {
-            case "input_key": {
-              const { key, modifiers } = params;
-              await this.getCdp().send("Input.dispatchKeyEvent", {
-                type: "keyDown",
-                key,
-                ...modifiers?.ctrl ? { modifiers: 2 } : {},
-                ...modifiers?.shift ? { modifiers: 8 } : {}
-              });
-              await this.getCdp().send("Input.dispatchKeyEvent", { type: "keyUp", key });
-              return { success: true };
-            }
-            case "input_click": {
-              let { x, y, nx, ny, button: btn } = params;
-              if ((x === void 0 || y === void 0) && nx !== void 0 && ny !== void 0) {
-                const viewport = await this.getCdp().evaluate(
-                  "JSON.stringify({ w: window.innerWidth, h: window.innerHeight })"
-                );
-                const { w, h } = JSON.parse(viewport);
-                x = Math.round(nx * w);
-                y = Math.round(ny * h);
-              }
-              if (x === void 0 || y === void 0) {
-                return { success: false, error: "No coordinates provided (x,y or nx,ny required)" };
+            const raw = await cdp.evaluate(script, 3e4);
+            let result = raw;
+            if (typeof raw === "string") {
+              try {
+                result = JSON.parse(raw);
+              } catch {
               }
-              await this.getCdp().send("Input.dispatchMouseEvent", {
+            }
+            LOG5.info("Command", `[resolveAction] script result: ${JSON.stringify(result)}`);
+            if (result?.resolved) {
+              LOG5.info("Command", `[resolveAction] script-click resolved \u2014 "${result.clicked}"`);
+              return { success: true, clicked: result.clicked };
+            }
+            if (result?.found && result.x != null && result.y != null) {
+              const x = result.x;
+              const y = result.y;
+              await cdp.send("Input.dispatchMouseEvent", {
                 type: "mousePressed",
                 x,
                 y,
-                button: btn || "left",
+                button: "left",
                 clickCount: 1
               });
-              await this.getCdp().send("Input.dispatchMouseEvent", {
+              await cdp.send("Input.dispatchMouseEvent", {
                 type: "mouseReleased",
                 x,
                 y,
-                button: btn || "left",
+                button: "left",
                 clickCount: 1
               });
-              return { success: true, x, y };
-            }
-            case "input_type": {
-              const { text } = params;
-              for (const char of text || "") {
-                await this.getCdp().send("Input.dispatchKeyEvent", {
-                  type: "keyDown",
-                  text: char,
-                  key: char
-                });
-                await this.getCdp().send("Input.dispatchKeyEvent", { type: "keyUp", key: char });
-              }
-              return { success: true };
-            }
-            case "page_screenshot":
-              return this.handleScreenshot(args);
-            case "page_eval":
-              return this.handleCdpEval(params);
-            case "dom_query": {
-              const html = await this.getCdp().querySelector(params?.selector);
-              return { success: true, html };
-            }
-            case "input_wheel": {
-              let { x, y, nx, ny, deltaX, deltaY } = params;
-              if ((x === void 0 || y === void 0) && nx !== void 0 && ny !== void 0) {
-                const viewport = await this.getCdp().evaluate(
-                  "JSON.stringify({ w: window.innerWidth, h: window.innerHeight })"
-                );
-                const { w, h } = JSON.parse(viewport);
-                x = Math.round(nx * w);
-                y = Math.round(ny * h);
-              }
-              await this.getCdp().send("Input.dispatchMouseEvent", {
-                type: "mouseWheel",
-                x: x || 0,
-                y: y || 0,
-                deltaX: deltaX || 0,
-                deltaY: deltaY || 0
-              });
-              return { success: true };
+              LOG5.info("Command", `[resolveAction] CDP click at (${x}, ${y}) \u2014 "${result.text}"`);
+              return { success: true, clicked: result.text };
             }
-            default:
-              return { success: false, error: `Unknown remote action: ${action}` };
+            return { success: false, error: result?.found === false ? `Button not found: ${button}` : "No coordinates" };
+          } catch (e) {
+            return { success: false, error: `resolveAction failed: ${e.message}` };
           }
-        } catch (e) {
-          return { success: false, error: e.message };
         }
       }
-      async handleDiscoverAgents(args) {
-        if (!this.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
-        const agents = await this.getCdp().discoverAgentWebviews();
-        return { success: true, agents };
+      return { success: false, error: "resolveAction script not available for this provider" };
+    }
+    var fs32 = __toESM2(require("fs"));
+    var path32 = __toESM2(require("path"));
+    var os4 = __toESM2(require("os"));
+    async function handleCdpEval(h, args) {
+      if (!h.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
+      const expression = args?.expression || args?.script;
+      if (!expression) return { success: false, error: "expression required" };
+      try {
+        const result = await h.getCdp().evaluate(expression, 5e4);
+        return { success: true, result };
+      } catch (e) {
+        return { success: false, error: e.message };
       }
-      // ─── file directly handle ─────────────────────────
-      async handleFileRead(args) {
-        try {
-          const filePath = this.resolveSafePath(args?.path);
-          const content = fs32.readFileSync(filePath, "utf-8");
-          return { success: true, content, path: filePath };
-        } catch (e) {
-          return { success: false, error: e.message };
+    }
+    async function handleScreenshot(h, args) {
+      if (!h.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
+      try {
+        const buf = await h.getCdp().captureScreenshot();
+        if (buf) {
+          const b64 = buf.toString("base64");
+          return { success: true, result: b64, base64: b64, screenshot: b64, format: "webp" };
         }
+        return { success: false, error: "Screenshot failed" };
+      } catch (e) {
+        return { success: false, error: e.message };
       }
-      async handleFileWrite(args) {
-        try {
-          const filePath = this.resolveSafePath(args?.path);
-          fs32.mkdirSync(path32.dirname(filePath), { recursive: true });
-          fs32.writeFileSync(filePath, args?.content || "", "utf-8");
-          return { success: true, path: filePath };
-        } catch (e) {
-          return { success: false, error: e.message };
-        }
+    }
+    async function handleCdpCommand(h, args) {
+      if (!h.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
+      const method = args?.method;
+      const params = args?.params || {};
+      if (!method) return { success: false, error: "method required" };
+      try {
+        const result = await h.getCdp().sendCdpCommand(method, params);
+        return { success: true, result };
+      } catch (e) {
+        return { success: false, error: e.message };
       }
-      async handleFileList(args) {
+    }
+    async function handleCdpBatch(h, args) {
+      if (!h.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
+      const commands = args?.commands;
+      const stopOnError = args?.stopOnError !== false;
+      if (!commands?.length) return { success: false, error: "commands array required" };
+      const results = [];
+      for (const cmd of commands) {
         try {
-          const dirPath = this.resolveSafePath(args?.path || ".");
-          const entries = fs32.readdirSync(dirPath, { withFileTypes: true });
-          const files = entries.map((e) => ({
-            name: e.name,
-            type: e.isDirectory() ? "directory" : "file",
-            size: e.isFile() ? fs32.statSync(path32.join(dirPath, e.name)).size : void 0
-          }));
-          return { success: true, files, path: dirPath };
+          const result = await h.getCdp().sendCdpCommand(cmd.method, cmd.params || {});
+          results.push({ method: cmd.method, success: true, result });
         } catch (e) {
-          return { success: false, error: e.message };
-        }
-      }
-      async handleFileListBrowse(args) {
-        return this.handleFileList(args);
-      }
-      resolveSafePath(requestedPath) {
-        const home = os4.homedir();
-        let resolved;
-        if (requestedPath.startsWith("~")) {
-          resolved = path32.join(home, requestedPath.slice(1));
-        } else if (path32.isAbsolute(requestedPath)) {
-          resolved = requestedPath;
-        } else {
-          resolved = path32.resolve(requestedPath);
+          results.push({ method: cmd.method, success: false, error: e.message });
+          if (stopOnError) break;
         }
-        return resolved;
       }
-      // ─── Extension delegate (No longer available — bridge-extension removed) ─────────────
-      async delegateToExtension(command, args) {
-        return { success: false, error: "Extension not available (bridge-extension removed)" };
-      }
-      // ─── Misc ───────────────────────────────────
-      async handleGetRecentWorkspaces(args) {
-        const config2 = loadConfig3();
-        const cliRecent = config2.recentCliWorkspaces || [];
-        try {
-          const storageDir = path32.join(os4.homedir(), "Library", "Application Support");
-          const candidates = ["Cursor", "Code", "VSCodium"];
-          for (const app of candidates) {
-            const stateFile = path32.join(storageDir, app, "User", "globalStorage", "state.vscdb");
-            if (fs32.existsSync(stateFile)) {
-              const result = await this.delegateToExtension("adhdev.getRecentWorkspaces", []);
-              if (result.success && Array.isArray(result.result)) {
-                const merged = Array.from(/* @__PURE__ */ new Set([...cliRecent, ...result.result])).slice(0, 20);
-                return { success: true, result: merged };
-              }
+      return { success: true, results };
+    }
+    async function handleCdpRemoteAction(h, args) {
+      if (!h.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
+      const action = args?.action;
+      const params = args?.params || args;
+      try {
+        switch (action) {
+          case "input_key": {
+            const { key, modifiers } = params;
+            await h.getCdp().send("Input.dispatchKeyEvent", {
+              type: "keyDown",
+              key,
+              ...modifiers?.ctrl ? { modifiers: 2 } : {},
+              ...modifiers?.shift ? { modifiers: 8 } : {}
+            });
+            await h.getCdp().send("Input.dispatchKeyEvent", { type: "keyUp", key });
+            return { success: true };
+          }
+          case "input_click": {
+            let { x, y, nx, ny, button: btn } = params;
+            if ((x === void 0 || y === void 0) && nx !== void 0 && ny !== void 0) {
+              const viewport = await h.getCdp().evaluate(
+                "JSON.stringify({ w: window.innerWidth, h: window.innerHeight })"
+              );
+              const { w, h: vh } = JSON.parse(viewport);
+              x = Math.round(nx * w);
+              y = Math.round(ny * vh);
             }
+            if (x === void 0 || y === void 0) {
+              return { success: false, error: "No coordinates provided (x,y or nx,ny required)" };
+            }
+            await h.getCdp().send("Input.dispatchMouseEvent", {
+              type: "mousePressed",
+              x,
+              y,
+              button: btn || "left",
+              clickCount: 1
+            });
+            await h.getCdp().send("Input.dispatchMouseEvent", {
+              type: "mouseReleased",
+              x,
+              y,
+              button: btn || "left",
+              clickCount: 1
+            });
+            return { success: true, x, y };
           }
-          return { success: true, result: cliRecent };
-        } catch {
-          return { success: true, result: cliRecent };
-        }
-      }
-      async handleRefreshScripts(_args) {
-        if (this.ctx.providerLoader) {
-          this.ctx.providerLoader.reload();
-          return { success: true };
-        }
-        return { success: false, error: "ProviderLoader not initialized" };
-      }
-      // ─── Agent Stream commands ───────────────────────
-      async handleAgentStreamSwitch(args) {
-        if (!this.agentStream || !this.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
-        const agentType = args?.agentType || args?.agent || null;
-        await this.agentStream.switchActiveAgent(this.getCdp(), agentType);
-        return { success: true, activeAgent: agentType };
-      }
-      async handleAgentStreamRead(args) {
-        if (!this.agentStream || !this.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
-        const streams = await this.agentStream.collectAgentStreams(this.getCdp());
-        return { success: true, streams };
-      }
-      async handleAgentStreamSend(args) {
-        const agentType = args?.agentType || args?.agent;
-        const text = args?.text || args?.message;
-        if (!text) return { success: false, error: "text required" };
-        if (agentType && this.ctx.adapters) {
-          for (const [key, adapter] of this.ctx.adapters.entries()) {
-            if (adapter.cliType === agentType || key.includes(agentType)) {
-              LOG4.info("Command", `[agent_stream_send] Routing to CLI adapter: ${adapter.cliType}`);
-              try {
-                await adapter.sendMessage(text);
-                return { success: true, sent: true, targetAgent: adapter.cliType };
-              } catch (e) {
-                LOG4.info("Command", `[agent_stream_send] CLI adapter failed: ${e.message}`);
-                return { success: false, error: `CLI send failed: ${e.message}` };
-              }
+          case "input_type": {
+            const { text } = params;
+            for (const char of text || "") {
+              await h.getCdp().send("Input.dispatchKeyEvent", {
+                type: "keyDown",
+                text: char,
+                key: char
+              });
+              await h.getCdp().send("Input.dispatchKeyEvent", { type: "keyUp", key: char });
             }
+            return { success: true };
+          }
+          case "page_screenshot":
+            return handleScreenshot(h, args);
+          case "page_eval":
+            return handleCdpEval(h, params);
+          case "dom_query": {
+            const html = await h.getCdp().querySelector(params?.selector);
+            return { success: true, html };
+          }
+          case "input_wheel": {
+            let { x, y, nx, ny, deltaX, deltaY } = params;
+            if ((x === void 0 || y === void 0) && nx !== void 0 && ny !== void 0) {
+              const viewport = await h.getCdp().evaluate(
+                "JSON.stringify({ w: window.innerWidth, h: window.innerHeight })"
+              );
+              const { w, h: vh } = JSON.parse(viewport);
+              x = Math.round(nx * w);
+              y = Math.round(ny * vh);
+            }
+            await h.getCdp().send("Input.dispatchMouseEvent", {
+              type: "mouseWheel",
+              x: x || 0,
+              y: y || 0,
+              deltaX: deltaX || 0,
+              deltaY: deltaY || 0
+            });
+            return { success: true };
           }
+          default:
+            return { success: false, error: `Unknown remote action: ${action}` };
         }
-        if (!this.agentStream || !this.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
-        const resolvedAgent = agentType || this.agentStream.activeAgentType;
-        if (!resolvedAgent) return { success: false, error: "agentType required" };
-        const ok = await this.agentStream.sendToAgent(this.getCdp(), resolvedAgent, text, this._currentIdeType);
-        return { success: ok };
+      } catch (e) {
+        return { success: false, error: e.message };
       }
-      async handleAgentStreamResolve(args) {
-        if (!this.agentStream || !this.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
-        const agentType = args?.agentType || args?.agent || this.agentStream.activeAgentType;
-        const action = args?.action || "approve";
-        if (!agentType) return { success: false, error: "agentType required" };
-        const ok = await this.agentStream.resolveAgentAction(this.getCdp(), agentType, action, this._currentIdeType);
-        return { success: ok };
+    }
+    async function handleDiscoverAgents(h, args) {
+      if (!h.getCdp()?.isConnected) return { success: false, error: "CDP not connected" };
+      const agents = await h.getCdp().discoverAgentWebviews();
+      return { success: true, agents };
+    }
+    function resolveSafePath(requestedPath) {
+      const home = os4.homedir();
+      let resolved;
+      if (requestedPath.startsWith("~")) {
+        resolved = path32.join(home, requestedPath.slice(1));
+      } else if (path32.isAbsolute(requestedPath)) {
+        resolved = requestedPath;
+      } else {
+        resolved = path32.resolve(requestedPath);
       }
-      async handleAgentStreamNew(args) {
-        if (!this.agentStream || !this.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
-        const agentType = args?.agentType || args?.agent || this.agentStream.activeAgentType;
-        if (!agentType) return { success: false, error: "agentType required" };
-        const ok = await this.agentStream.newAgentSession(this.getCdp(), agentType, this._currentIdeType);
-        return { success: ok };
+      return resolved;
+    }
+    async function handleFileRead(h, args) {
+      try {
+        const filePath = resolveSafePath(args?.path);
+        const content = fs32.readFileSync(filePath, "utf-8");
+        return { success: true, content, path: filePath };
+      } catch (e) {
+        return { success: false, error: e.message };
       }
-      async handleAgentStreamListChats(args) {
-        if (!this.agentStream || !this.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
-        const agentType = args?.agentType || args?.agent || this.agentStream.activeAgentType;
-        if (!agentType) return { success: false, error: "agentType required" };
-        const chats = await this.agentStream.listAgentChats(this.getCdp(), agentType);
-        return { success: true, chats };
-      }
-      async handleAgentStreamSwitchSession(args) {
-        if (!this.agentStream || !this.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
-        const agentType = args?.agentType || args?.agent || this.agentStream.activeAgentType;
-        const sessionId = args?.sessionId || args?.id;
-        if (!agentType || !sessionId) return { success: false, error: "agentType and sessionId required" };
-        const ok = await this.agentStream.switchAgentSession(this.getCdp(), agentType, sessionId);
-        return { success: ok };
+    }
+    async function handleFileWrite(h, args) {
+      try {
+        const filePath = resolveSafePath(args?.path);
+        fs32.mkdirSync(path32.dirname(filePath), { recursive: true });
+        fs32.writeFileSync(filePath, args?.content || "", "utf-8");
+        return { success: true, path: filePath };
+      } catch (e) {
+        return { success: false, error: e.message };
       }
-      async handleAgentStreamFocus(args) {
-        if (!this.agentStream || !this.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
-        const agentType = args?.agentType || args?.agent || this.agentStream.activeAgentType;
-        if (!agentType) return { success: false, error: "agentType required" };
-        await this.agentStream.ensureAgentPanelOpen(agentType, this._currentIdeType);
-        const ok = await this.agentStream.focusAgentEditor(this.getCdp(), agentType);
-        return { success: ok };
+    }
+    async function handleFileList(h, args) {
+      try {
+        const dirPath = resolveSafePath(args?.path || ".");
+        const entries = fs32.readdirSync(dirPath, { withFileTypes: true });
+        const files = entries.map((e) => ({
+          name: e.name,
+          type: e.isDirectory() ? "directory" : "file",
+          size: e.isFile() ? fs32.statSync(path32.join(dirPath, e.name)).size : void 0
+        }));
+        return { success: true, files, path: dirPath };
+      } catch (e) {
+        return { success: false, error: e.message };
+      }
+    }
+    async function handleFileListBrowse(h, args) {
+      return handleFileList(h, args);
+    }
+    init_config();
+    async function handleAgentStreamSwitch(h, args) {
+      if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
+      const agentType = args?.agentType || args?.agent || null;
+      await h.agentStream.switchActiveAgent(h.getCdp(), agentType);
+      return { success: true, activeAgent: agentType };
+    }
+    async function handleAgentStreamRead(h, args) {
+      if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
+      const streams = await h.agentStream.collectAgentStreams(h.getCdp());
+      return { success: true, streams };
+    }
+    async function handleAgentStreamSend(h, args) {
+      const agentType = args?.agentType || args?.agent;
+      const text = args?.text || args?.message;
+      if (!text) return { success: false, error: "text required" };
+      if (agentType && h.ctx.adapters) {
+        for (const [key, adapter] of h.ctx.adapters.entries()) {
+          if (adapter.cliType === agentType || key.includes(agentType)) {
+            LOG5.info("Command", `[agent_stream_send] Routing to CLI adapter: ${adapter.cliType}`);
+            try {
+              await adapter.sendMessage(text);
+              return { success: true, sent: true, targetAgent: adapter.cliType };
+            } catch (e) {
+              LOG5.info("Command", `[agent_stream_send] CLI adapter failed: ${e.message}`);
+              return { success: false, error: `CLI send failed: ${e.message}` };
+            }
+          }
+        }
       }
-      // ─── PTY Raw I/O (terminal view) ──────────────────────
-      handlePtyInput(args) {
-        const { cliType, data } = args || {};
-        if (!data) return { success: false, error: "data required" };
-        if (this.ctx.adapters) {
-          const targetCli = cliType || "";
-          if (!targetCli && this.ctx.adapters.size > 0) {
-            const first = this.ctx.adapters.values().next().value;
-            if (first && typeof first.writeRaw === "function") {
-              first.writeRaw(data);
-              return { success: true };
-            }
-          }
-          const directAdapter = this.ctx.adapters.get(targetCli);
-          if (directAdapter && typeof directAdapter.writeRaw === "function") {
-            directAdapter.writeRaw(data);
+      if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
+      const resolvedAgent = agentType || h.agentStream.activeAgentType;
+      if (!resolvedAgent) return { success: false, error: "agentType required" };
+      const ok = await h.agentStream.sendToAgent(h.getCdp(), resolvedAgent, text, h.currentIdeType);
+      return { success: ok };
+    }
+    async function handleAgentStreamResolve(h, args) {
+      if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
+      const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+      const action = args?.action || "approve";
+      if (!agentType) return { success: false, error: "agentType required" };
+      const ok = await h.agentStream.resolveAgentAction(h.getCdp(), agentType, action, h.currentIdeType);
+      return { success: ok };
+    }
+    async function handleAgentStreamNew(h, args) {
+      if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
+      const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+      if (!agentType) return { success: false, error: "agentType required" };
+      const ok = await h.agentStream.newAgentSession(h.getCdp(), agentType, h.currentIdeType);
+      return { success: ok };
+    }
+    async function handleAgentStreamListChats(h, args) {
+      if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
+      const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+      if (!agentType) return { success: false, error: "agentType required" };
+      const chats = await h.agentStream.listAgentChats(h.getCdp(), agentType);
+      return { success: true, chats };
+    }
+    async function handleAgentStreamSwitchSession(h, args) {
+      if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
+      const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+      const sessionId = args?.sessionId || args?.id;
+      if (!agentType || !sessionId) return { success: false, error: "agentType and sessionId required" };
+      const ok = await h.agentStream.switchAgentSession(h.getCdp(), agentType, sessionId);
+      return { success: ok };
+    }
+    async function handleAgentStreamFocus(h, args) {
+      if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
+      const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+      if (!agentType) return { success: false, error: "agentType required" };
+      await h.agentStream.ensureAgentPanelOpen(agentType, h.currentIdeType);
+      const ok = await h.agentStream.focusAgentEditor(h.getCdp(), agentType);
+      return { success: ok };
+    }
+    function handlePtyInput(h, args) {
+      const { cliType, data } = args || {};
+      if (!data) return { success: false, error: "data required" };
+      if (h.ctx.adapters) {
+        const targetCli = cliType || "";
+        if (!targetCli && h.ctx.adapters.size > 0) {
+          const first = h.ctx.adapters.values().next().value;
+          if (first && typeof first.writeRaw === "function") {
+            first.writeRaw(data);
             return { success: true };
           }
-          for (const [, adapter] of this.ctx.adapters) {
-            if (adapter.cliType === targetCli && typeof adapter.writeRaw === "function") {
-              adapter.writeRaw(data);
-              return { success: true };
-            }
+        }
+        const directAdapter = h.ctx.adapters.get(targetCli);
+        if (directAdapter && typeof directAdapter.writeRaw === "function") {
+          directAdapter.writeRaw(data);
+          return { success: true };
+        }
+        for (const [, adapter] of h.ctx.adapters) {
+          if (adapter.cliType === targetCli && typeof adapter.writeRaw === "function") {
+            adapter.writeRaw(data);
+            return { success: true };
           }
-          for (const [key, adapter] of this.ctx.adapters) {
-            if ((key.startsWith(targetCli) || targetCli.startsWith(adapter.cliType)) && typeof adapter.writeRaw === "function") {
-              adapter.writeRaw(data);
-              return { success: true };
-            }
+        }
+        for (const [key, adapter] of h.ctx.adapters) {
+          if ((key.startsWith(targetCli) || targetCli.startsWith(adapter.cliType)) && typeof adapter.writeRaw === "function") {
+            adapter.writeRaw(data);
+            return { success: true };
           }
         }
-        return { success: false, error: `CLI adapter not found: ${cliType}` };
       }
-      handlePtyResize(args) {
-        const { cliType, cols, rows, force } = args || {};
-        if (!cols || !rows) return { success: false, error: "cols and rows required" };
-        if (this.ctx.adapters) {
-          const targetCli = cliType || "";
-          if (!targetCli && this.ctx.adapters.size > 0) {
-            const first = this.ctx.adapters.values().next().value;
-            if (first && typeof first.resize === "function") {
-              if (force) {
-                first.resize(cols - 1, rows);
-                setTimeout(() => first.resize(cols, rows), 50);
-              } else {
-                first.resize(cols, rows);
-              }
-              return { success: true };
+      return { success: false, error: `CLI adapter not found: ${cliType}` };
+    }
+    function handlePtyResize(h, args) {
+      const { cliType, cols, rows, force } = args || {};
+      if (!cols || !rows) return { success: false, error: "cols and rows required" };
+      if (h.ctx.adapters) {
+        const targetCli = cliType || "";
+        if (!targetCli && h.ctx.adapters.size > 0) {
+          const first = h.ctx.adapters.values().next().value;
+          if (first && typeof first.resize === "function") {
+            if (force) {
+              first.resize(cols - 1, rows);
+              setTimeout(() => first.resize(cols, rows), 50);
+            } else {
+              first.resize(cols, rows);
             }
+            return { success: true };
+          }
+        }
+        const directAdapter = h.ctx.adapters.get(targetCli);
+        if (directAdapter && typeof directAdapter.resize === "function") {
+          if (force) {
+            directAdapter.resize(cols - 1, rows);
+            setTimeout(() => directAdapter.resize(cols, rows), 50);
+          } else {
+            directAdapter.resize(cols, rows);
           }
-          const directAdapter = this.ctx.adapters.get(targetCli);
-          if (directAdapter && typeof directAdapter.resize === "function") {
+          return { success: true };
+        }
+        for (const [key, adapter] of h.ctx.adapters) {
+          if ((adapter.cliType === targetCli || key.startsWith(targetCli) || targetCli.startsWith(adapter.cliType)) && typeof adapter.resize === "function") {
             if (force) {
-              directAdapter.resize(cols - 1, rows);
-              setTimeout(() => directAdapter.resize(cols, rows), 50);
+              adapter.resize(cols - 1, rows);
+              setTimeout(() => adapter.resize(cols, rows), 50);
             } else {
-              directAdapter.resize(cols, rows);
+              adapter.resize(cols, rows);
             }
             return { success: true };
           }
-          for (const [key, adapter] of this.ctx.adapters) {
-            if ((adapter.cliType === targetCli || key.startsWith(targetCli) || targetCli.startsWith(adapter.cliType)) && typeof adapter.resize === "function") {
-              if (force) {
-                adapter.resize(cols - 1, rows);
-                setTimeout(() => adapter.resize(cols, rows), 50);
-              } else {
-                adapter.resize(cols, rows);
-              }
-              return { success: true };
+        }
+      }
+      return { success: false, error: `CLI adapter not found: ${cliType}` };
+    }
+    function handleGetProviderSettings(h, args) {
+      const loader = h.ctx.providerLoader;
+      const { providerType } = args || {};
+      if (providerType) {
+        const schema = loader?.getPublicSettings(providerType) || [];
+        const values = loader?.getSettings(providerType) || {};
+        return { success: true, providerType, schema, values };
+      }
+      const allSettings = loader?.getAllPublicSettings() || {};
+      const allValues = {};
+      for (const type of Object.keys(allSettings)) {
+        allValues[type] = loader?.getSettings(type) || {};
+      }
+      return { success: true, settings: allSettings, values: allValues };
+    }
+    function handleSetProviderSetting(h, args) {
+      const loader = h.ctx.providerLoader;
+      const { providerType, key, value } = args || {};
+      if (!providerType || !key || value === void 0) {
+        return { success: false, error: "providerType, key, and value are required" };
+      }
+      const result = loader?.setSetting(providerType, key, value);
+      if (result) {
+        if (h.ctx.instanceManager) {
+          const allSettings = loader?.getSettings(providerType) || {};
+          const updated = h.ctx.instanceManager.updateInstanceSettings(providerType, allSettings);
+          LOG5.info("Command", `[set_provider_setting] ${providerType}.${key}=${JSON.stringify(value)} \u2192 ${updated} instance(s) updated`);
+        }
+        return { success: true, providerType, key, value };
+      }
+      return { success: false, error: `Failed to set ${providerType}.${key} \u2014 invalid key, value, or not a public setting` };
+    }
+    async function handleExtensionScript(h, args, scriptName) {
+      const { agentType, ideType } = args || {};
+      LOG5.info("Command", `[ExtScript] ${scriptName} agentType=${agentType} ideType=${ideType} _currentIdeType=${h.currentIdeType}`);
+      if (!agentType) return { success: false, error: "agentType is required" };
+      const loader = h.ctx.providerLoader;
+      if (!loader) return { success: false, error: "ProviderLoader not initialized" };
+      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 = provider.category === "ide" && !!provider.scripts?.[webviewScriptName];
+      const actualScriptName = hasWebviewScript ? webviewScriptName : scriptName;
+      if (!provider.scripts?.[actualScriptName]) {
+        return { success: false, error: `Script '${actualScriptName}' not available for ${agentType}` };
+      }
+      const scriptFn = provider.scripts[actualScriptName];
+      const scriptCode = scriptFn(args);
+      if (!scriptCode) return { success: false, error: `Script '${actualScriptName}' returned null` };
+      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 (provider.category === "extension") {
+          const sessions = cdp.getAgentSessions();
+          let targetSessionId = null;
+          for (const [sessionId, target] of sessions) {
+            if (target.agentType === agentType) {
+              targetSessionId = sessionId;
+              break;
             }
           }
+          if (!targetSessionId) {
+            return { success: false, error: `No active session found for ${agentType}` };
+          }
+          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 cdp.evaluateInWebviewFrame(scriptCode, matchFn);
+        } else {
+          result = await cdp.evaluate(scriptCode, 3e4);
+        }
+        if (typeof result === "string") {
+          try {
+            const parsed = JSON.parse(result);
+            return { success: true, ...parsed };
+          } catch {
+            return { success: true, result };
+          }
+        }
+        return { success: true, result };
+      } catch (e) {
+        return { success: false, error: `Script execution failed: ${e.message}` };
+      }
+    }
+    function handleGetIdeExtensions(h, args) {
+      const { ideType } = args || {};
+      const loader = h.ctx.providerLoader;
+      if (!loader) return { success: false, error: "ProviderLoader not initialized" };
+      const allExtProviders = loader.getByCategory?.("extension") || [];
+      const config2 = loadConfig3();
+      if (ideType) {
+        const extensions = allExtProviders.map((p) => ({
+          type: p.type,
+          name: p.name,
+          extensionId: p.extensionId,
+          enabled: config2.ideSettings?.[ideType]?.extensions?.[p.type]?.enabled === true
+        }));
+        return { success: true, ideType, extensions };
+      }
+      const connectedIdes = [...h.ctx.cdpManagers?.keys?.() || []];
+      const result = {};
+      for (const ide of connectedIdes) {
+        result[ide] = allExtProviders.map((p) => ({
+          type: p.type,
+          name: p.name,
+          extensionId: p.extensionId,
+          enabled: config2.ideSettings?.[ide]?.extensions?.[p.type]?.enabled === true
+        }));
+      }
+      return { success: true, ides: result };
+    }
+    function handleSetIdeExtension(h, args) {
+      const { ideType, extensionType, enabled } = args || {};
+      if (!ideType || !extensionType || enabled === void 0) {
+        return { success: false, error: "ideType, extensionType, and enabled are required" };
+      }
+      const loader = h.ctx.providerLoader;
+      if (!loader?.setIdeExtensionEnabled) {
+        return { success: false, error: "ProviderLoader not initialized" };
+      }
+      const ok = loader.setIdeExtensionEnabled(ideType, extensionType, !!enabled);
+      if (ok) {
+        return { success: true, ideType, extensionType, enabled: !!enabled };
+      }
+      return { success: false, error: "Failed to save setting" };
+    }
+    var DaemonCommandHandler = class {
+      _ctx;
+      _agentStream = null;
+      domHandlers;
+      _historyWriter;
+      /** Current IDE type extracted from command args (per-request) */
+      _currentIdeType;
+      /** Current provider type — agentType priority, ideType use */
+      _currentProviderType;
+      constructor(ctx) {
+        this._ctx = ctx;
+        this.domHandlers = new CdpDomHandlers((ideType) => this.getCdp(ideType));
+        this._historyWriter = new ChatHistoryWriter();
+      }
+      // ─── CommandHelpers implementation ─────────────────
+      get ctx() {
+        return this._ctx;
+      }
+      get agentStream() {
+        return this._agentStream;
+      }
+      get historyWriter() {
+        return this._historyWriter;
+      }
+      get currentIdeType() {
+        return this._currentIdeType;
+      }
+      get currentProviderType() {
+        return this._currentProviderType;
+      }
+      /** Get CDP manager for a specific ideType.
+       * Returns null if no match — never falls back to another IDE. */
+      getCdp(ideType) {
+        const key = ideType || this._currentIdeType;
+        if (!key) return null;
+        const m = this._ctx.cdpManagers.get(key.toLowerCase());
+        if (m?.isConnected) return m;
+        return null;
+      }
+      /**
+       * Get provider module — _currentProviderType (agentType priority) use.
+       */
+      getProvider(overrideType) {
+        const key = overrideType || this._currentProviderType || this._currentIdeType;
+        if (!key || !this._ctx.providerLoader) return void 0;
+        const result = this._ctx.providerLoader.resolve(key);
+        if (result) return result;
+        const baseType = key.split("_")[0];
+        if (baseType !== key) return this._ctx.providerLoader.resolve(baseType);
+        return void 0;
+      }
+      /** Get a provider script by name from ProviderLoader. */
+      getProviderScript(scriptName, params, ideType) {
+        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();
+            if (script) return script;
+          }
+        }
+        return null;
+      }
+      /**
+       * per-category CDP script execute:
+       * IDE → cdp.evaluate(script) (main window)
+       * Extension → cdp.evaluateInSession(sessionId, script) (webview)
+       */
+      async evaluateProviderScript(scriptName, params, timeout = 3e4) {
+        const provider = this.getProvider();
+        const script = this.getProviderScript(scriptName, params);
+        if (!script) return null;
+        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(cdp, provider.type);
+            await this._agentStream.syncAgentSessions(cdp);
+            sessionId = this.getExtensionSessionId(provider);
+          }
+          if (!sessionId) return null;
+          const result2 = await cdp.evaluateInSession(sessionId, script, timeout);
+          return { result: result2, category: "extension" };
         }
-        return { success: false, error: `CLI adapter not found: ${cliType}` };
+        const result = await cdp.evaluate(script, timeout);
+        return { result, category: provider?.category || "ide" };
       }
-      // ─── Provider Settings ────────────────────────
-      handleGetProviderSettings(args) {
-        const { providerType } = args || {};
-        if (providerType) {
-          const schema = this.ctx.providerLoader?.getPublicSettings?.(providerType) || [];
-          const values = this.ctx.providerLoader?.getSettings?.(providerType) || {};
-          return { success: true, providerType, schema, values };
-        }
-        const allSettings = this.ctx.providerLoader?.getAllPublicSettings?.() || {};
-        const allValues = {};
-        for (const type of Object.keys(allSettings)) {
-          allValues[type] = this.ctx.providerLoader?.getSettings?.(type) || {};
+      /** CLI adapter search */
+      getCliAdapter(type) {
+        const target = type || this._currentIdeType;
+        if (!target || !this._ctx.adapters) return null;
+        for (const [key, adapter] of this._ctx.adapters.entries()) {
+          if (adapter.cliType === target || key.startsWith(target)) {
+            return adapter;
+          }
         }
-        return { success: true, settings: allSettings, values: allValues };
+        return null;
       }
-      handleSetProviderSetting(args) {
-        const { providerType, key, value } = args || {};
-        if (!providerType || !key || value === void 0) {
-          return { success: false, error: "providerType, key, and value are required" };
-        }
-        const result = this.ctx.providerLoader?.setSetting?.(providerType, key, value);
-        if (result) {
-          if (this.ctx.instanceManager) {
-            const allSettings = this.ctx.providerLoader?.getSettings?.(providerType) || {};
-            const updated = this.ctx.instanceManager.updateInstanceSettings(providerType, allSettings);
-            LOG4.info("Command", `[set_provider_setting] ${providerType}.${key}=${JSON.stringify(value)} \u2192 ${updated} instance(s) updated`);
+      // ─── Private helpers ──────────────────────────────
+      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 */
+      extractIdeType(args) {
+        if (args?._targetInstance) {
+          let raw = args._targetInstance;
+          const ideMatch = raw.match(/:ide:(.+)$/);
+          const cliMatch = raw.match(/:cli:(.+)$/);
+          const acpMatch = raw.match(/:acp:(.+)$/);
+          if (ideMatch) raw = ideMatch[1];
+          else if (cliMatch) raw = cliMatch[1];
+          else if (acpMatch) raw = acpMatch[1];
+          if (this._ctx.instanceIdMap?.has(raw)) {
+            return this._ctx.instanceIdMap.get(raw);
           }
-          return { success: true, providerType, key, value };
+          const lastUnderscore = raw.lastIndexOf("_");
+          if (lastUnderscore > 0) return raw.substring(0, lastUnderscore);
+          return raw;
         }
-        return { success: false, error: `Failed to set ${providerType}.${key} \u2014 invalid key, value, or not a public setting` };
+        return void 0;
       }
-      // ─── Extension Script Execution (Model/Mode) ─────
-      /**
-      * Generic handler for executing Extension provider CDP scripts.
-      * args: { agentType, ideType?, model?, mode?, ... }
-      * scriptName: 'listModels' | 'setModel' | 'listModes' | 'setMode'
-      */
-      async handleExtensionScript(args, scriptName) {
-        const { agentType, ideType } = args || {};
-        LOG4.info("Command", `[ExtScript] ${scriptName} agentType=${agentType} ideType=${ideType} _currentIdeType=${this._currentIdeType}`);
-        if (!agentType) return { success: false, error: "agentType is required" };
-        const loader = this.ctx.providerLoader;
-        if (!loader) return { success: false, error: "ProviderLoader not initialized" };
-        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 = provider.category === "ide" && !!provider.scripts?.[webviewScriptName];
-        const actualScriptName = hasWebviewScript ? webviewScriptName : scriptName;
-        if (!provider.scripts?.[actualScriptName]) {
-          return { success: false, error: `Script '${actualScriptName}' not available for ${agentType}` };
-        }
-        const scriptFn = provider.scripts[actualScriptName];
-        const scriptCode = scriptFn(args);
-        if (!scriptCode) return { success: false, error: `Script '${actualScriptName}' returned null` };
-        const cdpKey = provider.category === "ide" ? this._currentIdeType || agentType : this._currentIdeType || ideType;
-        LOG4.info("Command", `[ExtScript] provider=${provider.type} category=${provider.category} cdpKey=${cdpKey}`);
-        const cdp = this.getCdp(cdpKey);
-        if (!cdp?.isConnected) return { success: false, error: `No CDP connection for ${cdpKey || "any"}` };
-        try {
-          let result;
-          if (provider.category === "extension") {
-            const sessions = cdp.getAgentSessions();
-            let targetSessionId = null;
-            for (const [sessionId, target] of sessions) {
-              if (target.agentType === agentType) {
-                targetSessionId = sessionId;
-                break;
-              }
-            }
-            if (!targetSessionId) {
-              return { success: false, error: `No active session found for ${agentType}` };
-            }
-            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 cdp.evaluateInWebviewFrame(scriptCode, matchFn);
-          } else {
-            result = await cdp.evaluate(scriptCode, 3e4);
+      setAgentStreamManager(manager) {
+        this._agentStream = manager;
+      }
+      // ─── Command Dispatcher ──────────────────────────
+      async handle(cmd, args) {
+        this._currentIdeType = this.extractIdeType(args);
+        this._currentProviderType = args?.agentType || args?.providerType || this._currentIdeType;
+        if (!this._currentIdeType && !this._currentProviderType) {
+          const cdpCommands = ["send_chat", "read_chat", "list_chats", "new_chat", "switch_chat", "set_mode", "change_model", "set_thought_level", "resolve_action"];
+          if (cdpCommands.includes(cmd)) {
+            return { success: false, error: "No ideType specified \u2014 cannot route command" };
           }
-          if (typeof result === "string") {
-            try {
-              const parsed = JSON.parse(result);
-              return { success: true, ...parsed };
-            } catch {
-              return { success: true, result };
+        }
+        try {
+          return await this.dispatch(cmd, args);
+        } catch (e) {
+          LOG5.error("Command", `[${cmd}] Unhandled error: ${e?.message || e}`);
+          return { success: false, error: `Internal error: ${e?.message || "unknown"}` };
+        }
+      }
+      async dispatch(cmd, args) {
+        switch (cmd) {
+          // ─── Chat commands (chat-commands.ts) ───────────────
+          case "read_chat":
+            return handleReadChat(this, args);
+          case "chat_history":
+            return handleChatHistory(this, args);
+          case "send_chat":
+            return handleSendChat(this, args);
+          case "list_chats":
+            return handleListChats(this, args);
+          case "new_chat":
+            return handleNewChat(this, args);
+          case "switch_chat":
+            return handleSwitchChat(this, args);
+          case "set_mode":
+            return handleSetMode(this, args);
+          case "change_model":
+            return handleChangeModel(this, args);
+          case "set_thought_level":
+            return handleSetThoughtLevel(this, args);
+          case "resolve_action":
+            return handleResolveAction(this, args);
+          // ─── CDP commands (cdp-commands.ts) ───────────────
+          case "cdp_eval":
+            return handleCdpEval(this, args);
+          case "cdp_screenshot":
+          case "screenshot":
+            return handleScreenshot(this, args);
+          case "cdp_command_exec":
+            return handleCdpCommand(this, args);
+          case "cdp_batch":
+            return handleCdpBatch(this, args);
+          case "cdp_remote_action":
+            return handleCdpRemoteAction(this, args);
+          case "cdp_discover_agents":
+            return handleDiscoverAgents(this, args);
+          case "cdp_dom_dump":
+            return this.domHandlers.handleDomDump(args);
+          case "cdp_dom_query":
+            return this.domHandlers.handleDomQuery(args);
+          case "cdp_dom_debug":
+            return this.domHandlers.handleDomDebug(args);
+          // ─── File commands (cdp-commands.ts) ──────────────
+          case "file_read":
+            return handleFileRead(this, args);
+          case "file_write":
+            return handleFileWrite(this, args);
+          case "file_list":
+            return handleFileList(this, args);
+          case "file_list_browse":
+            return handleFileListBrowse(this, args);
+          // ─── VSCode API commands (not available) ────
+          case "vscode_command_exec":
+          case "execute_vscode_command": {
+            const resolvedCmd = args?.commandId || args?.command;
+            if (resolvedCmd === "adhdev.captureCdpScreenshot") {
+              return handleScreenshot(this, args);
             }
+            return { success: false, error: `VSCode command not available: ${resolvedCmd || cmd}` };
           }
-          return { success: true, result };
-        } catch (e) {
-          return { success: false, error: `Script execution failed: ${e.message}` };
+          case "get_open_editors":
+          case "open_tab":
+          case "close_tab":
+          case "open_folder":
+          case "open_folder_picker":
+          case "open_recent":
+          case "get_commands":
+            return { success: false, error: `${cmd} requires bridge-extension (removed)` };
+          case "get_recent_workspaces":
+            return this.handleGetRecentWorkspaces(args);
+          // ─── Script manage ───────────────────
+          case "refresh_scripts":
+            return this.handleRefreshScripts(args);
+          // ─── Stream commands (stream-commands.ts) ───────────
+          case "agent_stream_switch":
+            return handleAgentStreamSwitch(this, args);
+          case "agent_stream_read":
+            return handleAgentStreamRead(this, args);
+          case "agent_stream_send":
+            return handleAgentStreamSend(this, args);
+          case "agent_stream_resolve":
+            return handleAgentStreamResolve(this, args);
+          case "agent_stream_new":
+            return handleAgentStreamNew(this, args);
+          case "agent_stream_list_chats":
+            return handleAgentStreamListChats(this, args);
+          case "agent_stream_switch_session":
+            return handleAgentStreamSwitchSession(this, args);
+          case "agent_stream_focus":
+            return handleAgentStreamFocus(this, args);
+          // ─── PTY Raw I/O (stream-commands.ts) ─────────
+          case "pty_input":
+            return handlePtyInput(this, args);
+          case "pty_resize":
+            return handlePtyResize(this, args);
+          // ─── Provider Settings (stream-commands.ts) ──────────
+          case "get_provider_settings":
+            return handleGetProviderSettings(this, args);
+          case "set_provider_setting":
+            return handleSetProviderSetting(this, args);
+          // ─── IDE Extension Settings (stream-commands.ts) ──────────
+          case "get_ide_extensions":
+            return handleGetIdeExtensions(this, args);
+          case "set_ide_extension":
+            return handleSetIdeExtension(this, args);
+          // ─── Extension Model / Mode Control (stream-commands.ts) ──────────
+          case "list_extension_models":
+            return handleExtensionScript(this, args, "listModels");
+          case "set_extension_model":
+            return handleExtensionScript(this, args, "setModel");
+          case "list_extension_modes":
+            return handleExtensionScript(this, args, "listModes");
+          case "set_extension_mode":
+            return handleExtensionScript(this, args, "setMode");
+          default:
+            return { success: false, error: `Unknown command: ${cmd}` };
         }
       }
-      // ─── IDE Extension Settings (per-IDE on/off) ─────
-      handleGetIdeExtensions(args) {
-        const { ideType } = args || {};
-        const loader = this.ctx.providerLoader;
-        if (!loader) return { success: false, error: "ProviderLoader not initialized" };
-        const allExtProviders = loader.getByCategory?.("extension") || [];
+      // ─── Misc (kept in handler — too small to extract) ───────
+      async handleGetRecentWorkspaces(args) {
         const config2 = loadConfig3();
-        if (ideType) {
-          const extensions = allExtProviders.map((p) => ({
-            type: p.type,
-            name: p.name,
-            extensionId: p.extensionId,
-            enabled: config2.ideSettings?.[ideType]?.extensions?.[p.type]?.enabled === true
-          }));
-          return { success: true, ideType, extensions };
-        }
-        const connectedIdes = [...this.ctx.cdpManagers?.keys?.() || []];
-        const result = {};
-        for (const ide of connectedIdes) {
-          result[ide] = allExtProviders.map((p) => ({
-            type: p.type,
-            name: p.name,
-            extensionId: p.extensionId,
-            enabled: config2.ideSettings?.[ide]?.extensions?.[p.type]?.enabled === true
-          }));
-        }
-        return { success: true, ides: result };
+        const cliRecent = config2.recentCliWorkspaces || [];
+        return { success: true, result: cliRecent };
       }
-      handleSetIdeExtension(args) {
-        const { ideType, extensionType, enabled } = args || {};
-        if (!ideType || !extensionType || enabled === void 0) {
-          return { success: false, error: "ideType, extensionType, and enabled are required" };
-        }
-        const loader = this.ctx.providerLoader;
-        if (!loader?.setIdeExtensionEnabled) {
-          return { success: false, error: "ProviderLoader not initialized" };
-        }
-        const ok = loader.setIdeExtensionEnabled(ideType, extensionType, !!enabled);
-        if (ok) {
-          return { success: true, ideType, extensionType, enabled: !!enabled };
+      async handleRefreshScripts(_args) {
+        if (this._ctx.providerLoader) {
+          this._ctx.providerLoader.reload();
+          return { success: true };
         }
-        return { success: false, error: "Failed to save setting" };
+        return { success: false, error: "ProviderLoader not initialized" };
       }
     };
     var import_child_process3 = require("child_process");
@@ -20488,7 +20451,7 @@ var require_dist = __commonJS({
         }
         this.userDir = options?.userDir || path4.join(os5.homedir(), ".adhdev", "providers");
         this.upstreamDir = path4.join(this.userDir, ".upstream");
-        this.logFn = options?.logFn || LOG4.forComponent("Provider").asLogFn();
+        this.logFn = options?.logFn || LOG5.forComponent("Provider").asLogFn();
       }
       log(msg) {
         this.logFn(`[ProviderLoader] ${msg}`);
@@ -21932,18 +21895,18 @@ var require_dist = __commonJS({
           case "launch_ide": {
             const launchArgs = { ...args, ideId: args?.ideId || args?.ideType };
             const ideKey = launchArgs.ideId;
-            LOG4.info("LaunchIDE", `target=${ideKey || "auto"}`);
+            LOG5.info("LaunchIDE", `target=${ideKey || "auto"}`);
             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) : LOG4.forComponent(`CDP:${result.ideId}`).asLogFn();
+              const logFn = this.deps.getCdpLogFn ? this.deps.getCdpLogFn(result.ideId) : LOG5.forComponent(`CDP:${result.ideId}`).asLogFn();
               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);
                 this.deps.cdpManagers.set(result.ideId, manager);
-                LOG4.info("CDP", `Connected: ${result.ideId} (port ${result.port})`);
-                LOG4.info("CDP", `${this.deps.cdpManagers.size} IDE(s) connected`);
+                LOG5.info("CDP", `Connected: ${result.ideId} (port ${result.port})`);
+                LOG5.info("CDP", `${this.deps.cdpManagers.size} IDE(s) connected`);
                 this.deps.onCdpManagerCreated?.(result.ideId, manager);
               }
             }
@@ -21969,7 +21932,7 @@ var require_dist = __commonJS({
           } catch {
           }
           this.deps.cdpManagers.delete(ideType);
-          LOG4.info("StopIDE", `CDP disconnected: ${ideType}`);
+          LOG5.info("StopIDE", `CDP disconnected: ${ideType}`);
         }
         const instanceKey = `ide:${ideType}`;
         const ideInstance = this.deps.instanceManager.getInstance(instanceKey);
@@ -21983,10 +21946,10 @@ var require_dist = __commonJS({
             }
           }
           this.deps.instanceManager.removeInstance(instanceKey);
-          LOG4.info("StopIDE", `Instance removed: ${instanceKey}`);
+          LOG5.info("StopIDE", `Instance removed: ${instanceKey}`);
         }
         this.deps.onStatusChange?.();
-        LOG4.info("StopIDE", `IDE stopped: ${ideType}`);
+        LOG5.info("StopIDE", `IDE stopped: ${ideType}`);
       }
     };
     var os8 = __toESM2(require("os"));
@@ -22002,23 +21965,23 @@ var require_dist = __commonJS({
       p2pTimer = null;
       constructor(deps, opts) {
         this.deps = deps;
-        this.log = opts?.logFn || LOG4.forComponent("Status").asLogFn();
+        this.log = opts?.logFn || LOG5.forComponent("Status").asLogFn();
       }
       // ─── Lifecycle ───────────────────────────────────
       startReporting() {
         setTimeout(() => {
-          this.sendUnifiedStatusReport().catch((e) => LOG4.warn("Status", `Initial report failed: ${e?.message}`));
+          this.sendUnifiedStatusReport().catch((e) => LOG5.warn("Status", `Initial report failed: ${e?.message}`));
         }, 2e3);
         const scheduleServerReport = () => {
           this.statusTimer = setTimeout(() => {
-            this.sendUnifiedStatusReport().catch((e) => LOG4.warn("Status", `Periodic report failed: ${e?.message}`));
+            this.sendUnifiedStatusReport().catch((e) => LOG5.warn("Status", `Periodic report failed: ${e?.message}`));
             scheduleServerReport();
           }, 3e4);
         };
         scheduleServerReport();
         this.p2pTimer = setInterval(() => {
           if (this.deps.p2p?.isConnected) {
-            this.sendUnifiedStatusReport({ p2pOnly: true }).catch((e) => LOG4.warn("Status", `P2P status send failed: ${e?.message}`));
+            this.sendUnifiedStatusReport({ p2pOnly: true }).catch((e) => LOG5.warn("Status", `P2P status send failed: ${e?.message}`));
           }
         }, 5e3);
       }
@@ -22039,17 +22002,17 @@ var require_dist = __commonJS({
         const now = Date.now();
         const elapsed = now - this.lastStatusSentAt;
         if (elapsed >= 5e3) {
-          this.sendUnifiedStatusReport().catch((e) => LOG4.warn("Status", `Throttled report failed: ${e?.message}`));
+          this.sendUnifiedStatusReport().catch((e) => LOG5.warn("Status", `Throttled report failed: ${e?.message}`));
         } else if (!this.statusPendingThrottle) {
           this.statusPendingThrottle = true;
           setTimeout(() => {
             this.statusPendingThrottle = false;
-            this.sendUnifiedStatusReport().catch((e) => LOG4.warn("Status", `Deferred report failed: ${e?.message}`));
+            this.sendUnifiedStatusReport().catch((e) => LOG5.warn("Status", `Deferred report failed: ${e?.message}`));
           }, 5e3 - elapsed);
         }
       }
       emitStatusEvent(event) {
-        LOG4.info("StatusEvent", `${event.event} (${event.providerType || event.ideType || ""})`);
+        LOG5.info("StatusEvent", `${event.event} (${event.providerType || event.ideType || ""})`);
         this.deps.serverConn?.sendMessage("status_event", event);
       }
       removeAgentTracking(_key) {
@@ -22084,9 +22047,9 @@ var require_dist = __commonJS({
         if (summaryChanged) {
           this.lastStatusSummary = summary;
           if (logLevel === "debug") {
-            LOG4.debug("StatusReport", summary);
+            LOG5.debug("StatusReport", summary);
           } else {
-            LOG4.info("StatusReport", summary);
+            LOG5.info("StatusReport", summary);
           }
         }
         const managedIdes = ideStates.map((s) => ({
@@ -22171,7 +22134,7 @@ var require_dist = __commonJS({
         };
         const p2pSent = this.sendP2PPayload(payload);
         if (p2pSent) {
-          LOG4.debug("P2P", `sent (${JSON.stringify(payload).length} bytes)`);
+          LOG5.debug("P2P", `sent (${JSON.stringify(payload).length} bytes)`);
         }
         if (opts?.p2pOnly) return;
         const plan = serverConn.getUserPlan();
@@ -22202,7 +22165,7 @@ var require_dist = __commonJS({
             timestamp: now
           };
           serverConn.sendMessage("status_report", wsPayload);
-          LOG4.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)`);
+          LOG5.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)`);
         }
       }
       // ─── P2P ─────────────────────────────────────────
@@ -22239,7 +22202,7 @@ var require_dist = __commonJS({
     try {
       pty = require("node-pty");
     } catch {
-      LOG4.error("CLI", "[ProviderCliAdapter] node-pty not found. Install: npm install node-pty@1.0.0");
+      LOG5.error("CLI", "[ProviderCliAdapter] node-pty not found. Install: npm install node-pty@1.0.0");
     }
     function stripAnsi(str) {
       return str.replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "");
@@ -22319,7 +22282,7 @@ var require_dist = __commonJS({
         const binaryPath = findBinary(spawnConfig.command);
         const isWin = os9.platform() === "win32";
         const allArgs = [...spawnConfig.args, ...this.extraArgs];
-        LOG4.info("CLI", `[${this.cliType}] Spawning in ${this.workingDir}`);
+        LOG5.info("CLI", `[${this.cliType}] Spawning in ${this.workingDir}`);
         let shellCmd;
         let shellArgs;
         if (spawnConfig.shell) {
@@ -22356,7 +22319,7 @@ var require_dist = __commonJS({
           }
         });
         this.ptyProcess.onExit(({ exitCode }) => {
-          LOG4.info("CLI", `[${this.cliType}] Exit code ${exitCode}`);
+          LOG5.info("CLI", `[${this.cliType}] Exit code ${exitCode}`);
           this.ptyProcess = null;
           this.currentStatus = "stopped";
           this.ready = false;
@@ -22391,7 +22354,7 @@ var require_dist = __commonJS({
           if (patterns.prompt.some((p) => p.test(this.startupBuffer))) {
             this.ready = true;
             this.currentStatus = "idle";
-            LOG4.info("CLI", `[${this.cliType}] \u2713 Ready`);
+            LOG5.info("CLI", `[${this.cliType}] \u2713 Ready`);
             this.onStatusChange?.();
           }
           return;
@@ -22478,7 +22441,7 @@ var require_dist = __commonJS({
         if (response) {
           this.messages.push({ role: "assistant", content: response, timestamp: Date.now() });
           if (this.messages.length > 200) this.messages = this.messages.slice(-200);
-          LOG4.info("CLI", `[${this.cliType}] Response (${response.length} chars)`);
+          LOG5.info("CLI", `[${this.cliType}] Response (${response.length} chars)`);
         }
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
@@ -22718,6 +22681,10 @@ var require_dist = __commonJS({
     var import_stream = require("stream");
     var import_child_process5 = require("child_process");
     var import_sdk = (init_acp(), __toCommonJS(acp_exports));
+    function flattenContent(content) {
+      if (typeof content === "string") return content;
+      return content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
+    }
     var AcpProviderInstance = class {
       constructor(provider, workingDir, cliArgs = []) {
         this.cliArgs = cliArgs;
@@ -22729,7 +22696,7 @@ var require_dist = __commonJS({
       }
       type;
       category = "acp";
-      log = LOG4.forComponent("ACP");
+      log = LOG5.forComponent("ACP");
       provider;
       context = null;
       settings = {};
@@ -22750,6 +22717,10 @@ var require_dist = __commonJS({
       activeToolCalls = [];
       stopReason = null;
       partialContent = "";
+      /** Rich content blocks accumulated during streaming */
+      partialBlocks = [];
+      /** Tool calls collected during current turn */
+      turnToolCalls = [];
       // Error tracking
       errorMessage = null;
       errorReason = null;
@@ -22784,18 +22755,23 @@ var require_dist = __commonJS({
       }
       getState() {
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
-        const recentMessages = this.messages.slice(-50).map((m) => ({
-          role: m.role,
-          content: m.content.length > 2e3 ? m.content.slice(0, 2e3) + "\n... (truncated)" : m.content,
-          timestamp: m.timestamp
-        }));
-        if (this.currentStatus === "generating" && this.partialContent) {
-          const cleaned = this.partialContent.trim();
-          if (cleaned) {
+        const recentMessages = this.messages.slice(-50).map((m) => {
+          const content = this.truncateContent(m.content);
+          return {
+            role: m.role,
+            content,
+            timestamp: m.timestamp,
+            toolCalls: m.toolCalls
+          };
+        });
+        if (this.currentStatus === "generating" && (this.partialContent || this.partialBlocks.length > 0)) {
+          const blocks = this.buildPartialBlocks();
+          if (blocks.length > 0) {
             recentMessages.push({
               role: "assistant",
-              content: (cleaned.length > 2e3 ? cleaned.slice(0, 2e3) + "..." : cleaned) + "...",
-              timestamp: Date.now()
+              content: blocks,
+              timestamp: Date.now(),
+              toolCalls: this.turnToolCalls.length > 0 ? [...this.turnToolCalls] : void 0
             });
           }
         }
@@ -23241,49 +23217,49 @@ var require_dist = __commonJS({
           this.currentStatus = "idle";
         }
       }
-      async sendPrompt(text) {
+      async sendPrompt(text, contentBlocks) {
         if (!this.connection || !this.sessionId) {
           this.log.warn(`[${this.type}] Cannot send prompt: no active connection/session`);
           return;
         }
+        let promptParts;
+        if (contentBlocks && contentBlocks.length > 0) {
+          promptParts = contentBlocks.map((b) => {
+            if (b.type === "text") return { type: "text", text: b.text };
+            if (b.type === "image") return { type: "image", data: b.data, mimeType: b.mimeType };
+            if (b.type === "resource_link") return { type: "resource_link", uri: b.uri, name: b.name };
+            if (b.type === "resource") return { type: "resource", resource: b.resource };
+            return { type: "text", text: flattenContent([b]) };
+          });
+        } else {
+          promptParts = [{ type: "text", text }];
+        }
         this.messages.push({
           role: "user",
-          content: text,
+          content: contentBlocks && contentBlocks.length > 0 ? contentBlocks : text,
           timestamp: Date.now()
         });
         this.currentStatus = "generating";
         this.partialContent = "";
+        this.partialBlocks = [];
+        this.turnToolCalls = [];
         this.detectStatusTransition();
-        this.log.info(`[${this.type}] Sending prompt: "${text.slice(0, 100)}"`);
+        this.log.info(`[${this.type}] Sending prompt: "${text.slice(0, 100)}" (${promptParts.length} parts)`);
         try {
           const result = await this.connection.prompt({
             sessionId: this.sessionId,
-            prompt: [{ type: "text", text }]
+            prompt: promptParts
           });
           if (result?.stopReason) {
             this.stopReason = result.stopReason;
           }
-          this.log.info(`[${this.type}] Prompt completed: stopReason=${result?.stopReason} partialContent=${this.partialContent.length} chars`);
-          if (this.partialContent.trim()) {
-            this.messages.push({
-              role: "assistant",
-              content: this.partialContent.trim(),
-              timestamp: Date.now()
-            });
-            this.partialContent = "";
-          }
+          this.log.info(`[${this.type}] Prompt completed: stopReason=${result?.stopReason} partialContent=${this.partialContent.length} chars partialBlocks=${this.partialBlocks.length}`);
+          this.finalizeAssistantMessage();
           this.currentStatus = "idle";
           this.detectStatusTransition();
         } catch (e) {
           this.log.warn(`[${this.type}] prompt error: ${e?.message}`);
-          if (this.partialContent.trim()) {
-            this.messages.push({
-              role: "assistant",
-              content: this.partialContent.trim(),
-              timestamp: Date.now()
-            });
-            this.partialContent = "";
-          }
+          this.finalizeAssistantMessage();
           this.currentStatus = "idle";
           this.detectStatusTransition();
         }
@@ -23317,6 +23293,27 @@ var require_dist = __commonJS({
             const content = update.content;
             if (content?.type === "text" && content.text) {
               this.partialContent += content.text;
+            } else if (content?.type === "image") {
+              this.partialBlocks.push({
+                type: "image",
+                data: content.data || "",
+                mimeType: content.mimeType || "image/png",
+                uri: content.uri
+              });
+            } else if (content?.type === "resource_link") {
+              this.partialBlocks.push({
+                type: "resource_link",
+                uri: content.uri || "",
+                name: content.name || "resource",
+                title: content.title,
+                mimeType: content.mimeType,
+                size: content.size
+              });
+            } else if (content?.type === "resource") {
+              this.partialBlocks.push({
+                type: "resource",
+                resource: content.resource
+              });
             }
             this.currentStatus = "generating";
             break;
@@ -23326,12 +23323,26 @@ var require_dist = __commonJS({
             break;
           }
           case "tool_call": {
+            const tcId = update.toolCallId || `tc_${Date.now()}`;
+            const tcTitle = update.title || "unknown";
+            const tcKind = update.kind;
+            const tcStatus = this.mapToolCallStatus(update.status);
             this.activeToolCalls.push({
-              id: update.toolCallId || `tc_${Date.now()}`,
-              name: update.title || "unknown",
-              status: this.mapToolCallStatus(update.status) || "running",
+              id: tcId,
+              name: tcTitle,
+              status: tcStatus,
               input: update.rawInput ? typeof update.rawInput === "string" ? update.rawInput : JSON.stringify(update.rawInput) : void 0
             });
+            const acpStatus = update.status || "in_progress";
+            this.turnToolCalls.push({
+              toolCallId: tcId,
+              title: tcTitle,
+              kind: tcKind,
+              status: acpStatus,
+              rawInput: update.rawInput,
+              content: this.convertToolCallContent(update.content),
+              locations: update.locations
+            });
             break;
           }
           case "tool_call_update": {
@@ -23341,6 +23352,13 @@ var require_dist = __commonJS({
               if (update.status) existing.status = this.mapToolCallStatus(update.status);
               if (update.rawOutput) existing.output = typeof update.rawOutput === "string" ? update.rawOutput : JSON.stringify(update.rawOutput);
             }
+            const tcInfo = this.turnToolCalls.find((t) => t.toolCallId === toolCallId);
+            if (tcInfo) {
+              if (update.status) tcInfo.status = update.status;
+              if (update.rawOutput) tcInfo.rawOutput = update.rawOutput;
+              if (update.content) tcInfo.content = this.convertToolCallContent(update.content);
+              if (update.locations) tcInfo.locations = update.locations;
+            }
             break;
           }
           case "current_mode_update": {
@@ -23433,6 +23451,62 @@ var require_dist = __commonJS({
             return "running";
         }
       }
+      // ─── Rich Content Helpers ────────────────────────────
+      /** Truncate content for transport (text: 2000 chars, images preserved) */
+      truncateContent(content) {
+        if (typeof content === "string") {
+          return content.length > 2e3 ? content.slice(0, 2e3) + "\n... (truncated)" : content;
+        }
+        return content.map((b) => {
+          if (b.type === "text" && b.text.length > 2e3) {
+            return { ...b, text: b.text.slice(0, 2e3) + "\n... (truncated)" };
+          }
+          return b;
+        });
+      }
+      /** Build ContentBlock[] from current partial state */
+      buildPartialBlocks() {
+        const blocks = [];
+        if (this.partialContent.trim()) {
+          blocks.push({ type: "text", text: this.partialContent.trim() + "..." });
+        }
+        blocks.push(...this.partialBlocks);
+        return blocks;
+      }
+      /** Finalize streaming content into an assistant message */
+      finalizeAssistantMessage() {
+        const blocks = this.buildPartialBlocks();
+        const finalBlocks = blocks.map((b) => {
+          if (b.type === "text" && b.text.endsWith("...")) {
+            return { ...b, text: b.text.slice(0, -3) };
+          }
+          return b;
+        }).filter((b) => b.type !== "text" || b.text.trim());
+        if (finalBlocks.length > 0) {
+          this.messages.push({
+            role: "assistant",
+            content: finalBlocks.length === 1 && finalBlocks[0].type === "text" ? finalBlocks[0].text : finalBlocks,
+            timestamp: Date.now(),
+            toolCalls: this.turnToolCalls.length > 0 ? [...this.turnToolCalls] : void 0
+          });
+        }
+        this.partialContent = "";
+        this.partialBlocks = [];
+        this.turnToolCalls = [];
+      }
+      /** Convert ACP ToolCallContent[] to our ToolCallContent[] */
+      convertToolCallContent(acpContent) {
+        if (!acpContent || !Array.isArray(acpContent)) return void 0;
+        return acpContent.map((c) => {
+          if (c.type === "diff") {
+            return { type: "diff", path: c.path || "", oldText: c.oldText, newText: c.newText || "" };
+          }
+          if (c.type === "terminal") {
+            return { type: "terminal", terminalId: c.terminalId || "" };
+          }
+          return { type: "content", content: c.content || { type: "text", text: JSON.stringify(c) } };
+        });
+      }
       // ─── status transition detect ────────────────────────────
       detectStatusTransition() {
         const now = Date.now();
@@ -23570,13 +23644,13 @@ ${installInfo}`
               await acpInstance.setConfigOption("model", initialModel);
               console.log(import_chalk3.default.green(`  \u{1F916} Initial model set: ${initialModel}`));
             } catch (e) {
-              LOG4.warn("CLI", `[ACP] Initial model set failed: ${e?.message}`);
+              LOG5.warn("CLI", `[ACP] Initial model set failed: ${e?.message}`);
             }
           }
           try {
             addCliHistory({ cliType: normalizedType, dir: resolvedDir, cliArgs });
           } catch (e) {
-            LOG4.warn("CLI", `ACP history save failed: ${e?.message}`);
+            LOG5.warn("CLI", `ACP history save failed: ${e?.message}`);
           }
           this.deps.onStatusChange();
           return;
@@ -23631,7 +23705,7 @@ ${installInfo}`
         try {
           addCliHistory({ cliType, dir: resolvedDir, cliArgs });
         } catch (e) {
-          LOG4.warn("CLI", `CLI history save failed: ${e?.message}`);
+          LOG5.warn("CLI", `CLI history save failed: ${e?.message}`);
         }
         this.deps.onStatusChange();
       }
@@ -23880,7 +23954,7 @@ ${installInfo}`
       discoveryIntervalMs = 1e4;
       _activeAgentType = null;
       constructor(logFn, providerLoader) {
-        this.logFn = logFn || LOG4.forComponent("AgentStream").asLogFn();
+        this.logFn = logFn || LOG5.forComponent("AgentStream").asLogFn();
         if (providerLoader) {
           const allExtProviders = providerLoader.getByCategory("extension");
           for (const p of allExtProviders) {
@@ -24155,7 +24229,7 @@ ${installInfo}`
             for (const extType of currentExtTypes) {
               if (!enabledExtTypes.has(extType)) {
                 ideInstance.removeExtension(extType);
-                LOG4.info("AgentStream", `Extension removed: ${extType} (disabled for ${ideType})`);
+                LOG5.info("AgentStream", `Extension removed: ${extType} (disabled for ${ideType})`);
               }
             }
             for (const extType of enabledExtTypes) {
@@ -24164,7 +24238,7 @@ ${installInfo}`
                 if (extProvider) {
                   const extSettings = providerLoader.getSettings(extType);
                   ideInstance.addExtension(extProvider, extSettings);
-                  LOG4.info("AgentStream", `Extension added: ${extType} (enabled for ${ideType})`);
+                  LOG5.info("AgentStream", `Extension added: ${extType} (enabled for ${ideType})`);
                 }
               }
             }
@@ -24191,7 +24265,7 @@ ${installInfo}`
               if (discovered.length > 0) {
                 this._activeIdeType = ideType;
                 await agentStreamManager.switchActiveAgent(cdp, discovered[0].agentType);
-                LOG4.info("AgentStream", `Auto-activated: ${discovered[0].agentType} (${ideType})`);
+                LOG5.info("AgentStream", `Auto-activated: ${discovered[0].agentType} (${ideType})`);
                 await agentStreamManager.syncAgentSessions(cdp);
                 const streams = await agentStreamManager.collectAgentStreams(cdp);
                 this.deps.onStreamsUpdated?.(ideType, streams);
@@ -24215,7 +24289,7 @@ ${installInfo}`
       */
       async addInstance(id, instance, context) {
         if (this.instances.has(id)) {
-          LOG4.warn("InstanceMgr", `[InstanceManager] Instance ${id} already exists, disposing old one`);
+          LOG5.warn("InstanceMgr", `[InstanceManager] Instance ${id} already exists, disposing old one`);
           this.instances.get(id).dispose();
         }
         this.instances.set(id, instance);
@@ -24266,7 +24340,7 @@ ${installInfo}`
               }
             }
           } catch (e) {
-            LOG4.warn("InstanceMgr", `[InstanceManager] Failed to collect state from ${id}: ${e.message}`);
+            LOG5.warn("InstanceMgr", `[InstanceManager] Failed to collect state from ${id}: ${e.message}`);
           }
         }
         return states;
@@ -24289,7 +24363,7 @@ ${installInfo}`
             try {
               await instance.onTick();
             } catch (e) {
-              LOG4.warn("InstanceMgr", `[InstanceManager] Tick failed for ${id}: ${e.message}`);
+              LOG5.warn("InstanceMgr", `[InstanceManager] Tick failed for ${id}: ${e.message}`);
             }
           }
         }, this.tickInterval);
@@ -24865,11 +24939,67 @@ async (params) => {
       constructor(options) {
         this.providerLoader = options.providerLoader;
         this.cdpManagers = options.cdpManagers;
-        this.logFn = options.logFn || LOG4.forComponent("DevServer").asLogFn();
+        this.logFn = options.logFn || LOG5.forComponent("DevServer").asLogFn();
       }
       log(msg) {
         this.logFn(`[DevServer] ${msg}`);
       }
+      // ─── Route Table ─────────────────────────────────────
+      routes = [
+        // Static routes
+        { method: "GET", pattern: "/api/providers", handler: (q, s) => this.handleListProviders(q, s) },
+        { method: "GET", pattern: "/api/providers/versions", handler: (q, s) => this.handleDetectVersions(q, s) },
+        { method: "POST", pattern: "/api/providers/reload", handler: (q, s) => this.handleReload(q, s) },
+        { method: "POST", pattern: "/api/cdp/evaluate", handler: (q, s) => this.handleCdpEvaluate(q, s) },
+        { method: "POST", pattern: "/api/cdp/dom/query", handler: (q, s) => this.handleCdpDomQuery(q, s) },
+        { method: "POST", pattern: "/api/cdp/dom/inspect", handler: (q, s) => this.handleDomInspect(q, s) },
+        { method: "POST", pattern: "/api/cdp/dom/children", handler: (q, s) => this.handleDomChildren(q, s) },
+        { method: "POST", pattern: "/api/cdp/dom/analyze", handler: (q, s) => this.handleDomAnalyze(q, s) },
+        { method: "POST", pattern: "/api/cdp/dom/find-text", handler: (q, s) => this.handleFindByText(q, s) },
+        { method: "POST", pattern: "/api/cdp/dom/find-common", handler: (q, s) => this.handleFindCommon(q, s) },
+        { method: "GET", pattern: "/api/cdp/screenshot", handler: (q, s) => this.handleScreenshot(q, s) },
+        { method: "GET", pattern: "/api/cdp/targets", handler: (q, s) => this.handleCdpTargets(q, s) },
+        { method: "POST", pattern: "/api/scripts/run", handler: (q, s) => this.handleScriptsRun(q, s) },
+        { method: "GET", pattern: "/api/status", handler: (q, s) => this.handleStatus(q, s) },
+        { method: "POST", pattern: "/api/watch/start", handler: (q, s) => this.handleWatchStart(q, s) },
+        { 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) },
+        // 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) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/file$/, handler: (q, s, p) => this.handleReadFile(p[0], q, s) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/file$/, handler: (q, s, p) => this.handleWriteFile(p[0], q, s) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/source$/, handler: (q, s, p) => this.handleSource(p[0], q, s) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/save$/, handler: (q, s, p) => this.handleSave(p[0], q, s) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/config$/, handler: (q, s, p) => this.handleProviderConfig(p[0], q, s) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/dom-context$/, handler: (q, s, p) => this.handleDomContext(p[0], q, s) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/auto-implement$/, handler: (q, s, p) => this.handleAutoImplement(p[0], q, s) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/auto-implement\/cancel$/, handler: (q, s, p) => this.handleAutoImplCancel(p[0], q, s) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/auto-implement\/status$/, handler: (q, s, p) => this.handleAutoImplSSE(p[0], q, s) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/spawn-test$/, handler: (q, s, p) => this.handleSpawnTest(p[0], q, s) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/validate$/, handler: (q, s, p) => this.handleValidate(p[0], q, s) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/acp-chat$/, handler: (q, s, p) => this.handleAcpChat(p[0], q, s) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/script-hints$/, handler: (q, s, p) => this.handleScriptHints(p[0], q, s) }
+      ];
+      matchRoute(method, pathname) {
+        for (const route of this.routes) {
+          if (route.method !== method) continue;
+          if (typeof route.pattern === "string") {
+            if (pathname === route.pattern) return { handler: route.handler };
+          } else {
+            const m = pathname.match(route.pattern);
+            if (m) return { handler: route.handler, params: m.slice(1) };
+          }
+        }
+        return null;
+      }
+      getEndpointList() {
+        return this.routes.map((r) => {
+          const path10 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path10}`;
+        });
+      }
       async start(port = DEV_SERVER_PORT) {
         this.server = http2.createServer(async (req, res) => {
           res.setHeader("Access-Control-Allow-Origin", "*");
@@ -24883,112 +25013,15 @@ async (params) => {
           const url2 = new URL(req.url || "/", `http://localhost:${port}`);
           const pathname = url2.pathname;
           try {
-            if (pathname === "/api/providers" && req.method === "GET") {
-              await this.handleListProviders(req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/script$/) && req.method === "POST") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/script$/)[1];
-              await this.handleRunScript(type, req, res);
-            } else if (pathname === "/api/cdp/evaluate" && req.method === "POST") {
-              await this.handleCdpEvaluate(req, res);
-            } else if (pathname === "/api/cdp/dom/query" && req.method === "POST") {
-              await this.handleCdpDomQuery(req, res);
-            } else if (pathname === "/api/cdp/screenshot" && req.method === "GET") {
-              await this.handleScreenshot(req, res);
-            } else if (pathname === "/api/scripts/run" && req.method === "POST") {
-              await this.handleScriptsRun(req, res);
-            } else if (pathname === "/api/status" && req.method === "GET") {
-              await this.handleStatus(req, res);
-            } else if (pathname === "/api/providers/reload" && req.method === "POST") {
-              await this.handleReload(req, res);
-            } else if (pathname === "/api/providers/versions" && req.method === "GET") {
-              await this.handleDetectVersions(req, res);
-            } else if (pathname === "/api/watch/start" && req.method === "POST") {
-              await this.handleWatchStart(req, res);
-            } else if (pathname === "/api/watch/stop" && req.method === "POST") {
-              await this.handleWatchStop(req, res);
-            } else if (pathname === "/api/watch/events" && req.method === "GET") {
-              this.handleSSE(req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/files$/) && req.method === "GET") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/files$/)[1];
-              await this.handleListFiles(type, req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/file$/) && req.method === "GET") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/file$/)[1];
-              await this.handleReadFile(type, req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/file$/) && req.method === "POST") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/file$/)[1];
-              await this.handleWriteFile(type, req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/source$/) && req.method === "GET") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/source$/)[1];
-              await this.handleSource(type, req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/save$/) && req.method === "POST") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/save$/)[1];
-              await this.handleSave(type, req, res);
-            } else if (pathname === "/api/cdp/dom/inspect" && req.method === "POST") {
-              await this.handleDomInspect(req, res);
-            } else if (pathname === "/api/cdp/dom/children" && req.method === "POST") {
-              await this.handleDomChildren(req, res);
-            } else if (pathname === "/api/cdp/dom/analyze" && req.method === "POST") {
-              await this.handleDomAnalyze(req, res);
-            } else if (pathname === "/api/cdp/dom/find-text" && req.method === "POST") {
-              await this.handleFindByText(req, res);
-            } else if (pathname === "/api/cdp/dom/find-common" && req.method === "POST") {
-              await this.handleFindCommon(req, res);
-            } else if (pathname === "/api/cdp/targets" && req.method === "GET") {
-              await this.handleCdpTargets(req, res);
-            } else if (pathname === "/api/scaffold" && req.method === "POST") {
-              await this.handleScaffold(req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/dom-context$/) && req.method === "POST") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/dom-context$/)[1];
-              await this.handleDomContext(type, req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/auto-implement$/) && req.method === "POST") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/auto-implement$/)[1];
-              await this.handleAutoImplement(type, req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/auto-implement\/cancel$/) && req.method === "POST") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/auto-implement\/cancel$/)[1];
-              this.handleAutoImplCancel(type, req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/auto-implement\/status$/) && req.method === "GET") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/auto-implement\/status$/)[1];
-              this.handleAutoImplSSE(type, req, res);
-            } else if (pathname.match(/^\/api\/providers\/([^/]+)\/config$/) && req.method === "GET") {
-              const type = pathname.match(/^\/api\/providers\/([^/]+)\/config$/)[1];
-              await this.handleProviderConfig(type, req, res);
-            } 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);
+            const route = this.matchRoute(req.method || "GET", pathname);
+            if (route) {
+              await route.handler(req, res, route.params);
             } else if (pathname.startsWith("/assets/") || pathname === "/favicon.ico") {
               await this.serveStaticAsset(pathname, res);
             } else if (pathname === "/" || pathname === "/console" || !pathname.startsWith("/api")) {
               await this.serveConsole(req, res);
             } else {
-              this.json(res, 404, {
-                error: "Not found",
-                endpoints: [
-                  "GET  /              \u2014 DevConsole web UI",
-                  "GET  /api/providers",
-                  "POST /api/providers/:type/script",
-                  "GET  /api/providers/:type/source",
-                  "POST /api/providers/:type/save",
-                  "POST /api/cdp/evaluate",
-                  "POST /api/cdp/dom/query",
-                  "GET  /api/cdp/screenshot",
-                  "GET  /api/cdp/targets",
-                  "GET  /api/status",
-                  "POST /api/providers/reload",
-                  "POST /api/watch/start",
-                  "POST /api/watch/stop",
-                  "GET  /api/watch/events  (SSE)",
-                  "POST /api/scaffold"
-                ]
-              });
+              this.json(res, 404, { error: "Not found", endpoints: this.getEndpointList() });
             }
           } catch (e) {
             this.log(`Error: ${e.message}`);
@@ -25255,7 +25288,7 @@ async (params) => {
           const buf = await cdp.captureScreenshot();
           if (buf) {
             res.writeHead(200, {
-              "Content-Type": "image/jpeg",
+              "Content-Type": "image/webp",
               "X-Viewport-Width": String(vpW),
               "X-Viewport-Height": String(vpH)
             });
@@ -27392,10 +27425,10 @@ data: ${JSON.stringify(msg.data)}
         ...config2.cliManagerDeps,
         getInstanceManager: () => instanceManager
       }, providerLoader);
-      LOG4.info("Init", "Detecting IDEs...");
+      LOG5.info("Init", "Detecting IDEs...");
       detectedIdesRef.value = await detectIDEs2();
       const installed = detectedIdesRef.value.filter((i) => i.installed);
-      LOG4.info("Init", `Found ${installed.length} IDE(s): ${installed.map((i) => i.id).join(", ") || "none"}`);
+      LOG5.info("Init", `Found ${installed.length} IDE(s): ${installed.map((i) => i.id).join(", ") || "none"}`);
       const cdpSetupContext = {
         providerLoader,
         instanceManager,
@@ -27423,7 +27456,7 @@ data: ${JSON.stringify(msg.data)}
         instanceIdMap
       });
       const agentStreamManager = new DaemonAgentStreamManager(
-        LOG4.forComponent("AgentStream").asLogFn(),
+        LOG5.forComponent("AgentStream").asLogFn(),
         providerLoader
       );
       commandHandler.setAgentStreamManager(agentStreamManager);
@@ -27443,7 +27476,7 @@ data: ${JSON.stringify(msg.data)}
         onIdeConnected: () => poller?.start(),
         onStatusChange: config2.onStatusChange,
         onPostChatCommand: config2.onPostChatCommand,
-        getCdpLogFn: config2.getCdpLogFn || ((ideType) => LOG4.forComponent(`CDP:${ideType}`).asLogFn())
+        getCdpLogFn: config2.getCdpLogFn || ((ideType) => LOG5.forComponent(`CDP:${ideType}`).asLogFn())
       });
       poller = new AgentStreamPoller({
         agentStreamManager,
@@ -27485,7 +27518,7 @@ data: ${JSON.stringify(msg.data)}
           await agentStreamManager.dispose(anyCdp);
         }
       } catch (e) {
-        LOG4.warn("Shutdown", `AgentStream dispose: ${e?.message}`);
+        LOG5.warn("Shutdown", `AgentStream dispose: ${e?.message}`);
       }
       try {
         await cliManager.shutdownAll();
@@ -28467,6 +28500,161 @@ var init_daemon_p2p = __esm({
   }
 });
 
+// src/screenshot-controller.ts
+var import_daemon_core3, ScreenshotController;
+var init_screenshot_controller = __esm({
+  "src/screenshot-controller.ts"() {
+    "use strict";
+    import_daemon_core3 = __toESM(require_dist());
+    ScreenshotController = class _ScreenshotController {
+      deps;
+      timer = null;
+      // Delta detection state
+      debugCount = 0;
+      lastSize = 0;
+      lastHash = 0;
+      staticFrameCount = 0;
+      currentInterval;
+      // Quality profiles
+      profileDirect;
+      profileRelay;
+      STATIC_THRESHOLD = 3;
+      // Daily budget state
+      dailyBudgetMinutes;
+      dailyBudgetMs;
+      dailyUsedMs = 0;
+      lastActiveTimestamp = 0;
+      budgetDate;
+      budgetExhausted = false;
+      constructor(deps, planLimits) {
+        this.deps = deps;
+        const planMinIntervalMs = (planLimits?.screenshotIntervalSeconds ?? 0) * 1e3;
+        this.profileDirect = {
+          minInterval: Math.max(300, planMinIntervalMs),
+          maxInterval: Math.max(2e3, planMinIntervalMs),
+          quality: 25
+        };
+        this.profileRelay = {
+          minInterval: Math.max(700, planMinIntervalMs),
+          maxInterval: Math.max(3e3, planMinIntervalMs),
+          quality: 12
+        };
+        this.currentInterval = this.profileDirect.maxInterval;
+        this.dailyBudgetMinutes = planLimits?.dailyScreenshotMinutes ?? -1;
+        this.dailyBudgetMs = this.dailyBudgetMinutes > 0 ? this.dailyBudgetMinutes * 6e4 : -1;
+        this.budgetDate = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+        if (planMinIntervalMs > 0) {
+          import_daemon_core3.LOG.info("Screenshot", `Plan limit: min interval ${planMinIntervalMs}ms (${planLimits?.screenshotIntervalSeconds}s)`);
+        }
+        if (this.dailyBudgetMs > 0) {
+          import_daemon_core3.LOG.info("Screenshot", `Daily budget: ${this.dailyBudgetMinutes}min/day`);
+        }
+      }
+      // ─── Lifecycle ────────────────────────────────
+      start() {
+        if (this.timer) return;
+        this.timer = setTimeout(() => this.tick(), 1e3);
+      }
+      stop() {
+        if (this.timer) {
+          clearTimeout(this.timer);
+          this.timer = null;
+        }
+      }
+      // ─── Core loop ────────────────────────────────
+      async tick() {
+        if (!this.deps.isRunning()) return;
+        const active = this.deps.isScreenshotActive();
+        const ssIdeType = this.deps.getScreenshotIdeType();
+        const cdp = this.deps.getCdp(ssIdeType);
+        const isRelay = this.deps.isUsingRelay();
+        const profile = isRelay ? this.profileRelay : this.profileDirect;
+        this.checkBudgetReset();
+        if (this.dailyBudgetMs > 0) {
+          const now = Date.now();
+          if (active && this.lastActiveTimestamp > 0) {
+            this.dailyUsedMs += now - this.lastActiveTimestamp;
+          }
+          this.lastActiveTimestamp = active ? now : 0;
+          if (this.dailyUsedMs >= this.dailyBudgetMs && !this.budgetExhausted) {
+            this.budgetExhausted = true;
+            const usedMin = Math.round(this.dailyUsedMs / 6e4);
+            import_daemon_core3.LOG.info("Screenshot", `Daily budget exhausted: ${usedMin}/${this.dailyBudgetMinutes}min \u2014 pausing until midnight UTC`);
+          }
+        }
+        if (!active || !cdp || this.budgetExhausted) {
+          this.staticFrameCount = 0;
+          this.currentInterval = profile.maxInterval;
+          if (!active) this.lastActiveTimestamp = 0;
+          this.timer = setTimeout(() => this.tick(), this.budgetExhausted ? 3e4 : this.currentInterval);
+          return;
+        }
+        this.debugCount++;
+        try {
+          const buf = await cdp.captureScreenshot({ quality: profile.quality });
+          if (buf) {
+            const hash2 = _ScreenshotController.fnvHash(buf);
+            const sizeMatch = buf.length === this.lastSize;
+            const hashMatch = hash2 === this.lastHash;
+            const anyNeedsFirstFrame = this.deps.hasAnyNeedingFirstFrame();
+            if (sizeMatch && hashMatch && !anyNeedsFirstFrame) {
+              this.staticFrameCount++;
+              if (this.staticFrameCount >= this.STATIC_THRESHOLD) {
+                this.currentInterval = Math.min(this.currentInterval + 200, profile.maxInterval);
+              }
+              if (this.debugCount <= 5 || this.debugCount % 50 === 0) {
+                import_daemon_core3.LOG.debug("Screenshot", `skip (unchanged, static=${this.staticFrameCount}, interval=${this.currentInterval}ms, ${isRelay ? "RELAY" : "DIRECT"})`);
+              }
+            } else {
+              this.lastSize = buf.length;
+              this.lastHash = hash2;
+              this.staticFrameCount = 0;
+              this.currentInterval = profile.minInterval;
+              const sent = this.deps.sendScreenshotBuffer(buf);
+              if (this.debugCount <= 3 || anyNeedsFirstFrame) {
+                import_daemon_core3.LOG.debug("Screenshot", `sent: ${buf.length} bytes, delivered=${sent}, interval=${this.currentInterval}ms, ${isRelay ? "RELAY" : "DIRECT"}${anyNeedsFirstFrame ? " (first-frame)" : ""}`);
+              }
+            }
+          } else {
+            if (this.debugCount <= 5) import_daemon_core3.LOG.debug("Screenshot", "captureScreenshot returned null");
+          }
+        } catch (e) {
+          if (this.debugCount <= 5) import_daemon_core3.LOG.warn("Screenshot", `error: ${e?.message}`);
+        }
+        this.timer = setTimeout(() => this.tick(), this.currentInterval);
+      }
+      // ─── Budget ───────────────────────────────────
+      checkBudgetReset() {
+        const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+        if (today !== this.budgetDate) {
+          this.dailyUsedMs = 0;
+          this.budgetDate = today;
+          this.budgetExhausted = false;
+          import_daemon_core3.LOG.info("Screenshot", `Daily budget reset (${this.dailyBudgetMinutes}min for today)`);
+        }
+      }
+      // ─── Hash ─────────────────────────────────────
+      /** FNV-1a hash of first 1KB + last 1KB for fast delta detection */
+      static fnvHash(buf) {
+        let h = 2166136261;
+        const sampleEnd = Math.min(1024, buf.length);
+        for (let i = 0; i < sampleEnd; i++) {
+          h ^= buf[i];
+          h = h * 16777619 >>> 0;
+        }
+        if (buf.length > 1024) {
+          const start = Math.max(0, buf.length - 1024);
+          for (let i = start; i < buf.length; i++) {
+            h ^= buf[i];
+            h = h * 16777619 >>> 0;
+          }
+        }
+        return h;
+      }
+    };
+  }
+});
+
 // src/adhdev-daemon.ts
 var adhdev_daemon_exports = {};
 __export(adhdev_daemon_exports, {
@@ -28513,13 +28701,14 @@ function stopDaemon() {
     return false;
   }
 }
-var import_daemon_core3, os2, fs2, path2, crypto2, import_chalk, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
+var import_daemon_core4, os2, fs2, path2, crypto2, import_chalk, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
     init_server_connection();
-    import_daemon_core3 = __toESM(require_dist());
+    import_daemon_core4 = __toESM(require_dist());
     init_daemon_p2p();
+    init_screenshot_controller();
     os2 = __toESM(require("os"));
     fs2 = __toESM(require("fs"));
     path2 = __toESM(require("path"));
@@ -28558,7 +28747,7 @@ var init_adhdev_daemon = __esm({
     AdhdevDaemon = class {
       serverConn = null;
       p2p = null;
-      screenshotTimer = null;
+      screenshotController = null;
       statusReporter = null;
       components = null;
       running = false;
@@ -28573,7 +28762,7 @@ var init_adhdev_daemon = __esm({
           installGlobalInterceptor();
         } catch {
         }
-        this.localPort = options.localPort || import_daemon_core3.DEFAULT_DAEMON_PORT;
+        this.localPort = options.localPort || import_daemon_core4.DEFAULT_DAEMON_PORT;
         const workingDir = options.workingDir || process.cwd();
         if (isDaemonRunning()) {
           console.log(import_chalk.default.yellow("\n\u26A0 ADHDev Daemon is already running."));
@@ -28582,14 +28771,14 @@ var init_adhdev_daemon = __esm({
           return;
         }
         writeDaemonPid(process.pid);
-        const config2 = (0, import_daemon_core3.loadConfig)();
+        const config2 = (0, import_daemon_core4.loadConfig)();
         if (!config2.connectionToken) {
           console.log(import_chalk.default.red("\n\u2717 No connection token found."));
           console.log(import_chalk.default.gray("  Run `adhdev setup` first.\n"));
           process.exit(1);
         }
-        this.components = await (0, import_daemon_core3.initDaemonComponents)({
-          providerLogFn: import_daemon_core3.LOG.forComponent("Provider").asLogFn(),
+        this.components = await (0, import_daemon_core4.initDaemonComponents)({
+          providerLogFn: import_daemon_core4.LOG.forComponent("Provider").asLogFn(),
           cliManagerDeps: {
             getServerConn: () => this.serverConn,
             getP2p: () => this.p2p,
@@ -28602,7 +28791,7 @@ var init_adhdev_daemon = __esm({
             setTimeout(() => this.statusReporter?.throttledReport(), 1e3);
             setTimeout(() => this.statusReporter?.throttledReport(), 3e3);
           },
-          getCdpLogFn: (ideType) => import_daemon_core3.LOG.forComponent(`CDP:${ideType}`).asLogFn(),
+          getCdpLogFn: (ideType) => import_daemon_core4.LOG.forComponent(`CDP:${ideType}`).asLogFn(),
           onCdpManagerSetup: (ideType) => {
             if (this.ideType === "unknown") this.ideType = ideType;
           },
@@ -28610,11 +28799,11 @@ var init_adhdev_daemon = __esm({
             this.statusReporter?.updateAgentStreams(ideType, streams);
           }
         });
-        const versionArchive = new import_daemon_core3.VersionArchive();
-        (0, import_daemon_core3.detectAllVersions)(this.components.providerLoader, versionArchive).then((results) => {
+        const versionArchive = new import_daemon_core4.VersionArchive();
+        (0, import_daemon_core4.detectAllVersions)(this.components.providerLoader, versionArchive).then((results) => {
           this.components.providerLoader.setVersionArchive(versionArchive);
           for (const info of results) {
-            if (info.warning) import_daemon_core3.LOG.warn("Provider", `\u26A0 [${info.name}] ${info.warning}`);
+            if (info.warning) import_daemon_core4.LOG.warn("Provider", `\u26A0 [${info.name}] ${info.warning}`);
           }
         }).catch(() => {
         });
@@ -28622,7 +28811,7 @@ var init_adhdev_daemon = __esm({
           if (updated) {
             this.components.providerLoader.reload();
             this.components.providerLoader.registerToDetector();
-            import_daemon_core3.LOG.info("Provider", "Providers auto-updated from upstream");
+            import_daemon_core4.LOG.info("Provider", "Providers auto-updated from upstream");
           }
         }).catch(() => {
         });
@@ -28675,99 +28864,25 @@ var init_adhdev_daemon = __esm({
           });
           this.p2p.onStateChange((state) => {
             if (state === "connected") {
-              import_daemon_core3.LOG.info("P2P", "Peer connected \u2192 sending immediate full status report");
-              this.statusReporter?.sendUnifiedStatusReport().catch((e) => import_daemon_core3.LOG.warn("P2P", `Immediate status report failed: ${e?.message}`));
+              import_daemon_core4.LOG.info("P2P", "Peer connected \u2192 sending immediate full status report");
+              this.statusReporter?.sendUnifiedStatusReport().catch((e) => import_daemon_core4.LOG.warn("P2P", `Immediate status report failed: ${e?.message}`));
               setTimeout(() => {
                 this.statusReporter?.sendUnifiedStatusReport().catch(() => {
                 });
               }, 2e3);
             }
           });
-          let ssDebugCount = 0;
-          let lastScreenshotSize = 0;
-          let lastScreenshotHash = 0;
-          let staticFrameCount = 0;
           const planLimits = this.serverConn.getPlanLimits();
-          const planMinIntervalMs = (planLimits?.screenshotIntervalSeconds ?? 0) * 1e3;
-          const PROFILE_DIRECT = {
-            minInterval: Math.max(300, planMinIntervalMs),
-            maxInterval: Math.max(2e3, planMinIntervalMs),
-            quality: 25
-          };
-          const PROFILE_RELAY = {
-            minInterval: Math.max(700, planMinIntervalMs),
-            maxInterval: Math.max(3e3, planMinIntervalMs),
-            quality: 12
-          };
-          let currentInterval = PROFILE_DIRECT.maxInterval;
-          const STATIC_THRESHOLD = 3;
-          if (planMinIntervalMs > 0) {
-            import_daemon_core3.LOG.info("Screenshot", `Plan limit: min interval ${planMinIntervalMs}ms (${planLimits?.screenshotIntervalSeconds}s)`);
-          }
-          const fnvHash = (buf) => {
-            let h = 2166136261;
-            const sampleEnd = Math.min(1024, buf.length);
-            for (let i = 0; i < sampleEnd; i++) {
-              h ^= buf[i];
-              h = h * 16777619 >>> 0;
-            }
-            if (buf.length > 1024) {
-              const start = Math.max(0, buf.length - 1024);
-              for (let i = start; i < buf.length; i++) {
-                h ^= buf[i];
-                h = h * 16777619 >>> 0;
-              }
-            }
-            return h;
-          };
-          const screenshotTick = async () => {
-            if (!this.running) return;
-            const active = this.p2p?.screenshotActive;
-            const ssIdeType = this.p2p?.screenshotIdeType;
-            const cdp = (ssIdeType ? this.getCdpFor(ssIdeType) : null) || this.getAnyCdp();
-            const isRelay = this.p2p?.isUsingRelay ?? false;
-            const profile = isRelay ? PROFILE_RELAY : PROFILE_DIRECT;
-            if (!active || !cdp) {
-              staticFrameCount = 0;
-              currentInterval = profile.maxInterval;
-              this.screenshotTimer = setTimeout(screenshotTick, currentInterval);
-              return;
-            }
-            ssDebugCount++;
-            try {
-              const buf = await cdp.captureScreenshot({ quality: profile.quality });
-              if (buf) {
-                const hash2 = fnvHash(buf);
-                const sizeMatch = buf.length === lastScreenshotSize;
-                const hashMatch = hash2 === lastScreenshotHash;
-                const anyNeedsFirstFrame = this.p2p.hasAnyNeedingFirstFrame();
-                if (sizeMatch && hashMatch && !anyNeedsFirstFrame) {
-                  staticFrameCount++;
-                  if (staticFrameCount >= STATIC_THRESHOLD) {
-                    currentInterval = Math.min(currentInterval + 200, profile.maxInterval);
-                  }
-                  if (ssDebugCount <= 5 || ssDebugCount % 50 === 0) {
-                    import_daemon_core3.LOG.debug("Screenshot", `skip (unchanged, static=${staticFrameCount}, interval=${currentInterval}ms, ${isRelay ? "RELAY" : "DIRECT"})`);
-                  }
-                } else {
-                  lastScreenshotSize = buf.length;
-                  lastScreenshotHash = hash2;
-                  staticFrameCount = 0;
-                  currentInterval = profile.minInterval;
-                  const sent = this.p2p.sendScreenshotBuffer(buf);
-                  if (ssDebugCount <= 3 || anyNeedsFirstFrame) {
-                    import_daemon_core3.LOG.debug("Screenshot", `sent: ${buf.length} bytes, delivered=${sent}, interval=${currentInterval}ms, ${isRelay ? "RELAY" : "DIRECT"}${anyNeedsFirstFrame ? " (first-frame)" : ""}`);
-                  }
-                }
-              } else {
-                if (ssDebugCount <= 5) import_daemon_core3.LOG.debug("Screenshot", "captureScreenshot returned null");
-              }
-            } catch (e) {
-              if (ssDebugCount <= 5) import_daemon_core3.LOG.warn("Screenshot", `error: ${e?.message}`);
-            }
-            this.screenshotTimer = setTimeout(screenshotTick, currentInterval);
-          };
-          this.screenshotTimer = setTimeout(screenshotTick, 1e3);
+          this.screenshotController = new ScreenshotController({
+            isRunning: () => this.running,
+            isScreenshotActive: () => this.p2p?.screenshotActive ?? false,
+            getScreenshotIdeType: () => this.p2p?.screenshotIdeType,
+            isUsingRelay: () => this.p2p?.isUsingRelay ?? false,
+            hasAnyNeedingFirstFrame: () => this.p2p?.hasAnyNeedingFirstFrame() ?? false,
+            getCdp: (ideType) => (ideType ? this.getCdpFor(ideType) : null) || this.getAnyCdp(),
+            sendScreenshotBuffer: (buf) => this.p2p.sendScreenshotBuffer(buf)
+          }, planLimits ?? void 0);
+          this.screenshotController.start();
         } else {
           console.log(import_chalk.default.gray("  \u26A0 P2P unavailable \u2014 using server relay"));
         }
@@ -28781,7 +28896,7 @@ var init_adhdev_daemon = __esm({
           }
         });
         await this.serverConn.connect();
-        this.statusReporter = new import_daemon_core3.DaemonStatusReporter({
+        this.statusReporter = new import_daemon_core4.DaemonStatusReporter({
           serverConn: this.serverConn,
           cdpManagers: this.components.cdpManagers,
           p2p: this.p2p,
@@ -28799,7 +28914,7 @@ var init_adhdev_daemon = __esm({
         process.on("SIGINT", () => this.stop());
         process.on("SIGTERM", () => this.stop());
         if (options.dev) {
-          const devServer = new import_daemon_core3.DevServer({ providerLoader: this.components.providerLoader, cdpManagers: this.components.cdpManagers });
+          const devServer = new import_daemon_core4.DevServer({ providerLoader: this.components.providerLoader, cdpManagers: this.components.cdpManagers });
           await devServer.start();
         }
         this.printBanner(options, config2.serverUrl);
@@ -28912,7 +29027,7 @@ var init_adhdev_daemon = __esm({
         }
       }
       async handleCommand(msg, cmd, args) {
-        import_daemon_core3.LOG.info("Command", `${cmd}${args?._targetInstance ? ` \u2192 ${args._targetType}:${args._targetInstance.split("_")[0]}` : ""}`);
+        import_daemon_core4.LOG.info("Command", `${cmd}${args?._targetInstance ? ` \u2192 ${args._targetType}:${args._targetInstance.split("_")[0]}` : ""}`);
         const cmdStart = Date.now();
         const source = msg.ipcWs ? "ext" : "ws";
         try {
@@ -28920,7 +29035,7 @@ var init_adhdev_daemon = __esm({
             const cmdStr = args?.command;
             if (!cmdStr) throw new Error("Command string required");
             if (DANGEROUS_PATTERNS.some((p) => p.test(cmdStr))) {
-              (0, import_daemon_core3.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source, args, success: false, error: "Blocked", durationMs: Date.now() - cmdStart });
+              (0, import_daemon_core4.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source, args, success: false, error: "Blocked", durationMs: Date.now() - cmdStart });
               this.sendResult(msg, false, { error: `Blocked: "${cmdStr}"` });
               return;
             }
@@ -28934,7 +29049,7 @@ var init_adhdev_daemon = __esm({
                 if (stderr) this.serverConn.sendMessage("log", { message: stderr.slice(0, 5e3), level: "warn" });
               }
             });
-            (0, import_daemon_core3.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source, args, success: true, durationMs: Date.now() - cmdStart });
+            (0, import_daemon_core4.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source, args, success: true, durationMs: Date.now() - cmdStart });
             this.sendResult(msg, true, { started: true });
             return;
           }
@@ -28951,16 +29066,16 @@ var init_adhdev_daemon = __esm({
         try {
           switch (cmdType) {
             case "get_cli_history": {
-              const config2 = (0, import_daemon_core3.loadConfig)();
-              (0, import_daemon_core3.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", success: true, durationMs: Date.now() - cmdStart });
+              const config2 = (0, import_daemon_core4.loadConfig)();
+              (0, import_daemon_core4.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", success: true, durationMs: Date.now() - cmdStart });
               return { success: true, history: config2.cliHistory || [] };
             }
             case "set_machine_nickname": {
               const nickname = data.nickname?.trim() || null;
-              const config2 = (0, import_daemon_core3.loadConfig)();
+              const config2 = (0, import_daemon_core4.loadConfig)();
               config2.machineNickname = nickname;
-              (0, import_daemon_core3.saveConfig)(config2);
-              (0, import_daemon_core3.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", args: { nickname }, success: true, durationMs: Date.now() - cmdStart });
+              (0, import_daemon_core4.saveConfig)(config2);
+              (0, import_daemon_core4.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", args: { nickname }, success: true, durationMs: Date.now() - cmdStart });
               return { success: true, nickname };
             }
             case "get_command_history": {
@@ -28972,7 +29087,7 @@ var init_adhdev_daemon = __esm({
           }
           return await this.components.router.execute(cmdType, data, "p2p");
         } catch (e) {
-          (0, import_daemon_core3.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", success: false, error: e.message, durationMs: Date.now() - cmdStart });
+          (0, import_daemon_core4.logCommand)({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", success: false, error: e.message, durationMs: Date.now() - cmdStart });
           return { success: false, error: e.message };
         }
       }
@@ -28997,16 +29112,16 @@ var init_adhdev_daemon = __esm({
         if (!this.running) return;
         this.running = false;
         console.log(import_chalk.default.yellow("\n  Shutting down ADHDev Daemon..."));
-        if (this.screenshotTimer) {
-          clearTimeout(this.screenshotTimer);
-          this.screenshotTimer = null;
+        if (this.screenshotController) {
+          this.screenshotController.stop();
+          this.screenshotController = null;
         }
         if (this.statusReporter) {
           this.statusReporter.stopReporting();
           this.statusReporter = null;
         }
         if (this.components) {
-          await (0, import_daemon_core3.shutdownDaemonComponents)(this.components);
+          await (0, import_daemon_core4.shutdownDaemonComponents)(this.components);
         }
         try {
           this.p2p?.disconnect();
@@ -29060,7 +29175,7 @@ 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_core4 = __toESM(require_dist());
+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")}
@@ -29070,13 +29185,13 @@ ${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({ logFn: () => {
+  const loader = new import_daemon_core5.ProviderLoader({ logFn: () => {
   } });
   loader.loadAll();
   loader.registerToDetector();
   console.log(LOGO);
-  if ((0, import_daemon_core4.isSetupComplete)() && !options.force) {
-    const config2 = (0, import_daemon_core4.loadConfig)();
+  if ((0, import_daemon_core5.isSetupComplete)() && !options.force) {
+    const config2 = (0, import_daemon_core5.loadConfig)();
     console.log(import_chalk2.default.green("\u2713") + " ADHDev is already set up!");
     const ides = config2.configuredIdes?.length ? config2.configuredIdes.join(", ") : config2.selectedIde || "none";
     console.log(import_chalk2.default.gray(`  IDEs: ${ides}`));
@@ -29105,7 +29220,7 @@ async function runWizard(options = {}) {
     if (action === "relogin") {
       const loginResult = await loginFlow();
       if (loginResult) {
-        (0, import_daemon_core4.updateConfig)({
+        (0, import_daemon_core5.updateConfig)({
           connectionToken: loginResult.connectionToken,
           userEmail: loginResult.email,
           userName: loginResult.name
@@ -29142,7 +29257,7 @@ async function runWizard(options = {}) {
 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_core4.detectIDEs)();
+  const ides = await (0, import_daemon_core5.detectIDEs)();
   const installedIDEs = ides.filter((i) => i.installed && i.cliCommand);
   spinner.stop();
   if (installedIDEs.length === 0) {
@@ -29190,9 +29305,9 @@ async function quickSetup() {
     }
   }
   const ideIds = selectedIDEs.map((i) => i.id);
-  (0, import_daemon_core4.markSetupComplete)(ideIds, ["adhdev"]);
+  (0, import_daemon_core5.markSetupComplete)(ideIds, ["adhdev"]);
   if (loginResult) {
-    (0, import_daemon_core4.updateConfig)({
+    (0, import_daemon_core5.updateConfig)({
       connectionToken: loginResult.connectionToken,
       userEmail: loginResult.email,
       userName: loginResult.name
@@ -29222,7 +29337,7 @@ async function quickSetup() {
 async function customSetup() {
   console.log(import_chalk2.default.bold("\n\u{1F4CD} Step 1/4 \u2014 Detecting installed IDEs...\n"));
   const spinner = (0, import_ora.default)("Scanning your system...").start();
-  const ides = await (0, import_daemon_core4.detectIDEs)();
+  const ides = await (0, import_daemon_core5.detectIDEs)();
   const installedIDEs = ides.filter((i) => i.installed);
   spinner.stop();
   if (installedIDEs.length === 0) {
@@ -29253,7 +29368,7 @@ async function customSetup() {
   const selectedIDE = installedIDEs.find((i) => i.id === selectedIdeId);
   console.log(DIVIDER);
   console.log(import_chalk2.default.bold("\n\u{1F4CD} Step 3/4 \u2014 Choose AI extensions\n"));
-  const aiExtensions = (0, import_daemon_core4.getAIExtensions)();
+  const aiExtensions = (0, import_daemon_core5.getAIExtensions)();
   const { selectedExtIds } = await import_inquirer.default.prompt([
     {
       type: "checkbox",
@@ -29270,7 +29385,7 @@ async function customSetup() {
   const allExtensions = selectedAIExts;
   console.log(import_chalk2.default.bold("\n\u{1F4CD} Step 4/4 \u2014 Installing extensions\n"));
   if (selectedIDE.cliCommand) {
-    await (0, import_daemon_core4.installExtensions)(
+    await (0, import_daemon_core5.installExtensions)(
       selectedIDE,
       allExtensions,
       (current, total, ext, result) => {
@@ -29289,9 +29404,9 @@ async function customSetup() {
   if (loginResult?.connectionToken) {
     await injectTokenToIDE(selectedIDE, loginResult.connectionToken);
   }
-  (0, import_daemon_core4.markSetupComplete)(selectedIdeId, allExtensions.map((e) => e.id));
+  (0, import_daemon_core5.markSetupComplete)(selectedIdeId, allExtensions.map((e) => e.id));
   if (loginResult) {
-    (0, import_daemon_core4.updateConfig)({
+    (0, import_daemon_core5.updateConfig)({
       connectionToken: loginResult.connectionToken,
       userEmail: loginResult.email,
       userName: loginResult.name
@@ -29397,7 +29512,7 @@ async function injectTokenToIDE(ide, connectionToken) {
         return path3.join(home, ".config", appName2, "User", "settings.json");
       }
     };
-    const loader = new import_daemon_core4.ProviderLoader({ logFn: () => {
+    const loader = new import_daemon_core5.ProviderLoader({ logFn: () => {
     } });
     loader.loadAll();
     const appNameMap = loader.getMacAppIdentifiers();