adhdev 0.5.36 → 0.5.38

package/dist/cli/index.js

@@ -16590,7 +16590,19 @@ var require_dist = __commonJS({
         delete merged.activeWorkspaceId;
         const hadStoredWorkspaces = Array.isArray(parsed.workspaces) && parsed.workspaces.length > 0;
         migrateWorkspacesFromRecent(merged);
+        let configChanged = false;
+        if (!merged.machineId) {
+          const os15 = require("os");
+          const crypto5 = require("crypto");
+          const safeHostname = os15.hostname().replace(/[^a-zA-Z0-9]/g, "_");
+          const machineHash = crypto5.createHash("md5").update(os15.hostname() + os15.homedir()).digest("hex").slice(0, 8);
+          merged.machineId = `${safeHostname}_${machineHash}`;
+          configChanged = true;
+        }
         if (!hadStoredWorkspaces && (merged.workspaces?.length || 0) > 0) {
+          configChanged = true;
+        }
+        if (configChanged) {
           try {
             saveConfig2(merged);
           } catch {
@@ -16691,6 +16703,7 @@ var require_dist = __commonJS({
           defaultWorkspaceId: null,
           recentWorkspaceActivity: [],
           machineNickname: null,
+          machineId: void 0,
           cliHistory: [],
           providerSettings: {},
           ideSettings: {}
@@ -17825,8 +17838,13 @@ var require_dist = __commonJS({
               });
               const value = result?.result?.value;
               if (value != null) {
+                const strValue = typeof value === "string" ? value : JSON.stringify(value);
+                if (strValue.includes("__adhdev_skip_iframe")) {
+                  this.log(`[CDP] evaluateInWebviewFrame: script requested skip in ${iframe.targetId.substring(0, 12)}`);
+                  continue;
+                }
                 this.log(`[CDP] evaluateInWebviewFrame: success in ${iframe.targetId.substring(0, 12)}`);
-                return typeof value === "string" ? value : JSON.stringify(value);
+                return strValue;
               }
             } catch (e) {
               if (sessionId) {
@@ -18363,7 +18381,7 @@ var require_dist = __commonJS({
         }
       }
     };
-    var crypto22 = __toESM2(require("crypto"));
+    var crypto2 = __toESM2(require("crypto"));
     var DEFAULT_MONITOR_CONFIG = {
       approvalAlert: true,
       longGeneratingAlert: true,
@@ -18461,6 +18479,8 @@ var require_dist = __commonJS({
       agentStreams = [];
       messages = [];
       activeModal = null;
+      currentModel = "";
+      currentMode = "";
       lastAgentStatus = "idle";
       generatingStartedAt = 0;
       monitor;
@@ -18500,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(),
@@ -18511,6 +18533,9 @@ var require_dist = __commonJS({
         if (event === "stream_update") {
           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);
@@ -18540,13 +18565,14 @@ var require_dist = __commonJS({
             this.pushEvent({ event: "agent:generating_started", chatTitle, timestamp: now });
           } else if (agentStatus === "waiting_approval") {
             if (!this.generatingStartedAt) this.generatingStartedAt = now;
+            const msg = data?.activeModal?.message || data?.modalMessage;
             this.pushEvent({
               event: "agent:waiting_approval",
               chatTitle,
               timestamp: now,
               ideType: this.ideType,
               agentType: this.type,
-              modalMessage: data?.activeModal?.message || data?.modalMessage,
+              modalMessage: msg,
               modalButtons: data?.activeModal?.buttons || data?.modalButtons
             });
           } else if (agentStatus === "idle" && (this.lastAgentStatus === "generating" || this.lastAgentStatus === "waiting_approval")) {
@@ -18730,7 +18756,7 @@ var require_dist = __commonJS({
       constructor(provider, instanceKey) {
         this.type = provider.type;
         this.provider = provider;
-        this.instanceId = crypto22.randomUUID();
+        this.instanceId = crypto2.randomUUID();
         this.monitor = new StatusMonitor();
         this.historyWriter = new ChatHistoryWriter();
       }
@@ -18906,8 +18932,8 @@ var require_dist = __commonJS({
               activeModal = void 0;
             } else {
               activeModal = {
-                message: activeModal.message?.slice(0, 300) ?? "",
-                buttons: (activeModal.buttons ?? []).filter((t) => t.length < 30)
+                message: activeModal.message?.slice(0, 5e3) ?? "",
+                buttons: (activeModal.buttons ?? []).filter((t) => t.length < 200)
               };
             }
           }
@@ -18978,12 +19004,13 @@ var require_dist = __commonJS({
             this.pushEvent({ event: "agent:generating_started", chatTitle, timestamp: now, ideType: this.type });
           } else if (agentStatus === "waiting_approval") {
             if (!this.generatingStartedAt.has(agentKey)) this.generatingStartedAt.set(agentKey, now);
+            const msg = chatData.activeModal?.message;
             this.pushEvent({
               event: "agent:waiting_approval",
               chatTitle,
               timestamp: now,
               ideType: this.type,
-              modalMessage: chatData.activeModal?.message,
+              modalMessage: msg,
               modalButtons: chatData.activeModal?.buttons
             });
           } else if (agentStatus === "idle" && (lastStatus === "generating" || lastStatus === "waiting_approval")) {
@@ -21905,9 +21932,29 @@ var require_dist = __commonJS({
             if (!file2.endsWith(".js")) continue;
             const scriptName = toCamel(file2.replace(".js", ""));
             const filePath = path6.join(dir, file2);
-            result[scriptName] = (..._args) => {
+            result[scriptName] = (...args) => {
               try {
-                return fs5.readFileSync(filePath, "utf-8");
+                let content = fs5.readFileSync(filePath, "utf-8");
+                if (args[0] && typeof args[0] === "object") {
+                  for (const [key, val] of Object.entries(args[0])) {
+                    let v = val;
+                    if (typeof v === "string") {
+                      if (!v.startsWith('"') && !v.startsWith("'") && !v.startsWith("`")) {
+                        v = JSON.stringify(v);
+                      }
+                    } else {
+                      v = JSON.stringify(v);
+                    }
+                    content = content.replace(new RegExp(`\\$\\{${key}\\}`, "g"), String(v));
+                  }
+                } else if (args[0] !== void 0) {
+                  let v = String(args[0]);
+                  if (!v.startsWith('"') && !v.startsWith("'") && !v.startsWith("`")) {
+                    v = JSON.stringify(v);
+                  }
+                  content = content.replace(/\$\{MESSAGE\}/g, v);
+                }
+                return content;
               } catch {
                 return "";
               }
@@ -22855,6 +22902,12 @@ var require_dist = __commonJS({
       emitStatusEvent(event) {
         LOG5.info("StatusEvent", `${event.event} (${event.providerType || event.ideType || ""})`);
         this.deps.serverConn?.sendMessage("status_event", event);
+        if (this.deps.p2p?.isConnected) {
+          try {
+            this.deps.p2p.sendStatusEvent?.(event);
+          } catch {
+          }
+        }
       }
       removeAgentTracking(_key) {
       }
@@ -25114,6 +25167,7 @@ ${installInfo}`
             messages: data.messages || [],
             inputContent: data.inputContent || "",
             model: data.model,
+            mode: data.mode,
             activeModal: data.activeModal
           };
           if (state.messages.length > 0) {
@@ -26448,11 +26502,15 @@ async (params) => {
             this.json(res, 500, { error: "Script function returned null" });
             return;
           }
-          const isWebviewScript = scriptName.toLowerCase().includes("webview");
+          this.log(`Exec script length: ${scriptCode.length}, first 50 chars: ${scriptCode.slice(0, 50)}...`);
+          const isWebviewScript = provider.category === "extension" || scriptName.toLowerCase().includes("webview");
           let raw;
           if (isWebviewScript) {
             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);
@@ -29601,13 +29659,13 @@ ${e?.stack || ""}`);
                 const transport = url2.includes("transport=tcp") ? "tcp" : "udp";
                 const isTls = url2.startsWith("turns:");
                 const parts = cleanUrl.replace(/^turns?:/, "").split(":");
-                const hostname4 = parts[0];
+                const hostname3 = parts[0];
                 const port = parseInt(parts[1]) || (isTls ? 5349 : 3478);
                 let relayType = "TurnUdp";
                 if (isTls) relayType = "TurnTls";
                 else if (transport === "tcp") relayType = "TurnTcp";
                 converted.push({
-                  hostname: hostname4,
+                  hostname: hostname3,
                   port,
                   username: server.username,
                   password: server.credential,
@@ -29635,16 +29693,16 @@ ${e?.stack || ""}`);
           connectedAt: Date.now(),
           pendingCandidates: [],
           remoteDescriptionSet: false,
-          isRelay: false
+          isRelay: false,
+          lastPongAt: Date.now()
         };
         this.peers.set(pid, entry);
         this.notifyStateChange();
-        const timeout = setTimeout(() => {
+        entry.connectionTimeout = setTimeout(() => {
           const peer = this.peers.get(pid);
           if (peer?.state === "connecting") {
-            log(`connection timeout (30s) for peer ${pid}`);
-            peer.state = "failed";
-            this.notifyStateChange();
+            log(`connection timeout (30s) for peer ${pid} \u2014 full cleanup`);
+            this.disconnectPeer(pid);
           }
         }, 3e4);
         try {
@@ -29729,9 +29787,11 @@ ${e?.stack || ""}`);
           filesCh.onMessage((msg) => this.handleCommandMessage(pid, msg));
         } catch (e) {
           log(`connection failed for peer ${pid}: ${e?.message}`);
-          clearTimeout(timeout);
           const peer = this.peers.get(pid);
-          if (peer) peer.state = "failed";
+          if (peer) {
+            if (peer.connectionTimeout) clearTimeout(peer.connectionTimeout);
+            peer.state = "failed";
+          }
           this.notifyStateChange();
         }
       }
@@ -29753,7 +29813,11 @@ ${e?.stack || ""}`);
             }
             return;
           }
-          if (parsed.type === "pong") return;
+          if (parsed.type === "pong") {
+            const peer = this.peers.get(peerId);
+            if (peer) peer.lastPongAt = Date.now();
+            return;
+          }
           if (parsed.type === "screenshot_start") {
             const peer = this.peers.get(peerId);
             if (!parsed.ideType) {
@@ -30068,6 +30132,7 @@ ${e?.stack || ""}`);
         if (!peer) return;
         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 {
@@ -30089,12 +30154,19 @@ ${e?.stack || ""}`);
         const peer = this.peers.get(peerId);
         if (!peer) return;
         if (peer.heartbeatTimer) clearInterval(peer.heartbeatTimer);
+        peer.lastPongAt = Date.now();
         peer.heartbeatTimer = setInterval(() => {
           const p = this.peers.get(peerId);
           if (!p || p.state !== "connected") {
             if (p?.heartbeatTimer) clearInterval(p.heartbeatTimer);
             return;
           }
+          const sincePong = Date.now() - p.lastPongAt;
+          if (sincePong > 45e3) {
+            log(`Peer ${peerId} pong timeout (${Math.round(sincePong / 1e3)}s) \u2014 disconnecting dead peer`);
+            this.disconnectPeer(peerId);
+            return;
+          }
           try {
             if (p.commandChannel?.isOpen()) {
               p.commandChannel.sendMessage(JSON.stringify({ type: "ping", ts: Date.now() }));
@@ -30317,7 +30389,7 @@ function stopDaemon() {
     return false;
   }
 }
-var import_daemon_core4, os2, fs2, path2, crypto2, import_chalk, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
+var import_daemon_core4, os2, fs2, path2, import_chalk, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
@@ -30328,9 +30400,8 @@ var init_adhdev_daemon = __esm({
     os2 = __toESM(require("os"));
     fs2 = __toESM(require("fs"));
     path2 = __toESM(require("path"));
-    crypto2 = __toESM(require("crypto"));
     import_chalk = __toESM(require("chalk"));
-    pkgVersion = "0.5.36";
+    pkgVersion = "0.5.38";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -30422,7 +30493,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
                 });
               }
             }
@@ -30444,9 +30517,7 @@ var init_adhdev_daemon = __esm({
           }
         }).catch(() => {
         });
-        const machineId = os2.hostname().replace(/[^a-zA-Z0-9]/g, "_");
-        const machineHash = crypto2.createHash("md5").update(os2.hostname() + os2.homedir()).digest("hex").slice(0, 8);
-        const instanceId = `daemon_${machineId}_${machineHash}`;
+        const instanceId = `daemon_${config2.machineId}`;
         this.serverConn = new ServerConnection({
           serverUrl: options.serverUrl || config2.serverUrl,
           token: config2.connectionToken,