@adhdev/daemon-core 0.6.34 → 0.6.36

package/dist/index.d.ts

@@ -2810,6 +2810,7 @@ declare class DevServer {
     private handleSpawnTest;
     private handleRunScript;
     private handleCdpEvaluate;
+    private handleCdpClick;
     private handleCdpDomQuery;
     private handleScreenshot;
     private handleScriptsRun;
@@ -2833,6 +2834,7 @@ declare class DevServer {
     private handleWriteFile;
     private handleSource;
     private handleSave;
+    private handleTypeAndSend;
     private handleScriptHints;
     private handleValidate;
     private handleAcpChat;

package/dist/index.js

@@ -1967,21 +1967,41 @@ var DaemonCdpManager = class {
       clickCount: 1
     });
     await new Promise((r) => setTimeout(r, 150));
-    await this.sendInternal("Input.insertText", { text });
+    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 });
+        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));
     await this.sendInternal("Input.dispatchKeyEvent", {
       type: "rawKeyDown",
       key: "Enter",
       code: "Enter",
       windowsVirtualKeyCode: 13,
-      nativeVirtualKeyCode: 13
+      text: "\r",
+      unmodifiedText: "\r"
     });
     await this.sendInternal("Input.dispatchKeyEvent", {
-      type: "keyUp",
+      type: "char",
       key: "Enter",
       code: "Enter",
       windowsVirtualKeyCode: 13,
-      nativeVirtualKeyCode: 13
+      text: "\r",
+      unmodifiedText: "\r"
+    });
+    await this.sendInternal("Input.dispatchKeyEvent", {
+      type: "keyUp",
+      key: "Enter",
+      code: "Enter",
+      windowsVirtualKeyCode: 13
     });
     this.log(`[CDP] typeAndSend: sent "${text.substring(0, 50)}..."`);
     return true;
@@ -2035,21 +2055,41 @@ var DaemonCdpManager = class {
       windowsVirtualKeyCode: 8
     });
     await new Promise((r) => setTimeout(r, 150));
-    await this.sendInternal("Input.insertText", { text });
+    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 });
+        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));
     await this.sendInternal("Input.dispatchKeyEvent", {
       type: "rawKeyDown",
       key: "Enter",
       code: "Enter",
       windowsVirtualKeyCode: 13,
-      nativeVirtualKeyCode: 13
+      text: "\r",
+      unmodifiedText: "\r"
     });
     await this.sendInternal("Input.dispatchKeyEvent", {
-      type: "keyUp",
+      type: "char",
       key: "Enter",
       code: "Enter",
       windowsVirtualKeyCode: 13,
-      nativeVirtualKeyCode: 13
+      text: "\r",
+      unmodifiedText: "\r"
+    });
+    await this.sendInternal("Input.dispatchKeyEvent", {
+      type: "keyUp",
+      key: "Enter",
+      code: "Enter",
+      windowsVirtualKeyCode: 13
     });
     this.log(`[CDP] typeAndSendAt(${Math.round(x)},${Math.round(y)}): sent "${text.substring(0, 50)}..."`);
     return true;
@@ -5733,7 +5773,9 @@ var ProviderLoader = class _ProviderLoader {
     if (options?.builtinDir) {
       this.builtinDirs = Array.isArray(options.builtinDir) ? options.builtinDir : [options.builtinDir];
     } else {
-      this.builtinDirs = [path6.resolve(__dirname, "../providers/_builtin")];
+      const bundledDir = path6.resolve(__dirname, "../providers/_builtin");
+      const devDir = path6.resolve(__dirname, "../../providers/_builtin");
+      this.builtinDirs = [fs5.existsSync(devDir) ? devDir : bundledDir];
     }
     this.userDir = options?.userDir || path6.join(os7.homedir(), ".adhdev", "providers");
     this.upstreamDir = path6.join(this.userDir, ".upstream");
@@ -10284,6 +10326,7 @@ var DevServer = 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) },
@@ -10314,6 +10357,7 @@ var DevServer = 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) },
@@ -10556,6 +10600,7 @@ var DevServer = class _DevServer {
         } catch {
         }
       }
