adhdev 0.6.18 → 0.6.21

package/dist/cli/index.js

@@ -4990,6 +4990,15 @@ var init_handler = __esm({
             return handleExtensionScript(this, args, "listModes");
           case "set_extension_mode":
             return handleExtensionScript(this, args, "setMode");
+          // ─── Provider Auto-Fix / Clone (DevServer proxy) ──────────
+          case "provider_auto_fix":
+            return this.proxyDevServerPost(args, "auto-implement");
+          case "provider_auto_fix_cancel":
+            return this.proxyDevServerPost(args, "auto-implement/cancel");
+          case "provider_auto_fix_status":
+            return this.proxyDevServerGet(args, "auto-implement/status");
+          case "provider_clone":
+            return this.proxyDevServerScaffold(args);
           default:
             return { success: false, error: `Unknown command: ${cmd}` };
         }
@@ -5017,6 +5026,95 @@ var init_handler = __esm({
         }
         return { success: false, error: "ProviderLoader not initialized" };
       }
+      // ─── DevServer HTTP proxy helpers ─────────────────
+      // These bridge WS commands to the DevServer REST API (localhost:19280)
+      async proxyDevServerPost(args, endpoint) {
+        const { providerType, ...body } = args || {};
+        if (!providerType) return { success: false, error: "providerType required" };
+        try {
+          const http3 = await import("http");
+          const postData = JSON.stringify(body);
+          const result = await new Promise((resolve8, reject) => {
+            const req = http3.request({
+              hostname: "127.0.0.1",
+              port: 19280,
+              path: `/api/providers/${providerType}/${endpoint}`,
+              method: "POST",
+              headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
+            }, (res) => {
+              let data = "";
+              res.on("data", (chunk) => data += chunk);
+              res.on("end", () => {
+                try {
+                  resolve8(JSON.parse(data));
+                } catch {
+                  resolve8({ raw: data });
+                }
+              });
+            });
+            req.on("error", reject);
+            req.write(postData);
+            req.end();
+          });
+          return { success: true, ...result };
+        } catch (e) {
+          return { success: false, error: `DevServer unreachable: ${e.message}. Start daemon with --dev flag.` };
+        }
+      }
+      async proxyDevServerGet(args, endpoint) {
+        const { providerType } = args || {};
+        if (!providerType) return { success: false, error: "providerType required" };
+        try {
+          const http3 = await import("http");
+          const result = await new Promise((resolve8, reject) => {
+            http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
+              let data = "";
+              res.on("data", (chunk) => data += chunk);
+              res.on("end", () => {
+                try {
+                  resolve8(JSON.parse(data));
+                } catch {
+                  resolve8({ raw: data });
+                }
+              });
+            }).on("error", reject);
+          });
+          return { success: true, ...result };
+        } catch (e) {
+          return { success: false, error: `DevServer unreachable: ${e.message}. Start daemon with --dev flag.` };
+        }
+      }
+      async proxyDevServerScaffold(args) {
+        try {
+          const http3 = await import("http");
+          const postData = JSON.stringify(args || {});
+          const result = await new Promise((resolve8, reject) => {
+            const req = http3.request({
+              hostname: "127.0.0.1",
+              port: 19280,
+              path: "/api/scaffold",
+              method: "POST",
+              headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
+            }, (res) => {
+              let data = "";
+              res.on("data", (chunk) => data += chunk);
+              res.on("end", () => {
+                try {
+                  resolve8(JSON.parse(data));
+                } catch {
+                  resolve8({ raw: data });
+                }
+              });
+            });
+            req.on("error", reject);
+            req.write(postData);
+            req.end();
+          });
+          return { success: true, ...result };
+        } catch (e) {
+          return { success: false, error: `DevServer unreachable: ${e.message}. Start daemon with --dev flag.` };
+        }
+      }
     };
   }
 });
