@adhdev/daemon-core 0.5.38 → 0.5.40

package/dist/index.js

@@ -4365,7 +4365,13 @@ async function handleExtensionScript(h, args, scriptName) {
     return { success: false, error: `Script '${actualScriptName}' not available for ${agentType}` };
   }
   const scriptFn = provider.scripts[actualScriptName];
-  const scriptCode = scriptFn(args);
+  const normalizedArgs = { ...args };
+  for (const key of ["mode", "model", "message", "action", "button", "text", "sessionId"]) {
+    if (key in normalizedArgs && !(key.toUpperCase() in normalizedArgs)) {
+      normalizedArgs[key.toUpperCase()] = normalizedArgs[key];
+    }
+  }
+  const scriptCode = scriptFn(normalizedArgs);
   if (!scriptCode) return { success: false, error: `Script '${actualScriptName}' returned null` };
   const cdpKey = provider.category === "ide" ? h.currentIdeType || agentType : h.currentIdeType || ideType;
   LOG.info("Command", `[ExtScript] provider=${provider.type} category=${provider.category} cdpKey=${cdpKey}`);
@@ -4382,10 +4388,31 @@ async function handleExtensionScript(h, args, scriptName) {
           break;
         }
       }
-      if (!targetSessionId) {
-        return { success: false, error: `No active session found for ${agentType}` };
+      const IDE_LEVEL_SCRIPTS = ["listModes", "setMode", "listModels", "setModel"];
+      if (IDE_LEVEL_SCRIPTS.includes(scriptName)) {
+        if (targetSessionId) {
+          try {
+            result = await cdp.evaluateInSessionFrame(targetSessionId, scriptCode);
+            const parsed = typeof result === "string" ? JSON.parse(result) : result;
+            const notFound = parsed?.error?.includes("not found") || parsed?.error?.includes("no root");
+            if (notFound) {
+              LOG.info("Command", `[ExtScript] ${scriptName} not found in session frame \u2192 trying IDE main page`);
+              result = await cdp.evaluate(scriptCode, 3e4);
+            }
+          } catch {
+            LOG.info("Command", `[ExtScript] ${scriptName} session frame failed \u2192 trying IDE main page`);
+            result = await cdp.evaluate(scriptCode, 3e4);
+          }
+        } else {
+          LOG.info("Command", `[ExtScript] ${scriptName} no session \u2192 trying IDE main page`);
+          result = await cdp.evaluate(scriptCode, 3e4);
+        }
+      } else {
+        if (!targetSessionId) {
+          return { success: false, error: `No active session found for ${agentType}` };
+        }
+        result = await cdp.evaluateInSessionFrame(targetSessionId, scriptCode);
       }
-      result = await cdp.evaluateInSessionFrame(targetSessionId, scriptCode);
     } else if (hasWebviewScript && cdp.evaluateInWebviewFrame) {
       const matchText = provider.webviewMatchText;
       const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
@@ -10256,14 +10283,29 @@ var DevServer = class _DevServer {
         return;
       }
       this.log(`Exec script length: ${scriptCode.length}, first 50 chars: ${scriptCode.slice(0, 50)}...`);
-      const isWebviewScript = provider.category === "extension" || scriptName.toLowerCase().includes("webview");
+      const isWebviewScript = scriptName.toLowerCase().includes("webview");
       let raw;
-      if (isWebviewScript) {
+      if (provider.category === "extension" && !isWebviewScript) {
+        const sessions = cdp.getAgentSessions();
+        let sessionId = null;
+        for (const [sid, target] of sessions) {
+          if (target.agentType === type) {
+            sessionId = sid;
+            break;
+          }
+        }
+        if (sessionId) {
+          raw = await cdp.evaluateInSessionFrame(sessionId, scriptCode);
+        } else if (cdp.evaluateInWebviewFrame) {
+          const matchText = provider.webviewMatchText;
+          const matchFn = matchText ? (body2) => body2.includes(matchText) : void 0;
+          raw = await cdp.evaluateInWebviewFrame(scriptCode, matchFn);
+        } else {
+          raw = await cdp.evaluate(scriptCode, 3e4);
+        }
+      } else if (isWebviewScript && cdp.evaluateInWebviewFrame) {
         const matchText = provider.webviewMatchText;
         const matchFn = matchText ? (body2) => body2.includes(matchText) : void 0;
-        if (!cdp.evaluateInWebviewFrame) {
-          throw new Error(`CDP manager does not support evaluateInWebviewFrame`);
-        }
         raw = await cdp.evaluateInWebviewFrame(scriptCode, matchFn);
       } else {
         raw = await cdp.evaluate(scriptCode, 3e4);