+      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) {
       this.json(res, 500, { error: `Script execution failed: ${e.message}` });
@@ -10590,6 +10635,26 @@ var DevServer = class _DevServer {
       this.json(res, 500, { error: e.message });
     }
   }
+  async handleCdpClick(req, res) {
+    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) {
+      this.json(res, 500, { error: e.message });
+    }
+  }
   async handleCdpDomQuery(req, res) {
     const body = await this.readBody(req);
     const { selector, limit = 10, ideType } = body;
@@ -10698,6 +10763,11 @@ var DevServer = class _DevServer {
         name: p.name,
         category: p.category
       }));
+      for (const cdp of this.cdpManagers.values()) {
+        if (!cdp.isConnected) {
+          cdp._targetId = null;
+        }
+      }
       this.json(res, 200, { reloaded: true, providers });
     } catch (e) {
       this.json(res, 500, { error: e.message });
@@ -10853,7 +10923,7 @@ var DevServer = class _DevServer {
     const provider = this.providerLoader.getMeta(type);
     if (!provider) return null;
     const cat = provider.category;
-    const builtinDir = this.providerLoader.builtinDir || path12.resolve(__dirname, "../providers/_builtin");
+    const builtinDir = this.providerLoader.builtinDirs?.[0] || path12.resolve(__dirname, "../providers/_builtin");
     const userDir = path12.join(os14.homedir(), ".adhdev", "providers");
     const directCandidates = [
       path12.join(userDir, type),
@@ -11004,6 +11074,25 @@ var DevServer = class _DevServer {
       this.json(res, 500, { error: `Save failed: ${e.message}` });
     }
   }
+  async handleTypeAndSend(type, req, res) {
+    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) {
+      this.json(res, 500, { error: e.message });
+    }
+  }
   async handleScriptHints(type, _req, res) {
     const dir = this.findProviderDir(type);
     if (!dir) {
@@ -11239,7 +11328,7 @@ var DevServer = class _DevServer {
     if (location === "user") {
       targetDir = path12.join(os14.homedir(), ".adhdev", "providers", type);
     } else {
-      const builtinDir = path12.resolve(__dirname, "../providers/_builtin");
+      const builtinDir = this.providerLoader.builtinDirs?.[0] || path12.resolve(__dirname, "../providers/_builtin");
       targetDir = path12.join(builtinDir, category, type);
     }
     const jsonPath = path12.join(targetDir, "provider.json");
@@ -12049,7 +12138,7 @@ var DevServer = class _DevServer {
       const domContext = null;
       this.sendAutoImplSSE({ event: "progress", data: { function: "_init", status: "loading_reference", message: `\uB808\uD37C\uB7F0\uC2A4 \uC2A4\uD06C\uB9BD\uD2B8 \uB85C\uB4DC \uC911 (${reference})...` } });
       let referenceScripts = {};
-      const builtinDir = this.providerLoader.builtinDir || path12.resolve(__dirname, "../providers/_builtin");
+      const builtinDir = this.providerLoader.builtinDirs?.[0] || path12.resolve(__dirname, "../providers/_builtin");
       const refDir = path12.join(builtinDir, "ide", reference);
       if (fs9.existsSync(refDir)) {
         const scriptsDir = path12.join(refDir, "scripts");
@@ -12249,7 +12338,7 @@ var DevServer = 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 {
         const escapedArgs = baseArgs.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
@@ -12311,7 +12400,7 @@ var DevServer = class _DevServer {
         const cleanData = chunk.replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "").replace(/  +/g, " ");
         approvalBuffer = (approvalBuffer + cleanData).slice(-1500);
         const elapsed = Date.now() - spawnedAt;
-        if (elapsed > 15e3 && approvalBuffer.includes("AUTO_IMPLEMENT_FINISHED")) {
+        if (elapsed > 15e3 && approvalBuffer.includes("_PIPELINE_COMPLETE_SIGNAL_")) {
           this.log(`Agent finished task after ${Math.round(elapsed / 1e3)}s. Terminating interactive CLI session to unblock pipeline.`);
           this.sendAutoImplSSE({ event: "output", data: { chunk: `
 [\u{1F916} ADHDev Pipeline] Completion token detected. Proceeding...