@adhdev/daemon-core 0.5.37 → 0.5.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.5.37",
+  "version": "0.5.40",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/agent-stream/provider-adapter.ts

@@ -62,6 +62,7 @@ export class ProviderStreamAdapter implements IAgentStreamAdapter {
                 messages: data.messages || [],
                 inputContent: data.inputContent || '',
                 model: data.model,
+                mode: data.mode,
                 activeModal: data.activeModal,
             };
             if (state.messages.length > 0) {

package/src/agent-stream/types.ts

@@ -30,6 +30,7 @@ export interface AgentStreamState {
     messages: AgentChatMessage[];
     inputContent: string;
     model?: string;
+    mode?: string;
     activeModal?: { message: string; buttons: string[] };
 }
 

package/src/commands/stream-commands.ts

@@ -229,7 +229,15 @@ export async function handleExtensionScript(h: CommandHelpers, args: any, script
     }
 
     const scriptFn = provider.scripts[actualScriptName as keyof typeof provider.scripts] as Function;
-    const scriptCode = scriptFn(args);
+    // Normalize args: script placeholders use UPPERCASE (${MODE}, ${MODEL}, ${MESSAGE})
+    // but WebSocket args typically use lowercase. Add uppercase versions of common keys.
+    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);
@@ -249,10 +257,35 @@ export async function handleExtensionScript(h: CommandHelpers, args: any, script
                     break;
                 }
             }
-            if (!targetSessionId) {
-                return { success: false, error: `No active session found for ${agentType}` };
+
+            // IDE-level scripts (model/mode) — try session frame first, fallback to main page
+            const IDE_LEVEL_SCRIPTS = ['listModes', 'setMode', 'listModels', 'setModel'];
+            if (IDE_LEVEL_SCRIPTS.includes(scriptName)) {
+                // Try session frame first (some extensions embed mode selector in their webview)
+                if (targetSessionId) {
+                    try {
+                        result = await cdp.evaluateInSessionFrame(targetSessionId, scriptCode);
+                        // Check if result indicates "not found" — fallback to main page
+                        const parsed = typeof result === 'string' ? JSON.parse(result) : result;
+                        const notFound = parsed?.error?.includes('not found') || parsed?.error?.includes('no root');
+                        if (notFound) {
+                            LOG.info('Command', `[ExtScript] ${scriptName} not found in session frame → trying IDE main page`);
+                            result = await cdp.evaluate(scriptCode, 30000);
+                        }
+                    } catch {
+                        LOG.info('Command', `[ExtScript] ${scriptName} session frame failed → trying IDE main page`);
+                        result = await cdp.evaluate(scriptCode, 30000);
+                    }
+                } else {
+                    LOG.info('Command', `[ExtScript] ${scriptName} no session → trying IDE main page`);
+                    result = await cdp.evaluate(scriptCode, 30000);
+                }
+            } 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: string) => body.includes(matchText) : undefined;

package/src/daemon/dev-server.ts

@@ -339,15 +339,29 @@ export class DevServer {
       }
       this.log(`Exec script length: ${scriptCode.length}, first 50 chars: ${scriptCode.slice(0, 50)}...`);
 
-      // Execute webview script via evaluateInWebviewFrame
-      const isWebviewScript = provider.category === 'extension' || scriptName.toLowerCase().includes('webview');
+      // Execute based on provider category
+      const isWebviewScript = scriptName.toLowerCase().includes('webview');
       let raw: any;
-      if (isWebviewScript) {
+      if (provider.category === 'extension' && !isWebviewScript) {
+        // Extension scripts: prefer session frame (agent webview) — matching agent-stream poller behavior
+        const sessions = cdp.getAgentSessions();
+        let sessionId: string | null = 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) {
+          // Fallback: try evaluateInWebviewFrame
+          const matchText = provider.webviewMatchText;
+          const matchFn = matchText ? (body: string) => body.includes(matchText) : undefined;
+          raw = await cdp.evaluateInWebviewFrame(scriptCode, matchFn);
+        } else {
+          raw = await cdp.evaluate(scriptCode, 30000);
+        }
+      } else if (isWebviewScript && cdp.evaluateInWebviewFrame) {
         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

@@ -23,6 +23,8 @@ export class ExtensionProviderInstance implements ProviderInstance {
     private agentStreams: any[] = [];
     private messages: any[] = [];
     private activeModal: any = null;
+    private currentModel: string = '';
+    private currentMode: string = '';
     private lastAgentStatus: string = 'idle';
     private generatingStartedAt: number = 0;
     private monitor: StatusMonitor;
@@ -74,6 +76,8 @@ export class ExtensionProviderInstance implements ProviderInstance {
                 activeModal: this.activeModal,
                 inputContent: '',
             } : null,
+            currentModel: this.currentModel || undefined,
+            currentPlan: this.currentMode || undefined,
             agentStreams: this.agentStreams,
             instanceId: this.instanceId,
             lastUpdated: Date.now(),
@@ -88,6 +92,8 @@ export class ExtensionProviderInstance implements ProviderInstance {
             if (data?.streams) this.agentStreams = data.streams;
             if (data?.messages) this.messages = data.messages;
             if (data?.activeModal !== undefined) 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);

package/src/status/reporter.ts

@@ -221,7 +221,7 @@ export class DaemonStatusReporter {
             LOG.debug('P2P', `sent (${JSON.stringify(payload).length} bytes)`);
         }
 
- // ═══ Server transmit (minimal routing meta only — sanitizeForRelay removes everything else) ═══
+ // ═══ Server transmit (minimal routing meta only) ═══
         if (opts?.p2pOnly) return;
         const wsPayload = {
             daemonMode: true,