@mushi-mushi/cli 0.23.0 → 0.24.0

package/dist/init.js

@@ -4,6 +4,7 @@ import {
   apiKeyHint,
   cliSetupDeepLink,
   consoleUrl,
+  ensureClientId,
   loadConfig,
   normalizeEndpoint,
   openInBrowser,
@@ -13,7 +14,7 @@ import {
   resolveConsoleUrl,
   resolveConsoleUrlSync,
   saveConfig
-} from "./chunk-WLLFV26V.js";
+} from "./chunk-GUVGTFVK.js";
 import {
   FRAMEWORKS,
   detectFramework,
@@ -24,7 +25,7 @@ import {
 } from "./chunk-AIZRI665.js";
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-BY5SZYRO.js";
+} from "./chunk-X74T7JKC.js";
 
 // src/init.ts
 import * as p from "@clack/prompts";
@@ -35,6 +36,7 @@ import { join as join2 } from "path";
 
 // src/device-auth.ts
 var DEVICE_FETCH_TIMEOUT_MS = 15e3;
+var DEFAULT_SLOW_DOWN_MS = 5e3;
 function trimTrailingSlash(endpoint) {
   let end = endpoint.length;
   while (end > 0 && endpoint.charCodeAt(end - 1) === 47) end--;
@@ -49,15 +51,18 @@ async function deviceFetch(url, init = {}) {
     clearTimeout(timer);
   }
 }
