@mushi-mushi/cli 0.23.1 → 0.25.0

package/dist/init.js

@@ -14,7 +14,7 @@ import {
   resolveConsoleUrl,
   resolveConsoleUrlSync,
   saveConfig
-} from "./chunk-NZ64LBLU.js";
+} from "./chunk-2WHQONHK.js";
 import {
   FRAMEWORKS,
   detectFramework,
@@ -25,7 +25,7 @@ import {
 } from "./chunk-AIZRI665.js";
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-I4UK3WTN.js";
+} from "./chunk-SS42XQ57.js";
 
 // src/init.ts
 import * as p from "@clack/prompts";
@@ -60,7 +60,9 @@ async function startDeviceAuth(endpoint, 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;
 }
@@ -101,10 +103,15 @@ async function pollDeviceToken(endpoint, deviceCode) {
         };
     }
   } 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;
@@ -155,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);
@@ -185,17 +224,26 @@ async function createProject(endpoint, cliToken, name) {
 }
 async function mintProjectKey(endpoint, cliToken, projectId) {
   const base = trimTrailingSlash(endpoint);
+  let res;
   try {
-    const res = await deviceFetch(`${base}/v1/cli/projects/${projectId}/keys`, {
+    res = await deviceFetch(`${base}/v1/cli/projects/${projectId}/keys`, {
       method: "POST",
       headers: cliAuthHeaders(cliToken),
       body: JSON.stringify({})
     });
-    const json = await res.json().catch(() => null);
-    if (res.ok && json?.ok) return json.data?.key ?? null;
-  } catch {
+  } catch (err) {
+    throw new DeviceAuthRequestError(
+      "mint_key",
+      `Could not reach ${base}/v1/cli/projects/\u2026/keys: ${err instanceof Error ? err.message : String(err)}`
+    );
   }
-  return null;
+  const json = await res.json().catch(() => 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.status
+  );
 }
 
 // src/freshness.ts
@@ -419,8 +467,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 });
@@ -492,7 +548,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",
@@ -517,7 +575,9 @@ 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, endpoint);
@@ -558,7 +618,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));
@@ -606,19 +668,14 @@ 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;
     }
   }
@@ -678,10 +735,11 @@ 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.");
@@ -836,6 +894,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) {
@@ -869,7 +941,7 @@ async function maybeOfferConnect(credentials, options, _consoleBase) {
   if (p.isCancel(answer) || !answer) return;
   const endpoint = resolveCloudEndpoint(options.endpoint);
   try {
-    const { runConnect } = await import("./connect-IWFKKXGZ.js");
+    const { runConnect } = await import("./connect-XFWRSEMW.js");
     await runConnect({
       apiKey: credentials.apiKey,
       projectId: credentials.projectId,
@@ -880,12 +952,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-I4UK3WTN.js";
+} from "./chunk-SS42XQ57.js";
 export {
   MUSHI_CLI_VERSION
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mushi-mushi/cli",
-  "version": "0.23.1",
+  "version": "0.25.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-I4UK3WTN.js

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