infernoflow 0.32.2 → 0.32.4

package/dist/lib/ai/providerRouter.mjs

@@ -234,3 +234,62 @@ export function detectAvailableProviders(cwd) {
     ollama:     false, // checked async — doctor runs its own check
   };
 }
+
+/**
+ * Resolve which provider + IDE is available for the `run` command.
+ * Returns a structured object that run.mjs uses to decide how to proceed.
+ *
+ * @param {string} providerRequested - "auto"|"anthropic"|"openai"|etc.
+ * @param {string} ideRequested      - "auto"|"vscode"|"cursor"|etc.
+ * @returns {{ providerResolved: string, ideDetected: string, agentAvailable: boolean, reasonCodes: string[], error?: string }}
+ */
+export async function resolveProvider(providerRequested = "auto", ideRequested = "auto") {
+  const cwd      = process.cwd();
+  const config   = readAiConfig(cwd);
+  const reasons  = [];
+
+  // Detect IDE
+  const inVsCode = !!process.env.VSCODE_PID || !!process.env.TERM_PROGRAM?.includes("vscode");
+  const inCursor = !!process.env.CURSOR_TRACE_ID || !!process.env.CURSOR_CHANNEL;
+  const ideDetected = inCursor ? "cursor" : inVsCode ? "vscode" : "terminal";
+
+  // Detect available providers
+  const available = {
+    anthropic:  !!(process.env.ANTHROPIC_API_KEY  || config.anthropic?.apiKey),
+    openai:     !!(process.env.OPENAI_API_KEY      || config.openai?.apiKey),
+    gemini:     !!(process.env.GOOGLE_AI_API_KEY   || process.env.GEMINI_API_KEY || config.gemini?.apiKey),
+    openrouter: !!(process.env.OPENROUTER_API_KEY  || config.openrouter?.apiKey),
+    ollama:     false,
+    vscode:     inVsCode || inCursor,
+  };
+
+  // Check Ollama quickly (sync port probe via env hint)
+  if (process.env.OLLAMA_HOST || config.ollama?.host) {
+    available.ollama = true;
+    reasons.push("ollama_env");
+  }
+
+  // Resolve which provider to use
+  let providerResolved = "none";
+  const forced = (providerRequested || "auto").toLowerCase();
+
+  if (forced !== "auto" && forced !== "prompt" && available[forced]) {
+    providerResolved = forced;
+    reasons.push(`forced_${forced}`);
+  } else {
+    // Priority order: vscode/cursor IDE → anthropic → openai → gemini → openrouter → ollama
+    const priority = ["vscode", "anthropic", "openai", "gemini", "openrouter", "ollama"];
+    for (const p of priority) {
+      if (available[p]) { providerResolved = p; reasons.push(`auto_${p}`); break; }
+    }
+  }
+
+  const agentAvailable = providerResolved !== "none";
+
+  if (!agentAvailable) {
+    reasons.push("no_provider");
+    return { providerResolved: "none", ideDetected, agentAvailable: false, reasonCodes: reasons, error: "agent_unavailable" };
+  }
+
+  return { providerResolved, ideDetected, agentAvailable: true, reasonCodes: reasons };
+}

package/dist/lib/commands/ai.mjs

