@testdriverai/agent 7.9.103-canary → 7.9.104-test

package/interfaces/cli/commands/init.js

@@ -1,6 +1,7 @@
 const BaseCommand = require("../lib/base.js");
 const { createCommandDefinitions } = require("../../../agent/interface.js");
 const { initProject } = require("../../../lib/init-project.js");
+const { CLIENTS, detectClients } = require("../../../lib/install-clients.js");
 const fs = require("fs");
 const path = require("path");
 const chalk = require("chalk");
@@ -22,13 +23,24 @@ const POLL_TIMEOUT = 900000; // 15 minutes
  */
 class InitCommand extends BaseCommand {
   async run() {
-    await this.parse(InitCommand);
+    const { flags } = await this.parse(InitCommand);
 
     console.log(chalk.cyan("\n🚀 Initializing TestDriver project...\n"));
 
     // Prompt for API key first
     const apiKey = await this.promptForApiKey();
 
+    // Determine which AI clients to wire up: from --client flag, or interactively.
+    let clients;
+    if (flags.client) {
+      clients = flags.client
+        .split(",")
+        .map((c) => c.trim())
+        .filter(Boolean);
+    } else {
+      clients = await this.promptForClients();
+    }
+
     // Helper to print progress messages with appropriate colors
     const printProgress = (msg) => {
       if (msg.startsWith("✓")) {
@@ -47,6 +59,7 @@ class InitCommand extends BaseCommand {
       targetDir: process.cwd(),
       apiKey: apiKey,
       skipInstall: false,
+      clients: clients && clients.length ? clients : undefined,
       onProgress: printProgress,
     });
 
@@ -159,6 +172,72 @@ class InitCommand extends BaseCommand {
     }
   }
 
+  /**
+   * Prompt the user to select which AI clients to install TestDriver into.
+   * Returns an array of client ids (possibly empty).
+   * @returns {Promise<string[]>}
+   */
+  async promptForClients() {
+    const ids = Object.keys(CLIENTS);
+    const detected = new Set(detectClients(process.cwd()));
+
+    // Non-interactive stdin (CI, piped input, no TTY): don't prompt — fall back
+    // to detected clients so init can still scaffold all files unattended.
+    if (!process.stdin.isTTY) {
+      return [...detected];
+    }
+
+    console.log(chalk.cyan("\n  Which AI clients should TestDriver be installed into?\n"));
+    ids.forEach((id, i) => {
+      const c = CLIENTS[id];
+      const tag = detected.has(id) ? chalk.green(" (detected)") : "";
+      const web = c.type === "web" ? chalk.gray(" — web, manual steps") : "";
+      console.log(`  ${chalk.cyan(i + 1)}. ${c.label}${tag}${web}`);
+    });
+    console.log(`  ${chalk.cyan("a")}. All of the above`);
+    console.log(
+      chalk.gray(
+        "\n  Enter numbers separated by commas (e.g. 1,3), 'a' for all, or press Enter to skip.\n",
+      ),
+    );
+
+    const answer = await new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+      });
+      // Default to detected clients if any, else skip.
+      const defaultHint = detected.size
+        ? ` [${[...detected].map((d) => ids.indexOf(d) + 1).join(",")}]`
+        : "";
+      let answered = false;
+      rl.question(`  Select clients${defaultHint}: `, (a) => {
+        answered = true;
+        rl.close();
+        resolve(a.trim());
+      });
+      // If stdin closes (EOF) before a line is entered, the question callback
+      // never fires — resolve empty so init doesn't hang.
+      rl.on("close", () => {
+        if (!answered) resolve("");
+      });
+    });
+
+    if (!answer) {
+      // Enter pressed: use detected clients if any, otherwise none.
+      return [...detected];
+    }
+    if (answer.toLowerCase() === "a" || answer.toLowerCase() === "all") {
+      return ["all"];
+    }
+    const selected = answer
+      .split(",")
+      .map((s) => parseInt(s.trim(), 10))
+      .filter((n) => Number.isInteger(n) && n >= 1 && n <= ids.length)
+      .map((n) => ids[n - 1]);
+    return selected;
+  }
+
   /**
    * Browser-based login flow using device code
    * @returns {Promise<string>} The API key
@@ -411,7 +490,7 @@ class InitCommand extends BaseCommand {
     console.log("  2. Use AI agents to write tests:");
     console.log(chalk.gray("     Open VSCode/Cursor and use @testdriver agent\n"));
     console.log("  3. MCP server configured:");
-    console.log(chalk.gray("     TestDriver tools available via MCP in .vscode/mcp.json\n"));
+    console.log(chalk.gray("     TestDriver tools are now available in your selected AI client(s)\n"));
     console.log(
       "  4. For CI/CD, add TD_API_KEY to your GitHub repository secrets",
     );

package/lib/init-project.js

@@ -39,6 +39,7 @@ function runInstall(cmd, args, cwd, label) {
  * @param {string} [options.apiKey] - TestDriver API key (will be saved to .env)
  * @param {boolean} [options.skipInstall=false] - Skip npm install step
  * @param {boolean} [options.interactive=false] - Whether to prompt for missing values (CLI mode)
+ * @param {string[]} [options.clients] - AI client ids to wire up (e.g. ["claude-code","cursor"] or ["all"]). When set, native per-client config is written instead of the interactive add-mcp flow.
  * @param {function} [options.onProgress] - Callback for progress updates (receives message string)
  * @returns {Promise<{success: boolean, results: string[], errors: string[]}>}
  */
