@boxes-dev/dvb 1.0.51 → 1.0.52

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]="9b79425f-27ad-5d1d-b18a-44941fda0c3f")}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]="97f511bb-fd6b-5e7d-806b-8247c14e14b8")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88619,8 +88619,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.51";
-      const rawGitSha = "f69b70b02373288eb39320f6968d879336da34dd";
+      const rawPackageVersion = "1.0.52";
+      const rawGitSha = "31ad250a42b9bef14c24988329cf61b81b33a15b";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120608,9 +120608,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.51";
-      const rawGitSha = "f69b70b02373288eb39320f6968d879336da34dd";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.51+f69b70b02373288eb39320f6968d879336da34dd";
+      const rawPackageVersion = "1.0.52";
+      const rawGitSha = "31ad250a42b9bef14c24988329cf61b81b33a15b";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.52+31ad250a42b9bef14c24988329cf61b81b33a15b";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -134283,7 +134283,7 @@ var init_copyableUrl = __esm({
 });
 
 // src/devbox/controlPlane.ts
-var import_node_http2, import_node_crypto5, import_node_child_process2, resolveControlPlaneUrl2, resolveConvexUrl2, openBrowser, escapeHtml, CALLBACK_LOGO_MARK, CALLBACK_FULL_LOGO, renderCallbackPage, requestJson2, startCallbackServer, getControlPlaneUrl, getConvexUrl, signInWithBrowser, spriteTokenGet, spriteTokenSet, spriteDaemonReleaseGet, spriteDaemonTokenIssue, spriteDaemonSessionSummariesList, spriteDaemonSessionsList, helloViewerGet, withConvexClient, fetchSpriteTokenStatus, fetchViewerIdentity, storeSpriteToken, fetchSpriteDaemonRelease, issueSpriteDaemonToken, listSpriteDaemonSessionSummaries, listSpriteDaemonSessions, signOutControlPlane, refreshControlPlaneSession;
+var import_node_http2, import_node_crypto5, import_node_child_process2, resolveControlPlaneUrl2, resolveConvexUrl2, openBrowser, escapeHtml, CALLBACK_LOGO_MARK, CALLBACK_FULL_LOGO, renderCallbackPage, requestJson2, startCallbackServer, getControlPlaneUrl, getConvexUrl, signInWithBrowser, spriteTokenGet, spriteTokenSet, spriteTokenClear, spriteDaemonReleaseGet, spriteDaemonTokenIssue, spriteDaemonSessionSummariesList, spriteDaemonSessionsList, helloViewerGet, withConvexClient, fetchSpriteTokenStatus, fetchViewerIdentity, storeSpriteToken, clearSpriteToken, fetchSpriteDaemonRelease, issueSpriteDaemonToken, listSpriteDaemonSessionSummaries, listSpriteDaemonSessions, signOutControlPlane, refreshControlPlaneSession;
 var init_controlPlane = __esm({
   "src/devbox/controlPlane.ts"() {
     "use strict";
@@ -134651,6 +134651,7 @@ var init_controlPlane = __esm({
     };
     spriteTokenGet = makeFunctionReference("spriteTokens:getForViewer");
     spriteTokenSet = makeFunctionReference("spriteTokens:setForViewer");
+    spriteTokenClear = makeFunctionReference("spriteTokens:clearForViewer");
     spriteDaemonReleaseGet = makeFunctionReference("spriteDaemonReleases:getLatest");
     spriteDaemonTokenIssue = makeFunctionReference("spriteDaemonAuth:issueTokenForViewer");
     spriteDaemonSessionSummariesList = makeFunctionReference("spriteDaemonSessionSummaries:listForSprite");
@@ -134692,6 +134693,11 @@ var init_controlPlane = __esm({
         await client.mutation(spriteTokenSet, { token: spriteToken });
       });
     };
+    clearSpriteToken = async (token) => {
+      await withConvexClient(token, async (client) => {
+        await client.mutation(spriteTokenClear, {});
+      });
+    };
     fetchSpriteDaemonRelease = async (token) => {
       return await withConvexClient(token, async (client) => {
         return await client.query(spriteDaemonReleaseGet, {});
@@ -155854,7 +155860,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, normalizeUrlForCompare, resolveCliName3, formatSpritesApiError, probeSpritesAccess, runSetup;
+var import_node_crypto13, trim, normalizeOrgSlug, extractOrgFromSpriteToken, parseCodexAuthMode, parseSpriteAuthMode, resolveSpriteAuthMode, 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";
@@ -155893,6 +155899,18 @@ var init_setup = __esm({
         `Invalid value for --codex-auth: ${value}. Expected "proxy" or "byo".`
       );
     };
+    parseSpriteAuthMode = (value) => {
+      const normalized = value.trim().toLowerCase();
+      if (normalized === "default" || normalized === "byo") {
+        return normalized;
+      }
+      throw new Error(
+        `Invalid value for --sprite-auth: ${value}. Expected "default" or "byo".`
+      );
+    };
+    resolveSpriteAuthMode = (tokenSource) => {
+      return tokenSource === "user" ? "byo" : "default";
+    };
     normalizeSiteUrl = (raw) => {
       const trimmed = trim(raw);
       if (!trimmed) return null;
@@ -155939,6 +155957,16 @@ var init_setup = __esm({
         if (arg === "--codex-auth") {
           throw new Error("Missing value for --codex-auth");
         }
+        if (arg === "--sprite-auth" && args[i2 + 1]) {
+          const value = args[i2 + 1];
+          if (!value) throw new Error("Missing value for --sprite-auth");
+          parsed.spriteAuthMode = parseSpriteAuthMode(value);
+          i2 += 1;
+          continue;
+        }
+        if (arg === "--sprite-auth") {
+          throw new Error("Missing value for --sprite-auth");
+        }
         if (arg === "--org" && args[i2 + 1]) {
           const value = args[i2 + 1];
           if (!value) throw new Error("Missing value for --org");
@@ -155959,6 +155987,14 @@ var init_setup = __esm({
       if (parsed.org && !parsed.token) {
         throw new Error("--org requires --token or --sprite-token");
       }
+      if (parsed.spriteAuthMode === "default" && parsed.token) {
+        throw new Error(
+          "--sprite-auth default cannot be used with --token or --sprite-token"
+        );
+      }
+      if (parsed.spriteAuthMode === "byo" && !parsed.token) {
+        throw new Error("--sprite-auth byo requires --token or --sprite-token");
+      }
       return parsed;
     };
     splitQrLines = (qr) => qr ? qr.trimEnd().split("\n") : [];
@@ -156073,18 +156109,52 @@ var init_setup = __esm({
         const storeOptions = homeDir ? { homeDir } : void 0;
         const store = await createSecretStore(void 0, storeOptions);
         const apiBaseUrl = resolveSpritesApiUrl(existingConfig);
+        const requireControlPlaneToken2 = parsed.spriteAuthMode ? true : parsed.verify;
         const tokenResult = await ensureSpritesToken(
           store,
           (message) => status.stage(message),
           parsed.token ? {
             tokenOverride: parsed.token,
-            requireControlPlaneToken: parsed.verify,
+            requireControlPlaneToken: requireControlPlaneToken2,
             apiBaseUrl
           } : { apiBaseUrl }
         );
         const token = tokenResult.token;
         const tokenSource = tokenResult.source;
+        const controlPlaneToken = tokenResult.controlPlaneToken;
         const codexAuthMode = parsed.codexAuthMode ?? resolveCodexAuthMode(existingConfig);
+        const didUpdateSpriteAuthMode = parsed.spriteAuthMode !== void 0;
+        if (parsed.spriteAuthMode === "default") {
+          if (!controlPlaneToken) {
+            throw new Error(
+              "Missing control plane session. Run `dvb setup` in a TTY first."
+            );
+          }
+          status.stage("Updating sprite auth mode");
+          await clearSpriteToken(controlPlaneToken);
+        }
+        if (parsed.spriteAuthMode === "byo") {
+          if (!controlPlaneToken || !parsed.token) {
+            throw new Error(
+              "Missing control plane session. Run `dvb setup` in a TTY first."
+            );
+          }
+          status.stage("Updating sprite auth mode");
+          await storeSpriteToken(controlPlaneToken, parsed.token);
+        }
+        let spriteAuthMode;
+        if (controlPlaneToken) {
+          status.stage("Checking sprite auth mode");
+          try {
+            const tokenStatus = await fetchSpriteTokenStatus(controlPlaneToken);
+            spriteAuthMode = resolveSpriteAuthMode(tokenStatus.tokenSource);
+          } catch (error2) {
+            logger7.warn("sprite_token_status_failed", { error: String(error2) });
+            spriteAuthMode = parsed.spriteAuthMode ?? (tokenSource === "flag" ? "byo" : "default");
+          }
+        } else {
+          spriteAuthMode = tokenSource === "flag" ? "byo" : "default";
+        }
         let org = tokenSource === "flag" ? parsed.org ?? existingConfig?.org : void 0;
         if (!org && tokenSource === "flag" && parsed.token) {
           org = extractOrgFromSpriteToken(parsed.token);
@@ -156121,12 +156191,13 @@ var init_setup = __esm({
             secretsPath: resolveSecretsPath(homeDir),
             tokenStore: store.kind,
             tokenSource,
+            spriteAuthMode,
             daemon
           };
           console.log(JSON.stringify(payload, null, 2));
           return;
         }
-        if (existingConfig && tokenSource === "control_plane") {
+        if (existingConfig && tokenSource === "control_plane" && !didUpdateSpriteAuthMode) {
           console.log("dvb already set up");
         } else {
           console.log("dvb setup complete");
@@ -156137,6 +156208,7 @@ var init_setup = __esm({
           console.log(`org: ${org}`);
         }
         console.log(`codex auth mode: ${codexAuthMode}`);
+        console.log(`sprite auth mode: ${spriteAuthMode}`);
         console.log(`token store: ${store.kind}`);
         console.log(`token source: ${tokenSource}`);
         console.log(`daemon: pid ${daemon.pid}`);
@@ -157480,6 +157552,7 @@ var init_cli = __esm({
         "  dvb setup [--sprite-token <token> | --token <token>] [--org <slug>]"
       );
       console.log("              [--codex-auth <proxy|byo>]");
+      console.log("              [--sprite-auth <default|byo>]");
       console.log("              [--no-verify] [--json]");
       console.log("  dvb whoami [--json]");
       console.log("  dvb logout [--json]");
@@ -157874,4 +157947,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=9b79425f-27ad-5d1d-b18a-44941fda0c3f
+//# debugId=97f511bb-fd6b-5e7d-806b-8247c14e14b8