@@ -26896,7 +26994,7 @@ var init_dev_server = __esm({
           this.json(res, 400, { error: `Script '${scriptName}' not found in provider '${type}'`, available: provider.scripts ? Object.keys(provider.scripts) : [] });
           return;
         }
-        const cdp = this.getCdp(scriptIdeType);
+        const cdp = this.getCdp(scriptIdeType || type);
         if (!cdp) {
           this.json(res, 503, { error: "No CDP connection available" });
           return;
@@ -28411,7 +28509,7 @@ var init_dev_server = __esm({
       // ─── Phase 2: Auto-Implement Backend ───
       async handleAutoImplement(type, req, res) {
         const body = await this.readBody(req);
-        const { agent = "claude-cli", functions, reference = "antigravity", model } = body;
+        const { agent = "claude-cli", functions, reference = "antigravity", model, comment } = body;
         if (!functions || !Array.isArray(functions) || functions.length === 0) {
           this.json(res, 400, { error: 'functions[] is required (e.g. ["readChat", "sendMessage"])' });
           return;
@@ -28460,7 +28558,7 @@ var init_dev_server = __esm({
               }
             }
           }
-          const prompt = this.buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts);
+          const prompt = this.buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts, comment);
           const tmpDir = path12.join(os14.tmpdir(), "adhdev-autoimpl");
           if (!fs9.existsSync(tmpDir)) fs9.mkdirSync(tmpDir, { recursive: true });
           const promptFile = path12.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
@@ -28615,9 +28713,11 @@ var init_dev_server = __esm({
           const baseArgs = [...spawn3.args || []].filter((a) => !interactiveFlags.includes(a));
           let shellCmd;
           if (command === "claude") {
-            const args = [...baseArgs, "--print", "--dangerously-skip-permissions", "--add-dir", providerDir];
+            const args = [...baseArgs, "--dangerously-skip-permissions"];
+            if (model) args.push("--model", model);
             const escapedArgs = args.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
-            shellCmd = `${command} ${escapedArgs} -p "$(cat '${promptFile}')"`;
+            const metaPrompt = `Read the file at ${promptFile} and follow ALL the instructions. Implement the specific function requested, then test it via CDP curl targeting 127.0.0.1:19280, wait for confirmation of success, and then close. DO NOT start working on other features not listed in the prompt constraint.`;
+            shellCmd = `${command} ${escapedArgs} -p "${metaPrompt}"`;
           } else if (command === "gemini") {
             const args = [...baseArgs, "-y", "-s", "false"];
             if (model) args.push("-m", model);
@@ -28633,7 +28733,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 the instructions. Implement the specific function requested, then test it via CDP curl targeting 127.0.0.1:19280, wait for confirmation of success, and then close. DO NOT start working on other features not listed in the prompt constraint.`;
+            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.`;
             shellCmd = `${command} ${escapedArgs} "${metaPrompt}"`;
           } else {
             const escapedArgs = baseArgs.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
@@ -28641,6 +28741,7 @@ var init_dev_server = __esm({
           }
           this.sendAutoImplSSE({ event: "progress", data: { function: "_init", status: "spawning", message: `\uC5D0\uC774\uC804\uD2B8 \uC2E4\uD589 \uC911: ${shellCmd.substring(0, 200)}... (prompt: ${prompt.length} chars)` } });
           this.autoImplStatus = { running: true, type, progress: [] };
+          const spawnedAt = Date.now();
           let child;
           let isPty = false;
           const { spawn: spawnFn } = await import("child_process");
@@ -28693,8 +28794,9 @@ var init_dev_server = __esm({
           const checkAutoApproval = (chunk, writeFn) => {
             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);
-            if (approvalBuffer.includes("AUTO_IMPLEMENT_FINISHED")) {
-              this.log("Agent finished task. Terminating interactive CLI session to unblock pipeline.");
+            const elapsed = Date.now() - spawnedAt;
+            if (elapsed > 15e3 && approvalBuffer.includes("AUTO_IMPLEMENT_FINISHED")) {
+              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...
 `, stream: "stdout" } });
@@ -28796,7 +28898,7 @@ var init_dev_server = __esm({
           this.json(res, 500, { error: `Auto-implement failed: ${e.message}` });
         }
       }
-      buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts) {
+      buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts, userComment) {
         const lines = [];
         lines.push("You are implementing browser automation scripts for an IDE provider.");
         lines.push("Be concise. Do NOT explain your reasoning. Just edit files directly.");
@@ -28912,6 +29014,10 @@ var init_dev_server = __esm({
         lines.push("1. Edit the script files to implement working code");
         lines.push("2. After editing, TEST each function using the DevConsole API (see below)");
         lines.push("3. If a test fails, fix the implementation and re-test");
+        lines.push("4. **IMPORTANT VERIFICATION LOGIC**: When verifying your implementation, beware of state contamination! You MUST perform strict Integration Testing:");
+        lines.push("   - `openPanel`: Toggle buttons are usually located in the top header, sidebar, or activity bar. Prefer finding and clicking these native UI buttons over extreme CSS injection hacks if possible.");
+        lines.push("   - `listSessions`: If sessions are unmounted when the panel is closed, try to explicitly interact with the UI to open the history/sessions view (e.g., clicking a history icon usually found near the chat header) BEFORE scraping.");
+        lines.push("   - `switchSession`: Prove your switch was successful by subsequently calling `readChat` and explicitly checking that the chat context has actually changed.");
         lines.push("");
         lines.push("## YOU MUST EXPLORE THE DOM YOURSELF!");
         lines.push("I have NOT provided you with the DOM snapshot. You MUST use your command-line tools to discover the IDE structure dynamically!");
@@ -28946,6 +29052,13 @@ var init_dev_server = __esm({
         lines.push("3. Use CDP evaluate to deeply inspect the DOM structure of the newly generated tables, code blocks, thought blocks, and tool calls.");
         lines.push("4. Ensure `readChat` extracts `content` with precise markdown formatting (especially for tables/code) and assigns correct `kind` tags (`thought`, `tool`, `terminal`).");
         lines.push("");
+        if (userComment) {
+          lines.push("## \u26A0\uFE0F User Instructions (HIGH PRIORITY)");
+          lines.push("The user has provided the following additional instructions. Follow them strictly:");
+          lines.push("");
+          lines.push(userComment);
+          lines.push("");
+        }
         lines.push("Start NOW. Do not ask for permission. Explore the DOM -> Code -> Test.");
         return lines.join("\n");
       }
@@ -31014,7 +31127,7 @@ var init_adhdev_daemon = __esm({
     fs11 = __toESM(require("fs"));
     path14 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.6.18";
+    pkgVersion = "0.6.21";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -32613,17 +32726,108 @@ function registerProviderCommands(program2) {
       process.exit(1);
     }
   });
-  provider.command("fix <type>").description("Auto-implement provider scripts using AI reading the target IDE DOM").option("-a, --agent <agent>", "AI agent to use (e.g. claude-cli, gemini-cli, codex-cli, or any ACP provider like cline-acp)", "claude-cli").option("-m, --model <model>", "Model override (e.g. claude-sonnet-4-20250514, gemini-2.5-pro)").option("-r, --reference <ref>", "Reference provider to learn from", "antigravity").action(async (type, options) => {
+  provider.command("fix [type] [scripts...]").description("Auto-implement provider scripts using AI reading the target IDE DOM").option("-a, --agent <agent>", "AI agent to use (e.g. claude-cli, gemini-cli, codex-cli, or any ACP provider like cline-acp)", "codex-cli").option("-m, --model <model>", "Model override (e.g. claude-sonnet-3.5, gemini-2.0-pro)").option("-r, --reference <ref>", "Reference provider to learn from", "antigravity").option("-c, --comment <text>", 'Additional instructions for the AI agent (e.g. "focus on shadow DOM handling")').action(async (typeArg, scripts, options) => {
     try {
       const http3 = await import("http");
-      const agentName = options.agent || "claude-cli";
+      const inquirer2 = (await import("inquirer")).default;
+      const { ProviderLoader: ProviderLoader2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const loader = new ProviderLoader2();
+      loader.loadAll();
+      const allProviders = loader.getAll();
+      const osMod = await import("os");
+      const pathMod = await import("path");
+      const fsMod = await import("fs");
+      const userProviderDir = pathMod.join(osMod.homedir(), ".adhdev", "providers");
+      const isUserProvider = (p) => {
+        const dir = pathMod.join(userProviderDir, p.type);
+        return fsMod.existsSync(dir) && !dir.includes(".upstream");
+      };
+      let type = typeArg;
+      if (!type) {
+        const ideProviders = allProviders.filter((p) => p.category === "ide");
+        if (ideProviders.length === 0) {
+          console.log(import_chalk6.default.red("\n\u2717 No IDE providers found.\n"));
+          process.exit(1);
+        }
+        const typeAnswer = await inquirer2.prompt([{
+          type: "list",
+          name: "selected",
+          message: "Select the IDE provider you want to fix:",
+          choices: ideProviders.map((p) => ({
+            name: `${p.name} ${isUserProvider(p) ? import_chalk6.default.yellow("[user]") : import_chalk6.default.gray("[upstream]")}`,
+            value: p.type
+          }))
+        }]);
+        type = typeAnswer.selected;
+      }
+      if (!type) {
+        console.log(import_chalk6.default.red("\n\u2717 Provider type is required.\n"));
+        process.exit(1);
+      }
+      const providerToFix = allProviders.find((p) => p.type === type);
+      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
+        }]);
+        if (confirmClone.doClone) {
+          const pathMod2 = await import("path");
+          const fsMod2 = await import("fs");
+          const osMod2 = await import("os");
+          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(`
+\u2717 Target directory already exists: ${targetDir}. Please delete it or fix it directly.`));
+            process.exit(1);
+          }
+          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.type = newType;
+            pJson.name = `My ${providerToFix.name}`;
+            fsMod2.writeFileSync(pJsonPath, JSON.stringify(pJson, null, 2));
+          }
+          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.
+`));
+        }
+      }
+      let agentName = options.agent || "codex-cli";
       const modelName = options.model;
       const reference = options.reference || "antigravity";
+      if (!typeArg && agentName === "codex-cli") {
+        const agentAnswer = await inquirer2.prompt([{
+          type: "list",
+          name: "selected",
+          message: "Select the AI agent to use for auto-fix:",
+          choices: [
+            { name: `${import_chalk6.default.green("Codex CLI")} ${import_chalk6.default.gray("(OpenAI o3/gpt-5.4)")}`, value: "codex-cli" },
+            { name: `${import_chalk6.default.magenta("Claude Code")} ${import_chalk6.default.gray("(Anthropic Claude)")}`, value: "claude-cli" },
+            { name: `${import_chalk6.default.blue("Gemini CLI")} ${import_chalk6.default.gray("(Google Gemini)")}`, value: "gemini-cli" }
+          ],
+          default: "codex-cli"
+        }]);
+        agentName = agentAnswer.selected;
+      }
       console.log(import_chalk6.default.bold(`
 \u{1F916} Starting Auto-Implement Agent for [${import_chalk6.default.cyan(type)}]`));
       console.log(import_chalk6.default.gray(`   Agent: ${agentName}${modelName ? ` (model: ${modelName})` : ""} | Reference: ${reference}
 `));
-      const functionsToFix = [
+      const allFunctions = [
         "openPanel",
         "sendMessage",
         "readChat",
@@ -32637,14 +32841,42 @@ function registerProviderCommands(program2) {
         "setMode",
         "focusEditor"
       ];
+      let functionsToFix = scripts;
+      if (!scripts || scripts.length === 0) {
+        const inquirer3 = (await import("inquirer")).default;
+        const answer = await inquirer3.prompt([{
+          type: "checkbox",
+          name: "selected",
+          message: "Select the scripts you want to fix (Space to toggle, Enter to confirm):",
+          choices: allFunctions.map((f) => ({ name: f, value: f, checked: false }))
+        }]);
+        functionsToFix = answer.selected;
+        if (!functionsToFix || functionsToFix.length === 0) {
+          console.log(import_chalk6.default.yellow("\n\u26A0\uFE0F  No scripts selected. Aborting Auto-Implement.\n"));
+          process.exit(0);
+        }
+      }
+      let userComment = options.comment || "";
+      if (!typeArg && !userComment) {
+        const commentAnswer = await inquirer2.prompt([{
+          type: "input",
+          name: "comment",
+          message: "Additional instructions for the agent (press Enter to skip):"
+        }]);
+        userComment = commentAnswer.comment || "";
+      }
       let consecutiveFailures = 0;
       console.log(import_chalk6.default.bold(`
-\u25B6\uFE0F Generating all [${functionsToFix.length}] functions natively via autonomous agent for ${type}...`));
+\u25B6\uFE0F Generating [${functionsToFix.length}] function(s) natively via autonomous agent for ${type}...`));
+      if (userComment) {
+        console.log(import_chalk6.default.gray(`   \u{1F4AC} Comment: ${userComment}`));
+      }
       try {
         const postData = JSON.stringify({
           functions: functionsToFix,
           agent: agentName,
           ...modelName ? { model: modelName } : {},
+          ...userComment ? { comment: userComment } : {},
           reference
         });
         const startResult = await new Promise((resolve8, reject) => {
@@ -32679,11 +32911,11 @@ function registerProviderCommands(program2) {
         if (!startResult.started || !startResult.sseUrl) {
           throw new Error(`Unexpected response: ${JSON.stringify(startResult)}`);
         }
-        const pathMod = await import("path");
+        const pathMod2 = await import("path");
         const osPaths = await import("os");
-        const targetDir = pathMod.join(osPaths.homedir(), ".adhdev", "providers", type);
+        const targetDir = pathMod2.join(osPaths.homedir(), ".adhdev", "providers", type);
         const fsMock = await import("fs");
-        const logFile2 = pathMod.join(targetDir, `auto-impl.log`);
+        const logFile2 = pathMod2.join(targetDir, `auto-impl.log`);
         fsMock.writeFileSync(logFile2, `=== Auto-Impl Started ===
 `);
         console.log(import_chalk6.default.gray(`  Agent logs: ${logFile2}`));
@@ -32747,6 +32979,7 @@ function registerProviderCommands(program2) {
       }
       console.log(import_chalk6.default.gray(`  Please run: adhdev provider verify ${type}
 `));
+      process.exit(0);
     } catch (e) {
       console.error(import_chalk6.default.red(`
 \u2717 ${e.message}
@@ -32790,6 +33023,7 @@ function registerProviderCommands(program2) {
       const http3 = await import("http");
       const postData = JSON.stringify({
         script,
+        ideType: type,
         params: options.param ? { text: options.param, sessionId: options.param, buttonText: options.param } : {}
       });
       const result = await new Promise((resolve8, reject) => {