@boxes-dev/dvb 1.0.59 → 1.0.60

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]="2abd239d-3084-5a69-b772-ab46c3dbd477")}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]="785204a7-1bc2-5318-801f-4ad682a364a7")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88683,8 +88683,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.59";
-      const rawGitSha = "9310fc020995a5ac4c4f9ee04ca291a3799a24c1";
+      const rawPackageVersion = "1.0.60";
+      const rawGitSha = "5d6099c6753665655e7ad622e1aa388d91ea0bf7";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120672,9 +120672,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.59";
-      const rawGitSha = "9310fc020995a5ac4c4f9ee04ca291a3799a24c1";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.59+9310fc020995a5ac4c4f9ee04ca291a3799a24c1";
+      const rawPackageVersion = "1.0.60";
+      const rawGitSha = "5d6099c6753665655e7ad622e1aa388d91ea0bf7";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.60+5d6099c6753665655e7ad622e1aa388d91ea0bf7";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -189911,21 +189911,8 @@ var init_logger3 = __esm({
   }
 });
 
-// src/devbox/ui/copyableUrl.ts
-var showCopyableUrl;
-var init_copyableUrl = __esm({
-  "src/devbox/ui/copyableUrl.ts"() {
-    "use strict";
-    init_dist5();
-    showCopyableUrl = (url, label) => {
-      R2.info(`${label}:`);
-      R2.message(url, { withGuide: false, spacing: 0 });
-    };
-  }
-});
-
 // src/devbox/controlPlane.ts