@@ -277,12 +278,64 @@ jobs:
       progress("⊘ GitHub workflow already exists");
     }
 
+    // Resolve the bundled agent/skills source dirs once; reused by the
+    // client-aware installer (step 6) and the legacy copy steps (8 & 9).
+    const resolveSource = (...candidates) =>
+      candidates.find((c) => fs.existsSync(c)) || null;
+    const skillsSourceDir = resolveSource(
+      path.join(targetDir, "node_modules", "testdriverai", "ai", "skills"),
+      path.join(__dirname, "..", "ai", "skills"),
+    );
+    const agentsSourceDir = resolveSource(
+      path.join(targetDir, "node_modules", "testdriverai", "ai", "agents"),
+      path.join(__dirname, "..", "ai", "agents"),
+    );
+
     // 6. Setup MCP configuration
-    // When triggered from VS Code extension, create .vscode/mcp.json silently
-    // When triggered from CLI, use interactive add-mcp for user to select their MCP client
+    // Priority:
+    //   a) options.clients set        -> write native config per selected client
+    //   b) TD_INIT_SOURCE=vscode      -> create .vscode/mcp.json silently
+    //   c) otherwise (CLI)            -> interactive add-mcp client picker
     const isVscodeInit = process.env.TD_INIT_SOURCE === "vscode";
-
-    if (isVscodeInit) {
+    const requestedClients =
+      Array.isArray(options.clients) && options.clients.length
+        ? options.clients
+        : null;
+
+    if (requestedClients) {
+      const {
+        installClient,
+        resolveClientIds,
+      } = require("./install-clients.js");
+      const { valid, unknown } = resolveClientIds(requestedClients);
+      for (const id of unknown) {
+        progress(`⚠ Unknown client "${id}" - skipping`);
+      }
+      for (const id of valid) {
+        try {
+          const result = installClient(id, {
+            targetDir,
+            apiKey: options.apiKey,
+            agentSource: agentsSourceDir,
+            skillsSource: skillsSourceDir,
+          });
+          progress(`🔧 ${result.label}:`);
+          for (const step of result.steps) {
+            if (step.status === "manual") {
+              progress(`  ℹ ${step.message}`);
+            } else if (step.status === "error") {
+              progress(`  ⚠ ${step.message}`);
+            } else if (step.status === "skipped") {
+              progress(`  ⊘ ${step.message || step.file}`);
+            } else {
+              progress(`  ✓ ${step.message || step.file}`);
+            }
+          }
+        } catch (err) {
+          progress(`⚠ Failed to configure ${id}: ${err.message}`);
+        }
+      }
+    } else if (isVscodeInit) {
       // VS Code extension: create .vscode/mcp.json directly
       const vscodeDir = path.join(targetDir, ".vscode");
       if (!fs.existsSync(vscodeDir)) {
@@ -365,18 +418,6 @@ jobs:
 
     // 8. Copy TestDriver skills
     const skillsDestDir = path.join(targetDir, ".github", "skills");
-    const possibleSkillsSources = [
-      path.join(targetDir, "node_modules", "testdriverai", "ai", "skills"),
-      path.join(__dirname, "..", "ai", "skills"),
-    ];
-
-    let skillsSourceDir = null;
-    for (const source of possibleSkillsSources) {
-      if (fs.existsSync(source)) {
-        skillsSourceDir = source;
-        break;
-      }
-    }
 
     if (skillsSourceDir) {
       if (!fs.existsSync(skillsDestDir)) {
@@ -412,18 +453,6 @@ jobs:
 
     // 9. Copy TestDriver agents
     const agentsDestDir = path.join(targetDir, ".github", "agents");
-    const possibleAgentsSources = [
-      path.join(targetDir, "node_modules", "testdriverai", "ai", "agents"),
-      path.join(__dirname, "..", "ai", "agents"),
-    ];
-
-    let agentsSourceDir = null;
-    for (const source of possibleAgentsSources) {
-      if (fs.existsSync(source)) {
-        agentsSourceDir = source;
-        break;
-      }
-    }
 
     if (agentsSourceDir) {
       if (!fs.existsSync(agentsDestDir)) {