@adhdev/daemon-core 0.5.36 → 0.5.38

package/dist/index.d.ts

@@ -161,6 +161,7 @@ interface ADHDevConfig {
     /** Recently used workspaces (IDE / CLI / ACP / default) for quick resume */
     recentWorkspaceActivity?: WorkspaceActivityEntry[];
     machineNickname: string | null;
+    machineId?: string;
     cliHistory: CliHistoryEntry[];
     providerSettings: Record<string, Record<string, any>>;
     ideSettings: Record<string, {
@@ -1457,6 +1458,7 @@ interface AgentStreamState {
     messages: AgentChatMessage[];
     inputContent: string;
     model?: string;
+    mode?: string;
     activeModal?: {
         message: string;
         buttons: string[];
@@ -1782,6 +1784,8 @@ declare class ExtensionProviderInstance implements ProviderInstance {
     private agentStreams;
     private messages;
     private activeModal;
+    private currentModel;
+    private currentMode;
     private lastAgentStatus;
     private generatingStartedAt;
     private monitor;
@@ -2187,6 +2191,7 @@ interface StatusReporterDeps {
         connectedPeerCount: number;
         screenshotActive: boolean;
         sendStatus(data: any): void;
+        sendStatusEvent?(event: Record<string, unknown>): boolean;
     } | null;
     providerLoader: {
         resolve(type: string): any;

package/dist/index.js

@@ -250,7 +250,19 @@ function loadConfig() {
     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 {
         saveConfig(merged);
       } catch {
@@ -348,6 +360,7 @@ var init_config = __esm({
       defaultWorkspaceId: null,
       recentWorkspaceActivity: [],
       machineNickname: null,
+      machineId: void 0,
       cliHistory: [],
       providerSettings: {},
       ideSettings: {}
@@ -1498,8 +1511,13 @@ var DaemonCdpManager = class {
           });
           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) {
@@ -2142,6 +2160,8 @@ var ExtensionProviderInstance = class {
   agentStreams = [];
   messages = [];
   activeModal = null;
+  currentModel = "";
+  currentMode = "";
   lastAgentStatus = "idle";
   generatingStartedAt = 0;
   monitor;
@@ -2181,6 +2201,8 @@ var ExtensionProviderInstance = class {
         activeModal: this.activeModal,
         inputContent: ""
       } : null,
+      currentModel: this.currentModel || void 0,
+      currentPlan: this.currentMode || void 0,
       agentStreams: this.agentStreams,
       instanceId: this.instanceId,
       lastUpdated: Date.now(),
@@ -2192,6 +2214,9 @@ var ExtensionProviderInstance = class {
     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);
@@ -2221,13 +2246,14 @@ var ExtensionProviderInstance = class {
         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")) {
@@ -2591,8 +2617,8 @@ var IdeProviderInstance = class {
           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)
           };
         }
       }
@@ -2663,12 +2689,13 @@ var IdeProviderInstance = class {
         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")) {
@@ -5614,9 +5641,29 @@ var ProviderLoader = class _ProviderLoader {
         if (!file.endsWith(".js")) continue;
         const scriptName = toCamel(file.replace(".js", ""));
         const filePath = path6.join(dir, file);
-        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 "";
           }
@@ -6574,6 +6621,12 @@ var DaemonStatusReporter = class {
   emitStatusEvent(event) {
     LOG.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) {
   }
@@ -8853,6 +8906,7 @@ var ProviderStreamAdapter = class {
         messages: data.messages || [],
         inputContent: data.inputContent || "",
         model: data.model,
+        mode: data.mode,
         activeModal: data.activeModal
       };
       if (state.messages.length > 0) {
@@ -10201,11 +10255,15 @@ var DevServer = class _DevServer {
         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);