-async function startDeviceAuth(endpoint) {
+async function startDeviceAuth(endpoint, clientId) {
   const base = trimTrailingSlash(endpoint);
   const res = await deviceFetch(`${base}/v1/cli/auth/device/start`, {
     method: "POST",
-    headers: { "Content-Type": "application/json" }
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(clientId ? { client_id: clientId } : {})
   });
   const json = await res.json().catch(() => null);
   if (!res.ok || !json?.ok || !json.data) {
-    throw new Error(json?.error?.message ?? `Could not start browser sign-in (HTTP ${res.status}).`);
+    throw new Error(
+      json?.error?.message ?? `Could not start browser sign-in (HTTP ${res.status}).`
+    );
   }
   return json.data;
 }
@@ -76,6 +81,12 @@ async function pollDeviceToken(endpoint, deviceCode) {
     switch (json.error) {
       case "authorization_pending":
         return { status: "pending" };
+      case "slow_down": {
+        const retryAfterHeader = res.headers?.get?.("Retry-After");
+        const retryAfterSeconds = retryAfterHeader ? Number(retryAfterHeader) : NaN;
+        const retryAfterMs = Number.isFinite(retryAfterSeconds) && retryAfterSeconds > 0 ? retryAfterSeconds * 1e3 : DEFAULT_SLOW_DOWN_MS;
+        return { status: "slow_down", retryAfterMs };
+      }
       case "access_denied":
         return { status: "denied" };
       case "expired_token":
@@ -84,20 +95,27 @@ async function pollDeviceToken(endpoint, deviceCode) {
         return {
           status: "error",
           message: json.error_description ?? json.error ?? `HTTP ${res.status}`,
-          // 5xx is a server hiccup the next poll may clear; a 4xx is a definitive
-          // rejection (already claimed / invalid_grant) that won't fix itself.
-          retryable: res.status >= 500
+          // 5xx is a server hiccup the next poll may clear; 408 (gateway
+          // timeout) is equally transient. Any other 4xx is a definitive
+          // rejection (already claimed / invalid_grant) that won't fix
+          // itself. (429/slow_down is handled above as its own outcome.)
+          retryable: res.status >= 500 || res.status === 408
         };
     }
   } catch (err) {
-    return { status: "error", message: err instanceof Error ? err.message : String(err), retryable: true };
+    return {
+      status: "error",
+      message: err instanceof Error ? err.message : String(err),
+      retryable: true
+    };
   }
 }
 var defaultSleep = (ms) => new Promise((r) => setTimeout(r, ms));
+var deviceAuthRetryDelayMs = 1e3;
 async function waitForCliToken(endpoint, session, opts = {}) {
   const sleep = opts.sleep ?? defaultSleep;
   const now = opts.now ?? Date.now;
-  const intervalMs = (session.interval || 5) * 1e3;
+  let intervalMs = (session.interval || 5) * 1e3;
   const deadline = now() + (session.expires_in || 600) * 1e3;
   const maxConsecutiveErrors = opts.maxConsecutiveErrors ?? 5;
   let consecutiveErrors = 0;
@@ -115,6 +133,11 @@ async function waitForCliToken(endpoint, session, opts = {}) {
         consecutiveErrors = 0;
         opts.onPending?.();
         continue;
+      case "slow_down":
+        consecutiveErrors = 0;
+        intervalMs = Math.max(intervalMs, outcome.retryAfterMs);
+        opts.onSlowDown?.(outcome.retryAfterMs);
+        continue;
       case "denied":
         throw new Error("Login was denied in the browser.");
       case "expired":
@@ -139,19 +162,51 @@ function cliAuthHeaders(cliToken) {
     Authorization: `Bearer ${cliToken}`
   };
 }
+var DeviceAuthRequestError = class extends Error {
+  step;
+  status;
+  retryable;
+  constructor(step, message, status) {
+    super(message);
+    this.name = "DeviceAuthRequestError";
+    this.step = step;
+    this.status = status;
+    this.retryable = status === void 0 || status >= 500 || status === 408;
+  }
+};
+async function withOneRetry(run) {
+  try {
+    return await run();
+  } catch (err) {
+    if (err instanceof DeviceAuthRequestError && err.retryable) {
+      if (deviceAuthRetryDelayMs > 0) {
+        await defaultSleep(deviceAuthRetryDelayMs);
+      }
+      return run();
+    }
+    throw err;
+  }
+}
 async function listProjects(endpoint, cliToken) {
   const base = trimTrailingSlash(endpoint);
-  try {
-    const res = await deviceFetch(`${base}/v1/cli/projects`, { headers: cliAuthHeaders(cliToken) });
+  return withOneRetry(async () => {
+    let res;
+    try {
+      res = await deviceFetch(`${base}/v1/cli/projects`, { headers: cliAuthHeaders(cliToken) });
+    } catch (err) {
+      throw new DeviceAuthRequestError(
+        "list_projects",
+        `Could not reach ${base}/v1/cli/projects: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
     const json = await res.json().catch(() => null);
     if (res.ok && json?.ok) return json.data?.projects ?? [];
-  } catch (err) {
-    console.error(
-      "[mushi] Failed to list projects:",
-      err instanceof Error ? err.message : err
+    throw new DeviceAuthRequestError(
+      "list_projects",
+      json?.error?.message ?? `Could not list projects (HTTP ${res.status}).`,
+      res.status
     );
-  }
-  return [];
+  });
 }
 async function createProject(endpoint, cliToken, name) {
   const base = trimTrailingSlash(endpoint);
@@ -169,17 +224,28 @@ async function createProject(endpoint, cliToken, name) {
 }
 async function mintProjectKey(endpoint, cliToken, projectId) {
   const base = trimTrailingSlash(endpoint);
-  try {
-    const res = await deviceFetch(`${base}/v1/cli/projects/${projectId}/keys`, {
-      method: "POST",
-      headers: cliAuthHeaders(cliToken),
-      body: JSON.stringify({})
-    });
+  return withOneRetry(async () => {
+    let res;
+    try {
+      res = await deviceFetch(`${base}/v1/cli/projects/${projectId}/keys`, {
+        method: "POST",
+        headers: cliAuthHeaders(cliToken),
+        body: JSON.stringify({})
+      });
+    } catch (err) {
+      throw new DeviceAuthRequestError(
+        "mint_key",
+        `Could not reach ${base}/v1/cli/projects/\u2026/keys: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
     const json = await res.json().catch(() => null);
-    if (res.ok && json?.ok) return json.data?.key ?? null;
-  } catch {
-  }
-  return null;
+    if (res.ok && json?.ok && json.data?.key) return json.data.key;
+    throw new DeviceAuthRequestError(
+      "mint_key",
+      json?.error?.message ?? `Could not mint an SDK key (HTTP ${res.status}).`,
+      res.ok ? void 0 : res.status
+    );
+  });
 }
 
 // src/freshness.ts
@@ -390,7 +456,10 @@ async function runInit(options = {}) {
   const detected = detectFramework(cwd, pkg);
   const framework = await chooseFramework(detected, options);
   const consoleBase = await resolveConsoleUrl({ cwd });
-  const endpoint = resolveCloudEndpoint(options.endpoint);
+  const endpoint = resolveCloudEndpoint(
+    options.endpoint ?? process.env.MUSHI_API_ENDPOINT?.trim() ?? loadConfig().endpoint
+  );
+  options = { ...options, endpoint };
   const credentials = await acquireCredentials(options, consoleBase, endpoint);
   await verifyCredentials(credentials, options, consoleBase);
   const pm = detectPackageManager(cwd);
@@ -400,8 +469,16 @@ async function runInit(options = {}) {
   } else {
     p.log.info(`Skipped install. Run \`${installCommand(pm, packagesToInstall)}\` yourself.`);
   }
-  await writeEnvFile(cwd, credentials.apiKey, credentials.projectId, framework, endpoint, Boolean(options.yes));
+  await writeEnvFile(
+    cwd,
+    credentials.apiKey,
+    credentials.projectId,
+    framework,
+    endpoint,
+    Boolean(options.yes)
+  );
   persistCliConfig(credentials.apiKey, credentials.projectId, endpoint);
+  emitWizardFunnelEvent(credentials, endpoint, "wizard_env_written", { framework: framework.id });
   const enableRewards = await maybeEnableRewards(options);
   printNextSteps(framework, consoleBase, enableRewards);
   await maybeSendTestReport(credentials, { ...options, endpoint, consoleBase });
@@ -473,7 +550,9 @@ async function acquireCredentials(options, consoleBase, endpoint) {
   if (options.yes) {
     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.");
+    p.log.warn(
+      "Browser sign-in didn't complete \u2014 switching to manual entry. Run `npx mushi-mushi doctor --auth` to diagnose the sign-in path."
+    );
   } else {
     const method = await p.select({
       message: "Connect this app to Mushi",
@@ -498,17 +577,19 @@ async function acquireCredentials(options, consoleBase, endpoint) {
     if (method === "browser") {
       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.");
+      p.log.warn(
+        "Browser sign-in didn't complete \u2014 switching to manual entry. Run `npx mushi-mushi doctor --auth` to diagnose the sign-in path."
+      );
     }
   }
-  return collectCredentialsManually(options, consoleBase);
+  return collectCredentialsManually(options, consoleBase, endpoint);
 }
 async function runBrowserSignIn(options, endpoint, consoleBase) {
   const startSpin = p.spinner();
   startSpin.start("Starting secure browser sign-in\u2026");
   let session;
   try {
-    session = await startDeviceAuth(endpoint);
+    session = await startDeviceAuth(endpoint, ensureClientId());
   } catch (err) {
     startSpin.stop("Could not start browser sign-in.");
     p.log.warn(err instanceof Error ? err.message : String(err));
@@ -539,7 +620,9 @@ async function runBrowserSignIn(options, endpoint, consoleBase) {
     fetchSpin.start("Loading your projects\u2026");
     try {
       projects = await listProjects(endpoint, cliToken);
-      fetchSpin.stop(projects.length > 0 ? `Found ${projects.length} project(s).` : "No projects yet.");
+      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));
@@ -587,34 +670,50 @@ async function runBrowserSignIn(options, endpoint, consoleBase) {
     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;
-      }
+      apiKey = await mintProjectKey(endpoint, cliToken, projectId);
       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));
+      p.log.warn(
+        `You're signed in, but key minting failed. Generate one manually in the console Verify tab: ${consoleUrl(consoleBase, "/onboarding?tab=verify")}`
+      );
       return null;
     }
   }
   if (!projectId || !apiKey) return null;
   return { apiKey, projectId };
 }
-async function collectCredentialsManually(options, consoleBase) {
+async function collectCredentialsManually(options, consoleBase, endpoint) {
   const existing = loadConfig();
-  const rawProjectId = options.projectId ?? existing.projectId ?? await promptText({
+  let savedProjectId = existing.projectId;
+  let savedApiKey = existing.apiKey;
+  if (!options.projectId && !options.apiKey && savedProjectId && savedApiKey) {
+    p.log.info(
+      `Found saved credentials from a previous sign-in (project ${sanitizeSecret(savedProjectId).slice(0, 8)}\u2026).`
+    );
+    const checkSpin = p.spinner();
+    checkSpin.start("Checking saved credentials\u2026");
+    const check = await apiCall("/v1/sync/whoami", {
+      apiKey: sanitizeSecret(savedApiKey),
+      projectId: sanitizeSecret(savedProjectId),
+      endpoint
+    });
+    if (check.ok) {
+      checkSpin.stop(`Saved credentials still work (${check.data.project_name}).`);
+    } else {
+      checkSpin.stop("Saved credentials no longer authenticate \u2014 enter fresh ones below.");
+      savedProjectId = void 0;
+      savedApiKey = void 0;
+    }
+  }
+  const rawProjectId = options.projectId ?? savedProjectId ?? await promptText({
     message: "Project ID",
     placeholder: "e.g. bdafa28d-b153-482f-bd4f-42981f3fd3a4",
     hint: projectIdHint(consoleBase),
     validate: (v) => PROJECT_ID_PATTERN.test(v.trim()) ? void 0 : "Expected a UUID \u2014 copy it from the Projects page or the panel right after you create a project."
   });
-  const rawApiKey = options.apiKey ?? existing.apiKey ?? await promptText({
+  const rawApiKey = options.apiKey ?? savedApiKey ?? await promptText({
     message: "API key",
     placeholder: "mushi_xxxxxxxxxxxx",
     hint: apiKeyHint(consoleBase),
@@ -638,17 +737,30 @@ async function verifyCredentials(credentials, options, consoleBase) {
   const endpoint = resolveCloudEndpoint(options.endpoint);
   const spinner2 = p.spinner();
   spinner2.start("Verifying credentials\u2026");
-  const result = await apiCall(
-    "/v1/sync/whoami",
-    { apiKey: credentials.apiKey, projectId: credentials.projectId, endpoint }
-  );
+  const result = await apiCall("/v1/sync/whoami", {
+    apiKey: credentials.apiKey,
+    projectId: credentials.projectId,
+    endpoint
+  });
   if (!result.ok) {
     spinner2.stop("Credentials could not be verified.");
     p.log.error(result.error?.message ?? "Authentication failed.");
-    p.log.info(`Double-check values in the console:
-  ${cliSetupDeepLink(consoleBase)}`);
+    p.log.warn("Setup did NOT complete: nothing was installed and no env vars were written.");
+    p.log.info(
+      [
+        "To recover:",
+        '  \u2022 Re-run `npx mushi-mushi` and choose "Sign in with your browser", or',
+        `  \u2022 Double-check the Project ID / API key in the console: ${cliSetupDeepLink(consoleBase)}`
+      ].join("\n")
+    );
     throw new Error("Credential verification failed \u2014 fix Project ID / API key and re-run.");
   }
+  if (result.data.project_id && result.data.project_id !== credentials.projectId) {
+    p.log.warn(
+      `Project ID ${redact(credentials.projectId)} doesn't match this API key's project \u2014 using the key's actual project (${result.data.project_name}) instead.`
+    );
+    credentials.projectId = result.data.project_id;
+  }
   spinner2.stop(`Connected to ${result.data.project_name}`);
 }
 function sanitizeSecret(raw) {
@@ -784,6 +896,20 @@ function persistCliConfig(apiKey, projectId, endpoint) {
   const existing = loadConfig();
   saveConfig({ ...existing, apiKey, projectId, endpoint });
 }
+function emitWizardFunnelEvent(credentials, endpoint, event, metadata = {}) {
+  if (process.env.MUSHI_NO_TELEMETRY) return;
+  void fetch(`${endpoint.replace(/\/$/, "")}/v1/cli/funnel`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "X-Mushi-Api-Key": credentials.apiKey,
+      "X-Mushi-Project": credentials.projectId
+    },
+    body: JSON.stringify({ event, source: "cli", metadata }),
+    signal: AbortSignal.timeout(4e3)
+  }).catch(() => {
+  });
+}
 function printNextSteps(framework, consoleBase, enableRewards = false) {
   p.note(framework.snippet(), "Add this to your app:");
   if (enableRewards) {
@@ -817,7 +943,7 @@ async function maybeOfferConnect(credentials, options, _consoleBase) {
   if (p.isCancel(answer) || !answer) return;
   const endpoint = resolveCloudEndpoint(options.endpoint);
   try {
-    const { runConnect } = await import("./connect-KX4UGY6Z.js");
+    const { runConnect } = await import("./connect-7LTQRBEW.js");
     await runConnect({
       apiKey: credentials.apiKey,
       projectId: credentials.projectId,
@@ -828,12 +954,8 @@ async function maybeOfferConnect(credentials, options, _consoleBase) {
       wait: true
     });
   } catch (err) {
-    p.log.warn(
-      err instanceof Error ? err.message : String(err)
-    );
-    p.log.info(
-      "You can run manually: mushi connect --write-env --wire-ide --wait"
-    );
+    p.log.warn(err instanceof Error ? err.message : String(err));
+    p.log.info("You can run manually: mushi connect --write-env --wire-ide --wait");
   }
 }
 async function maybeEnableRewards(options) {

package/dist/version.js

@@ -1,6 +1,6 @@
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-BY5SZYRO.js";
+} from "./chunk-X74T7JKC.js";
 export {
   MUSHI_CLI_VERSION
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mushi-mushi/cli",
-  "version": "0.23.0",
+  "version": "0.24.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": {
@@ -11,11 +11,11 @@
     "commander": "^15.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.19.21",
-    "eslint": "^10.4.1",
+    "@types/node": "^22.20.0",
+    "eslint": "^10.6.0",
     "tsup": "^8.5.1",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.8",
+    "vitest": "^4.1.9",
     "@mushi-mushi/eslint-config": "0.0.0"
   },
   "author": "Kenji Sakuramoto (https://bsky.app/profile/mushimushi.dev)",

package/dist/chunk-BY5SZYRO.js

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