@0dai-dev/cli 2.1.1 → 2.2.0

package/bin/0dai.js

@@ -7,7 +7,7 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 
-const VERSION = "2.1.1";
+const VERSION = "2.2.0";
 const API_URL = process.env.ODAI_API_URL || "https://api.0dai.dev";
 const T = process.stdout.isTTY ? "\x1b[38;2;45;212;168m" : ""; // teal
 const R = process.stdout.isTTY ? "\x1b[0m" : ""; // reset
@@ -152,10 +152,15 @@ async function cmdInit(target) {
     return;
   }
 
-  log("collecting project metadata...");
-  const { projectFiles, fileContents, clis } = collectMetadata(target);
+  const isTTY = process.stdout.isTTY;
+  let spinner = null;
+  if (isTTY) {
+    try { spinner = require("@clack/prompts").spinner(); } catch {}
+  }
 
-  log(`sending to API (${projectFiles.length} files, ${clis.length} CLIs)...`);
+  const { projectFiles, fileContents, clis } = collectMetadata(target);
+  if (spinner) spinner.start(`Generating ai/ layer (${projectFiles.length} files, ${clis.length} CLIs)...`);
+  else log(`sending to API (${projectFiles.length} files, ${clis.length} CLIs)...`);
   const result = await apiCall("/v1/init", {
     project_files: projectFiles,
     file_contents: fileContents,
@@ -172,7 +177,8 @@ async function cmdInit(target) {
     process.exit(1);
   }
 
-  log(`detected: ${result.stack || "?"}`);
+  if (spinner) spinner.stop(`Detected: ${result.stack || "?"}`);
+  else log(`detected: ${result.stack || "?"}`);
   writeFiles(target, result.files || {});
 
   // Add to .gitignore
@@ -310,43 +316,128 @@ async function checkVersion() {
 }
 
 async function cmdAuthLogin() {
-  // Step 1: request device code
-  const result = await apiCall("/v1/auth/device", { client_id: "cli" });
-  if (result.error) { log(`error: ${result.error}`); process.exit(1); }
+  const isTTY = process.stdout.isTTY && process.stdin.isTTY;
+
+  if (isTTY) {
+    // Interactive TUI flow
+    const p = require("@clack/prompts");
+    p.intro(`${T}0dai${R} authentication`);
+
+    const method = await p.select({
+      message: "How would you like to sign in?",
+      options: [
+        { value: "github", label: "GitHub", hint: "recommended" },
+        { value: "google", label: "Google" },
+        { value: "device", label: "Device code", hint: "no browser needed" },
+      ],
+    });
+    if (p.isCancel(method)) { p.cancel("Cancelled"); process.exit(0); }
+
+    if (method === "github" || method === "google") {
+      const url = `${API_URL}/v1/auth/${method}?cli=true`;
+      p.log.info(`Opening browser: ${url}`);
+      try {
+        const { execSync } = require("child_process");
+        const cmd = os.platform() === "darwin" ? "open" : os.platform() === "win32" ? "start" : "xdg-open";
+        execSync(`${cmd} "${url}"`, { stdio: "ignore" });
+      } catch {
+        p.log.warn(`Could not open browser. Visit manually:\n  ${url}`);
+      }
+
+      const s = p.spinner();
+      s.start("Waiting for browser confirmation...");
 
-  log(`Open this URL in your browser:\n`);
-  console.log(`  ${result.verification_uri}\n`);
-  log(`Enter code: ${result.user_code}\n`);
-  log("Waiting for authorization...");
-
-  // Step 2: poll for token
-  const interval = (result.interval || 5) * 1000;
-  const deadline = Date.now() + (result.expires_in || 600) * 1000;
-
-  while (Date.now() < deadline) {
-    await new Promise(r => setTimeout(r, interval));
-    const poll = await apiCall("/v1/auth/token", { device_code: result.device_code });
-    if (poll.access_token) {
-      // Save token
-      fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
-      fs.writeFileSync(AUTH_FILE, JSON.stringify({
-        access_token: poll.access_token,
-        email: poll.email,
-        plan: poll.plan || "free",
-        authenticated_at: new Date().toISOString(),
-        expires_at: poll.expires_at,
-      }, null, 2) + "\n", { mode: 0o600 });
-      log(`Logged in as ${poll.email} (${poll.plan} plan)`);
-      return;
+      // Poll auth/status until we get a new token (check every 3s, 5min timeout)
+      // For now, ask user to paste token from success page
+      s.stop("Browser opened");
+      const token = await p.text({
+        message: "Paste your token from the success page (or press Enter to skip):",
+        placeholder: "0dai_at_...",
+      });
+      if (token && !p.isCancel(token) && token.startsWith("0dai_at_")) {
+        fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
+        fs.writeFileSync(AUTH_FILE, JSON.stringify({
+          access_token: token,
+          authenticated_at: new Date().toISOString(),
+        }, null, 2) + "\n", { mode: 0o600 });
+        // Fetch profile
+        const status = await apiCall("/v1/auth/status");
+        if (status.email) {
+          const auth = JSON.parse(fs.readFileSync(AUTH_FILE, "utf8"));
+          auth.email = status.email;
+          auth.plan = status.plan;
+          auth.name = status.name;
+          fs.writeFileSync(AUTH_FILE, JSON.stringify(auth, null, 2) + "\n", { mode: 0o600 });
+          p.outro(`${T}Logged in${R} as ${status.email} (${status.plan} plan)`);
+        } else {
+          p.outro(`${T}Token saved${R}`);
+        }
+        return;
+      }
+      p.log.info("Skipped. You can also use device code flow:");
     }
-    if (poll.error && poll.error !== "authorization_pending") {
-      log(`${poll.error}`);
-      process.exit(1);
+
+    // Device code fallback
+    const result = await apiCall("/v1/auth/device", { client_id: "cli" });
+    if (result.error) { p.log.error(result.error); process.exit(1); }
+
+    p.log.step(`Open: ${result.verification_uri}`);
+    p.log.step(`Code: ${T}${result.user_code}${R}`);
+
+    const s = p.spinner();
+    s.start("Waiting for confirmation...");
+
+    const interval = (result.interval || 5) * 1000;
+    const deadline = Date.now() + (result.expires_in || 600) * 1000;
+    while (Date.now() < deadline) {
+      await new Promise(r => setTimeout(r, interval));
+      const poll = await apiCall("/v1/auth/token", { device_code: result.device_code });
+      if (poll.access_token) {
+        s.stop("Authorized!");
+        fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
+        fs.writeFileSync(AUTH_FILE, JSON.stringify({
+          access_token: poll.access_token, email: poll.email,
+          plan: poll.plan || "free", authenticated_at: new Date().toISOString(),
+          expires_at: poll.expires_at,
+        }, null, 2) + "\n", { mode: 0o600 });
+        p.outro(`${T}Logged in${R} as ${poll.email} (${poll.plan} plan)`);
+        return;
+      }
+      if (poll.error && poll.error !== "authorization_pending") {
+        s.stop("Failed");
+        p.log.error(poll.error);
+        process.exit(1);
+      }
     }
-    process.stdout.write(".");
+    s.stop("Timed out");
+    p.log.error("Try again.");
+    process.exit(1);
+
+  } else {
+    // Non-interactive: device code only
+    const result = await apiCall("/v1/auth/device", { client_id: "cli" });
+    if (result.error) { log(`error: ${result.error}`); process.exit(1); }
+    log(`Open: ${result.verification_uri}`);
+    log(`Code: ${result.user_code}`);
+    log("Waiting...");
+    const interval = (result.interval || 5) * 1000;
+    const deadline = Date.now() + (result.expires_in || 600) * 1000;
+    while (Date.now() < deadline) {
+      await new Promise(r => setTimeout(r, interval));
+      const poll = await apiCall("/v1/auth/token", { device_code: result.device_code });
+      if (poll.access_token) {
+        fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
+        fs.writeFileSync(AUTH_FILE, JSON.stringify({
+          access_token: poll.access_token, email: poll.email,
+          plan: poll.plan || "free", authenticated_at: new Date().toISOString(),
+        }, null, 2) + "\n", { mode: 0o600 });
+        log(`Logged in as ${poll.email}`);
+        return;
+      }
+    }
+    log("Timed out");
+    process.exit(1);
   }
-  log("Authorization timed out. Try again.");
-  process.exit(1);
 }
 
 function cmdAuthLogout() {

package/package.json

@@ -1,11 +1,20 @@
 {
   "name": "@0dai-dev/cli",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "One config layer for 5 AI agent CLIs — Claude Code, Codex, OpenCode, Gemini, Aider",
   "bin": {
     "0dai": "./bin/0dai.js"
   },
-  "keywords": ["ai", "agents", "claude", "codex", "gemini", "aider", "developer-tools", "mcp"],
+  "keywords": [
+    "ai",
+    "agents",
+    "claude",
+    "codex",
+    "gemini",
+    "aider",
+    "developer-tools",
+    "mcp"
+  ],
   "author": "0dai-dev <dev@0dai.dev>",
   "license": "MIT",
   "repository": {
@@ -20,5 +29,8 @@
     "bin/",
     "lib/",
     "README.md"
-  ]
+  ],
+  "dependencies": {
+    "@clack/prompts": "^1.2.0"
+  }
 }