-var import_node_http2, import_node_crypto6, import_node_child_process2, resolveControlPlaneUrl2, resolveConvexUrl2, openBrowser, escapeHtml, CALLBACK_LOGO_MARK, CALLBACK_FULL_LOGO, renderCallbackPage, requestJson2, startCallbackServer, getControlPlaneUrl, getConvexUrl, signInWithBrowser, spriteTokenGet, spriteTokenSet, spriteTokenClear, modalTokenGet, modalTokenSet, modalTokenClear, modalTokenResolvedGet2, modalDevboxUpsert, modalDevboxRemove, modalDevboxEnsureActive2, modalDevboxShellConnectionOpened, modalDevboxShellConnectionClosed, modalDevboxProxyConnectionOpened2, modalDevboxProxyConnectionClosed2, modalDevboxStatusesList, spriteDaemonReleaseGet, spriteDaemonTokenIssue, spriteDaemonSessionSummariesList, spriteDaemonSessionsList, helloViewerGet, withConvexClient, fetchSpriteTokenStatus, fetchResolvedModalCredentials2, fetchViewerIdentity, storeSpriteToken, clearSpriteToken, storeModalCredentials, clearModalCredentials, upsertModalDevboxLifecycle, ensureModalDevboxActive2, fetchSpriteDaemonRelease, issueSpriteDaemonToken, listSpriteDaemonSessionSummaries, listSpriteDaemonSessions, signOutControlPlane, refreshControlPlaneSession;
+var import_node_http2, import_node_crypto6, import_node_child_process2, resolveControlPlaneUrl2, resolveConvexUrl2, openBrowser, waitForAnyKeypress, escapeHtml, CALLBACK_LOGO_MARK, CALLBACK_FULL_LOGO, renderCallbackPage, requestJson2, startCallbackServer, getControlPlaneUrl, getConvexUrl, signInWithBrowser, spriteTokenGet, spriteTokenSet, spriteTokenClear, modalTokenGet, modalTokenSet, modalTokenClear, modalTokenResolvedGet2, modalDevboxUpsert, modalDevboxRemove, modalDevboxEnsureActive2, modalDevboxShellConnectionOpened, modalDevboxShellConnectionClosed, modalDevboxProxyConnectionOpened2, modalDevboxProxyConnectionClosed2, modalDevboxStatusesList, spriteDaemonReleaseGet, spriteDaemonTokenIssue, spriteDaemonSessionSummariesList, spriteDaemonSessionsList, helloViewerGet, withConvexClient, fetchSpriteTokenStatus, fetchResolvedModalCredentials2, fetchViewerIdentity, storeSpriteToken, clearSpriteToken, storeModalCredentials, clearModalCredentials, upsertModalDevboxLifecycle, ensureModalDevboxActive2, fetchSpriteDaemonRelease, issueSpriteDaemonToken, listSpriteDaemonSessionSummaries, listSpriteDaemonSessions, signOutControlPlane, refreshControlPlaneSession;
 var init_controlPlane = __esm({
   "src/devbox/controlPlane.ts"() {
     "use strict";
@@ -189936,7 +189923,6 @@ var init_controlPlane = __esm({
     init_index_node();
     init_server();
     init_logger3();
-    init_copyableUrl();
     resolveControlPlaneUrl2 = () => {
       const envOverride = process.env.DEVBOX_CONTROL_PLANE_URL ?? process.env.CONVEX_SITE_URL;
       if (envOverride && envOverride.trim().length > 0) {
@@ -189980,6 +189966,70 @@ var init_controlPlane = __esm({
         return false;
       }
     };
+    waitForAnyKeypress = () => {
+      const stdin = process.stdin;
+      const wasPaused = stdin.isPaused();
+      let stopRawMode = null;
+      let stopped = false;
+      let resolvePromise = null;
+      let rejectPromise = null;
+      const stop = () => {
+        if (stopped) return;
+        stopped = true;
+        stdin.off("data", onData);
+        stdin.off("error", onError);
+        stopRawMode?.();
+        if (wasPaused) {
+          stdin.pause();
+        }
+      };
+      const settle = (value) => {
+        if (stopped) return;
+        const resolve2 = resolvePromise;
+        stop();
+        resolve2?.(value);
+      };
+      const reject = (error2) => {
+        if (stopped) return;
+        const rejectFn = rejectPromise;
+        stop();
+        rejectFn?.(error2);
+      };
+      const onData = (chunk) => {
+        const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+        if (buffer.includes(3)) {
+          settle("cancel");
+          return;
+        }
+        settle("open_browser");
+      };
+      const onError = (error2) => {
+        reject(error2);
+      };
+      const promise = new Promise((resolve2, reject2) => {
+        resolvePromise = resolve2;
+        rejectPromise = reject2;
+      });
+      if (stdin.isTTY) {
+        const wasRaw = stdin.isRaw;
+        if (wasRaw !== true) {
+          try {
+            stdin.setRawMode(true);
+            stopRawMode = () => {
+              try {
+                stdin.setRawMode(false);
+              } catch {
+              }
+            };
+          } catch {
+          }
+        }
+      }
+      stdin.resume();
+      stdin.on("data", onData);
+      stdin.on("error", onError);
+      return { promise, stop };
+    };
     escapeHtml = (value) => value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&#39;");
     CALLBACK_LOGO_MARK = `<svg viewBox="0 0 48 48" aria-hidden="true" focusable="false">
   <rect x="1.5" y="1.5" width="45" height="45" rx="8" fill="#111" />
@@ -190246,34 +190296,50 @@ var init_controlPlane = __esm({
         if (!start.redirect || !start.verifier) {
           throw new Error("Control plane sign-in failed to start.");
         }
-        showCopyableUrl(start.redirect, "Login URL");
-        const action = await qt({
-          message: "Open the login URL in your browser?",
-          options: [
-            { value: "open", label: "Open in browser" },
-            { value: "skip", label: "Skip" }
-          ],
-          initialValue: "open"
-        });
-        if (Ct(action)) {
-          Pt("Sign-in canceled.");
-          throw new Error("Control plane sign-in cancelled.");
-        }
-        if (action === "open") {
-          const opened = openBrowser(start.redirect);
-          if (!opened) {
-            R2.warn("Unable to open the browser automatically.");
-            R2.info("Open the URL above to continue login.");
-          }
-        } else {
-          R2.warn(
-            "Skipping browser open. Open the URL above to continue login."
+        R2.info("Sign in to boxes.dev to continue. Log in here:");
+        R2.message(start.redirect, { withGuide: false, spacing: 0 });
+        const codePromise = callback.waitForCode();
+        const keypress = waitForAnyKeypress();
+        const listeningSpinner = Ie();
+        let code2 = "";
+        try {
+          listeningSpinner.start(
+            "Listening for login. Press any key to open in your browser..."
           );
+          const firstResult = await Promise.race([
+            codePromise.then((value) => ({ type: "code", value })),
+            keypress.promise.then((value) => ({
+              type: "keypress",
+              value
+            }))
+          ]);
+          listeningSpinner.clear();
+          if (firstResult.type === "code") {
+            code2 = firstResult.value;
+          } else {
+            if (firstResult.value === "cancel") {
+              Pt("Sign-in canceled.");
+              throw new Error("Control plane sign-in cancelled.");
+            }
+            const opened = openBrowser(start.redirect);
+            if (!opened) {
+              R2.warn("Unable to open the browser automatically.");
+              R2.info("Open the URL above to continue login.");
+            }
+            const waitSpinner = Ie();
+            waitSpinner.start(
+              "Listening for login. Complete sign-in in your browser..."
+            );
+            try {
+              code2 = await codePromise;
+            } finally {
+              waitSpinner.clear();
+            }
+          }
+        } finally {
+          listeningSpinner.clear();
+          keypress.stop();
         }
-        R2.step(
-          "Waiting for browser login. Complete sign-in in your browser."
-        );
-        const code2 = await callback.waitForCode();
         const finish = await requestJson2(
           baseUrl,
           "POST",
@@ -190286,6 +190352,18 @@ var init_controlPlane = __esm({
         if (!finish.token) {
           throw new Error("Control plane sign-in failed to complete.");
         }
+        const viewer = await fetchViewerIdentity(finish.token).catch((error2) => {
+          logger7.warn("control_plane_viewer_identity_failed", {
+            error: error2 instanceof Error ? error2.message : String(error2)
+          });
+          return null;
+        });
+        const email = typeof viewer?.email === "string" ? viewer.email.trim() : "";
+        if (email.length > 0) {
+          R2.success(`Signed in as ${email}.`);
+        } else {
+          R2.success("Signed in.");
+        }
         return finish.refresh_token ? { token: finish.token, refreshToken: finish.refresh_token } : { token: finish.token };
       } finally {
         await callback.close();
@@ -190966,13 +191044,14 @@ var init_daemonClient = __esm({
 });
 
 // src/devbox/auth.ts
-var TOKEN_REFRESH_BUFFER_MS2, decodeJwtPayload4, parseTokenExpiresAt2, shouldRefreshToken2, isUnauthorizedError2, clearControlPlaneSession2, updateControlPlaneSession, refreshControlPlaneToken, ensureControlPlaneToken, ensureSpritesToken;
+var CONTROL_PLANE_INTERACTIVE_SIGNIN_STAGE, TOKEN_REFRESH_BUFFER_MS2, decodeJwtPayload4, parseTokenExpiresAt2, shouldRefreshToken2, isUnauthorizedError2, clearControlPlaneSession2, updateControlPlaneSession, refreshControlPlaneToken, ensureControlPlaneToken, ensureSpritesToken;
 var init_auth = __esm({
   "src/devbox/auth.ts"() {
     "use strict";
     init_src();
     init_logger3();
     init_controlPlane();
+    CONTROL_PLANE_INTERACTIVE_SIGNIN_STAGE = "Opening browser to sign in";
     TOKEN_REFRESH_BUFFER_MS2 = 5 * 60 * 1e3;
     decodeJwtPayload4 = (token) => {
       const parts = token.split(".");
@@ -191070,7 +191149,7 @@ var init_auth = __esm({
       if (!process.stdin.isTTY) {
         return null;
       }
-      stage?.("Opening browser to sign in");
+      stage?.(CONTROL_PLANE_INTERACTIVE_SIGNIN_STAGE);
       const tokens = await signInWithBrowser();
       await updateControlPlaneSession(store, tokens.token, tokens.refreshToken);
       logger7.info("control_plane_signed_in");
@@ -204003,6 +204082,19 @@ ${combined}` : "";
   }
 });
 
+// src/devbox/ui/copyableUrl.ts
+var showCopyableUrl;
+var init_copyableUrl = __esm({
+  "src/devbox/ui/copyableUrl.ts"() {
+    "use strict";
+    init_dist5();
+    showCopyableUrl = (url, label) => {
+      R2.info(`${label}:`);
+      R2.message(url, { withGuide: false, spacing: 0 });
+    };
+  }
+});
+
 // src/devbox/commands/init/codex/template.ts
 var renderTemplate;
 var init_template = __esm({
@@ -211246,7 +211338,7 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
 });
 
 // src/devbox/commands/list.ts
-var buildListColumns, parseListArgs, resolveBoxStateStyle, resolveBoxStatus, resolveSetupCell, fetchSpritesRemoteStates, resolveRemoteStates, runList;
+var buildListColumns, parseListArgs, resolveBoxStateStyle, resolveBoxStatus, resolveSetupCell, resolveSpritesLookupAlias, fetchSpritesRemoteStates, resolveRemoteStates, runList;
 var init_list = __esm({
   "src/devbox/commands/list.ts"() {
     "use strict";
@@ -211323,17 +211415,32 @@ var init_list = __esm({
       }
       return makeCell("-", colors.dim);
     };
+    resolveSpritesLookupAlias = (box) => {
+      const alias = box.alias?.trim();
+      return alias ? alias : null;
+    };
     fetchSpritesRemoteStates = async (client2, boxes) => {
       const states = /* @__PURE__ */ new Map();
-      const canonicals = Array.from(
-        new Set(
-          boxes.filter((box) => box.computeProvider !== "modal").map((box) => box.canonical).filter((canonical) => canonical.trim().length > 0)
-        )
-      );
+      const canonicalLookups = /* @__PURE__ */ new Map();
+      for (const box of boxes) {
+        if (box.computeProvider === "modal") continue;
+        const canonical = box.canonical.trim();
+        if (!canonical || canonicalLookups.has(canonical)) continue;
+        const lookupAlias = resolveSpritesLookupAlias(box);
+        if (!lookupAlias) {
+          logger7.warn("sprites_status_lookup_missing_alias", { canonical });
+          states.set(canonical, {
+            remote: "error",
+            note: "alias metadata missing"
+          });
+          continue;
+        }
+        canonicalLookups.set(canonical, lookupAlias);
+      }
       await Promise.all(
-        canonicals.map(async (canonical) => {
+        [...canonicalLookups.entries()].map(async ([canonical, lookupName]) => {
           try {
-            const sprite = await client2.getSprite(canonical);
+            const sprite = await client2.getSprite(lookupName);
             if (!sprite) {
               states.set(canonical, { remote: "missing" });
               return;
@@ -211345,6 +211452,7 @@ var init_list = __esm({
           } catch (error2) {
             logger7.warn("sprites_status_lookup_failed", {
               canonical,
+              lookupName,
               error: String(error2)
             });
             states.set(canonical, { remote: "error" });
@@ -215124,9 +215232,16 @@ var init_setup = __esm({
         const store = await createSecretStore(void 0, storeOptions);
         const apiBaseUrl = resolveSpritesApiUrl(existingConfig);
         const requireControlPlaneToken2 = parsed.spriteAuthMode ? true : parsed.verify;
+        const authStage = (message) => {
+          if (message === CONTROL_PLANE_INTERACTIVE_SIGNIN_STAGE) {
+            status.stop();
+            return;
+          }
+          status.stage(message);
+        };
         const tokenResult = await ensureSpritesToken(
           store,
-          (message) => status.stage(message),
+          authStage,
           parsed.token ? {
             tokenOverride: parsed.token,
             requireControlPlaneToken: requireControlPlaneToken2,
@@ -216968,4 +217083,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=2abd239d-3084-5a69-b772-ab46c3dbd477
+//# debugId=785204a7-1bc2-5318-801f-4ad682a364a7