@adhdev/daemon-core 0.6.34 → 0.6.36

package/package.json

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

package/src/cdp/manager.ts

@@ -503,18 +503,31 @@ export class DaemonCdpManager {
         });
         await new Promise(r => setTimeout(r, 150));
 
- // Step 3: Insert text
-        await this.sendInternal('Input.insertText', { text });
+ // Step 3: Insert text & handle newlines
+        const lines = text.split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            if (lines[i].length > 0) {
+                await this.sendInternal('Input.insertText', { text: lines[i] });
+                await new Promise(r => setTimeout(r, 100));
+            }
+            if (i < lines.length - 1) {
+                await this.sendInternal('Input.dispatchKeyEvent', { type: 'rawKeyDown', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, modifiers: 8 }); // Shift
+                await this.sendInternal('Input.dispatchKeyEvent', { type: 'char', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, text: '\r', unmodifiedText: '\r', modifiers: 8 });
+                await this.sendInternal('Input.dispatchKeyEvent', { type: 'keyUp', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, modifiers: 8 });
+                await new Promise(r => setTimeout(r, 100));
+            }
+        }
         await new Promise(r => setTimeout(r, 200));
 
  // Step 4: Press Enter
         await this.sendInternal('Input.dispatchKeyEvent', {
-            type: 'rawKeyDown', key: 'Enter', code: 'Enter',
-            windowsVirtualKeyCode: 13, nativeVirtualKeyCode: 13,
+            type: 'rawKeyDown', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, text: '\r', unmodifiedText: '\r'
+        });
+        await this.sendInternal('Input.dispatchKeyEvent', {
+            type: 'char', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, text: '\r', unmodifiedText: '\r'
         });
         await this.sendInternal('Input.dispatchKeyEvent', {
-            type: 'keyUp', key: 'Enter', code: 'Enter',
-            windowsVirtualKeyCode: 13, nativeVirtualKeyCode: 13,
+            type: 'keyUp', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13
         });
 
         this.log(`[CDP] typeAndSend: sent "${text.substring(0, 50)}..."`);
@@ -558,18 +571,31 @@ export class DaemonCdpManager {
         });
         await new Promise(r => setTimeout(r, 150));
 
- // Step 3: Insert text
-        await this.sendInternal('Input.insertText', { text });
+ // Step 3: Insert text & handle newlines
+        const lines = text.split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            if (lines[i].length > 0) {
+                await this.sendInternal('Input.insertText', { text: lines[i] });
+                await new Promise(r => setTimeout(r, 100));
+            }
+            if (i < lines.length - 1) {
+                await this.sendInternal('Input.dispatchKeyEvent', { type: 'rawKeyDown', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, modifiers: 8 }); // Shift
+                await this.sendInternal('Input.dispatchKeyEvent', { type: 'char', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, text: '\r', unmodifiedText: '\r', modifiers: 8 });
+                await this.sendInternal('Input.dispatchKeyEvent', { type: 'keyUp', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, modifiers: 8 });
+                await new Promise(r => setTimeout(r, 100));
+            }
+        }
         await new Promise(r => setTimeout(r, 200));
 
  // Step 4: Press Enter
         await this.sendInternal('Input.dispatchKeyEvent', {
-            type: 'rawKeyDown', key: 'Enter', code: 'Enter',
-            windowsVirtualKeyCode: 13, nativeVirtualKeyCode: 13,
+            type: 'rawKeyDown', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, text: '\r', unmodifiedText: '\r'
+        });
+        await this.sendInternal('Input.dispatchKeyEvent', {
+            type: 'char', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, text: '\r', unmodifiedText: '\r'
         });
         await this.sendInternal('Input.dispatchKeyEvent', {
-            type: 'keyUp', key: 'Enter', code: 'Enter',
-            windowsVirtualKeyCode: 13, nativeVirtualKeyCode: 13,
+            type: 'keyUp', key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13
         });
 
         this.log(`[CDP] typeAndSendAt(${Math.round(x)},${Math.round(y)}): sent "${text.substring(0, 50)}..."`);

package/src/daemon/dev-server.ts

