@adhdev/daemon-core 0.5.21 → 0.5.24

package/dist/index.d.ts

@@ -1331,6 +1331,14 @@ declare class DaemonCdpManager {
     discoverAgentWebviews(): Promise<AgentWebviewTarget[]>;
     attachToAgent(target: AgentWebviewTarget): Promise<string | null>;
     evaluateInSession(sessionId: string, expression: string, timeoutMs?: number): Promise<unknown>;
+    /**
+     * Evaluate inside the child frame of an attached session.
+     * Extension webviews have a nested iframe structure:
+     *   outer (vscode-webview://) → inner (extension React app)
+     * This method navigates into the inner frame using CDP Page.getFrameTree.
+     * Falls back to evaluateInSession if no child frame is found.
+     */
+    evaluateInSessionFrame(sessionId: string, expression: string, timeoutMs?: number): Promise<unknown>;
     detachAgent(sessionId: string): Promise<void>;
     detachAllAgents(): Promise<void>;
     getAgentSessions(): Map<string, AgentWebviewTarget>;

package/dist/index.js

@@ -1631,6 +1631,60 @@ var DaemonCdpManager = class {
       }, timeoutMs);
     });
   }
+  /**
+   * Evaluate inside the child frame of an attached session.
+   * Extension webviews have a nested iframe structure:
+   *   outer (vscode-webview://) → inner (extension React app)
+   * This method navigates into the inner frame using CDP Page.getFrameTree.
+   * Falls back to evaluateInSession if no child frame is found.
+   */
+  async evaluateInSessionFrame(sessionId, expression, timeoutMs = 15e3) {
+    const ws = this._browserConnected ? this.browserWs : this.ws;
+    if (!ws || ws.readyState !== import_ws.default.OPEN) {
+      throw new Error("CDP not connected");
+    }
+    const sendViaSession = (method, params = {}) => {
+      return new Promise((resolve7, reject) => {
+        const pendingMap = this._browserConnected ? this.browserPending : this.pending;
+        const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
+        pendingMap.set(id, { resolve: resolve7, reject });
+        ws.send(JSON.stringify({ id, sessionId, method, params }));
+        setTimeout(() => {
+          if (pendingMap.has(id)) {
+            pendingMap.delete(id);
+            reject(new Error(`CDP session timeout: ${method}`));
+          }
+        }, timeoutMs);
+      });
+    };
+    try {
+      const { frameTree } = await sendViaSession("Page.getFrameTree");
+      const childFrame = frameTree?.childFrames?.[0]?.frame;
+      if (!childFrame) {
+        return this.evaluateInSession(sessionId, expression, timeoutMs);
+      }
+      const { executionContextId } = await sendViaSession("Page.createIsolatedWorld", {
+        frameId: childFrame.id,
+        worldName: "adhdev-agent-eval",
+        grantUniveralAccess: true
+      });
+      const result = await sendViaSession("Runtime.evaluate", {
+        expression,
+        returnByValue: true,
+        awaitPromise: true,
+        contextId: executionContextId
+      });
+      if (result?.result?.subtype === "error") {
+        throw new Error(result.result.description);
+      }
+      return result?.result?.value;
+    } catch (e) {
+      if (e.message?.includes("getFrameTree")) {
+        return this.evaluateInSession(sessionId, expression, timeoutMs);
+      }
+      throw e;
+    }
+  }
   async detachAgent(sessionId) {
     try {
       const sendFn = this._browserConnected ? this.sendBrowser.bind(this) : this.sendInternal.bind(this);
@@ -1777,7 +1831,7 @@ var CdpDomHandlers = class {
       }
       let result;
       if (sessionId) {
-        result = await this.getCdp().evaluateInSession(sessionId, expression);
+        result = await this.getCdp().evaluateInSessionFrame(sessionId, expression);
       } else {
         result = await this.getCdp().evaluate(expression, 3e4);
       }
@@ -1838,7 +1892,7 @@ var CdpDomHandlers = class {
     try {
       let raw;
       if (sessionId) {
-        raw = await this.getCdp().evaluateInSession(sessionId, expression);
+        raw = await this.getCdp().evaluateInSessionFrame(sessionId, expression);
       } else {
         raw = await this.getCdp().evaluate(expression, 15e3);
       }
@@ -1973,7 +2027,7 @@ var CdpDomHandlers = class {
     try {
       let raw;
       if (sessionId) {
-        raw = await this.getCdp().evaluateInSession(sessionId, expression);
+        raw = await this.getCdp().evaluateInSessionFrame(sessionId, expression);
       } else {
         raw = await this.getCdp().evaluate(expression, 3e4);
       }
@@ -4221,7 +4275,7 @@ async function handleExtensionScript(h, args, scriptName) {
       if (!targetSessionId) {
         return { success: false, error: `No active session found for ${agentType}` };
       }
-      result = await cdp.evaluateInSession(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;
@@ -4459,7 +4513,7 @@ var DaemonCommandHandler = class {
         sessionId = this.getExtensionSessionId(provider);
       }
       if (!sessionId) return null;
-      const result2 = await cdp.evaluateInSession(sessionId, script, timeout);
+      const result2 = await cdp.evaluateInSessionFrame(sessionId, script, timeout);
       return { result: result2, category: "extension" };
     }
     const result = await cdp.evaluate(script, timeout);
@@ -4485,6 +4539,10 @@ var DaemonCommandHandler = class {
   /** Extract ideType from _targetInstance or explicit ideType */
   extractIdeType(args) {
     if (args?.ideType) {
+      const mappedKey = this._ctx.instanceIdMap?.get(args.ideType);
+      if (mappedKey) {
+        return mappedKey;
+      }
       if (this._ctx.cdpManagers.has(args.ideType)) {
         return args.ideType;
       }
@@ -8839,7 +8897,7 @@ var DaemonAgentStreamManager = class {
         results.push(agent.lastState);
       } else {
         try {
-          const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
+          const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
           const state = await agent.adapter.readChat(evaluate);
           agent.lastState = state;
           agent.lastError = null;
@@ -8877,7 +8935,7 @@ var DaemonAgentStreamManager = class {
     const agent = this.managed.get(agentType);
     if (!agent) return false;
     try {
-      const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
+      const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
       await agent.adapter.sendMessage(evaluate, text);
       return true;
     } catch (e) {
@@ -8890,7 +8948,7 @@ var DaemonAgentStreamManager = class {
     const agent = this.managed.get(agentType);
     if (!agent) return false;
     try {
-      const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
+      const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
       return await agent.adapter.resolveAction(evaluate, action);
     } catch (e) {
       this.logFn(`[AgentStream] resolveAction(${agentType}) error: ${e.message}`);
@@ -8902,7 +8960,7 @@ var DaemonAgentStreamManager = class {
     const agent = this.managed.get(agentType);
     if (!agent) return false;
     try {
-      const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
+      const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
       await agent.adapter.newSession(evaluate);
       return true;
     } catch (e) {
@@ -8920,7 +8978,7 @@ var DaemonAgentStreamManager = class {
     }
     if (!agent || typeof agent.adapter.listChats !== "function") return [];
     try {
-      const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
+      const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
       return await agent.adapter.listChats(evaluate);
     } catch (e) {
       this.logFn(`[AgentStream] listChats(${agentType}) error: ${e.message}`);
@@ -8937,7 +8995,7 @@ var DaemonAgentStreamManager = class {
     }
     if (!agent || typeof agent.adapter.switchSession !== "function") return false;
     try {
-      const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
+      const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
       return await agent.adapter.switchSession(evaluate, sessionId);
     } catch (e) {
       this.logFn(`[AgentStream] switchSession(${agentType}) error: ${e.message}`);
@@ -8948,7 +9006,7 @@ var DaemonAgentStreamManager = class {
     const agent = this.managed.get(agentType);
     if (!agent || typeof agent.adapter.focusEditor !== "function") return false;
     try {
-      const evaluate = (expr, timeout) => cdp.evaluateInSession(agent.sessionId, expr, timeout);
+      const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
       await agent.adapter.focusEditor(evaluate);
       return true;
     } catch (e) {