adhdev 0.5.37 → 0.5.40

package/dist/cli/index.js

@@ -18479,6 +18479,8 @@ var require_dist = __commonJS({
       agentStreams = [];
       messages = [];
       activeModal = null;
+      currentModel = "";
+      currentMode = "";
       lastAgentStatus = "idle";
       generatingStartedAt = 0;
       monitor;
@@ -18518,6 +18520,8 @@ var require_dist = __commonJS({
             activeModal: this.activeModal,
             inputContent: ""
           } : null,
+          currentModel: this.currentModel || void 0,
+          currentPlan: this.currentMode || void 0,
           agentStreams: this.agentStreams,
           instanceId: this.instanceId,
           lastUpdated: Date.now(),
@@ -18530,6 +18534,8 @@ var require_dist = __commonJS({
           if (data?.streams) this.agentStreams = data.streams;
           if (data?.messages) this.messages = data.messages;
           if (data?.activeModal !== void 0) this.activeModal = data.activeModal;
+          if (data?.model) this.currentModel = data.model;
+          if (data?.mode) this.currentMode = data.mode;
           if (data?.status) {
             const newStatus = data.status;
             this.detectTransition(newStatus, data);
@@ -20658,7 +20664,13 @@ var require_dist = __commonJS({
         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;
       LOG5.info("Command", `[ExtScript] provider=${provider.type} category=${provider.category} cdpKey=${cdpKey}`);
@@ -20675,10 +20687,31 @@ var require_dist = __commonJS({
               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) {
+                  LOG5.info("Command", `[ExtScript] ${scriptName} not found in session frame \u2192 trying IDE main page`);
+                  result = await cdp.evaluate(scriptCode, 3e4);
+                }
+              } catch {
+                LOG5.info("Command", `[ExtScript] ${scriptName} session frame failed \u2192 trying IDE main page`);
+                result = await cdp.evaluate(scriptCode, 3e4);
+              }
+            } else {
+              LOG5.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;
@@ -25161,6 +25194,7 @@ ${installInfo}`
             messages: data.messages || [],
             inputContent: data.inputContent || "",
             model: data.model,
+            mode: data.mode,
             activeModal: data.activeModal
           };
           if (state.messages.length > 0) {
@@ -26496,14 +26530,29 @@ async (params) => {
             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);
@@ -29490,7 +29539,7 @@ ${e?.stack || ""}`);
       }
       get isConnected() {
         for (const peer of this.peers.values()) {
-          if (peer.state === "connected" && peer.screenshotChannel) return true;
+          if (peer.state === "connected" && peer.dataChannel) return true;
         }
         return false;
       }
@@ -29610,9 +29659,9 @@ ${e?.stack || ""}`);
             if (oldestPeer) {
               log(`P2P limit reached (${connectedCount}/${limits.maxP2PConnections}). Evicting oldest peer ${oldestPeer.id.slice(0, 12)}\u2026`);
               const evictedPeer = this.peers.get(oldestPeer.id);
-              if (evictedPeer?.commandChannel?.isOpen()) {
+              if (evictedPeer?.dataChannel?.isOpen()) {
                 try {
-                  evictedPeer.commandChannel.sendMessage(JSON.stringify({
+                  evictedPeer.dataChannel.sendMessage(JSON.stringify({
                     type: "p2p_evicted",
                     reason: "P2P_LIMIT_REACHED",
                     maxconnections: limits.maxP2PConnections
@@ -29679,8 +29728,7 @@ ${e?.stack || ""}`);
         const entry = {
           peerId: pid,
           pc,
-          screenshotChannel: null,
-          commandChannel: null,
+          dataChannel: null,
           state: "connecting",
           screenshotActive: false,
           connectedAt: Date.now(),
@@ -29743,41 +29791,31 @@ ${e?.stack || ""}`);
               }
             }
           });
-          const screenshotCh = pc.createDataChannel("screenshots");
-          screenshotCh.onOpen(() => {
-            log(`Screenshots channel OPEN for peer ${pid}`);
+          const dataCh = pc.createDataChannel("data");
+          entry.dataChannel = dataCh;
+          dataCh.onOpen(() => {
+            log(`Data channel OPEN for peer ${pid}`);
             const peer = this.peers.get(pid);
             if (peer) {
-              peer.screenshotChannel = screenshotCh;
               peer.state = "connected";
               this.notifyStateChange();
               if (peer.screenshotActive) {
                 log(`Screenshots auto-starting for peer ${pid} (was waiting for channel open)`);
               }
             }
+            setTimeout(() => this.sendPtyScrollback(pid), 100);
           });
-          screenshotCh.onClosed(() => {
-            log(`Screenshots channel CLOSED for peer ${pid}`);
+          dataCh.onClosed(() => {
+            log(`Data channel CLOSED for peer ${pid}`);
             const peer = this.peers.get(pid);
-            if (peer?.screenshotChannel === screenshotCh) {
-              peer.screenshotChannel = null;
+            if (peer?.dataChannel === dataCh) {
+              peer.dataChannel = null;
               peer.state = "failed";
               this.notifyStateChange();
             }
           });
-          screenshotCh.onError((err) => log(`Screenshots error: ${err}`));
-          const filesCh = pc.createDataChannel("commands");
-          entry.commandChannel = filesCh;
-          filesCh.onOpen(() => {
-            log(`Command channel OPEN for peer ${pid}`);
-            setTimeout(() => this.sendPtyScrollback(pid), 100);
-          });
-          filesCh.onClosed(() => {
-            const peer = this.peers.get(pid);
-            if (peer?.commandChannel === filesCh) peer.commandChannel = null;
-          });
-          filesCh.onError((err) => log(`Command channel error: ${err}`));
-          filesCh.onMessage((msg) => this.handleCommandMessage(pid, msg));
+          dataCh.onError((err) => log(`Data channel error: ${err}`));
+          dataCh.onMessage((msg) => this.handleCommandMessage(pid, msg));
         } catch (e) {
           log(`connection failed for peer ${pid}: ${e?.message}`);
           const peer = this.peers.get(pid);
@@ -29798,9 +29836,9 @@ ${e?.stack || ""}`);
           }
           if (parsed.type === "ping") {
             const peer = this.peers.get(peerId);
-            if (peer?.commandChannel?.isOpen()) {
+            if (peer?.dataChannel?.isOpen()) {
               try {
-                peer.commandChannel.sendMessage(JSON.stringify({ type: "pong", ts: Date.now() }));
+                peer.dataChannel.sendMessage(JSON.stringify({ type: "pong", ts: Date.now() }));
               } catch {
               }
             }
@@ -29821,7 +29859,7 @@ ${e?.stack || ""}`);
               peer.screenshotActive = true;
               peer.screenshotIdeType = parsed.ideType;
               peer.needsFirstFrame = true;
-              log(`screenshot_start: peer=${peerId}, ideType=${parsed.ideType}, channelOpen=${!!peer.screenshotChannel}, state=${peer.state}`);
+              log(`screenshot_start: peer=${peerId}, ideType=${parsed.ideType}, channelOpen=${!!peer.dataChannel}, state=${peer.state}`);
             } else {
               log(`screenshot_start: peer ${peerId} NOT FOUND in peers map!`);
             }
@@ -29875,9 +29913,9 @@ ${e?.stack || ""}`);
         });
         let sentAny = false;
         for (const peer of this.peers.values()) {
-          if (peer.state !== "connected" || !peer.commandChannel) continue;
+          if (peer.state !== "connected" || !peer.dataChannel) continue;
           try {
-            peer.commandChannel.sendMessage(payload);
+            peer.dataChannel.sendMessage(payload);
             sentAny = true;
           } catch {
           }
@@ -29893,9 +29931,9 @@ ${e?.stack || ""}`);
         });
         let sentAny = false;
         for (const peer of this.peers.values()) {
-          if (peer.state !== "connected" || !peer.commandChannel) continue;
+          if (peer.state !== "connected" || !peer.dataChannel) continue;
           try {
-            peer.commandChannel.sendMessage(payload);
+            peer.dataChannel.sendMessage(payload);
             sentAny = true;
           } catch {
           }
@@ -29913,9 +29951,9 @@ ${e?.stack || ""}`);
         const msg = JSON.stringify({ type: "pty_output", cliType, data });
         let sentAny = false;
         for (const peer of this.peers.values()) {
-          if (peer.state !== "connected" || !peer.commandChannel) continue;
+          if (peer.state !== "connected" || !peer.dataChannel) continue;
           try {
-            peer.commandChannel.sendMessage(msg);
+            peer.dataChannel.sendMessage(msg);
             sentAny = true;
           } catch {
           }
@@ -29925,11 +29963,11 @@ ${e?.stack || ""}`);
       /** Send scrollback on peer connect */
       sendPtyScrollback(peerId) {
         const peer = this.peers.get(peerId);
-        if (!peer?.commandChannel) return;
+        if (!peer?.dataChannel) return;
         for (const [cliType, buffer] of this.ptyScrollback) {
           if (!buffer) continue;
           try {
-            peer.commandChannel.sendMessage(JSON.stringify({
+            peer.dataChannel.sendMessage(JSON.stringify({
               type: "pty_output",
               cliType,
               data: buffer,
@@ -29951,17 +29989,17 @@ ${e?.stack || ""}`);
         const CHUNK_SIZE = 6e4;
         for (const [pid, peer] of this.peers.entries()) {
           if (debugOnce) {
-            logDebug(`sendScreenshot peer=${pid}: state=${peer.state}, hasSsCh=${!!peer.screenshotChannel}, ssActive=${peer.screenshotActive}, chOpen=${peer.screenshotChannel?.isOpen?.() ?? "N/A"}, bufSize=${buffer.length}`);
+            logDebug(`sendScreenshot peer=${pid}: state=${peer.state}, hasCh=${!!peer.dataChannel}, ssActive=${peer.screenshotActive}, chOpen=${peer.dataChannel?.isOpen?.() ?? "N/A"}, bufSize=${buffer.length}`);
           }
-          if (peer.state !== "connected" || !peer.screenshotChannel || !peer.screenshotActive) continue;
+          if (peer.state !== "connected" || !peer.dataChannel || !peer.screenshotActive) continue;
           try {
-            if (!peer.screenshotChannel.isOpen()) continue;
+            if (!peer.dataChannel.isOpen()) continue;
             const header = Buffer.alloc(4);
             header.writeUInt32BE(buffer.length, 0);
-            peer.screenshotChannel.sendMessageBinary(header);
+            peer.dataChannel.sendMessageBinary(header);
             for (let offset = 0; offset < buffer.length; offset += CHUNK_SIZE) {
               const chunk = buffer.subarray(offset, Math.min(offset + CHUNK_SIZE, buffer.length));
-              peer.screenshotChannel.sendMessageBinary(chunk);
+              peer.dataChannel.sendMessageBinary(chunk);
             }
             sentAny = true;
             if (peer.needsFirstFrame) {
@@ -30038,9 +30076,9 @@ ${e?.stack || ""}`);
       }
       sendToPeer(peerId, data) {
         const peer = this.peers.get(peerId);
-        if (!peer?.commandChannel) return;
+        if (!peer?.dataChannel) return;
         try {
-          peer.commandChannel.sendMessage(JSON.stringify(data));
+          peer.dataChannel.sendMessage(JSON.stringify(data));
         } catch {
         }
       }
@@ -30126,12 +30164,8 @@ ${e?.stack || ""}`);
         if (peer.failedCleanupTimer) clearTimeout(peer.failedCleanupTimer);
         if (peer.heartbeatTimer) clearInterval(peer.heartbeatTimer);
         if (peer.connectionTimeout) clearTimeout(peer.connectionTimeout);
-        if (peer.screenshotChannel) try {
-          peer.screenshotChannel.close();
-        } catch {
-        }
-        if (peer.commandChannel) try {
-          peer.commandChannel.close();
+        if (peer.dataChannel) try {
+          peer.dataChannel.close();
         } catch {
         }
         if (peer.pc) try {
@@ -30161,8 +30195,8 @@ ${e?.stack || ""}`);
             return;
           }
           try {
-            if (p.commandChannel?.isOpen()) {
-              p.commandChannel.sendMessage(JSON.stringify({ type: "ping", ts: Date.now() }));
+            if (p.dataChannel?.isOpen()) {
+              p.dataChannel.sendMessage(JSON.stringify({ type: "ping", ts: Date.now() }));
             }
           } catch {
           }
@@ -30394,7 +30428,7 @@ var init_adhdev_daemon = __esm({
     fs2 = __toESM(require("fs"));
     path2 = __toESM(require("path"));
     import_chalk = __toESM(require("chalk"));
-    pkgVersion = "0.5.37";
+    pkgVersion = "0.5.40";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -30486,7 +30520,9 @@ var init_adhdev_daemon = __esm({
                   streams: [stream],
                   messages: stream.messages || [],
                   status: stream.status || "idle",
-                  activeModal: stream.activeModal || null
+                  activeModal: stream.activeModal || null,
+                  model: stream.model || void 0,
+                  mode: stream.mode || void 0
                 });
               }
             }