@@ -78,6 +78,7 @@ export class DevServer {
     { method: 'GET',  pattern: '/api/providers/versions',  handler: (q, s) => this.handleDetectVersions(q, s) },
     { method: 'POST', pattern: '/api/providers/reload',    handler: (q, s) => this.handleReload(q, s) },
     { method: 'POST', pattern: '/api/cdp/evaluate',        handler: (q, s) => this.handleCdpEvaluate(q, s) },
+    { method: 'POST', pattern: '/api/cdp/click',           handler: (q, s) => this.handleCdpClick(q, s) },
     { method: 'POST', pattern: '/api/cdp/dom/query',       handler: (q, s) => this.handleCdpDomQuery(q, s) },
     { method: 'POST', pattern: '/api/cdp/dom/inspect',     handler: (q, s) => this.handleDomInspect(q, s) },
     { method: 'POST', pattern: '/api/cdp/dom/children',    handler: (q, s) => this.handleDomChildren(q, s) },
@@ -108,6 +109,7 @@ export class DevServer {
     { method: 'POST', pattern: /^\/api\/providers\/([^/]+)\/file$/,                  handler: (q, s, p) => this.handleWriteFile(p![0], q, s) },
     { method: 'GET',  pattern: /^\/api\/providers\/([^/]+)\/source$/,                handler: (q, s, p) => this.handleSource(p![0], q, s) },
     { method: 'POST', pattern: /^\/api\/providers\/([^/]+)\/save$/,                  handler: (q, s, p) => this.handleSave(p![0], q, s) },
+    { method: 'POST', pattern: /^\/api\/providers\/([^/]+)\/typeAndSend$/,           handler: (q, s, p) => this.handleTypeAndSend(p![0], q, s) },
     { method: 'GET',  pattern: /^\/api\/providers\/([^/]+)\/config$/,                handler: (q, s, p) => this.handleProviderConfig(p![0], q, s) },
     { method: 'POST', pattern: /^\/api\/providers\/([^/]+)\/dom-context$/,           handler: (q, s, p) => this.handleDomContext(p![0], q, s) },
     { method: 'POST', pattern: /^\/api\/providers\/([^/]+)\/auto-implement$/,        handler: (q, s, p) => this.handleAutoImplement(p![0], q, s) },
@@ -371,6 +373,7 @@ export class DevServer {
       if (typeof raw === 'string') {
         try { result = JSON.parse(raw); } catch { /* keep */ }
       }
+      this.log(`Script raw debug: typeof=${typeof raw}, raw=${JSON.stringify(raw)}, parsed=${JSON.stringify(result)}`);
       this.json(res, 200, { type, script: scriptName, result });
     } catch (e: any) {
       this.json(res, 500, { error: `Script execution failed: ${e.message}` });
@@ -406,6 +409,29 @@ export class DevServer {
     }
   }
 
+  private async handleCdpClick(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
+    const body = await this.readBody(req);
+    const { ideType, x, y } = body;
+    if (x == null || y == null) {
+      this.json(res, 400, { error: 'x and y coordinates required' });
+      return;
+    }
+
+    const cdp = this.getCdp(ideType);
+    if (!cdp?.isConnected) {
+      this.json(res, 503, { error: 'No CDP connection available' });
+      return;
+    }
+
+    try {
+      await cdp.send('Input.dispatchMouseEvent', { type: 'mousePressed', x, y, button: 'left', clickCount: 1 });
+      await cdp.send('Input.dispatchMouseEvent', { type: 'mouseReleased', x, y, button: 'left', clickCount: 1 });
+      this.json(res, 200, { success: true, clicked: true, x, y });
+    } catch (e: any) {
+      this.json(res, 500, { error: e.message });
+    }
+  }
+
   private async handleCdpDomQuery(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
     const body = await this.readBody(req);
     const { selector, limit = 10, ideType } = body;
@@ -522,6 +548,11 @@ export class DevServer {
       const providers = this.providerLoader.getAll().map(p => ({
         type: p.type, name: p.name, category: p.category,
       }));
+      for (const cdp of this.cdpManagers.values()) {
+        if (!cdp.isConnected) {
+          (cdp as any)._targetId = null;
+        }
+      }
       this.json(res, 200, { reloaded: true, providers });
     } catch (e: any) {
       this.json(res, 500, { error: e.message });
@@ -692,7 +723,7 @@ export class DevServer {
     const provider = this.providerLoader.getMeta(type);
     if (!provider) return null;
     const cat = provider.category;
-    const builtinDir = (this.providerLoader as any).builtinDir || path.resolve(__dirname, '../providers/_builtin');
+    const builtinDir = (this.providerLoader as any).builtinDirs?.[0] || path.resolve(__dirname, '../providers/_builtin');
     const userDir = path.join(os.homedir(), '.adhdev', 'providers');
 
     // Direct match first
@@ -833,6 +864,24 @@ export class DevServer {
     }
   }
 
+  private async handleTypeAndSend(type: string, req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
+    const body = await this.readBody(req);
+    const { selector, text } = body;
+    if (!selector || typeof selector !== 'string' || !text || typeof text !== 'string') {
+      this.json(res, 400, { error: 'selector and text strings required' }); return;
+    }
+    const cdp = this.getCdp(type);
+    if (!cdp) {
+      this.json(res, 503, { error: `CDP not connected for '${type}'` }); return;
+    }
+    try {
+      const sent = await cdp.typeAndSend(selector, text);
+      this.json(res, 200, { sent });
+    } catch (e: any) {
+      this.json(res, 500, { error: e.message });
+    }
+  }
+
   private async handleScriptHints(type: string, _req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
     const dir = this.findProviderDir(type);
     if (!dir) { this.json(res, 404, { error: `Provider not found: ${type}` }); return; }
@@ -1065,7 +1114,7 @@ export class DevServer {
     if (location === 'user') {
       targetDir = path.join(os.homedir(), '.adhdev', 'providers', type);
     } else {
-      const builtinDir = path.resolve(__dirname, '../providers/_builtin');
+      const builtinDir = (this.providerLoader as any).builtinDirs?.[0] || path.resolve(__dirname, '../providers/_builtin');
       targetDir = path.join(builtinDir, category, type);
     }
 
@@ -1851,7 +1900,7 @@ export class DevServer {
       this.sendAutoImplSSE({ event: 'progress', data: { function: '_init', status: 'loading_reference', message: `레퍼런스 스크립트 로드 중 (${reference})...` } });
 
       let referenceScripts: Record<string, string> = {};
-      const builtinDir = (this.providerLoader as any).builtinDir || path.resolve(__dirname, '../providers/_builtin');
+      const builtinDir = (this.providerLoader as any).builtinDirs?.[0] || path.resolve(__dirname, '../providers/_builtin');
       const refDir = path.join(builtinDir, 'ide', reference);
       if (fs.existsSync(refDir)) {
         // Find latest versioned scripts dir
@@ -2053,7 +2102,7 @@ export class DevServer {
         }
         if (model) args.push('--model', model);
         const escapedArgs = args.map(a => `'${a.replace(/'/g, "'\\''")}'`).join(' ');
-        const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions recursively. You have full authority to implement ALL required script files, update provider.json configurations based on the reference patterns, and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "AUTO_IMPLEMENT_FINISHED" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
+        const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions recursively. You have full authority to implement ALL required script files, update provider.json configurations based on the reference patterns, and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
         shellCmd = `${command} ${escapedArgs} "${metaPrompt}"`;
       } else {
         // Generic fallback: pipe prompt via stdin
@@ -2131,7 +2180,7 @@ export class DevServer {
         
         // Force exit on completion signal (ignore during first 15s — prompt echo contains the token)
         const elapsed = Date.now() - spawnedAt;
-        if (elapsed > 15000 && approvalBuffer.includes('AUTO_IMPLEMENT_FINISHED')) {
+        if (elapsed > 15000 && approvalBuffer.includes('_PIPELINE_COMPLETE_SIGNAL_')) {
           this.log(`Agent finished task after ${Math.round(elapsed/1000)}s. Terminating interactive CLI session to unblock pipeline.`);
           this.sendAutoImplSSE({ event: 'output', data: { chunk: `\n[🤖 ADHDev Pipeline] Completion token detected. Proceeding...\n`, stream: 'stdout' } });
           approvalBuffer = '';

package/src/providers/provider-loader.ts

@@ -57,7 +57,10 @@ export class ProviderLoader {
     if (options?.builtinDir) {
         this.builtinDirs = Array.isArray(options.builtinDir) ? options.builtinDir : [options.builtinDir];
     } else {
-        this.builtinDirs = [path.resolve(__dirname, '../providers/_builtin')];
+        // Handle both development (src/providers -> ../../providers) and production (dist -> ../providers)
+        const bundledDir = path.resolve(__dirname, '../providers/_builtin');
+        const devDir = path.resolve(__dirname, '../../providers/_builtin');
+        this.builtinDirs = [fs.existsSync(devDir) ? devDir : bundledDir];
     }
  // User custom directory: ~/.adhdev/providers/
     this.userDir = options?.userDir ||