wispy-cli 0.1.1 → 0.2.0

package/lib/wispy-repl.mjs

@@ -132,111 +132,137 @@ ${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));
-
-  // 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")}`)
+  // Splash
+  console.log("");
+  console.log(box([
+    "",
+    `${bold("🌿 W I S P Y")}`,
+    "",
+    `${dim("AI workspace assistant")}`,
+    `${dim("with multi-agent orchestration")}`,
+    "",
+  ]));
   console.log("");
 
-  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 1: Ollama running locally?
+  process.stdout.write(dim("  Checking environment..."));
+  try {
+    const resp = await fetch("http://localhost:11434/api/tags", { signal: AbortSignal.timeout(2000) });
+    if (resp.ok) {
+      console.log(green(" found Ollama! ✓\n"));
+      console.log(box([
+        `${green("✓")} Using local Ollama ${dim("— no API key needed")}`,
+        "",
+        `  ${dim("Your AI runs entirely on your machine.")}`,
+        `  ${dim("No data leaves your computer.")}`,
+      ]));
+      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("");
+      return;
     }
-    console.log("");
-
-    apiKey = await ask(green("  API key: "));
-    apiKey = apiKey.trim();
+  } catch { /* not running */ }
 
-    if (!apiKey) {
-      console.log(red("\n  No key entered. Run wispy again when you have one."));
-      rl.close();
-      process.exit(1);
+  // Auto-detect 2: macOS Keychain
+  const keychainProviders = [
+    { service: "google-ai-key", provider: "google", label: "Google AI (Gemini)" },
+    { service: "anthropic-api-key", provider: "anthropic", label: "Anthropic (Claude)" },
+    { service: "openai-api-key", provider: "openai", label: "OpenAI (GPT)" },
+  ];
+  for (const kc of keychainProviders) {
+    const key = await tryKeychainKey(kc.service);
+    if (key) {
+      console.log(green(` found ${kc.label} key! ✓\n`));
+      console.log(box([
+        `${green("✓")} ${kc.label} ${dim("— auto-detected from Keychain")}`,
+        "",
+        `  ${dim("Ready to go. No setup needed.")}`,
+      ]));
+      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("");
+      return;
     }
-
-    // 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",
-    );
   }
 
-  rl.close();
+  console.log(dim(" no existing config found.\n"));
 
-  console.log(`
-${green("✅ Setup complete!")}
+  // Nothing auto-detected — elegant key setup
+  console.log(box([
+    `${bold("Quick Setup")} ${dim("— one step, 10 seconds")}`,
+    "",
+    `  Wispy needs an AI provider to work.`,
+    `  The easiest: ${bold("Google AI")} ${dim("(free, no credit card)")}`,
+  ]));
+  console.log("");
 
-${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
+  // 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("→")} Browser opened to ${underline("aistudio.google.com/apikey")}`);
+  } catch {
+    console.log(`  ${green("→")} Visit: ${underline("https://aistudio.google.com/apikey")}`);
+  }
+  console.log(`  ${dim('  Click "Create API Key" → copy → paste below')}`);
+  console.log("");
 
-${dim("🌿 Enjoy Wispy!")}
-`);
+  const rl = createRL({ input: process.stdin, output: process.stdout });
+  const ask = (q) => new Promise(r => rl.question(q, r));
+
+  const apiKey = (await ask(`  ${green("API key")} ${dim("(paste here)")}: `)).trim();
 
-  // 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
+  if (!apiKey) {
+    console.log("");
+    console.log(box([
+      `${dim("No key? Try local AI instead:")}`,
+      "",
+      `  ${cyan("brew install ollama")}`,
+      `  ${cyan("ollama serve")}`,
+      `  ${cyan("wispy")} ${dim("← will auto-detect")}`,
+    ]));
+    console.log("");
+    rl.close();
+    process.exit(0);
   }
+
+  // Auto-detect provider from key format
+  let chosenProvider = "google";
+  if (apiKey.startsWith("sk-ant-")) chosenProvider = "anthropic";
+  else if (apiKey.startsWith("sk-or-")) chosenProvider = "openrouter";
+  else if (apiKey.startsWith("sk-")) chosenProvider = "openai";
+  else if (apiKey.startsWith("gsk_")) chosenProvider = "groq";
+
+  // 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;
+
+  rl.close();
+
+  console.log("");
+  console.log(box([
+    `${green("✓")} Connected to ${bold(PROVIDERS[chosenProvider].label)}`,
+    "",
+    `  ${cyan("wispy")}                  ${dim("start chatting")}`,
+    `  ${cyan('wispy "do something"')}   ${dim("quick command")}`,
+    `  ${cyan("wispy -w project")}       ${dim("use a workstream")}`,
+    `  ${cyan("wispy --help")}           ${dim("all options")}`,
+  ]));
+  console.log("");
 }
 
 let detected = await detectProvider();
@@ -255,6 +281,29 @@ const green = (s) => `\x1b[32m${s}\x1b[0m`;
 const cyan = (s) => `\x1b[36m${s}\x1b[0m`;
 const yellow = (s) => `\x1b[33m${s}\x1b[0m`;
 const red = (s) => `\x1b[31m${s}\x1b[0m`;
+const magenta = (s) => `\x1b[35m${s}\x1b[0m`;
+const bgGreen = (s) => `\x1b[42m\x1b[30m${s}\x1b[0m`;
+const underline = (s) => `\x1b[4m${s}\x1b[0m`;
+
+function box(lines, { padding = 1, border = "rounded" } = {}) {
+  const chars = border === "rounded"
+    ? { tl: "╭", tr: "╮", bl: "╰", br: "╯", h: "─", v: "│" }
+    : { tl: "┌", tr: "┐", bl: "└", br: "┘", h: "─", v: "│" };
+
+  // Strip ANSI for width calculation
+  const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, "");
+  const maxW = Math.max(...lines.map(l => stripAnsi(l).length)) + padding * 2;
+  const pad = " ".repeat(padding);
+
+  const top = `  ${chars.tl}${chars.h.repeat(maxW)}${chars.tr}`;
+  const bot = `  ${chars.bl}${chars.h.repeat(maxW)}${chars.br}`;
+  const mid = lines.map(l => {
+    const visible = stripAnsi(l).length;
+    const rightPad = " ".repeat(Math.max(0, maxW - padding * 2 - visible));
+    return `  ${chars.v}${pad}${l}${rightPad}${pad}${chars.v}`;
+  });
+  return [top, ...mid, bot].join("\n");
+}
 
 // ---------------------------------------------------------------------------
 // File helpers
@@ -1830,11 +1879,11 @@ ${bold("Wispy Commands:")}
 // ---------------------------------------------------------------------------
 
 async function runRepl() {
-  const wsLabel = ACTIVE_WORKSTREAM === "default" ? "" : ` [${cyan(ACTIVE_WORKSTREAM)}]`;
+  const wsLabel = ACTIVE_WORKSTREAM === "default" ? "" : ` ${dim("·")} ${cyan(ACTIVE_WORKSTREAM)}`;
   const providerLabel = PROVIDERS[PROVIDER]?.label ?? PROVIDER;
   console.log(`
-${bold("🌿 Wispy")}${wsLabel} ${dim(`— ${providerLabel} (${MODEL})`)}
-${dim("Type a message to chat. /help for commands. Ctrl+C to exit.")}
+  ${bold("🌿 Wispy")}${wsLabel} ${dim(`· ${MODEL}`)}
+  ${dim(`${providerLabel} · /help for commands · Ctrl+C to exit`)}
 `);
 
   const systemPrompt = await buildSystemPrompt();

package/package.json

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