adhdev 0.6.34 → 0.6.36

package/dist/cli/index.js

@@ -1288,21 +1288,41 @@ var init_manager = __esm({
           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;
@@ -1356,21 +1376,41 @@ var init_manager = __esm({
           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;
@@ -5151,7 +5191,9 @@ var init_provider_loader = __esm({
         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");
@@ -26769,6 +26811,7 @@ var init_dev_server = __esm({
         { 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) },
@@ -26799,6 +26842,7 @@ var init_dev_server = __esm({
         { 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) },
@@ -27041,6 +27085,7 @@ var init_dev_server = __esm({
             } 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}` });
@@ -27075,6 +27120,26 @@ var init_dev_server = __esm({
           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;
@@ -27183,6 +27248,11 @@ var init_dev_server = __esm({
             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 });
@@ -27338,7 +27408,7 @@ var init_dev_server = __esm({
         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),
@@ -27489,6 +27559,25 @@ var init_dev_server = __esm({
           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) {
@@ -27724,7 +27813,7 @@ var init_dev_server = __esm({
         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");
@@ -28534,7 +28623,7 @@ var init_dev_server = __esm({
           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");
@@ -28734,7 +28823,7 @@ var init_dev_server = __esm({
             }
             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(" ");
@@ -28796,7 +28885,7 @@ var init_dev_server = __esm({
             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...
@@ -31184,7 +31273,7 @@ var init_adhdev_daemon = __esm({
     fs11 = __toESM(require("fs"));
     path14 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.6.34";
+    pkgVersion = "0.6.36";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -32774,7 +32863,10 @@ function registerProviderCommands(program2) {
         const pathMod = await import("path");
         const fsMod = await import("fs");
         const osMod = await import("os");
-        let targetDir = location === "builtin" ? pathMod.resolve(__dirname, "../../providers/_builtin", category, type) : pathMod.join(osMod.homedir(), ".adhdev", "providers", type);
+        const { ProviderLoader: ProviderLoader2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+        const loader = new ProviderLoader2();
+        const bDir = loader.builtinDirs[0];
+        let targetDir = location === "builtin" ? pathMod.join(bDir, category, type) : pathMod.join(osMod.homedir(), ".adhdev", "providers", type);
         if (fsMod.existsSync(targetDir)) return { error: `Provider already exists at ${targetDir}` };
         const isExt = category === "extension";
         const isIde = category === "ide";
@@ -32864,21 +32956,31 @@ function registerProviderCommands(program2) {
       if (providerToFix && !isUserProvider(providerToFix)) {
         console.log(import_chalk6.default.yellow(`
 \u26A0\uFE0F  [${type}] is an upstream provider.`));
-        console.log(import_chalk6.default.yellow(`    Any local modifications will be permanently OVERWRITTEN by the next auto-update!`));
-        const confirmClone = await inquirer2.prompt([{
-          type: "confirm",
-          name: "doClone",
-          message: `Do you want to safely clone it to a custom user provider ('my-${type}') and fix that instead?`,
-          default: true
+        console.log(import_chalk6.default.yellow(`    Any local modifications will be normally OVERWRITTEN by the next auto-update!`));
+        console.log(import_chalk6.default.gray(`    We can disable upstream updates for this provider so your local edits are preserved.`));
+        const actionAnswer = await inquirer2.prompt([{
+          type: "list",
+          name: "action",
+          message: `How would you like to proceed?`,
+          choices: [
+            { name: "Edit in-place (Copy locally and disable upstream updates)", value: "inplace" },
+            { name: `Clone to a custom provider ('my-${type}')`, value: "clone" },
+            { name: "Cancel", value: "cancel" }
+          ]
         }]);
-        if (confirmClone.doClone) {
-          const pathMod2 = await import("path");
-          const fsMod2 = await import("fs");
-          const osMod2 = await import("os");
+        if (actionAnswer.action === "cancel") {
+          console.log(import_chalk6.default.red("\n\u2717 Fix aborted.\n"));
+          process.exit(1);
+        }
+        const pathMod2 = await import("path");
+        const fsMod2 = await import("fs");
+        const osMod2 = await import("os");
+        const bDir = loader.builtinDirs[0];
+        const builtinSrc = pathMod2.join(bDir, providerToFix.category, type);
+        const downloadedSrc = pathMod2.join(osMod2.homedir(), ".adhdev", "providers", ".upstream", providerToFix.category, type);
+        const sourceDir = fsMod2.existsSync(builtinSrc) ? builtinSrc : downloadedSrc;
+        if (actionAnswer.action === "clone") {
           const newType = `my-${type}`;
-          const builtinSrc = pathMod2.resolve(__dirname, "../../providers/_builtin", providerToFix.category, type);
-          const downloadedSrc = pathMod2.join(osMod2.homedir(), ".adhdev", "providers", ".upstream", providerToFix.category, type);
-          const sourceDir = fsMod2.existsSync(builtinSrc) ? builtinSrc : downloadedSrc;
           const targetDir = pathMod2.join(osMod2.homedir(), ".adhdev", "providers", newType);
           if (fsMod2.existsSync(targetDir)) {
             console.log(import_chalk6.default.red(`
@@ -32896,10 +32998,19 @@ function registerProviderCommands(program2) {
           console.log(import_chalk6.default.green(`
 \u2713 Successfully cloned to [${newType}]`));
           type = newType;
-        } else {
-          console.log(import_chalk6.default.red(`
-\u2757 Proceeding with upstream modification. Changes WILL BE WIPED on next sync.
-`));
+        } else if (actionAnswer.action === "inplace") {
+          const targetDir = pathMod2.join(osMod2.homedir(), ".adhdev", "providers", type);
+          if (!fsMod2.existsSync(targetDir)) {
+            fsMod2.cpSync(sourceDir, targetDir, { recursive: true });
+          }
+          const pJsonPath = pathMod2.join(targetDir, "provider.json");
+          if (fsMod2.existsSync(pJsonPath)) {
+            const pJson = JSON.parse(fsMod2.readFileSync(pJsonPath, "utf8"));
+            pJson.disableUpstream = true;
+            fsMod2.writeFileSync(pJsonPath, JSON.stringify(pJson, null, 2));
+          }
+          console.log(import_chalk6.default.green(`
+\u2713 Local copy created at [${targetDir}] with upstream updates disabled.`));
         }
       }
       let agentName = options.agent || "codex-cli";
@@ -33192,8 +33303,8 @@ function registerProviderCommands(program2) {
         const osMod = await import("os");
         const possiblePaths = [
           pathMod.join(osMod.homedir(), ".adhdev", "providers", type, "provider.js"),
-          pathMod.resolve(__dirname, "../../providers/_builtin/ide", type, "provider.js"),
-          pathMod.resolve(__dirname, "../../providers/_builtin/extension", type, "provider.js")
+          pathMod.join(new (await Promise.resolve().then(() => (init_src(), src_exports))).ProviderLoader().builtinDirs[0], "ide", type, "provider.js"),
+          pathMod.join(new (await Promise.resolve().then(() => (init_src(), src_exports))).ProviderLoader().builtinDirs[0], "extension", type, "provider.js")
         ];
         for (const p of possiblePaths) {
           if (fsMod.existsSync(p)) {