@boxes-dev/dvb 1.0.45 → 1.0.46

package/dist/bin/dvb.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 "use strict";
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="75e14a2b-e317-57b3-808b-d23c6c8ae631")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="dece91dc-8ff3-5ae7-af2e-041acbeac6d7")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88635,8 +88635,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.45";
-      const rawGitSha = "7dc8cf49b32ed0301fd9eb88a83ec6823e8d1252";
+      const rawPackageVersion = "1.0.46";
+      const rawGitSha = "8c5415bca9329d74553d87053dd1d08b83bc730c";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120624,9 +120624,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.45";
-      const rawGitSha = "7dc8cf49b32ed0301fd9eb88a83ec6823e8d1252";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.45+7dc8cf49b32ed0301fd9eb88a83ec6823e8d1252";
+      const rawPackageVersion = "1.0.46";
+      const rawGitSha = "8c5415bca9329d74553d87053dd1d08b83bc730c";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.46+8c5415bca9329d74553d87053dd1d08b83bc730c";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -135552,30 +135552,35 @@ var init_auth = __esm({
         }
       }
       if (options?.tokenOverride) {
-        if (!controlPlaneToken) {
+        stage?.("Saving account token override");
+        await store.setToken(options.tokenOverride);
+        if (!controlPlaneToken && requireControlPlaneToken2) {
           controlPlaneToken = await ensureControlPlaneToken(store, stage);
         }
-        if (!controlPlaneToken) {
+        if (requireControlPlaneToken2 && !controlPlaneToken) {
           throw new Error(
             "Missing control plane session (non-interactive). Run `dvb setup` in a TTY first."
           );
         }
-        stage?.("Saving account token override");
-        try {
-          await storeSpriteToken(controlPlaneToken, options.tokenOverride);
-        } catch (error2) {
-          if (isUnauthorizedError2(error2)) {
-            await clearControlPlaneSession2(store);
-            logger7.warn("control_plane_session_cleared", {
+        if (controlPlaneToken) {
+          try {
+            await storeSpriteToken(controlPlaneToken, options.tokenOverride);
+          } catch (error2) {
+            if (isUnauthorizedError2(error2)) {
+              await clearControlPlaneSession2(store);
+              controlPlaneToken = null;
+              logger7.warn("control_plane_session_cleared", {
+                error: String(error2)
+              });
+            }
+            logger7.warn("control_plane_token_store_failed", {
               error: String(error2)
             });
           }
-          logger7.warn("control_plane_token_store_failed", {
-            error: String(error2)
-          });
         }
+        const tokenForSpritesRequests = controlPlaneToken ?? options.tokenOverride;
         return {
-          token: controlPlaneToken,
+          token: tokenForSpritesRequests,
           controlPlaneToken,
           source: "flag"
         };
@@ -156030,7 +156035,7 @@ var init_qr = __esm({
 });
 
 // src/devbox/commands/setup.ts
-var import_node_crypto13, trim, normalizeOrgSlug, extractOrgFromSpriteToken, parseCodexAuthMode, normalizeSiteUrl, resolveSiteUrl, MOBILE_DOWNLOAD_LINK, parseSetupArgs, splitQrLines, printMobileDownloadQr, printFirstSetupCompleteMessage, probeSpritesAccess, runSetup;
+var import_node_crypto13, trim, normalizeOrgSlug, extractOrgFromSpriteToken, parseCodexAuthMode, normalizeSiteUrl, resolveSiteUrl, MOBILE_DOWNLOAD_LINK, parseSetupArgs, splitQrLines, printMobileDownloadQr, printFirstSetupCompleteMessage, normalizeUrlForCompare, resolveCliName3, formatSpritesApiError, probeSpritesAccess, runSetup;
 var init_setup = __esm({
   "src/devbox/commands/setup.ts"() {
     "use strict";
@@ -156038,6 +156043,7 @@ var init_setup = __esm({
     init_src();
     init_src();
     init_auth();
+    init_controlPlane();
     init_daemonClient();
     init_logger3();
     init_colors();
@@ -156167,6 +156173,45 @@ var init_setup = __esm({
       console.log("");
       console.log(nextStep);
     };
+    normalizeUrlForCompare = (value) => {
+      const trimmed = value.trim();
+      if (!trimmed) return "";
+      try {
+        const parsed = new URL(trimmed);
+        const pathname = parsed.pathname.replace(/\/+$/, "");
+        return `${parsed.protocol}//${parsed.host}${pathname}`;
+      } catch {
+        return trimmed.replace(/\/+$/, "");
+      }
+    };
+    resolveCliName3 = () => {
+      const raw = process.env.DEVBOX_CLI_NAME?.trim();
+      if (!raw) return "dvb";
+      return raw.length > 0 ? raw : "dvb";
+    };
+    formatSpritesApiError = ({
+      status,
+      requestUrl,
+      apiBaseUrl
+    }) => {
+      const lines = [`Sprites API error: ${status}`, `request: GET ${requestUrl}`];
+      const isDevProfile = process.env.DEVBOX_PROFILE?.trim() === "dev";
+      const usingDefaultRelay = normalizeUrlForCompare(apiBaseUrl) === normalizeUrlForCompare(DEFAULT_SPRITES_API_URL);
+      if (status === 403 && isDevProfile && usingDefaultRelay) {
+        lines.push(
+          "Hint: the dev CLI is usually expected to talk to a local relay, not https://relay.boxes.dev."
+        );
+        const controlPlaneUrl = getControlPlaneUrl();
+        if (controlPlaneUrl) {
+          lines.push(`control plane: ${controlPlaneUrl}`);
+        }
+        const cliName = resolveCliName3();
+        lines.push(
+          `Start it with \`just dev\`, then run \`${cliName} setup --api-base-url http://127.0.0.1:8787\`.`
+        );
+      }
+      return lines.join("\n");
+    };
     probeSpritesAccess = async (apiBaseUrl, token) => {
       const requestId = (0, import_node_crypto13.randomUUID)();
       const url = new URL("/v1/sprites", apiBaseUrl);
@@ -156187,7 +156232,13 @@ var init_setup = __esm({
         status: response.status
       });
       if (!response.ok) {
-        throw new Error(`Sprites API error: ${response.status}`);
+        throw new Error(
+          formatSpritesApiError({
+            status: response.status,
+            requestUrl: url.toString(),
+            apiBaseUrl
+          })
+        );
       }
       const payload = await response.json();
       const orgs = /* @__PURE__ */ new Set();
@@ -156213,7 +156264,11 @@ var init_setup = __esm({
         const tokenResult = await ensureSpritesToken(
           store,
           (message) => status.stage(message),
-          parsed.token ? { tokenOverride: parsed.token, apiBaseUrl } : { apiBaseUrl }
+          parsed.token ? {
+            tokenOverride: parsed.token,
+            requireControlPlaneToken: parsed.verify,
+            apiBaseUrl
+          } : { apiBaseUrl }
         );
         const token = tokenResult.token;
         const tokenSource = tokenResult.source;
@@ -156717,7 +156772,7 @@ var init_whoami = __esm({
 });
 
 // src/devbox/commands/wezterm.ts
-var import_node_crypto14, import_node_child_process12, import_promises34, import_node_os17, import_node_path35, import_promises35, logger10, WEZTERM_APP_PATH, WEZTERM_BIN_PATH, WEZTERM_BIN_DIR, WEZTERM_INSTALL_URL, WEZTERM_PATH_EXPORT, WEZTERM_HEALTH_POLL_INTERVAL_MS, WEZTERM_HEALTH_POLL_TIMEOUT_MS, WEZTERM_PROXY_BASE_ENV, WEZTERM_PROXY_LOG_NAME, WEZTERM_USAGE, parseWeztermArgs, resolveCanonical3, initWeztermClient, waitForWeztermMuxHealthy, ensureWeztermMuxReady, runWeztermProxy, runCommand6, promptYesNo2, fileExists, hasWeztermOnPath, resolveShellProfilePath, ensureWeztermOnPath, ensureWeztermInstalled, expandPath, resolveDefaultConfigPath, escapeRegExp2, resolveCliName3, resolveDvbCommand, formatLuaArgs, resolveWeztermProxyEnv, buildProxyCommand, buildDomainBlock, canAppendToConfig, countReturns, applyReturnTableTransform, insertBlock, runWeztermSetup, startWeztermDomain, runWezterm;
+var import_node_crypto14, import_node_child_process12, import_promises34, import_node_os17, import_node_path35, import_promises35, logger10, WEZTERM_APP_PATH, WEZTERM_BIN_PATH, WEZTERM_BIN_DIR, WEZTERM_INSTALL_URL, WEZTERM_PATH_EXPORT, WEZTERM_HEALTH_POLL_INTERVAL_MS, WEZTERM_HEALTH_POLL_TIMEOUT_MS, WEZTERM_PROXY_BASE_ENV, WEZTERM_PROXY_LOG_NAME, WEZTERM_USAGE, parseWeztermArgs, resolveCanonical3, initWeztermClient, waitForWeztermMuxHealthy, ensureWeztermMuxReady, runWeztermProxy, runCommand6, promptYesNo2, fileExists, hasWeztermOnPath, resolveShellProfilePath, ensureWeztermOnPath, ensureWeztermInstalled, expandPath, resolveDefaultConfigPath, escapeRegExp2, resolveCliName4, resolveDvbCommand, formatLuaArgs, resolveWeztermProxyEnv, buildProxyCommand, buildDomainBlock, canAppendToConfig, countReturns, applyReturnTableTransform, insertBlock, runWeztermSetup, startWeztermDomain, runWezterm;
 var init_wezterm = __esm({
   "src/devbox/commands/wezterm.ts"() {
     "use strict";
@@ -157264,7 +157319,7 @@ ${content ? "\n" : ""}${WEZTERM_PATH_EXPORT}
       return candidates[0];
     };
     escapeRegExp2 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    resolveCliName3 = () => {
+    resolveCliName4 = () => {
       const raw = process.env.DEVBOX_CLI_NAME?.trim();
       if (!raw) return "dvb";
       const normalized = raw.replace(/[^A-Za-z0-9_-]+/g, "").slice(0, 32);
@@ -157280,14 +157335,14 @@ ${content ? "\n" : ""}${WEZTERM_PATH_EXPORT}
         } catch {
         }
       }
-      return [resolveCliName3()];
+      return [resolveCliName4()];
     };
     formatLuaArgs = (args) => `{ ${args.map((arg) => JSON.stringify(arg)).join(", ")} }`;
     resolveWeztermProxyEnv = () => {
       const env2 = [...WEZTERM_PROXY_BASE_ENV];
       const profile = process.env.DEVBOX_PROFILE?.trim();
       if (profile) env2.push(`DEVBOX_PROFILE=${profile}`);
-      const cliName = resolveCliName3();
+      const cliName = resolveCliName4();
       if (cliName !== "dvb") env2.push(`DEVBOX_CLI_NAME=${cliName}`);
       return env2;
     };
@@ -157970,4 +158025,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=75e14a2b-e317-57b3-808b-d23c6c8ae631
+//# debugId=dece91dc-8ff3-5ae7-af2e-041acbeac6d7