@adhdev/daemon-core 0.5.35 → 0.5.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.5.35",
+  "version": "0.5.37",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,7 +12,8 @@
   },
   "scripts": {
     "build": "tsup",
-    "dev": "tsup --watch"
+    "dev": "tsup --watch",
+    "typecheck": "tsc --noEmit -p tsconfig.json"
   },
   "files": [
     "dist",

package/src/cdp/manager.ts

@@ -689,8 +689,14 @@ export class DaemonCdpManager {
 
                     const value = result?.result?.value;
                     if (value != null) {
+                        const strValue = typeof value === 'string' ? value : JSON.stringify(value);
+                        // Let provider script explicitly tell us to skip this iframe and try the next one
+                        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: any) {
                     if (sessionId) {

package/src/config/config.ts

@@ -58,6 +58,9 @@ export interface ADHDevConfig {
  // Machine nickname (user-customizable label for this machine)
     machineNickname: string | null;
 
+ // Stable machine ID (prevents duplicate daemon entries when OS hostname changes dynamically)
+    machineId?: string;
+
  // CLI launch history
     cliHistory: CliHistoryEntry[];
 
@@ -98,6 +101,7 @@ const DEFAULT_CONFIG: ADHDevConfig = {
     defaultWorkspaceId: null,
     recentWorkspaceActivity: [],
     machineNickname: null,
+    machineId: undefined,
     cliHistory: [],
     providerSettings: {},
     ideSettings: {},
@@ -141,7 +145,22 @@ export function loadConfig(): ADHDevConfig {
         delete (merged as any).activeWorkspaceId;
         const hadStoredWorkspaces = Array.isArray(parsed.workspaces) && parsed.workspaces.length > 0;
         migrateWorkspacesFromRecent(merged);
+        
+        let configChanged = false;
+        if (!merged.machineId) {
+            const os = require('os');
+            const crypto = require('crypto');
+            const safeHostname = os.hostname().replace(/[^a-zA-Z0-9]/g, '_');
+            const machineHash = crypto.createHash('md5').update(os.hostname() + os.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 { /* ignore */ }

package/src/daemon/dev-server.ts

@@ -337,13 +337,17 @@ export class DevServer {
         this.json(res, 500, { error: 'Script function returned null' });
         return;
       }
+      this.log(`Exec script length: ${scriptCode.length}, first 50 chars: ${scriptCode.slice(0, 50)}...`);
 
       // Execute webview script via evaluateInWebviewFrame
-      const isWebviewScript = scriptName.toLowerCase().includes('webview');
+      const isWebviewScript = provider.category === 'extension' || scriptName.toLowerCase().includes('webview');
       let raw: any;
       if (isWebviewScript) {
         const matchText = provider.webviewMatchText;
         const matchFn = matchText ? (body: string) => body.includes(matchText) : undefined;
+        if (!cdp.evaluateInWebviewFrame) {
+            throw new Error(`CDP manager does not support evaluateInWebviewFrame`);
+        }
         raw = await cdp.evaluateInWebviewFrame(scriptCode, matchFn);
       } else {
         raw = await cdp.evaluate(scriptCode, 30000);

package/src/providers/extension-provider-instance.ts

@@ -87,6 +87,7 @@ export class ExtensionProviderInstance implements ProviderInstance {
  // Reflect data collected from agent-stream-manager
             if (data?.streams) this.agentStreams = data.streams;
             if (data?.messages) this.messages = data.messages;
+            if (data?.activeModal !== undefined) this.activeModal = data.activeModal;
             if (data?.status) {
                 const newStatus = data.status;
                 this.detectTransition(newStatus, data);
@@ -125,11 +126,12 @@ export class ExtensionProviderInstance implements ProviderInstance {
                 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')) {

package/src/providers/ide-provider-instance.ts

@@ -253,8 +253,8 @@ export class IdeProviderInstance implements ProviderInstance {
                     activeModal = undefined;
                 } else {
                     activeModal = {
-                        message: activeModal.message?.slice(0, 300) ?? '',
-                        buttons: (activeModal.buttons ?? []).filter((t: string) => t.length < 30),
+                        message: activeModal.message?.slice(0, 5000) ?? '',
+                        buttons: (activeModal.buttons ?? []).filter((t: string) => t.length < 200),
                     };
                 }
             }
@@ -345,9 +345,10 @@ export class IdeProviderInstance implements ProviderInstance {
                 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')) {

package/src/providers/provider-loader.ts

@@ -904,8 +904,32 @@ export class ProviderLoader {
         if (!file.endsWith('.js')) continue;
         const scriptName = toCamel(file.replace('.js', ''));
         const filePath = path.join(dir, file);
-        (result as any)[scriptName] = (..._args: any[]): string => {
-          try { return fs.readFileSync(filePath, 'utf-8'); } catch { return ''; }
+        (result as any)[scriptName] = (...args: any[]): string => {
+          try {
+            let content = fs.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 it doesn't start with a quote, user probably passed raw text
+                  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] !== undefined) {
+               // legacy fallback for single argument usually MESSAGE
+               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 ''; }
         };
       }
     } catch { /* ignore */ }

package/src/status/reporter.ts

@@ -25,7 +25,7 @@ import type {
 export interface StatusReporterDeps {
     serverConn: { isConnected(): boolean; sendMessage(type: string, data: any): void; getUserPlan(): string } | null;
     cdpManagers: Map<string, { isConnected: boolean }>;
-    p2p: { isConnected: boolean; isAvailable: boolean; connectionState: string; connectedPeerCount: number; screenshotActive: boolean; sendStatus(data: any): void } | null;
+    p2p: { isConnected: boolean; isAvailable: boolean; connectionState: string; connectedPeerCount: number; screenshotActive: boolean; sendStatus(data: any): void; sendStatusEvent?(event: Record<string, unknown>): boolean } | null;
     providerLoader: { resolve(type: string): any; getAll(): any[] };
     adapters: Map<string, { cliType: string; cliName: string; workingDir: string; getStatus(): any; getPartialResponse(): string }>;
     detectedIdes: any[];
@@ -98,7 +98,15 @@ export class DaemonStatusReporter {
 
     emitStatusEvent(event: Record<string, unknown>): void {
         LOG.info('StatusEvent', `${event.event} (${event.providerType || event.ideType || ''})`);
+        // Send via WS (server relay → dashboard + push notifications)
         this.deps.serverConn?.sendMessage('status_event', event);
+        // Also send via P2P (direct → dashboard, works even when WS is flaky)
+        // Frontend dedup prevents duplicate toasts
+        if (this.deps.p2p?.isConnected) {
+            try {
+                this.deps.p2p.sendStatusEvent?.(event);
+            } catch { /* P2P send failure is non-critical */ }
+        }
     }
 
     removeAgentTracking(_key: string): void { /* Managed by Instance itself */ }