@mushi-mushi/cli 0.20.0 → 0.22.0

package/dist/init.js

@@ -1,6 +1,6 @@
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-6LM2KW4S.js";
+} from "./chunk-5KN6S63C.js";
 import {
   TEST_REPORT_FETCH_TIMEOUT_MS,
   loadConfig,
@@ -15,13 +15,13 @@ import {
   envVarsToWrite,
   installCommand,
   readPackageJson
-} from "./chunk-7Q44KWGN.js";
+} from "./chunk-JAUKBLPK.js";
 
 // src/init.ts
 import * as p from "@clack/prompts";
 import { spawn } from "child_process";
 import { randomUUID } from "crypto";
-import { appendFileSync, existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+import { appendFileSync, existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync } from "fs";
 import { join as join3 } from "path";
 
 // src/console-url.ts
@@ -207,13 +207,13 @@ async function apiCall(path, config, options = {}) {
     }
     if (!res.ok && typeof body === "object" && body !== null && !("ok" in body)) {
       const b = body;
+      const nested = b["error"];
+      const errCode = nested?.["code"] ?? b["code"] ?? `HTTP_${res.status}`;
+      const errMsg = nested?.["message"] ?? b["message"] ?? `Request failed (${res.status})`;
       return {
         ok: false,
         httpStatus: res.status,
-        error: {
-          code: b["code"] ?? `HTTP_${res.status}`,
-          message: b["message"] ?? `Request failed (${res.status})`
-        }
+        error: { code: errCode, message: errMsg }
       };
     }
     return body;
@@ -306,8 +306,12 @@ async function waitForCliToken(endpoint, session, opts = {}) {
   const deadline = now() + (session.expires_in || 600) * 1e3;
   const maxConsecutiveErrors = opts.maxConsecutiveErrors ?? 5;
   let consecutiveErrors = 0;
+  let firstPoll = true;
   while (now() < deadline) {
-    await sleep(intervalMs);
+    if (!firstPoll) {
+      await sleep(intervalMs);
+    }
+    firstPoll = false;
     const outcome = await pollDeviceToken(endpoint, session.device_code);
     switch (outcome.status) {
       case "approved":
@@ -535,6 +539,33 @@ function getFrameworkFromPkg(pkg) {
   return void 0;
 }
 
+// src/auth-ui.ts
+var LINE = "\u2500".repeat(58);
+function printAuthBanner(userCode, verificationUri) {
+  console.log("");
+  console.log(`  \u250C${LINE}\u2510`);
+  console.log(`  \u2502  Browser sign-in \u2014 follow these 3 steps              \u2502`);
+  console.log(`  \u251C${LINE}\u2524`);
+  console.log(`  \u2502                                                        \u2502`);
+  console.log(`  \u2502  1. A browser tab will open (or visit the URL below)  \u2502`);
+  console.log(`  \u2502  2. Sign in if prompted, then click "Approve"         \u2502`);
+  console.log(`  \u2502  3. Come back here \u2014 setup continues automatically    \u2502`);
+  console.log(`  \u2502                                                        \u2502`);
+  console.log(`  \u251C${LINE}\u2524`);
+  console.log(`  \u2502  Verification code (show in browser \u2014 NOT terminal):  \u2502`);
+  console.log(`  \u2502                                                        \u2502`);
+  console.log(`  \u2502    ${userCode.padEnd(52)}\u2502`);
+  console.log(`  \u2502                                                        \u2502`);
+  console.log(`  \u2502  \u26A0  Do NOT paste or type this code in your terminal   \u2502`);
+  console.log(`  \u2514${LINE}\u2518`);
+  console.log("");
+  console.log(`  If the browser didn't open, visit this URL and approve:`);
+  console.log(`    ${verificationUri}`);
+  console.log("");
+  console.log("  \u23F3 Waiting for browser approval\u2026 (Ctrl+C to cancel)");
+  console.log("");
+}
+
 // src/init.ts
 var ENV_FILES = [".env.local", ".env"];
 var PROJECT_ID_PATTERN = /^(?:proj_[A-Za-z0-9_-]{10,}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i;
@@ -542,7 +573,7 @@ var API_KEY_PATTERN = /^(mushi_|mush_pk_)[A-Za-z0-9_-]{10,}$/;
 async function runInit(options = {}) {
   const cwd = options.cwd ?? process.cwd();
   ensureInteractiveOrBailOut(options);
-  p.intro("\u{1F41B} Mushi Mushi setup wizard");
+  p.intro("Mushi setup");
   await printFreshnessHint();
   warnIfWorkspaceRoot(cwd);
   const pkg = readPackageJson(cwd);
@@ -570,13 +601,13 @@ async function runInit(options = {}) {
   } else {
     p.log.info(`Skipped install. Run \`${installCommand(pm, packagesToInstall)}\` yourself.`);
   }
-  writeEnvFile(cwd, credentials.apiKey, credentials.projectId, framework);
+  await writeEnvFile(cwd, credentials.apiKey, credentials.projectId, framework, endpoint, Boolean(options.yes));
   persistCliConfig(credentials.apiKey, credentials.projectId, endpoint);
   const enableRewards = await maybeEnableRewards(options);
   printNextSteps(framework, consoleBase, enableRewards);
   await maybeSendTestReport(credentials, { ...options, endpoint, consoleBase });
   await maybeOfferConnect(credentials, options, consoleBase);
-  p.outro("Setup complete. Happy bug squashing \u{1F41B}");
+  p.outro("Setup complete.");
 }
 function ensureInteractiveOrBailOut(options) {
   const isTTY = Boolean(process.stdin.isTTY && process.stdout.isTTY);
@@ -641,7 +672,7 @@ async function acquireCredentials(options, consoleBase, endpoint) {
     }
   }
   if (options.yes) {
-    const creds = await runBrowserSignIn(options, endpoint);
+    const creds = await runBrowserSignIn(options, endpoint, consoleBase);
     if (creds) return creds;
     p.log.warn("Browser sign-in didn't complete \u2014 switching to manual entry.");
   } else {
@@ -657,7 +688,7 @@ async function acquireCredentials(options, consoleBase, endpoint) {
         {
           value: "manual",
           label: "Paste a Project ID + API key",
-          hint: "Self-hosted or expert setup"
+          hint: "Self-hosted or expert setup \u2014 run npx mushi-mushi (not mushi setup)"
         }
       ]
     });
@@ -666,14 +697,14 @@ async function acquireCredentials(options, consoleBase, endpoint) {
       process.exit(0);
     }
     if (method === "browser") {
-      const creds = await runBrowserSignIn(options, endpoint);
+      const creds = await runBrowserSignIn(options, endpoint, consoleBase);
       if (creds) return creds;
       p.log.warn("Browser sign-in didn't complete \u2014 switching to manual entry.");
     }
   }
   return collectCredentialsManually(options, consoleBase);
 }
-async function runBrowserSignIn(options, endpoint) {
+async function runBrowserSignIn(options, endpoint, consoleBase) {
   const startSpin = p.spinner();
   startSpin.start("Starting secure browser sign-in\u2026");
   let session;
@@ -685,13 +716,11 @@ async function runBrowserSignIn(options, endpoint) {
     return null;
   }
   startSpin.stop("Browser sign-in ready.");
-  p.log.step(`Confirmation code: ${session.user_code}`);
-  p.log.info(`Opening ${session.verification_uri}`);
   try {
     await openInBrowser(session.verification_uri);
   } catch {
   }
-  p.log.message("Approve the request in your browser to continue. (Ctrl+C to cancel)");
+  printAuthBanner(session.user_code, session.verification_uri);
   const waitSpin = p.spinner();
   waitSpin.start("Waiting for you to approve in the browser\u2026");
   let cliToken;
@@ -707,9 +736,14 @@ async function runBrowserSignIn(options, endpoint) {
   let apiKey;
   if (!projectId) {
     let projects = [];
+    const fetchSpin = p.spinner();
+    fetchSpin.start("Loading your projects\u2026");
     try {
       projects = await listProjects(endpoint, cliToken);
-    } catch {
+      fetchSpin.stop(projects.length > 0 ? `Found ${projects.length} project(s).` : "No projects yet.");
+    } catch (err) {
+      fetchSpin.stop("Could not load projects \u2014 you can still create a new one.");
+      p.log.warn(err instanceof Error ? err.message : String(err));
     }
     const NEW = "__new__";
     const choice = await p.select({
@@ -751,7 +785,24 @@ async function runBrowserSignIn(options, endpoint) {
     }
   }
   if (projectId && !apiKey) {
-    apiKey = await mintProjectKey(endpoint, cliToken, projectId) ?? void 0;
+    const keySpin = p.spinner();
+    keySpin.start("Minting SDK key\u2026");
+    try {
+      const minted = await mintProjectKey(endpoint, cliToken, projectId);
+      apiKey = minted ?? void 0;
+      if (!apiKey) {
+        keySpin.stop("Could not mint an API key.");
+        p.log.warn(
+          `Open the console Verify tab to generate a key manually: ${consoleUrl(consoleBase, "/onboarding?tab=verify")}`
+        );
+        return null;
+      }
+      keySpin.stop("SDK key ready.");
+    } catch (err) {
+      keySpin.stop("Could not mint an API key.");
+      p.log.warn(err instanceof Error ? err.message : String(err));
+      return null;
+    }
   }
   if (!projectId || !apiKey) return null;
   return { apiKey, projectId };
@@ -857,13 +908,37 @@ function runCommand(pm, packages, cwd) {
     });
   });
 }
-function writeEnvFile(cwd, apiKey, projectId, framework) {
+async function writeEnvFile(cwd, apiKey, projectId, framework, endpoint, overwrite) {
   const target = ENV_FILES.find((f) => existsSync3(join3(cwd, f))) ?? ENV_FILES[0];
   const targetPath = join3(cwd, target);
-  const newVars = envVarsToWrite(apiKey, projectId, framework);
+  const newVars = envVarsToWrite(apiKey, projectId, framework, endpoint);
   const existing = existsSync3(targetPath) ? readFileSync3(targetPath, "utf-8") : "";
   if (existing.includes("MUSHI_PROJECT_ID")) {
-    p.log.warn(`Existing MUSHI_* vars found in ${target} \u2014 leaving them untouched.`);
+    let shouldOverwrite = overwrite;
+    if (!shouldOverwrite) {
+      const answer = await p.confirm({
+        message: `Existing MUSHI_* vars found in ${target}. Update with new credentials?`,
+        initialValue: true
+      });
+      if (p.isCancel(answer)) {
+        p.log.info(`Kept existing env vars in ${target}.`);
+        return;
+      }
+      shouldOverwrite = Boolean(answer);
+    }
+    if (!shouldOverwrite) {
+      p.log.info(`Kept existing env vars in ${target}. Re-run and confirm to overwrite.`);
+      return;
+    }
+    const MUSHI_LINE_RE = /^(NEXT_PUBLIC_|NUXT_PUBLIC_|VITE_|EXPO_PUBLIC_)?MUSHI_[A-Z_]+=.*/gm;
+    const stripped = existing.replace(MUSHI_LINE_RE, "").replace(/\n{3,}/g, "\n\n").trimEnd();
+    const prefix2 = stripped.length > 0 ? "\n" : "";
+    writeFileSync(targetPath, `${stripped}${prefix2}
+# Mushi Mushi
+${newVars}
+`);
+    p.log.success(`Updated MUSHI_* env vars in ${target}`);
+    warnIfMissingFromGitignore(cwd, target);
     return;
   }
   const prefix = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
@@ -924,12 +999,14 @@ import { MushiRewardsBadge } from '@mushi-mushi/react';
     p.log.info(`Enable rewards in your project settings at ${consoleUrl(consoleBase, "/rewards")}`);
     p.log.info("Users will earn points for bug reports, screen navigation, and app activity.");
   }
-  p.log.message("Verify the install:");
-  p.log.message("  \u2022 Start your dev server");
-  p.log.message("  \u2022 Look for the \u{1F41B} button in the bottom-right corner (or shake on mobile)");
-  p.log.message(`  \u2022 Submit a test report \u2014 it should appear at ${reportsUrl(consoleBase)}`);
-  p.log.info(
-    "Tip: `mushi connect --write-env --wire-ide --wait` also wires Cursor MCP and waits for SDK heartbeat."
+  p.note(
+    [
+      "  [ ] 1. Paste the init snippet above into your app entry file",
+      "  [ ] 2. Start your dev server",
+      "  [ ] 3. Run: mushi connect --write-env --wire-ide --wait",
+      `  [ ] 4. Open the Verify tab to send a test report: ${consoleUrl(consoleBase, "/onboarding?tab=verify")}`
+    ].join("\n"),
+    "Next steps:"
   );
 }
 async function maybeOfferConnect(credentials, options, _consoleBase) {
@@ -941,7 +1018,7 @@ async function maybeOfferConnect(credentials, options, _consoleBase) {
   if (p.isCancel(answer) || !answer) return;
   const endpoint = resolveCloudEndpoint(options.endpoint);
   try {
-    const { runConnect } = await import("./connect-IC7I76Z2.js");
+    const { runConnect } = await import("./connect-2RM43XHO.js");
     await runConnect({
       apiKey: credentials.apiKey,
       projectId: credentials.projectId,

package/dist/version.js

@@ -1,6 +1,6 @@
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-6LM2KW4S.js";
+} from "./chunk-5KN6S63C.js";
 export {
   MUSHI_CLI_VERSION
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mushi-mushi/cli",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "license": "MIT",
   "description": "CLI for Mushi Mushi — `mushi init` wizard installs the right SDK for your framework, plus report triage and pipeline health commands",
   "bin": {
@@ -18,13 +18,13 @@
     "vitest": "^4.1.8",
     "@mushi-mushi/eslint-config": "0.0.0"
   },
-  "author": "Kenji Sakuramoto",
+  "author": "Kenji Sakuramoto (https://bsky.app/profile/mushimushi.dev)",
   "repository": {
     "type": "git",
     "url": "https://github.com/kensaurus/mushi-mushi.git",
     "directory": "packages/cli"
   },
-  "homepage": "https://github.com/kensaurus/mushi-mushi/tree/main/packages/cli#readme",
+  "homepage": "https://kensaur.us/mushi-mushi",
   "bugs": {
     "url": "https://github.com/kensaurus/mushi-mushi/issues"
   },

package/dist/chunk-6LM2KW4S.js

@@ -1,6 +0,0 @@
-// src/version.ts
-var MUSHI_CLI_VERSION = true ? "0.20.0" : "0.0.0-dev";
-
-export {
-  MUSHI_CLI_VERSION
-};