wispy-cli 0.1.1 → 0.1.2

package/lib/wispy-repl.mjs

@@ -132,111 +132,93 @@ ${bold("macOS Keychain (auto-detected):")}
 
 async function runOnboarding() {
   const { createInterface: createRL } = await import("node:readline");
+  const { execSync } = await import("node:child_process");
 
-  console.log(`
-${bold("🌿 Welcome to Wispy!")}
-${dim("Let's get you set up in 30 seconds.")}
-`);
-
-  const rl = createRL({ input: process.stdin, output: process.stdout });
-  const ask = (q) => new Promise(r => rl.question(q, r));
+  console.log(`\n${bold("🌿 Welcome to Wispy!")}\n`);
 
-  // Step 1: Choose provider
-  console.log(`${bold("Step 1:")} Choose your AI provider\n`);
-  console.log(`  ${green("1")} Google AI (Gemini)    ${dim("← free, recommended")}`)
-  console.log(`  ${cyan("2")} Anthropic (Claude)    ${dim("paid")}`)
-  console.log(`  ${cyan("3")} OpenAI (GPT-4o)       ${dim("paid")}`)
-  console.log(`  ${cyan("4")} OpenRouter            ${dim("any model, some free")}`)
-  console.log(`  ${cyan("5")} Groq                  ${dim("free, fast")}`)
-  console.log(`  ${cyan("6")} DeepSeek              ${dim("cheap")}`)
-  console.log(`  ${cyan("7")} Ollama                ${dim("local, no key needed")}`)
-  console.log("");
+  // Auto-detect 1: Ollama running locally?
+  try {
+    const resp = await fetch("http://localhost:11434/api/tags", { signal: AbortSignal.timeout(2000) });
+    if (resp.ok) {
+      console.log(`${green("✅")} Found Ollama running locally — no API key needed!`);
+      const configPath = path.join(WISPY_DIR, "config.json");
+      await mkdir(WISPY_DIR, { recursive: true });
+      const config = JSON.parse(await readFileOr(configPath, "{}"));
+      config.provider = "ollama";
+      await writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
+      process.env.OLLAMA_HOST = "http://localhost:11434";
+      console.log(dim("  Using local Ollama. Run wispy to start.\n"));
+      return;
+    }
+  } catch { /* not running */ }
 
-  const choice = await ask(green("  Pick a number (1-7): "));
-  const providerMap = { "1": "google", "2": "anthropic", "3": "openai", "4": "openrouter", "5": "groq", "6": "deepseek", "7": "ollama" };
-  const chosenProvider = providerMap[choice.trim()] ?? "google";
-  const chosenConfig = PROVIDERS[chosenProvider];
-
-  let apiKey = null;
-
-  if (chosenProvider === "ollama") {
-    console.log(`\n${green("✅")} Ollama selected — no API key needed!`);
-    console.log(dim("  Make sure Ollama is running: ollama serve"));
-    const host = await ask(green("  Ollama host (enter for default localhost:11434): "));
-    const ollamaHost = host.trim() || "http://localhost:11434";
-
-    // Save config
-    const configPath = path.join(WISPY_DIR, "config.json");
-    await mkdir(WISPY_DIR, { recursive: true });
-    const existing = await readFileOr(configPath, "{}");
-    const config = JSON.parse(existing);
-    config.provider = "ollama";
-    config.ollamaHost = ollamaHost;
-    await writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
-
-    process.env.OLLAMA_HOST = ollamaHost;
-  } else {
-    // Step 2: Get API key
-    console.log(`\n${bold("Step 2:")} Enter your API key`);
-    if (chosenConfig.signupUrl) {
-      console.log(dim(`  Get one here: ${chosenConfig.signupUrl}`));
+  // Auto-detect 2: macOS Keychain
+  const keychainProviders = [
+    { service: "google-ai-key", provider: "google", label: "Google AI" },
+    { service: "anthropic-api-key", provider: "anthropic", label: "Anthropic" },
+    { service: "openai-api-key", provider: "openai", label: "OpenAI" },
+  ];
+  for (const kc of keychainProviders) {
+    const key = await tryKeychainKey(kc.service);
+    if (key) {
+      console.log(`${green("✅")} Found ${kc.label} key in macOS Keychain — using it automatically!`);
+      const configPath = path.join(WISPY_DIR, "config.json");
+      await mkdir(WISPY_DIR, { recursive: true });
+      const config = JSON.parse(await readFileOr(configPath, "{}"));
+      config.provider = kc.provider;
+      await writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
+      process.env[PROVIDERS[kc.provider].envKeys[0]] = key;
+      console.log(dim("  Ready to go. Run wispy to start.\n"));
+      return;
     }
-    console.log("");
+  }
 
-    apiKey = await ask(green("  API key: "));
-    apiKey = apiKey.trim();
+  // Nothing auto-detected — minimal setup: open browser, paste key
+  console.log(`${dim("No API key found. Let's set one up — takes 10 seconds.")}\n`);
 
-    if (!apiKey) {
-      console.log(red("\n  No key entered. Run wispy again when you have one."));
-      rl.close();
-      process.exit(1);
-    }
+  const rl = createRL({ input: process.stdin, output: process.stdout });
+  const ask = (q) => new Promise(r => rl.question(q, r));
 
-    // Save to config
-    const configPath = path.join(WISPY_DIR, "config.json");
-    await mkdir(WISPY_DIR, { recursive: true });
-    const existing = await readFileOr(configPath, "{}");
-    const config = JSON.parse(existing);
-    config.provider = chosenProvider;
-    config.apiKey = apiKey;
-    await writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
-
-    // Set env for current session
-    process.env[chosenConfig.envKeys[0]] = apiKey;
-  }
-
-  // Step 3: Name (optional)
-  console.log(`\n${bold("Step 3:")} What should I call you? ${dim("(enter to skip)")}`);
-  const userName = await ask(green("  Your name: "));
-  if (userName.trim()) {
-    await mkdir(path.join(WISPY_DIR, "memory"), { recursive: true });
-    await appendFile(
-      path.join(WISPY_DIR, "memory", "user.md"),
-      `\n- [${new Date().toISOString().slice(0,16)}] Name: ${userName.trim()}\n`,
-      "utf8",
-    );
+  console.log(`  The easiest way: ${bold("Google AI")} (free, no credit card)\n`);
+
+  // Auto-open browser
+  try {
+    execSync('open "https://aistudio.google.com/apikey" 2>/dev/null || xdg-open "https://aistudio.google.com/apikey" 2>/dev/null', { stdio: "ignore" });
+    console.log(`  ${green("→")} Opened browser to get your free API key`);
+    console.log(`  ${dim("  Click 'Create API Key' and paste it here:")}\n`);
+  } catch {
+    console.log(`  ${dim("  Go to:")} ${cyan("https://aistudio.google.com/apikey")}`);
+    console.log(`  ${dim("  Click 'Create API Key' and paste it here:")}\n`);
   }
 
-  rl.close();
+  const apiKey = (await ask(green("  API key: "))).trim();
 
-  console.log(`
-${green("✅ Setup complete!")}
+  if (!apiKey) {
+    console.log(`\n  ${dim("No key? You can also use Ollama for free local AI:")}`);
+    console.log(`  ${cyan("brew install ollama && ollama serve")}`);
+    console.log(`  ${dim("Then run wispy again.\n")}`);
+    rl.close();
+    process.exit(0);
+  }
 
-${bold("You're ready to go:")}
-  ${cyan("wispy")}                     Start chatting
-  ${cyan('wispy "hello"')}             Quick message
-  ${cyan("wispy -w project")}          Use a workstream
-  ${cyan("wispy --help")}              All options
+  // Detect provider from key format
+  let chosenProvider = "google"; // default
+  if (apiKey.startsWith("sk-ant-")) chosenProvider = "anthropic";
+  else if (apiKey.startsWith("sk-")) chosenProvider = "openai";
+  else if (apiKey.startsWith("sk-or-")) chosenProvider = "openrouter";
+  else if (apiKey.startsWith("gsk_")) chosenProvider = "groq";
 
-${dim("🌿 Enjoy Wispy!")}
-`);
+  // Save
+  const configPath = path.join(WISPY_DIR, "config.json");
+  await mkdir(WISPY_DIR, { recursive: true });
+  const config = JSON.parse(await readFileOr(configPath, "{}"));
+  config.provider = chosenProvider;
+  config.apiKey = apiKey;
+  await writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
+  process.env[PROVIDERS[chosenProvider].envKeys[0]] = apiKey;
 
-  // Re-detect provider with new config
-  const newDetected = await detectProvider();
-  if (newDetected) {
-    // Update globals — but since they're const, we need to restart
-    // For this session, just continue with the values we set
-  }
+  rl.close();
+  console.log(`\n${green("✅")} Ready! Using ${PROVIDERS[chosenProvider].label}.\n`);
 }
 
 let detected = await detectProvider();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wispy-cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "🌿 Wispy — AI workspace assistant with multi-agent orchestration",
   "license": "Apache-2.0",
   "author": "Minseo & Poropo",