@@ -196,35 +196,52 @@ async function cmdStatus(cwd) {
 async function cmdSetup(cwd) {
   const config = loadConfig(cwd);
 
+  // Check which providers already have keys (env vars or saved config)
+  const envKeys = {
+    anthropic:  process.env.ANTHROPIC_API_KEY,
+    openai:     process.env.OPENAI_API_KEY,
+    gemini:     process.env.GOOGLE_AI_API_KEY || process.env.GEMINI_API_KEY,
+    openrouter: process.env.OPENROUTER_API_KEY,
+  };
+
   console.log();
   console.log(`  ${bold("🔥 infernoflow ai setup")}`);
   console.log(`  ${gray("Connect an AI provider for explain, why, review, and changelog.")}`);
   console.log();
-  console.log(`  Providers: ${PROVIDERS.map(p => bold(p.id)).join("  ")}`);
+
+  // Numbered menu
+  PROVIDERS.forEach((p, i) => {
+    const envKey    = envKeys[p.id];
+    const savedKey  = config[p.id]?.apiKey;
+    const detected  = envKey  ? green(" ✓ key detected in environment") :
+                      savedKey ? green(" ✓ key already saved") : "";
+    const num       = bold(String(i + 1));
+    const local     = p.id === "ollama" ? gray("  (local, no key needed)") : "";
+    console.log(`  ${num})  ${bold(p.name.padEnd(22))}${local}${detected}`);
+  });
+
   console.log();
 
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
 
   try {
-    // Pick provider
-    const providerInput = await prompt(rl, `  Provider [anthropic]: `);
-    const providerId    = providerInput.trim().toLowerCase() || "anthropic";
-    const provider      = PROVIDERS.find(p => p.id === providerId);
+    // Numbered selection
+    const choice = await prompt(rl, `  Select provider [1]: `);
+    const idx    = (parseInt(choice.trim()) || 1) - 1;
 
-    if (!provider) {
-      console.log(red(`  Unknown provider "${providerId}". Options: ${PROVIDERS.map(p => p.id).join(", ")}`));
+    if (idx < 0 || idx >= PROVIDERS.length) {
+      console.log(red(`  Invalid choice. Enter a number 1–${PROVIDERS.length}.`));
       return;
     }
 
+    const provider   = PROVIDERS[idx];
+    const providerId = provider.id;
+
     console.log();
     console.log(`  ${bold(provider.name)}`);
 
-    if (provider.docsUrl) {
-      console.log(`  ${gray("Get API key:")} ${cyan(provider.docsUrl)}`);
-    }
-
     if (providerId === "ollama") {
-      // Ollama — no key, just model + host
+      // Ollama — no key needed
       const hostInput  = await prompt(rl, `  Ollama host [http://localhost:11434]: `);
       const modelInput = await prompt(rl, `  Model [${provider.default}]: `);
 
@@ -235,49 +252,70 @@ async function cmdSetup(cwd) {
       saveConfig(cwd, config);
 
       console.log();
-      console.log(`  ${green("✓")} Ollama configured. Testing connection…`);
+      process.stdout.write(`  ${green("✓")} Saved. Testing connection…  `);
       const probe = await httpGet(`${config.ollama.host}/api/tags`).catch(() => null);
       if (probe?.status === 200) {
-        console.log(`  ${green("✓")} Ollama is running. You're all set.`);
+        console.log(green("OK"));
       } else {
-        console.log(`  ${yellow("⚠")}  Could not reach Ollama. Make sure it's running: ${cyan("ollama serve")}`);
+        console.log(yellow("not reachable"));
+        console.log(`  ${yellow("⚠")}  Start Ollama first: ${cyan("ollama serve")}`);
       }
+
     } else {
       // API key provider
-      const existingKey = process.env[provider.envKey] || config[providerId]?.apiKey;
-      const keyHint     = existingKey ? `[${existingKey.slice(0, 8)}… (existing)] ` : `[${provider.keyHint}] `;
-      const keyInput    = await prompt(rl, `  API key ${keyHint}: `);
-      const apiKey      = keyInput.trim() || existingKey;
-
-      if (!apiKey) {
-        console.log(red("  No API key provided. Exiting."));
-        return;
+      const envKey    = envKeys[providerId];
+      const savedKey  = config[providerId]?.apiKey;
+      const existing  = envKey || savedKey;
+
+      if (existing) {
+        // Key already detected — confirm or replace
+        const source = envKey ? "environment variable" : "saved config";
+        console.log(`  ${green("✓")} API key detected from ${source}: ${gray(existing.slice(0, 12) + "…")}`);
+        const useIt = await prompt(rl, `  Use this key? [Y/n]: `);
+        if (useIt.trim().toLowerCase() === "n") {
+          console.log();
+          if (provider.docsUrl) console.log(`  ${gray("Get a key at:")} ${cyan(provider.docsUrl)}`);
+          const keyInput = await prompt(rl, `  Paste new API key: `);
+          if (!keyInput.trim()) { console.log(red("  No key provided. Exiting.")); return; }
+          config[providerId] = { apiKey: keyInput.trim(), model: config[providerId]?.model || provider.default };
+        } else {
+          // Use existing key — just confirm/update model
+          config[providerId] = { apiKey: existing, model: config[providerId]?.model || provider.default };
+        }
+      } else {
+        // No key found — ask for it
+        console.log(`  ${gray("Get your API key at:")} ${cyan(provider.docsUrl)}`);
+        console.log(`  ${gray("Tip: paste the key below — it starts with")} ${gray(provider.keyHint)}`);
+        console.log();
+        const keyInput = await prompt(rl, `  Paste API key: `);
+        if (!keyInput.trim()) { console.log(red("  No key provided. Exiting.")); return; }
+        config[providerId] = { apiKey: keyInput.trim(), model: provider.default };
       }
 
-      const modelInput = await prompt(rl, `  Model [${provider.default}]: `);
-      const model      = modelInput.trim() || provider.default;
+      // Model selection (just press Enter to keep default)
+      const currentModel = config[providerId].model;
+      console.log();
+      console.log(`  ${gray("Available models:")} ${provider.models.join("  ")}`);
+      const modelInput = await prompt(rl, `  Model [${currentModel}]: `);
+      config[providerId].model = modelInput.trim() || currentModel;
 
-      config[providerId] = { apiKey, model };
       saveConfig(cwd, config);
 
       console.log();
-      console.log(`  ${green("✓")} Saved to inferno/integrations.json`);
-      console.log();
-      process.stdout.write(`  Testing connection…  `);
+      process.stdout.write(`  ${green("✓")} Saved. Testing connection…  `);
 
       const result = await testProvider(providerId, config, cwd);
       if (result?.text) {
-        console.log(green("OK"));
-        console.log(`  ${gray(result.text.trim().slice(0, 80))}`);
+        console.log(green("OK") + gray(` (${config[providerId].model})`));
       } else {
         console.log(yellow("no response"));
-        console.log(`  ${yellow("⚠")}  Could not get a test response. Check your API key.`);
+        console.log(`  ${yellow("⚠")}  Connection failed — double-check your API key.`);
       }
     }
 
     console.log();
     console.log(`  ${green("✓")} ${bold(provider.name)} is ready.`);
-    console.log(`  ${gray("Commands that now use AI:")} explain  why  review  changelog`);
+    console.log(`  ${gray("AI-powered commands:")}  explain  why  review  changelog`);
     console.log();
 
     // gitignore reminder
@@ -285,8 +323,7 @@ async function cmdSetup(cwd) {
     if (fs.existsSync(gitignorePath)) {
       const content = fs.readFileSync(gitignorePath, "utf8");
       if (!content.includes("integrations.json")) {
-        console.log(`  ${yellow("⚠")}  Your API key is in inferno/integrations.json.`);
-        console.log(`     ${gray("Add")} ${cyan("inferno/integrations.json")} ${gray("to .gitignore to avoid committing it.")}`);
+        console.log(`  ${yellow("⚠")}  Add ${cyan("inferno/integrations.json")} to your .gitignore to avoid committing your API key.`);
         console.log();
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "infernoflow",
-  "version": "0.32.2",
+  "version": "0.32.4",
   "description": "The forge for liquid code - keep capabilities, contracts, and docs in sync.",
   "type": "module",
   "bin": {