@overscore/cli 0.11.1 → 0.11.3

package/dist/index.js

@@ -23,7 +23,7 @@ function parseEnv(content) {
     }
     return env;
 }
-function loadEnv() {
+async function loadEnv() {
     // (1) Local .env (inside a dashboard project)
     const envPath = path.resolve(process.cwd(), ".env");
     if (fs.existsSync(envPath)) {
@@ -49,33 +49,32 @@ function loadEnv() {
             };
         }
     }
-    // No creds. Tailor the message based on what kind of folder we're in so the
-    // user gets pointed at the right setup command.
-    const inAnalysisFolder = fs.existsSync(path.resolve(process.cwd(), ".overscore", "analysis.json"));
-    if (inAnalysisFolder) {
-        let analysisSlug = null;
-        try {
-            const meta = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), ".overscore", "analysis.json"), "utf-8"));
-            analysisSlug = typeof meta.slug === "string" ? meta.slug : null;
-        }
-        catch {
-            // Fall through to the generic message.
+    // No creds — trigger browser auth inline, then re-check
+    console.log("\n  No Overscore credentials found. Launching browser login...\n");
+    await authLogin();
+    const configPath2 = path.join(process.env.HOME || "", ".overscore", "config");
+    if (fs.existsSync(configPath2)) {
+        const cfg2 = parseEnv(fs.readFileSync(configPath2, "utf-8"));
+        if (cfg2.OVERSCORE_API_KEY) {
+            return {
+                apiUrl: cfg2.OVERSCORE_API_URL || `${HUB_URL}/api`,
+                apiKey: cfg2.OVERSCORE_API_KEY,
+                dashboardSlug: path.basename(process.cwd()),
+                projectSlug: cfg2.OVERSCORE_PROJECT_SLUG || "",
+            };
         }
-        console.error("\n  Error: No credentials found in this analysis folder.");
-        console.error("  This usually means the analysis hasn't been linked to your account yet.");
-        console.error("  Run:");
-        console.error(`    npx @overscore/cli analysis pull ${analysisSlug || "<slug>"}`);
-        console.error("  to refresh credentials and link this folder, or:");
-        console.error("    npx @overscore/cli auth login");
-        console.error("  if you've never set up the CLI on this machine.\n");
-    }
-    else {
-        console.error("\n  Error: No credentials found. Run 'npx @overscore/cli auth login' to set up.\n");
     }
-    process.exit(1);
+    // Logged in but no project API key yet — the user needs to run setup first
+    console.log(`
+  Logged in! To get your first project set up:
+
+    Create a dashboard:   npx create-overscore --dashboard <name> --project <slug>
+    Pull an analysis:     npx @overscore/cli analysis pull <slug>
+`);
+    process.exit(0);
 }
 async function apiRequest(method, urlPath, body, command) {
-    const { apiUrl, apiKey } = loadEnv();
+    const { apiUrl, apiKey, projectSlug } = await loadEnv();
     const baseUrl = apiUrl.replace(/\/api$/, "");
     const url = `${baseUrl}${urlPath}`;
     const headers = {
@@ -93,6 +92,23 @@ async function apiRequest(method, urlPath, body, command) {
         body: body !== undefined ? JSON.stringify(body) : undefined,
     });
     const data = await res.json();
+    if (res.status === 401 && projectSlug) {
+        console.log("\n  API key expired. Refreshing...\n");
+        const newKey = await refreshApiKey(projectSlug);
+        if (newKey) {
+            const retryRes = await fetch(url, {
+                method,
+                headers: { ...headers, Authorization: `Bearer ${newKey}` },
+                body: body !== undefined ? JSON.stringify(body) : undefined,
+            });
+            const retryData = await retryRes.json();
+            if (!retryRes.ok) {
+                console.error(`\n  Error: ${retryData.error || `HTTP ${retryRes.status}`}\n`);
+                process.exit(1);
+            }
+            return retryData;
+        }
+    }
     if (!res.ok) {
         console.error(`\n  Error: ${data.error || `HTTP ${res.status}`}\n`);
         process.exit(1);
@@ -117,6 +133,58 @@ function prompt(message) {
         });
     });
 }
