@boxes-dev/dvb 1.0.32 → 1.0.34

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]="1ca4f1c5-c6fc-5436-8e08-a600d5ee41ad")}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]="c5ff8eeb-e556-5c16-a965-f352e4d938da")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88634,8 +88634,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.32";
-      const rawGitSha = "88e830e75f1877cc78e3b9e21c3f17965fbc2ebe";
+      const rawPackageVersion = "1.0.34";
+      const rawGitSha = "728f3b4e592ce57024fb094a16f6d43414ab5db7";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120623,9 +120623,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.32";
-      const rawGitSha = "88e830e75f1877cc78e3b9e21c3f17965fbc2ebe";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.32+88e830e75f1877cc78e3b9e21c3f17965fbc2ebe";
+      const rawPackageVersion = "1.0.34";
+      const rawGitSha = "728f3b4e592ce57024fb094a16f6d43414ab5db7";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.34+728f3b4e592ce57024fb094a16f6d43414ab5db7";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -134194,7 +134194,7 @@ var init_controlPlane = __esm({
           0 4px 14px rgba(0, 0, 0, 0.05);
       }
       .brand {
-        display: inline-flex;
+        display: flex;
         align-items: center;
         justify-content: center;
         width: min(100%, 360px);
@@ -153919,12 +153919,11 @@ var init_qr = __esm({
 });
 
 // src/devbox/commands/setup.ts
-var import_node_crypto11, import_promises31, trim, normalizeSiteUrl, resolveSiteUrl, MOBILE_DOWNLOAD_LINK, parseSetupArgs, promptForValue, splitQrLines, printMobileDownloadQr, printFirstSetupCompleteMessage, listSprites2, runSetup;
+var import_node_crypto11, trim, normalizeOrgSlug, extractOrgFromSpriteToken, normalizeSiteUrl, resolveSiteUrl, MOBILE_DOWNLOAD_LINK, parseSetupArgs, splitQrLines, printMobileDownloadQr, printFirstSetupCompleteMessage, probeSpritesAccess, runSetup;
 var init_setup = __esm({
   "src/devbox/commands/setup.ts"() {
     "use strict";
     import_node_crypto11 = require("node:crypto");
-    import_promises31 = __toESM(require("node:readline/promises"), 1);
     init_src();
     init_src();
     init_auth();
@@ -153935,6 +153934,20 @@ var init_setup = __esm({
     init_statusLine();
     init_completions();
     trim = (value) => value.trim().replace(/\r/g, "");
+    normalizeOrgSlug = (value) => {
+      const trimmed = value.trim();
+      if (!trimmed) return void 0;
+      if (!/^[a-z0-9][a-z0-9-]*$/i.test(trimmed)) return void 0;
+      return trimmed;
+    };
+    extractOrgFromSpriteToken = (token) => {
+      const trimmed = token.trim();
+      if (!trimmed) return void 0;
+      const normalized = trimmed.toLowerCase().startsWith("bearer ") ? trimmed.slice("bearer ".length).trim() : trimmed;
+      const slashIndex = normalized.indexOf("/");
+      if (slashIndex <= 0) return void 0;
+      return normalizeOrgSlug(normalized.slice(0, slashIndex));
+    };
     normalizeSiteUrl = (raw) => {
       const trimmed = trim(raw);
       if (!trimmed) return null;
@@ -153995,19 +154008,10 @@ var init_setup = __esm({
         }
         throw new Error(`Unknown setup flag: ${arg}`);
       }
-      return parsed;
-    };
-    promptForValue = async (label) => {
-      if (!process.stdin.isTTY) {
-        throw new Error(`Missing ${label} (non-interactive)`);
+      if (parsed.org && !parsed.token) {
+        throw new Error("--org requires --token or --sprite-token");
       }
-      const rl = import_promises31.default.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-      const answer = await rl.question(`${label}: `);
-      rl.close();
-      return answer.trim();
+      return parsed;
     };
     splitQrLines = (qr) => qr ? qr.trimEnd().split("\n") : [];
     printMobileDownloadQr = () => {
@@ -154033,7 +154037,7 @@ var init_setup = __esm({
       console.log("");
       console.log(nextStep);
     };
-    listSprites2 = async (apiBaseUrl, token) => {
+    probeSpritesAccess = async (apiBaseUrl, token) => {
       const requestId = (0, import_node_crypto11.randomUUID)();
       const url = new URL("/v1/sprites", apiBaseUrl);
       url.searchParams.set("max_results", "1");
@@ -154058,7 +154062,8 @@ var init_setup = __esm({
       const payload = await response.json();
       const orgs = /* @__PURE__ */ new Set();
       for (const sprite of payload.sprites ?? []) {
-        if (sprite.org_slug) orgs.add(sprite.org_slug);
+        const org = normalizeOrgSlug(sprite.org_slug ?? sprite.organization ?? "");
+        if (org) orgs.add(org);
       }
       return { orgs: [...orgs] };
     };
@@ -154082,19 +154087,17 @@ var init_setup = __esm({
         );
         const token = tokenResult.token;
         const tokenSource = tokenResult.source;
-        let org = parsed.org ?? existingConfig?.org;
+        let org = tokenSource === "flag" ? parsed.org ?? existingConfig?.org : void 0;
+        if (!org && tokenSource === "flag" && parsed.token) {
+          org = extractOrgFromSpriteToken(parsed.token);
+        }
         if (parsed.verify) {
           status.stage("Verifying token");
-          const { orgs } = await listSprites2(apiBaseUrl, token);
-          if (!org && orgs.length === 1) {
-            org = orgs[0];
-          } else if (!org && orgs.length > 1) {
-            status.stop();
-            org = await promptForValue("Sprites org slug");
-          } else if (!org && orgs.length === 0) {
-            status.stop();
-            org = await promptForValue("Sprites org slug (optional)");
-            if (org.length === 0) org = void 0;
+          const { orgs } = await probeSpritesAccess(apiBaseUrl, token);
+          if (tokenSource === "flag") {
+            if (!org && orgs.length > 0) {
+              org = orgs[0];
+            }
           }
         }
         status.stage("Saving config");
@@ -154104,7 +154107,7 @@ var init_setup = __esm({
           tokenStore: store.kind,
           tokenUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
           lastSetupAt: (/* @__PURE__ */ new Date()).toISOString(),
-          ...org ? { org } : {}
+          ...tokenSource === "flag" && org ? { org } : {}
         };
         await saveConfig(config3, configOptions);
         status.stage("Starting dvbd");
@@ -154132,7 +154135,9 @@ var init_setup = __esm({
         }
         console.log(`config: ${resolveConfigPath(homeDir)}`);
         console.log(`secrets: ${resolveSecretsPath(homeDir)}`);
-        if (org) console.log(`org: ${org}`);
+        if (tokenSource === "flag" && org) {
+          console.log(`org: ${org}`);
+        }
         console.log(`token store: ${store.kind}`);
         console.log(`token source: ${tokenSource}`);
         console.log(`daemon: pid ${daemon.pid}`);
@@ -154579,16 +154584,16 @@ var init_whoami = __esm({
 });
 
 // src/devbox/commands/wezterm.ts
-var import_node_crypto12, import_node_child_process12, import_promises32, import_node_os13, import_node_path29, import_promises33, 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_crypto12, import_node_child_process12, import_promises31, import_node_os13, import_node_path29, import_promises32, 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 init_wezterm = __esm({
   "src/devbox/commands/wezterm.ts"() {
     "use strict";
     import_node_crypto12 = require("node:crypto");
     import_node_child_process12 = require("node:child_process");
-    import_promises32 = __toESM(require("node:fs/promises"), 1);
+    import_promises31 = __toESM(require("node:fs/promises"), 1);
     import_node_os13 = __toESM(require("node:os"), 1);
     import_node_path29 = __toESM(require("node:path"), 1);
-    import_promises33 = __toESM(require("node:readline/promises"), 1);
+    import_promises32 = __toESM(require("node:readline/promises"), 1);
     init_src();
     init_daemonClient();
     init_auth();
@@ -154783,10 +154788,10 @@ var init_wezterm = __esm({
         if (!homeDir) return;
         try {
           const logDir = import_node_path29.default.join(resolveDevboxDir(homeDir), "wezterm");
-          await import_promises32.default.mkdir(logDir, { recursive: true });
+          await import_promises31.default.mkdir(logDir, { recursive: true });
           const line = `${(/* @__PURE__ */ new Date()).toISOString()} ${message}
 `;
-          await import_promises32.default.appendFile(
+          await import_promises31.default.appendFile(
             import_node_path29.default.join(logDir, WEZTERM_PROXY_LOG_NAME),
             line,
             "utf8"
@@ -155002,7 +155007,7 @@ var init_wezterm = __esm({
       if (!process.stdin.isTTY || !process.stdout.isTTY) {
         throw new Error("This command requires a TTY to confirm changes.");
       }
-      const rl = import_promises33.default.createInterface({
+      const rl = import_promises32.default.createInterface({
         input: process.stdin,
         output: process.stdout
       });
@@ -155014,7 +155019,7 @@ var init_wezterm = __esm({
     };
     fileExists = async (value) => {
       try {
-        await import_promises32.default.access(value);
+        await import_promises31.default.access(value);
         return true;
       } catch {
         return false;
@@ -155060,7 +155065,7 @@ var init_wezterm = __esm({
       if (shouldUpdate) {
         let content = "";
         try {
-          content = await import_promises32.default.readFile(profilePath, "utf8");
+          content = await import_promises31.default.readFile(profilePath, "utf8");
         } catch {
           content = "";
         }
@@ -155068,7 +155073,7 @@ var init_wezterm = __esm({
           const next = `${content.trimEnd()}
 ${content ? "\n" : ""}${WEZTERM_PATH_EXPORT}
 `;
-          await import_promises32.default.writeFile(profilePath, next, "utf8");
+          await import_promises31.default.writeFile(profilePath, next, "utf8");
           updatedProfile = true;
         }
         const currentPath = process.env.PATH ?? "";
@@ -155112,7 +155117,7 @@ ${content ? "\n" : ""}${WEZTERM_PATH_EXPORT}
       ];
       for (const candidate of candidates) {
         try {
-          await import_promises32.default.access(candidate);
+          await import_promises31.default.access(candidate);
           return candidate;
         } catch {
         }
@@ -155131,7 +155136,7 @@ ${content ? "\n" : ""}${WEZTERM_PATH_EXPORT}
       if (scriptPath) {
         const candidate = import_node_path29.default.isAbsolute(scriptPath) ? scriptPath : import_node_path29.default.resolve(process.cwd(), scriptPath);
         try {
-          await import_promises32.default.access(candidate);
+          await import_promises31.default.access(candidate);
           return [process.execPath, candidate];
         } catch {
         }
@@ -155232,7 +155237,7 @@ ${block}`;
       let existing = "";
       let hasExisting = false;
       try {
-        existing = await import_promises32.default.readFile(configPath, "utf8");
+        existing = await import_promises31.default.readFile(configPath, "utf8");
         hasExisting = true;
       } catch {
         hasExisting = false;
@@ -155271,8 +155276,8 @@ ${block}`;
         }
       }
       if (updated) {
-        await import_promises32.default.mkdir(import_node_path29.default.dirname(configPath), { recursive: true });
-        await import_promises32.default.writeFile(configPath, nextContent, "utf8");
+        await import_promises31.default.mkdir(import_node_path29.default.dirname(configPath), { recursive: true });
+        await import_promises31.default.writeFile(configPath, nextContent, "utf8");
         console.log(`Updated WezTerm config: ${configPath}`);
       } else {
         console.log(`WezTerm config already up to date: ${configPath}`);
@@ -155766,4 +155771,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=1ca4f1c5-c6fc-5436-8e08-a600d5ee41ad
+//# debugId=c5ff8eeb-e556-5c16-a965-f352e4d938da