+async function refreshApiKey(projectSlug) {
+    const configDir = path.join(process.env.HOME || "", ".overscore");
+    const configPath = path.join(configDir, "config");
+    let cfg = fs.existsSync(configPath)
+        ? parseEnv(fs.readFileSync(configPath, "utf-8"))
+        : {};
+    let deviceToken = cfg.OVERSCORE_DEVICE_TOKEN;
+    if (!deviceToken) {
+        console.log("\n  No session found. Launching browser login...\n");
+        await authLogin();
+        cfg = parseEnv(fs.readFileSync(configPath, "utf-8"));
+        deviceToken = cfg.OVERSCORE_DEVICE_TOKEN;
+        if (!deviceToken)
+            return null;
+    }
+    for (let attempt = 0; attempt < 2; attempt++) {
+        const keyRes = await fetch(`${HUB_URL}/api/projects/${projectSlug}/api-keys`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${deviceToken}`, "Content-Type": "application/json" },
+            body: JSON.stringify({ name: `cli-${Date.now()}` }),
+        });
+        if (keyRes.ok) {
+            const data = (await keyRes.json());
+            const newKey = data.raw_key;
+            if (!newKey)
+                return null;
+            // Update local .env if present
+            const envPath = path.resolve(process.cwd(), ".env");
+            if (fs.existsSync(envPath)) {
+                const envContent = fs.readFileSync(envPath, "utf-8");
+                fs.writeFileSync(envPath, envContent.replace(/^VITE_OVERSCORE_API_KEY=.*/m, `VITE_OVERSCORE_API_KEY=${newKey}`));
+            }
+            // Update global config
+            cfg.OVERSCORE_API_KEY = newKey;
+            fs.mkdirSync(configDir, { recursive: true });
+            fs.writeFileSync(configPath, Object.entries(cfg).map(([k, v]) => `${k}=${v}`).join("\n") + "\n", { mode: 0o600 });
+            console.log("  API key refreshed.\n");
+            return newKey;
+        }
+        if ((keyRes.status === 401 || keyRes.status === 403) && attempt === 0) {
+            console.log("\n  Session expired. Launching browser login...\n");
+            await authLogin();
+            cfg = parseEnv(fs.readFileSync(configPath, "utf-8"));
+            deviceToken = cfg.OVERSCORE_DEVICE_TOKEN;
+            if (!deviceToken)
+                return null;
+            continue;
+        }
+        return null;
+    }
+    return null;
+}
 const SOURCE_EXCLUDE = new Set([
     "node_modules",
     "dist",
@@ -195,7 +263,7 @@ function extractZip(zipBuffer, targetDir) {
 }
 // ── Commands ────────────────────────────────────────────────────────
 async function deploy() {
-    const { apiUrl, apiKey, dashboardSlug } = loadEnv();
+    const { apiUrl, apiKey, dashboardSlug } = await loadEnv();
     // Parse --message flag
     const msgIndex = process.argv.indexOf("--message");
     const commitMessage = msgIndex !== -1 && process.argv[msgIndex + 1]
@@ -264,7 +332,7 @@ async function deploy() {
   URL: ${data.url}
 `);
     // Sync context files to Hub
-    const { projectSlug } = loadEnv();
+    const { projectSlug } = await loadEnv();
     const baseUrl = apiUrl.replace(/\/api$/, "");
     // Upload knowledge base (project-level, shared across all artifacts)
     await uploadKnowledgeBase(process.cwd(), baseUrl, projectSlug, apiKey);
@@ -306,7 +374,7 @@ async function deploy() {
     await syncPlatformRules(process.cwd(), baseUrl, apiKey);
 }
 async function queryList() {
-    const { dashboardSlug } = loadEnv();
+    const { dashboardSlug } = await loadEnv();
     const data = (await apiRequest("GET", `/api/dashboards/${dashboardSlug}/queries`, undefined, "query-list"));
     console.log(`\n  Dashboard: ${data.dashboard}\n`);
     // Registered queries
@@ -353,7 +421,7 @@ async function queryShow(name) {
         console.error("\n  Usage: npx @overscore/cli query show <name>\n");
         process.exit(1);
     }
-    const { dashboardSlug } = loadEnv();
+    const { dashboardSlug } = await loadEnv();
     const data = (await apiRequest("GET", `/api/dashboards/${dashboardSlug}/queries`));
     const query = data.queries.find((q) => q.query_name === name);
     if (!query) {
@@ -421,7 +489,7 @@ async function queryAdd(name, sql) {
         console.error("\n  Error: Query name must start with a lowercase letter and contain only lowercase letters, numbers, and underscores.\n");
         process.exit(1);
     }
-    const { dashboardSlug } = loadEnv();
+    const { dashboardSlug } = await loadEnv();
     let body;
     if (datasetName) {
         // Look up the dataset UUID from project_datasets in the queries endpoint
@@ -454,7 +522,7 @@ async function queryUpdate(name, sql) {
         console.error("    npx @overscore/cli query update <name> --file query.sql\n");
         process.exit(1);
     }
-    const { dashboardSlug } = loadEnv();
+    const { dashboardSlug } = await loadEnv();
     const data = (await apiRequest("PUT", `/api/dashboards/${dashboardSlug}/queries/${encodeURIComponent(name)}`, { sql_text: resolvedSql }));
     console.log(`\n  Query "${data.query_name}" updated.`);
     console.log("  Cache has been invalidated — fresh data on next load.\n");
@@ -469,7 +537,7 @@ async function queryRemove(name) {
         console.log("  Cancelled.\n");
         return;
     }
-    const { dashboardSlug } = loadEnv();
+    const { dashboardSlug } = await loadEnv();
     await apiRequest("DELETE", `/api/dashboards/${dashboardSlug}/queries/${encodeURIComponent(name)}`);
     console.log(`\n  Query "${name}" deleted.\n`);
 }
@@ -527,7 +595,7 @@ async function queryTest(sql) {
         console.error("    npx @overscore/cli query run --file queries/foo.sql\n");
         process.exit(1);
     }
-    const { projectSlug } = loadEnv();
+    const { projectSlug } = await loadEnv();
     if (!projectSlug) {
         const analysisMetaPath = path.resolve(process.cwd(), ".overscore", "analysis.json");
         if (fs.existsSync(analysisMetaPath)) {
@@ -797,7 +865,7 @@ VITE_OVERSCORE_API_URL=https://overscore.dev/api
 `);
 }
 async function versions() {
-    const { dashboardSlug } = loadEnv();
+    const { dashboardSlug } = await loadEnv();
     const data = (await apiRequest("GET", `/api/dashboards/${dashboardSlug}/versions`));
     console.log(`\n  Dashboard: ${dashboardSlug}\n`);
     if (data.versions.length === 0) {
@@ -821,7 +889,7 @@ async function versions() {
     console.log(`\n  Pull a version: npx @overscore/cli pull ${dashboardSlug} --version N\n`);
 }
 async function listDashboards() {
-    const { apiUrl, apiKey } = loadEnv();
+    const { apiUrl, apiKey } = await loadEnv();
     const baseUrl = apiUrl.replace(/\/api$/, "");
     const res = await fetch(`${baseUrl}/api/dashboards`, {
         headers: { Authorization: `Bearer ${apiKey}` },
@@ -927,44 +995,80 @@ async function loadAnalysisConfig() {
             }
         }
     }
-    // (3) Interactive — only ask for the API key, resolve project automatically
-    console.log("\n  No Overscore config found. Let's set one up.\n");
-    const apiKey = await prompt("API key (from the Hub):");
-    if (!apiKey || !apiKey.startsWith("os_")) {
-        console.error("\n  Error: API key should start with os_\n");
-        process.exit(1);
+    // (3) No valid API key — use an existing device token or trigger browser auth
+    let existingCfg = fs.existsSync(configPath)
+        ? parseEnv(fs.readFileSync(configPath, "utf-8"))
+        : {};
+    let deviceToken = existingCfg.OVERSCORE_DEVICE_TOKEN;
+    if (!deviceToken) {
+        console.log("\n  No Overscore credentials found. Launching browser login...\n");
+        await authLogin();
+        existingCfg = parseEnv(fs.readFileSync(configPath, "utf-8"));
+        deviceToken = existingCfg.OVERSCORE_DEVICE_TOKEN;
+        if (!deviceToken) {
+            console.error("\n  Error: Login did not complete. Please try again.\n");
+            process.exit(1);
+        }
     }
-    // Look up the project slug from the key
-    let projectSlug = null;
-    try {
-        const res = await fetch(`${HUB_URL}/api/projects/verify-key`, {
+    // Resolve project slug
+    let targetProjectSlug = existingCfg.OVERSCORE_PROJECT_SLUG || "";
+    if (!targetProjectSlug) {
+        targetProjectSlug = await prompt("Project slug:");
+        if (!targetProjectSlug) {
+            console.error("\n  Error: Project slug is required.\n");
+            process.exit(1);
+        }
+    }
+    // Generate an API key via device token (retry once on expired token)
+    let generatedKey;
+    for (let attempt = 0; attempt < 2; attempt++) {
+        const keyGenRes = await fetch(`${HUB_URL}/api/projects/${targetProjectSlug}/api-keys`, {
             method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ key: apiKey }),
+            headers: {
+                Authorization: `Bearer ${deviceToken}`,
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({ name: `cli-${Date.now()}` }),
         });
-        if (res.ok) {
-            const data = (await res.json());
-            projectSlug = data.project_slug || null;
-            if (projectSlug) {
-                console.log(`\n  Detected project: ${projectSlug}`);
+        if (keyGenRes.ok) {
+            const data = (await keyGenRes.json());
+            generatedKey = data.raw_key;
+            break;
+        }
+        if ((keyGenRes.status === 401 || keyGenRes.status === 403) && attempt === 0) {
+            console.log("\n  Session expired. Launching browser login...\n");
+            await authLogin();
+            existingCfg = parseEnv(fs.readFileSync(configPath, "utf-8"));
+            deviceToken = existingCfg.OVERSCORE_DEVICE_TOKEN;
+            if (!deviceToken) {
+                console.error("\n  Error: Login did not complete. Please try again.\n");
+                process.exit(1);
             }
+            continue;
         }
-    }
-    catch {
-        // Fall back to manual entry
-    }
-    if (!projectSlug) {
-        projectSlug = await prompt("Project slug:");
-        if (!projectSlug) {
-            console.error("\n  Error: Project slug is required\n");
-            process.exit(1);
+        if (keyGenRes.status === 403) {
+            console.error(`\n  Error: Access denied for project "${targetProjectSlug}". Make sure you have access.\n`);
+        }
+        else {
+            console.error(`\n  Error: Failed to generate API key (HTTP ${keyGenRes.status}).\n`);
         }
+        process.exit(1);
+    }
+    if (!generatedKey) {
+        console.error("\n  Error: Failed to generate API key.\n");
+        process.exit(1);
     }
-    // Save for next time
+    // Persist the new key
+    const newLines = [
+        `OVERSCORE_API_URL=${HUB_URL}/api`,
+        `OVERSCORE_DEVICE_TOKEN=${deviceToken}`,
+        `OVERSCORE_API_KEY=${generatedKey}`,
+        `OVERSCORE_PROJECT_SLUG=${targetProjectSlug}`,
+    ];
     fs.mkdirSync(configDir, { recursive: true });
-    fs.writeFileSync(configPath, `OVERSCORE_API_URL=${HUB_URL}/api\nOVERSCORE_API_KEY=${apiKey}\nOVERSCORE_PROJECT_SLUG=${projectSlug}\n`, { mode: 0o600 });
+    fs.writeFileSync(configPath, newLines.join("\n") + "\n", { mode: 0o600 });
     console.log(`\n  Saved to ~/.overscore/config\n`);
-    return { apiUrl: `${HUB_URL}/api`, apiKey, projectSlug };
+    return { apiUrl: `${HUB_URL}/api`, apiKey: generatedKey, projectSlug: targetProjectSlug };
 }
 async function analysisApiRequest(cfg, method, urlPath, body) {
     const baseUrl = cfg.apiUrl.replace(/\/api$/, "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@overscore/cli",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "description": "CLI for deploying Overscore dashboards and publishing analyses",
   "bin": {
     "overscore": "dist/index.js"