@boxes-dev/dvb 0.2.43 → 0.2.45

package/dist/bin/dvb.cjs

@@ -404,11 +404,11 @@ var init_repo = __esm({
       try {
         const url = new URL(trimmed);
         const host = url.hostname.toLowerCase();
-        const path25 = stripGitSuffix(url.pathname);
-        if (!host || !path25) {
+        const path26 = stripGitSuffix(url.pathname);
+        if (!host || !path26) {
           throw new Error(`Unrecognized git URL: ${input}`);
         }
-        return `${host}/${path25}`;
+        return `${host}/${path26}`;
       } catch {
       }
       if (trimmed.includes(":")) {
@@ -436,11 +436,11 @@ var init_sprites = __esm({
       method;
       path;
       body;
-      constructor(status, method, path25, body) {
-        super(`Sprites API error ${status} ${method} ${path25}: ${body}`);
+      constructor(status, method, path26, body) {
+        super(`Sprites API error ${status} ${method} ${path26}: ${body}`);
         this.status = status;
         this.method = method;
-        this.path = path25;
+        this.path = path26;
         this.body = body;
       }
     };
@@ -485,15 +485,15 @@ var init_sprites = __esm({
       }
       return { message: String(event) };
     };
-    toWsUrl = (apiBaseUrl, path25) => {
+    toWsUrl = (apiBaseUrl, path26) => {
       const base = new URL(apiBaseUrl);
       const protocol = base.protocol === "https:" ? "wss:" : "ws:";
-      return new URL(path25, `${protocol}//${base.host}`);
+      return new URL(path26, `${protocol}//${base.host}`);
     };
     shellQuote = (value) => `'${value.replace(/'/g, `'\\''`)}'`;
-    requestJson = async (apiBaseUrl, token, method, path25, body) => {
+    requestJson = async (apiBaseUrl, token, method, path26, body) => {
       const requestId = (0, import_node_crypto.randomUUID)();
-      const url = new URL(path25, apiBaseUrl);
+      const url = new URL(path26, apiBaseUrl);
       const headers = {
         authorization: `Bearer ${token}`,
         "x-request-id": requestId
@@ -505,18 +505,18 @@ var init_sprites = __esm({
       if (body) {
         init.body = JSON.stringify(body);
       }
-      logger.info("sprites_request", { requestId, method, path: path25 });
+      logger.info("sprites_request", { requestId, method, path: path26 });
       const response = await fetch(url, init);
       const text = await response.text();
       logger.info("sprites_response", {
         requestId,
         method,
-        path: path25,
+        path: path26,
         status: response.status
       });
       if (!response.ok) {
         const snippet = text.trim().slice(0, 200);
-        throw new SpritesApiError(response.status, method, path25, snippet);
+        throw new SpritesApiError(response.status, method, path26, snippet);
       }
       if (!text) return null;
       try {
@@ -536,8 +536,8 @@ var init_sprites = __esm({
       if (options?.prefix) {
         params.set("prefix", options.prefix);
       }
-      const path25 = `/v1/sprites${params.size ? `?${params.toString()}` : ""}`;
-      const payload = await requestJson(apiBaseUrl, token, "GET", path25);
+      const path26 = `/v1/sprites${params.size ? `?${params.toString()}` : ""}`;
+      const payload = await requestJson(apiBaseUrl, token, "GET", path26);
       const record = payload && typeof payload === "object" ? payload : null;
       const rawSprites = Array.isArray(record?.sprites) ? record?.sprites : Array.isArray(payload) ? payload : [];
       const sprites = rawSprites.filter(
@@ -563,9 +563,9 @@ var init_sprites = __esm({
       }
       return response;
     };
-    requestNdjson = async (apiBaseUrl, token, method, path25, body) => {
+    requestNdjson = async (apiBaseUrl, token, method, path26, body) => {
       const requestId = (0, import_node_crypto.randomUUID)();
-      const url = new URL(path25, apiBaseUrl);
+      const url = new URL(path26, apiBaseUrl);
       const headers = {
         authorization: `Bearer ${token}`,
         "x-request-id": requestId
@@ -577,18 +577,18 @@ var init_sprites = __esm({
       if (body) {
         init.body = JSON.stringify(body);
       }
-      logger.info("sprites_request", { requestId, method, path: path25 });
+      logger.info("sprites_request", { requestId, method, path: path26 });
       const response = await fetch(url, init);
       logger.info("sprites_response", {
         requestId,
         method,
-        path: path25,
+        path: path26,
         status: response.status
       });
       const text = await response.text();
       if (!response.ok) {
         const snippet = text.trim().slice(0, 200);
-        throw new SpritesApiError(response.status, method, path25, snippet);
+        throw new SpritesApiError(response.status, method, path26, snippet);
       }
       const lines = text.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
       const events = [];
@@ -618,13 +618,13 @@ var init_sprites = __esm({
     };
     writeFile = async (apiBaseUrl, token, name, remotePath, data) => {
       const requestId = (0, import_node_crypto.randomUUID)();
-      const path25 = `/v1/sprites/${name}/fs/write`;
-      const url = new URL(path25, apiBaseUrl);
+      const path26 = `/v1/sprites/${name}/fs/write`;
+      const url = new URL(path26, apiBaseUrl);
       url.searchParams.set("path", remotePath);
       url.searchParams.set("mkdir", "true");
       logger.info("sprites_fs_write", {
         requestId,
-        path: path25,
+        path: path26,
         name,
         remotePath,
         size: data.length
@@ -640,7 +640,7 @@ var init_sprites = __esm({
       });
       logger.info("sprites_fs_write_response", {
         requestId,
-        path: path25,
+        path: path26,
         status: response.status
       });
       if (!response.ok) {
@@ -677,15 +677,15 @@ var init_sprites = __esm({
     };
     readFile = async (apiBaseUrl, token, name, options) => {
       const requestId = (0, import_node_crypto.randomUUID)();
-      const path25 = `/v1/sprites/${name}/fs/read`;
-      const url = new URL(path25, apiBaseUrl);
+      const path26 = `/v1/sprites/${name}/fs/read`;
+      const url = new URL(path26, apiBaseUrl);
       url.searchParams.set("path", options.path);
       if (options.workingDir) {
         url.searchParams.set("workingDir", options.workingDir);
       }
       logger.info("sprites_fs_read", {
         requestId,
-        path: path25,
+        path: path26,
         name,
         remotePath: options.path,
         workingDir: options.workingDir
@@ -699,12 +699,12 @@ var init_sprites = __esm({
       });
       logger.info("sprites_fs_read_response", {
         requestId,
-        path: path25,
+        path: path26,
         status: response.status
       });
       if (!response.ok) {
         const snippet = (await response.text()).trim().slice(0, 200);
-        throw new SpritesApiError(response.status, "GET", path25, snippet);
+        throw new SpritesApiError(response.status, "GET", path26, snippet);
       }
       const buffer = await response.arrayBuffer();
       return new Uint8Array(buffer);
@@ -931,9 +931,9 @@ var init_sprites = __esm({
       await internalServicesRequest(apiBaseUrl, token, name, command);
       return [];
     };
-    execCommand = async (apiBaseUrl, token, name, cmd, requestId) => {
-      const path25 = `/v1/sprites/${name}/exec`;
-      const url = toWsUrl(apiBaseUrl, path25);
+    execCommand = async (apiBaseUrl, token, name, cmd, requestId, options) => {
+      const path26 = `/v1/sprites/${name}/exec`;
+      const url = toWsUrl(apiBaseUrl, path26);
       cmd.forEach((part) => url.searchParams.append("cmd", part));
       url.searchParams.set("tty", "false");
       url.searchParams.set("stdin", "false");
@@ -942,11 +942,28 @@ var init_sprites = __esm({
         const stderr = [];
         let exitCode = null;
         let resolved = false;
+        const timeoutMs = options?.timeoutMs;
+        const handshakeTimeoutMs = options?.handshakeTimeoutMs ?? (typeof timeoutMs === "number" ? Math.min(timeoutMs, 6e4) : void 0);
+        const timeoutHandle = typeof timeoutMs === "number" && timeoutMs > 0 ? setTimeout(() => {
+          if (resolved) return;
+          resolved = true;
+          logger.warn("sprites_exec_timeout", {
+            requestId,
+            path: path26,
+            timeoutMs
+          });
+          try {
+            ws.terminate();
+          } catch {
+          }
+          reject(new Error(`Exec websocket timed out after ${timeoutMs}ms`));
+        }, timeoutMs) : null;
         const ws = new import_ws.default(url.toString(), {
           headers: {
             Authorization: `Bearer ${token}`,
             "x-request-id": requestId
-          }
+          },
+          ...typeof handshakeTimeoutMs === "number" && handshakeTimeoutMs > 0 ? { handshakeTimeout: handshakeTimeoutMs } : {}
         });
         const readResponseSnippet = async (response, limit = 800) => new Promise((resolveBody) => {
           let body = "";
@@ -966,12 +983,14 @@ var init_sprites = __esm({
             const status = response.statusCode ?? 0;
             logger.warn("sprites_exec_unexpected_response", {
               requestId,
-              path: path25,
+              path: path26,
               status,
               headers: response.headers,
               bodySnippet: snippet ? snippet.slice(0, 800) : void 0
             });
             if (!resolved) {
+              if (timeoutHandle) clearTimeout(timeoutHandle);
+              resolved = true;
               const suffix = snippet ? ` (${snippet.slice(0, 800)})` : "";
               reject(new Error(`Exec websocket error: Unexpected server response: ${status}${suffix}`));
             }
@@ -980,7 +999,8 @@ var init_sprites = __esm({
         const finish = (code2) => {
           if (resolved) return;
           resolved = true;
-          logger.info("sprites_exec_response", { requestId, path: path25, status: code2 });
+          if (timeoutHandle) clearTimeout(timeoutHandle);
+          logger.info("sprites_exec_response", { requestId, path: path26, status: code2 });
           resolve({
             exitCode: code2,
             stdout: Buffer.concat(stdout).toString("utf8"),
@@ -1030,13 +1050,15 @@ var init_sprites = __esm({
           const errorMessage = errorInfo.details && errorInfo.details !== errorInfo.message ? `${errorInfo.message} (${errorInfo.details})` : errorInfo.message;
           logger.warn("sprites_exec_error", {
             requestId,
-            path: path25,
+            path: path26,
             errorMessage,
             errorName: errorInfo.name,
             errorCode: errorInfo.code,
             errorStack: errorInfo.stack
           });
           if (!resolved) {
+            if (timeoutHandle) clearTimeout(timeoutHandle);
+            resolved = true;
             reject(new Error(`Exec websocket error: ${errorMessage}`));
           }
         };
@@ -1091,7 +1113,7 @@ var init_sprites = __esm({
         await writeFile(apiBaseUrl, token, name, remotePath, data);
       },
       readFile: async (name, options) => readFile(apiBaseUrl, token, name, options),
-      exec: async (name, cmd) => {
+      exec: async (name, cmd, options) => {
         const requestId = (0, import_node_crypto.randomUUID)();
         logger.info("sprites_exec", {
           requestId,
@@ -1099,7 +1121,7 @@ var init_sprites = __esm({
           cmd,
           path: `/v1/sprites/${name}/exec`
         });
-        return execCommand(apiBaseUrl, token, name, cmd, requestId);
+        return execCommand(apiBaseUrl, token, name, cmd, requestId, options);
       },
       listExecSessions: async (name) => listExecSessions(apiBaseUrl, token, name),
       listServices: async (name) => USE_INTERNAL_SERVICE_API ? listServicesInternal(apiBaseUrl, token, name) : listServices(apiBaseUrl, token, name),
@@ -3335,12 +3357,12 @@ function createApi(pathParts = []) {
             `API path is expected to be of the form \`api.moduleName.functionName\`. Found: \`${found}\``
           );
         }
-        const path25 = pathParts.slice(0, -1).join("/");
+        const path26 = pathParts.slice(0, -1).join("/");
         const exportName = pathParts[pathParts.length - 1];
         if (exportName === "default") {
-          return path25;
+          return path26;
         } else {
-          return path25 + ":" + exportName;
+          return path26 + ":" + exportName;
         }
       } else if (prop === Symbol.toStringTag) {
         return "FunctionReference";
@@ -4726,27 +4748,27 @@ var init_authentication_manager = __esm({
           );
           return;
         }
-        let delay = Math.min(
+        let delay2 = Math.min(
           MAXIMUM_REFRESH_DELAY,
           (tokenValiditySeconds - this.refreshTokenLeewaySeconds) * 1e3
         );
-        if (delay <= 0) {
+        if (delay2 <= 0) {
           this.logger.warn(
             `Refetching auth token immediately, configured leeway ${this.refreshTokenLeewaySeconds}s is larger than the token's lifetime ${tokenValiditySeconds}s`
           );
-          delay = 0;
+          delay2 = 0;
         }
         const refetchTokenTimeoutId = setTimeout(() => {
           this._logVerbose("running scheduled token refetch");
           void this.refetchToken();
-        }, delay);
+        }, delay2);
         this.setAuthState({
           state: "waitingForScheduledRefetch",
           refetchTokenTimeoutId,
           config: this.authState.config
         });
         this._logVerbose(
-          `scheduled preemptive auth token refetching in ${delay}ms`
+          `scheduled preemptive auth token refetching in ${delay2}ms`
         );
       }
       // Protects against simultaneous calls to `setConfig`
@@ -6549,8 +6571,8 @@ var init_simple_client_node = __esm({
     });
     require_node_gyp_build = __commonJS2({
       "../common/temp/node_modules/.pnpm/node-gyp-build@4.8.4/node_modules/node-gyp-build/node-gyp-build.js"(exports2, module2) {
-        var fs25 = __require("fs");
-        var path25 = __require("path");
+        var fs26 = __require("fs");
+        var path26 = __require("path");
         var os11 = __require("os");
         var runtimeRequire = typeof __webpack_require__ === "function" ? __non_webpack_require__ : __require;
         var vars = process.config && process.config.variables || {};
@@ -6567,21 +6589,21 @@ var init_simple_client_node = __esm({
           return runtimeRequire(load2.resolve(dir));
         }
         load2.resolve = load2.path = function(dir) {
-          dir = path25.resolve(dir || ".");
+          dir = path26.resolve(dir || ".");
           try {
-            var name = runtimeRequire(path25.join(dir, "package.json")).name.toUpperCase().replace(/-/g, "_");
+            var name = runtimeRequire(path26.join(dir, "package.json")).name.toUpperCase().replace(/-/g, "_");
             if (process.env[name + "_PREBUILD"]) dir = process.env[name + "_PREBUILD"];
           } catch (err) {
           }
           if (!prebuildsOnly) {
-            var release = getFirst(path25.join(dir, "build/Release"), matchBuild);
+            var release = getFirst(path26.join(dir, "build/Release"), matchBuild);
             if (release) return release;
-            var debug = getFirst(path25.join(dir, "build/Debug"), matchBuild);
+            var debug = getFirst(path26.join(dir, "build/Debug"), matchBuild);
             if (debug) return debug;
           }
           var prebuild = resolve(dir);
           if (prebuild) return prebuild;
-          var nearby = resolve(path25.dirname(process.execPath));
+          var nearby = resolve(path26.dirname(process.execPath));
           if (nearby) return nearby;
           var target = [
             "platform=" + platform,
@@ -6598,26 +6620,26 @@ var init_simple_client_node = __esm({
           ].filter(Boolean).join(" ");
           throw new Error("No native build was found for " + target + "\n    loaded from: " + dir + "\n");
           function resolve(dir2) {
-            var tuples = readdirSync(path25.join(dir2, "prebuilds")).map(parseTuple);
+            var tuples = readdirSync(path26.join(dir2, "prebuilds")).map(parseTuple);
             var tuple = tuples.filter(matchTuple(platform, arch)).sort(compareTuples)[0];
             if (!tuple) return;
-            var prebuilds = path25.join(dir2, "prebuilds", tuple.name);
+            var prebuilds = path26.join(dir2, "prebuilds", tuple.name);
             var parsed = readdirSync(prebuilds).map(parseTags);
             var candidates = parsed.filter(matchTags(runtime, abi));
             var winner = candidates.sort(compareTags(runtime))[0];
-            if (winner) return path25.join(prebuilds, winner.file);
+            if (winner) return path26.join(prebuilds, winner.file);
           }
         };
         function readdirSync(dir) {
           try {
-            return fs25.readdirSync(dir);
+            return fs26.readdirSync(dir);
           } catch (err) {
             return [];
           }
         }
         function getFirst(dir, filter) {
           var files = readdirSync(dir).filter(filter);
-          return files[0] && path25.join(dir, files[0]);
+          return files[0] && path26.join(dir, files[0]);
         }
         function matchBuild(name) {
           return /\.node$/.test(name);
@@ -6704,7 +6726,7 @@ var init_simple_client_node = __esm({
           return typeof window !== "undefined" && window.process && window.process.type === "renderer";
         }
         function isAlpine(platform2) {
-          return platform2 === "linux" && fs25.existsSync("/etc/alpine-release");
+          return platform2 === "linux" && fs26.existsSync("/etc/alpine-release");
         }
         load2.parseTags = parseTags;
         load2.matchTags = matchTags;
@@ -10686,7 +10708,7 @@ var init_server = __esm({
 });
 
 // ../daemon/src/spritesRegistry.ts
-var import_node_crypto2, import_node_fs, import_promises4, registryGet, registryReplace, registryUpsert, registryUsage, registryRemove, logger4, TOKEN_REFRESH_BUFFER_MS, clientCache, migrationPromise, migrationCompleted, trimEnv, resolveConvexUrl, resolveControlPlaneUrl, requireConvexConfig, decodeJwtPayload, parseTokenExpiresAt, shouldRefreshToken, isUnauthorizedError, clearControlPlaneSession, handleUnauthorized, refreshSession, loadControlPlaneToken, getClient, spritePortsList, logRequest, logResponse, parseTimestamp, pickEarlier, pickLater, mergeBoxes, mergeProjects, mergeRegistry, getRegistryFromConvex, replaceRegistry, migrateLocalRegistry, backfillInitStatus, fetchRegistry, upsertRegistry, recordRegistryUsage, removeRegistryEntry, subscribeSpritePorts;
+var import_node_crypto2, import_node_fs, import_promises4, registryGet, registryReplace, registryUpsert, registryUsage, registryRemove, logger4, TOKEN_REFRESH_BUFFER_MS, clientCache, migrationPromise, migrationCompleted, trimEnv, normalizeConvexDeployment, stripDevPrefix, resolveFromDeployment, resolveFromUrl, resolveConvexUrl, resolveControlPlaneUrl, requireConvexConfig, decodeJwtPayload, parseTokenExpiresAt, shouldRefreshToken, isUnauthorizedError, clearControlPlaneSession, handleUnauthorized, refreshSession, loadControlPlaneToken, requireControlPlaneToken, getClient, spritePortsList, logRequest, logResponse, parseTimestamp, pickEarlier, pickLater, mergeBoxes, mergeProjects, mergeRegistry, getRegistryFromConvex, replaceRegistry, migrateLocalRegistry, backfillInitStatus, fetchRegistry, upsertRegistry, recordRegistryUsage, removeRegistryEntry, subscribeSpritePorts;
 var init_spritesRegistry = __esm({
   "../daemon/src/spritesRegistry.ts"() {
     "use strict";
@@ -10708,13 +10730,55 @@ var init_spritesRegistry = __esm({
     migrationPromise = null;
     migrationCompleted = false;
     trimEnv = (value) => value?.trim() ?? "";
+    normalizeConvexDeployment = (value) => {
+      const normalized = trimEnv(value).replace(/\r/g, "");
+      if (!normalized) return "";
+      if (normalized.includes(":")) {
+        const [prefix, rest] = normalized.split(":", 2);
+        return `${prefix}:${trimEnv(rest ?? "")}`;
+      }
+      return normalized;
+    };
+    stripDevPrefix = (value) => {
+      if (value.startsWith("dev:")) {
+        return trimEnv(value.slice(4));
+      }
+      return value;
+    };
+    resolveFromDeployment = (deploymentRaw, suffix) => {
+      const deployment = stripDevPrefix(normalizeConvexDeployment(deploymentRaw));
+      if (!deployment) return "";
+      if (deployment.includes("://")) {
+        return deployment;
+      }
+      if (deployment.includes(".")) {
+        const host = suffix === "cloud" ? deployment.replace(".convex.site", ".convex.cloud") : deployment.replace(".convex.cloud", ".convex.site");
+        return `https://${host}`;
+      }
+      return `https://${deployment}.convex.${suffix}`;
+    };
+    resolveFromUrl = (raw, suffix) => {
+      const value = trimEnv(raw).replace(/\r/g, "");
+      if (!value) return "";
+      try {
+        const url = new URL(value);
+        const host = suffix === "cloud" ? url.host.replace(".convex.site", ".convex.cloud") : url.host.replace(".convex.cloud", ".convex.site");
+        return `${url.protocol}//${host}`;
+      } catch {
+        return "";
+      }
+    };
     resolveConvexUrl = () => {
       const url = trimEnv(process.env.DEVBOX_CONVEX_URL) || trimEnv(process.env.VITE_CONVEX_URL);
-      return url.length > 0 ? url : null;
+      if (url.length > 0) return url;
+      const derived = resolveFromDeployment(process.env.CONVEX_DEPLOYMENT ?? "", "cloud") || resolveFromUrl(process.env.CONVEX_SITE_URL ?? "", "cloud");
+      return derived ? derived : null;
     };
     resolveControlPlaneUrl = () => {
       const url = trimEnv(process.env.DEVBOX_CONTROL_PLANE_URL) || trimEnv(process.env.CONVEX_SITE_URL);
-      return url.length > 0 ? url : null;
+      if (url.length > 0) return url;
+      const derived = resolveFromDeployment(process.env.CONVEX_DEPLOYMENT ?? "", "site") || resolveFromUrl(process.env.VITE_CONVEX_URL ?? "", "site");
+      return derived ? derived : null;
     };
     requireConvexConfig = () => {
       if (!resolveControlPlaneUrl()) {
@@ -10850,26 +10914,35 @@ var init_spritesRegistry = __esm({
       if (!token) {
         const refreshToken = await store.getControlPlaneRefreshToken();
         if (refreshToken) {
-          const refreshed = await refreshSession(refreshToken);
-          token = refreshed.token;
-          await store.setControlPlaneToken(token);
-          if (refreshed.refreshToken) {
-            await store.setControlPlaneRefreshToken(refreshed.refreshToken);
-          }
-          const nextExpiresAt = parseTokenExpiresAt(token);
-          if (nextExpiresAt) {
-            await store.setControlPlaneTokenExpiresAt(nextExpiresAt);
-          } else {
-            await store.clearControlPlaneTokenExpiresAt();
+          try {
+            const refreshed = await refreshSession(refreshToken);
+            token = refreshed.token;
+            await store.setControlPlaneToken(token);
+            if (refreshed.refreshToken) {
+              await store.setControlPlaneRefreshToken(refreshed.refreshToken);
+            }
+            const nextExpiresAt = parseTokenExpiresAt(token);
+            if (nextExpiresAt) {
+              await store.setControlPlaneTokenExpiresAt(nextExpiresAt);
+            } else {
+              await store.clearControlPlaneTokenExpiresAt();
+            }
+          } catch (error) {
+            logger4.warn("control_plane_refresh_failed", { error: String(error) });
           }
         }
       }
+      return token ?? null;
+    };
+    requireControlPlaneToken = async () => {
+      const token = await loadControlPlaneToken();
       if (!token) {
         throw new Error("Control plane auth missing. Run `dvb setup` to sign in.");
       }
       return token;
     };
     getClient = async () => {
+      await requireControlPlaneToken();
       const convexUrl = requireConvexConfig();
       if (clientCache && clientCache.url === convexUrl) {
         return clientCache.client;
@@ -11677,7 +11750,7 @@ __export(src_exports, {
   runDaemon: () => runDaemon,
   startDaemon: () => startDaemon
 });
-var import_node_http, import_promises5, import_node_fs2, import_node_crypto4, import_node_net2, import_node_path5, logger6, startedAt, DAEMON_API_VERSION, DAEMON_FEATURES, allowShutdown, buildBoxSummaries, readBody, readRequestPath, writeJson, handleRequestError, isSocketAlive, ensureRuntimeDir, startDaemon, runDaemon;
+var import_node_http, import_promises5, import_node_fs2, import_node_crypto4, import_node_net2, import_node_path5, logger6, startedAt, DAEMON_API_VERSION, DAEMON_FEATURES, allowShutdown, buildBoxSummaries, readBody, readRequestPath, writeJson, handleRequestError, isSocketAlive, waitForSocketAlive, ensureRuntimeDir, startDaemon, runDaemon;
 var init_src2 = __esm({
   "../daemon/src/index.ts"() {
     import_node_http = require("node:http");
@@ -11790,6 +11863,15 @@ var init_src2 = __esm({
       socket.once("error", () => done(false));
       socket.setTimeout(250, () => done(false));
     });
+    waitForSocketAlive = async (socketPath, timeoutMs) => {
+      const deadline = Date.now() + timeoutMs;
+      while (Date.now() < deadline) {
+        if (!(0, import_node_fs2.existsSync)(socketPath)) return false;
+        if (await isSocketAlive(socketPath)) return true;
+        await new Promise((resolve) => setTimeout(resolve, 50));
+      }
+      return false;
+    };
     ensureRuntimeDir = async (runtimeDir) => {
       await import_promises5.default.mkdir(runtimeDir, { recursive: true, mode: 448 });
       try {
@@ -11805,7 +11887,7 @@ var init_src2 = __esm({
       const { socketPath, runtimeDir } = socketInfo;
       await ensureRuntimeDir(runtimeDir);
       if ((0, import_node_fs2.existsSync)(socketPath)) {
-        const alive = await isSocketAlive(socketPath);
+        const alive = await waitForSocketAlive(socketPath, 1e3);
         if (alive) {
           throw new Error(`dvbd already running at ${socketPath}`);
         }
@@ -11813,31 +11895,18 @@ var init_src2 = __esm({
       }
       const portManager = new PortManager();
       portManager.start();
-      void fetchRegistry().then((registry) => {
-        for (const canonical of Object.keys(registry.boxes)) {
-          portManager.noteBox(canonical);
-        }
-        for (const canonical of Object.values(registry.aliases)) {
-          portManager.noteBox(canonical);
-        }
-        for (const project of Object.values(registry.projects)) {
-          portManager.noteBox(project.canonical);
-        }
-      }).catch((error) => {
-        logger6.warn("ports_registry_load_failed", { error: String(error) });
-      });
       const server = (0, import_node_http.createServer)((req, res) => {
         const requestId = req.headers["x-request-id"] ?? (0, import_node_crypto4.randomUUID)();
-        const path25 = readRequestPath(req);
+        const path26 = readRequestPath(req);
         res.on("finish", () => {
           logger6.info("daemon_request", {
             requestId,
             method: req.method,
-            path: path25,
+            path: path26,
             status: res.statusCode
           });
         });
-        if (path25 === "/health") {
+        if (path26 === "/health") {
           writeJson(res, 200, {
             ok: true,
             pid: process.pid,
@@ -11846,7 +11915,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/version") {
+        if (path26 === "/version") {
           writeJson(res, 200, {
             name: "dvbd",
             version: "0.0.0",
@@ -11855,7 +11924,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/boxes") {
+        if (path26 === "/boxes") {
           void buildBoxSummaries().then((boxes) => {
             writeJson(res, 200, { boxes });
           }).catch((error) => {
@@ -11863,7 +11932,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/registry/project" && req.method === "GET") {
+        if (path26 === "/registry/project" && req.method === "GET") {
           const url = new URL(req.url ?? "", "http://localhost");
           const fingerprint = url.searchParams.get("fingerprint") ?? "";
           void fetchRegistry().then((registry) => {
@@ -11874,7 +11943,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/registry/alias" && req.method === "GET") {
+        if (path26 === "/registry/alias" && req.method === "GET") {
           const url = new URL(req.url ?? "", "http://localhost");
           const alias = url.searchParams.get("alias") ?? "";
           void fetchRegistry().then((registry) => {
@@ -11885,7 +11954,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/registry/upsert" && req.method === "POST") {
+        if (path26 === "/registry/upsert" && req.method === "POST") {
           void readBody(req).then(async (payload) => {
             const project = payload?.project;
             const box = payload?.box;
@@ -11910,7 +11979,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/registry/usage" && req.method === "POST") {
+        if (path26 === "/registry/usage" && req.method === "POST") {
           void readBody(req).then(async (payload) => {
             const canonical = typeof payload?.canonical === "string" ? payload.canonical : "";
             if (!canonical) {
@@ -11925,7 +11994,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/registry/remove" && req.method === "POST") {
+        if (path26 === "/registry/remove" && req.method === "POST") {
           void readBody(req).then(async (payload) => {
             const canonical = typeof payload?.canonical === "string" ? payload.canonical : "";
             if (!canonical) {
@@ -11940,12 +12009,12 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/ports" && req.method === "GET") {
+        if (path26 === "/ports" && req.method === "GET") {
           const snapshot = portManager.listPorts();
           writeJson(res, 200, snapshot);
           return;
         }
-        if (path25 === "/ports/clear" && req.method === "POST") {
+        if (path26 === "/ports/clear" && req.method === "POST") {
           void readBody(req).then((payload) => {
             const box = typeof payload?.box === "string" ? payload.box : void 0;
             if (!box) {
@@ -11959,7 +12028,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/ports/reload" && req.method === "POST") {
+        if (path26 === "/ports/reload" && req.method === "POST") {
           void readBody(req).then(async (payload) => {
             const box = typeof payload?.box === "string" ? payload.box : void 0;
             if (!box) {
@@ -11973,7 +12042,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/ports/policy" && req.method === "POST") {
+        if (path26 === "/ports/policy" && req.method === "POST") {
           void readBody(req).then((payload) => {
             const box = typeof payload?.box === "string" ? payload.box : void 0;
             const policy = payload?.policy === "auto" || payload?.policy === "disabled" ? payload.policy : null;
@@ -11990,7 +12059,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/ports/forward" && req.method === "POST") {
+        if (path26 === "/ports/forward" && req.method === "POST") {
           void readBody(req).then(async (payload) => {
             const box = typeof payload?.box === "string" ? payload.box : void 0;
             const port = typeof payload?.port === "number" ? payload.port : void 0;
@@ -12010,7 +12079,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/ports/stop" && req.method === "POST") {
+        if (path26 === "/ports/stop" && req.method === "POST") {
           void readBody(req).then((payload) => {
             const box = typeof payload?.box === "string" ? payload.box : void 0;
             const port = typeof payload?.port === "number" ? payload.port : void 0;
@@ -12025,7 +12094,7 @@ var init_src2 = __esm({
           });
           return;
         }
-        if (path25 === "/shutdown" && req.method === "POST" && allowShutdown()) {
+        if (path26 === "/shutdown" && req.method === "POST" && allowShutdown()) {
           writeJson(res, 202, { ok: true });
           void close();
           return;
@@ -12098,7 +12167,7 @@ var init_logger2 = __esm({
 });
 
 // src/devbox/controlPlane.ts
-var import_node_http2, import_node_crypto5, import_node_child_process, resolveControlPlaneUrl2, resolveConvexUrl2, openBrowser, requestJson2, startCallbackServer, getControlPlaneUrl, getConvexUrl, signInWithBrowser, spriteTokenGet, spriteTokenSet, spriteDaemonReleaseGet, spriteDaemonTokenIssue, spriteDaemonSessionSummariesList, spriteDaemonSessionsList, withConvexClient, fetchSpriteToken, storeSpriteToken, fetchSpriteDaemonRelease, issueSpriteDaemonToken, listSpriteDaemonSessionSummaries, listSpriteDaemonSessions, signOutControlPlane, refreshControlPlaneSession;
+var import_node_http2, import_node_crypto5, import_node_child_process, trim, normalizeConvexDeployment2, stripDevPrefix2, resolveFromDeployment2, resolveFromUrl2, resolveControlPlaneUrl2, resolveConvexUrl2, openBrowser, requestJson2, startCallbackServer, getControlPlaneUrl, getConvexUrl, signInWithBrowser, spriteTokenGet, spriteTokenSet, spriteDaemonReleaseGet, spriteDaemonTokenIssue, spriteDaemonSessionSummariesList, spriteDaemonSessionsList, withConvexClient, fetchSpriteToken, storeSpriteToken, fetchSpriteDaemonRelease, issueSpriteDaemonToken, listSpriteDaemonSessionSummaries, listSpriteDaemonSessions, signOutControlPlane, refreshControlPlaneSession;
 var init_controlPlane = __esm({
   "src/devbox/controlPlane.ts"() {
     "use strict";
@@ -12108,11 +12177,52 @@ var init_controlPlane = __esm({
     init_index_node();
     init_server();
     init_logger2();
+    trim = (value) => value.trim().replace(/\r/g, "");
+    normalizeConvexDeployment2 = (value) => {
+      const normalized = trim(value);
+      if (!normalized) return "";
+      if (normalized.includes(":")) {
+        const [prefix, rest] = normalized.split(":", 2);
+        return `${prefix}:${trim(rest ?? "")}`;
+      }
+      return normalized;
+    };
+    stripDevPrefix2 = (value) => {
+      if (value.startsWith("dev:")) {
+        return trim(value.slice(4));
+      }
+      return value;
+    };
+    resolveFromDeployment2 = (deploymentRaw, suffix) => {
+      const deployment = stripDevPrefix2(normalizeConvexDeployment2(deploymentRaw));
+      if (!deployment) return "";
+      if (deployment.includes("://")) {
+        return deployment;
+      }
+      if (deployment.includes(".")) {
+        const host = suffix === "cloud" ? deployment.replace(".convex.site", ".convex.cloud") : deployment.replace(".convex.cloud", ".convex.site");
+        return `https://${host}`;
+      }
+      return `https://${deployment}.convex.${suffix}`;
+    };
+    resolveFromUrl2 = (raw, suffix) => {
+      const value = trim(raw);
+      if (!value) return "";
+      try {
+        const url = new URL(value);
+        const host = suffix === "cloud" ? url.host.replace(".convex.site", ".convex.cloud") : url.host.replace(".convex.cloud", ".convex.site");
+        return `${url.protocol}//${host}`;
+      } catch {
+        return "";
+      }
+    };
     resolveControlPlaneUrl2 = () => {
       const envOverride = process.env.DEVBOX_CONTROL_PLANE_URL ?? process.env.CONVEX_SITE_URL;
       if (envOverride && envOverride.trim().length > 0) {
         return envOverride.trim();
       }
+      const derived = resolveFromDeployment2(process.env.CONVEX_DEPLOYMENT ?? "", "site") || resolveFromUrl2(process.env.VITE_CONVEX_URL ?? "", "site");
+      if (derived) return derived;
       if (false) return null;
       const trimmed = "https://api.boxes.dev".trim();
       return trimmed.length > 0 ? trimmed : null;
@@ -12122,6 +12232,8 @@ var init_controlPlane = __esm({
       if (envOverride && envOverride.trim().length > 0) {
         return envOverride.trim();
       }
+      const derived = resolveFromDeployment2(process.env.CONVEX_DEPLOYMENT ?? "", "cloud") || resolveFromUrl2(process.env.CONVEX_SITE_URL ?? "", "cloud");
+      if (derived) return derived;
       if (false) return null;
       const trimmed = "https://convex.boxes.dev".trim();
       return trimmed.length > 0 ? trimmed : null;
@@ -12151,9 +12263,9 @@ var init_controlPlane = __esm({
         console.log(url);
       }
     };
-    requestJson2 = async (baseUrl, method, path25, body, token) => {
+    requestJson2 = async (baseUrl, method, path26, body, token) => {
       const requestId = (0, import_node_crypto5.randomUUID)();
-      const url = new URL(path25, baseUrl);
+      const url = new URL(path26, baseUrl);
       const headers = {
         "x-request-id": requestId
       };
@@ -12426,7 +12538,7 @@ var init_controlPlane = __esm({
 });
 
 // src/devbox/daemonClient.ts
-var import_node_http3, import_node_path6, import_node_child_process2, import_node_crypto6, import_promises6, DAEMON_TIMEOUT_MS, DaemonConnectionError, isConnectionError, requestJson3, requireDaemonFeatures, resolveDaemonCommand, spawnDaemon, waitForHealth, listAlternateSocketPaths, pruneDuplicateDaemons, ensureDaemonRunning, waitForSocketGone, stopDaemon;
+var import_node_http3, import_node_path6, import_node_child_process2, import_node_crypto6, import_node_fs3, import_promises6, DAEMON_TIMEOUT_MS, DaemonConnectionError, isConnectionError, requestJson3, requireDaemonFeatures, resolveDaemonCommand, spawnDaemon, waitForHealth, listAlternateSocketPaths, pruneDuplicateDaemons, ensureDaemonRunning, waitForSocketGone, stopDaemon;
 var init_daemonClient = __esm({
   "src/devbox/daemonClient.ts"() {
     "use strict";
@@ -12434,6 +12546,7 @@ var init_daemonClient = __esm({
     import_node_path6 = __toESM(require("node:path"), 1);
     import_node_child_process2 = require("node:child_process");
     import_node_crypto6 = require("node:crypto");
+    import_node_fs3 = __toESM(require("node:fs"), 1);
     import_promises6 = require("node:fs/promises");
     init_src();
     init_controlPlane();
@@ -12584,11 +12697,20 @@ var init_daemonClient = __esm({
       const command = resolveDaemonCommand();
       const controlPlaneUrl = getControlPlaneUrl();
       const convexUrl = getConvexUrl();
+      const runtimeDir = import_node_path6.default.dirname(socketPath);
+      const logPath = import_node_path6.default.join(runtimeDir, "dvbd.log");
+      let logFd = null;
+      try {
+        logFd = import_node_fs3.default.openSync(logPath, "a");
+      } catch {
+        logFd = null;
+      }
       logger7.info("daemon_spawn", {
         socketPath,
         command: command.command,
         args: command.args,
-        source: command.source
+        source: command.source,
+        ...logFd !== null ? { logPath } : {}
       });
       const child = (0, import_node_child_process2.spawn)(command.command, command.args, {
         env: {
@@ -12597,9 +12719,15 @@ var init_daemonClient = __esm({
           ...controlPlaneUrl ? { DEVBOX_CONTROL_PLANE_URL: controlPlaneUrl } : {},
           ...convexUrl ? { DEVBOX_CONVEX_URL: convexUrl } : {}
         },
-        stdio: "ignore",
+        stdio: logFd !== null ? ["ignore", logFd, logFd] : "ignore",
         detached: true
       });
+      if (logFd !== null) {
+        try {
+          import_node_fs3.default.closeSync(logFd);
+        } catch {
+        }
+      }
       child.unref();
     };
     waitForHealth = async (socketPath, timeoutMs) => {
@@ -12879,11 +13007,11 @@ ${tokenInstructions()}`
         );
       }
       let controlPlaneToken = await store.getControlPlaneToken();
-      const requireControlPlaneToken = options?.requireControlPlaneToken !== false;
-      if (!controlPlaneToken && requireControlPlaneToken) {
+      const requireControlPlaneToken2 = options?.requireControlPlaneToken !== false;
+      if (!controlPlaneToken && requireControlPlaneToken2) {
         controlPlaneToken = await ensureControlPlaneToken(store, stage);
       }
-      if (controlPlaneToken && requireControlPlaneToken) {
+      if (controlPlaneToken && requireControlPlaneToken2) {
         const expiresAt = await store.getControlPlaneTokenExpiresAt();
         if (shouldRefreshToken2(expiresAt)) {
           try {
@@ -19635,8 +19763,8 @@ var init_connect = __esm({
           pendingPortLogs.set(event.port, token2);
           const delays = [30, 60, 120, 200];
           void (async () => {
-            for (const delay of delays) {
-              await new Promise((resolve) => setTimeout(resolve, delay));
+            for (const delay2 of delays) {
+              await new Promise((resolve) => setTimeout(resolve, delay2));
               if (pendingPortLogs.get(event.port) !== token2) {
                 return;
               }
@@ -22164,16 +22292,25 @@ var init_registry2 = __esm({
 });
 
 // src/devbox/commands/init/scripts.ts
-var import_promises19, import_node_path14, resolveScriptsDir, loadInitScript;
+var import_node_fs4, import_promises19, import_node_path14, resolveScriptsDir, loadInitScript;
 var init_scripts = __esm({
   "src/devbox/commands/init/scripts.ts"() {
     "use strict";
+    import_node_fs4 = __toESM(require("node:fs"), 1);
     import_promises19 = __toESM(require("node:fs/promises"), 1);
     import_node_path14 = __toESM(require("node:path"), 1);
     resolveScriptsDir = () => {
-      const binPath = process.argv[1];
-      if (binPath) {
-        return import_node_path14.default.resolve(import_node_path14.default.dirname(binPath), "..", "scripts");
+      const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
+      if (argv1) {
+        try {
+          const real = import_node_fs4.default.realpathSync(argv1);
+          return import_node_path14.default.resolve(import_node_path14.default.dirname(real), "..", "scripts");
+        } catch {
+        }
+        try {
+          return import_node_path14.default.resolve(import_node_path14.default.dirname(argv1), "..", "scripts");
+        } catch {
+        }
       }
       return import_node_path14.default.resolve(process.cwd(), "scripts");
     };
@@ -22202,7 +22339,7 @@ var init_weztermMux = __esm({
 });
 
 // src/devbox/commands/init/remote.ts
-var import_node_crypto10, DAEMON_DIR, DAEMON_TARBALL, DAEMON_BUNDLE_DIR, DAEMON_ENTRY, DAEMON_WRAPPER, DAEMON_SERVICE_NAME, DAEMON_CONFIG_FILE, DEFAULT_DAEMON_BASE_URL, DEFAULT_HEARTBEAT_MS, logger8, truncateTail, shellQuote3, expandHome2, execWithLog, writeRemoteFile, bootstrapDevbox, buildWeztermMuxConfig, buildWeztermMuxRunner, patchBashrc, writeRemoteCodexConfig, stageRemoteSetupArtifacts, resolveDaemonUrl, fetchDaemonBinary, buildDaemonConfig, isSameArgs, ensureSpriteDaemonService, installWeztermMux, ensureWeztermMuxService, hasWeztermMuxBinary, isWeztermMuxHealthy, installSpriteDaemon;
+var import_node_crypto10, DAEMON_DIR, DAEMON_TARBALL, DAEMON_BUNDLE_DIR, DAEMON_ENTRY, DAEMON_WRAPPER, DAEMON_SERVICE_NAME, DAEMON_CONFIG_FILE, DEFAULT_DAEMON_BASE_URL, DEFAULT_HEARTBEAT_MS, BOOTSTRAP_EXEC_TIMEOUT_MS, BOOTSTRAP_EXEC_RETRY_DELAY_MS, logger8, truncateTail, shellQuote3, expandHome2, execWithLog, isExecTimeoutError, delay, writeRemoteFile, bootstrapDevbox, buildWeztermMuxConfig, buildWeztermMuxRunner, patchBashrc, writeRemoteCodexConfig, stageRemoteSetupArtifacts, resolveDaemonUrl, fetchDaemonBinary, buildDaemonConfig, isSameArgs, ensureSpriteDaemonService, installWeztermMux, ensureWeztermMuxService, hasWeztermMuxBinary, isWeztermMuxHealthy, installSpriteDaemon;
 var init_remote = __esm({
   "src/devbox/commands/init/remote.ts"() {
     "use strict";
@@ -22220,6 +22357,8 @@ var init_remote = __esm({
     DAEMON_CONFIG_FILE = `${DAEMON_DIR}/config.json`;
     DEFAULT_DAEMON_BASE_URL = process.env.SPRITE_DAEMON_BASE_URL?.trim() || "https://deploy-dev.boxes.dev";
     DEFAULT_HEARTBEAT_MS = 3e4;
+    BOOTSTRAP_EXEC_TIMEOUT_MS = 9e4;
+    BOOTSTRAP_EXEC_RETRY_DELAY_MS = 1e4;
     logger8 = createLogger("devbox-init");
     truncateTail = (value, maxChars) => {
       if (value.length <= maxChars) return value;
@@ -22233,7 +22372,7 @@ var init_remote = __esm({
       }
       return value;
     };
-    execWithLog = async (client, canonical, script, stage) => {
+    execWithLog = async (client, canonical, script, stage, options) => {
       const requestId = (0, import_node_crypto10.randomUUID)();
       const startedAt2 = Date.now();
       logger8.info("sprites_request", {
@@ -22243,7 +22382,11 @@ var init_remote = __esm({
         box: canonical,
         stage
       });
-      const result = await client.exec(canonical, ["/bin/bash", "-lc", script]);
+      const result = await client.exec(
+        canonical,
+        ["/bin/bash", "-lc", script],
+        options
+      );
       const durationMs = Date.now() - startedAt2;
       logger8.info("sprites_response", {
         requestId,
@@ -22263,21 +22406,23 @@ var init_remote = __esm({
       });
       return result;
     };
-    writeRemoteFile = async (client, canonical, path25, content, stage) => {
+    isExecTimeoutError = (error) => error instanceof Error && typeof error.message === "string" && error.message.startsWith("Exec websocket timed out after ");
+    delay = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    writeRemoteFile = async (client, canonical, path26, content, stage) => {
       const requestId = (0, import_node_crypto10.randomUUID)();
       logger8.info("sprites_request", {
         requestId,
         method: "writeFile",
-        path: path25,
+        path: path26,
         box: canonical,
         stage
       });
       const buffer = typeof content === "string" ? Buffer.from(content, "utf8") : content;
-      await client.writeFile(canonical, path25, buffer);
+      await client.writeFile(canonical, path26, buffer);
       logger8.info("sprites_response", {
         requestId,
         method: "writeFile",
-        path: path25,
+        path: path26,
         status: "ok",
         box: canonical,
         stage
@@ -22294,12 +22439,28 @@ var init_remote = __esm({
         "  sudo -n chown -R sprite:sprite /home/sprite/.devbox || true",
         "fi"
       ].join("\n");
-      const permsResult = await execWithLog(
+      let permsResult = await execWithLog(
         client,
         canonical,
         permissionsScript,
-        "bootstrap-permissions"
-      );
+        "bootstrap-permissions",
+        { timeoutMs: BOOTSTRAP_EXEC_TIMEOUT_MS }
+      ).catch(async (error) => {
+        if (!isExecTimeoutError(error)) throw error;
+        logger8.warn("sprites_exec_retry_after_timeout", {
+          stage: "bootstrap-permissions",
+          timeoutMs: BOOTSTRAP_EXEC_TIMEOUT_MS,
+          delayMs: BOOTSTRAP_EXEC_RETRY_DELAY_MS
+        });
+        await delay(BOOTSTRAP_EXEC_RETRY_DELAY_MS);
+        return await execWithLog(
+          client,
+          canonical,
+          permissionsScript,
+          "bootstrap-permissions",
+          { timeoutMs: BOOTSTRAP_EXEC_TIMEOUT_MS }
+        );
+      });
       if (permsResult.exitCode !== 0) {
         const details = permsResult.stderr || permsResult.stdout || "";
         throw new Error(
@@ -22319,7 +22480,8 @@ var init_remote = __esm({
         client,
         canonical,
         ipv4PreferenceScript,
-        "bootstrap-ipv4-preference"
+        "bootstrap-ipv4-preference",
+        { timeoutMs: BOOTSTRAP_EXEC_TIMEOUT_MS }
       );
       if (ipv4Result.exitCode !== 0) {
         const details = ipv4Result.stderr || ipv4Result.stdout || "";
@@ -22964,30 +23126,34 @@ chmod 755 ${WEZTERM_MUX_RUNNER_PATH}`,
         DAEMON_CONFIG_FILE,
         Buffer.from(buildDaemonConfig(convexUrl, heartbeatToken))
       );
-      const result = await client.exec(spriteName, [
-        "/bin/bash",
-        "--noprofile",
-        "--norc",
-        "-e",
-        "-u",
-        "-o",
-        "pipefail",
-        "-c",
+      const result = await client.exec(
+        spriteName,
         [
-          `mkdir -p ${DAEMON_DIR}`,
-          `rm -rf ${DAEMON_BUNDLE_DIR}`,
-          `mkdir -p ${DAEMON_BUNDLE_DIR}`,
-          `tar -xzf ${DAEMON_TARBALL} -C ${DAEMON_BUNDLE_DIR}`,
-          `chmod 755 ${DAEMON_ENTRY} || true`,
-          `chmod 755 ${DAEMON_BUNDLE_DIR}/bin/* || true`,
+          "/bin/bash",
+          "--noprofile",
+          "--norc",
+          "-e",
+          "-u",
+          "-o",
+          "pipefail",
+          "-c",
           [
-            `${DAEMON_ENTRY} daemonctl install --json --timeout-ms 20000`,
-            `--tarball ${DAEMON_TARBALL}`,
-            `--release-sha ${release.sha256}`,
-            `--config-path ${DAEMON_CONFIG_FILE}`
-          ].join(" ")
-        ].join("\n")
-      ]);
+            `mkdir -p ${DAEMON_DIR}`,
+            `rm -rf ${DAEMON_BUNDLE_DIR}`,
+            `mkdir -p ${DAEMON_BUNDLE_DIR}`,
+            `tar -xzf ${DAEMON_TARBALL} -C ${DAEMON_BUNDLE_DIR}`,
+            `chmod 755 ${DAEMON_ENTRY} || true`,
+            `chmod 755 ${DAEMON_BUNDLE_DIR}/bin/* || true`,
+            [
+              `${DAEMON_ENTRY} daemonctl install --json --timeout-ms 20000`,
+              `--tarball ${DAEMON_TARBALL}`,
+              `--release-sha ${release.sha256}`,
+              `--config-path ${DAEMON_CONFIG_FILE}`
+            ].join(" ")
+          ].join("\n")
+        ],
+        { timeoutMs: 12e4 }
+      );
       if (result.exitCode !== 0) {
         throw new Error(result.stderr || result.stdout || "Daemon install failed.");
       }
@@ -23293,7 +23459,7 @@ var init_ssh = __esm({
       }
       return trimmed.replace(/^\/+/, "");
     };
-    buildSshUrl = (host, path25) => `git@${host}:${stripGitSuffix2(path25)}.git`;
+    buildSshUrl = (host, path26) => `git@${host}:${stripGitSuffix2(path26)}.git`;
     buildSettingsUrl = (host) => {
       const lower = host.toLowerCase();
       if (lower.includes("gitlab")) {
@@ -23306,12 +23472,12 @@ var init_ssh = __esm({
       const withoutUser = trimmed.startsWith("git@") ? trimmed.slice("git@".length) : trimmed;
       const [host, pathPart] = withoutUser.split(":");
       if (!host || !pathPart) return null;
-      const path25 = stripGitSuffix2(pathPart);
+      const path26 = stripGitSuffix2(pathPart);
       return {
         host: host.toLowerCase(),
-        path: path25,
+        path: path26,
         protocol: "ssh",
-        sshUrl: buildSshUrl(host, path25),
+        sshUrl: buildSshUrl(host, path26),
         settingsUrl: buildSettingsUrl(host)
       };
     };
@@ -23328,13 +23494,13 @@ var init_ssh = __esm({
         try {
           const url = new URL(trimmed);
           const host = url.hostname;
-          const path25 = stripGitSuffix2(url.pathname);
-          if (!host || !path25) return null;
+          const path26 = stripGitSuffix2(url.pathname);
+          if (!host || !path26) return null;
           return {
             host: host.toLowerCase(),
-            path: path25,
+            path: path26,
             protocol: "ssh",
-            sshUrl: buildSshUrl(host, path25),
+            sshUrl: buildSshUrl(host, path26),
             settingsUrl: buildSettingsUrl(host)
           };
         } catch {
@@ -23345,13 +23511,13 @@ var init_ssh = __esm({
         try {
           const url = new URL(trimmed);
           const host = url.hostname;
-          const path25 = stripGitSuffix2(url.pathname);
-          if (!host || !path25) return null;
+          const path26 = stripGitSuffix2(url.pathname);
+          if (!host || !path26) return null;
           return {
             host: host.toLowerCase(),
-            path: path25,
+            path: path26,
             protocol: "https",
-            sshUrl: buildSshUrl(host, path25),
+            sshUrl: buildSshUrl(host, path26),
             settingsUrl: buildSettingsUrl(host)
           };
         } catch {
@@ -24309,21 +24475,25 @@ fi`
 });
 
 // src/devbox/commands/init/codex/plan.ts
-var import_node_path18, import_promises24, resolveSchemaPath, writeSetupEnvSecretsSchema, writeSetupExternalSchema, writeSetupExtraArtifactsSchema, writeServicesSchema, isObject4, isServicesSelection, isSetupPlan, isSetupEnvSecretsPlan, isSetupExternalPlan, isSetupExtraArtifactsPlan, isServicesPlan, readSetupPlan, readSetupEnvSecretsPlan, readSetupExternalPlan, readSetupExtraArtifactsPlan, readServicesPlan, writeSetupPlan, mergeSetupScans;
+var import_node_path18, import_node_fs5, import_promises24, resolveSchemaPath, writeSetupEnvSecretsSchema, writeSetupExternalSchema, writeSetupExtraArtifactsSchema, writeServicesSchema, isObject4, isServicesSelection, isSetupPlan, isSetupEnvSecretsPlan, isSetupExternalPlan, isSetupExtraArtifactsPlan, isServicesPlan, readSetupPlan, readSetupEnvSecretsPlan, readSetupExternalPlan, readSetupExtraArtifactsPlan, readServicesPlan, writeSetupPlan, mergeSetupScans;
 var init_plan = __esm({
   "src/devbox/commands/init/codex/plan.ts"() {
     "use strict";
     import_node_path18 = __toESM(require("node:path"), 1);
+    import_node_fs5 = __toESM(require("node:fs"), 1);
     import_promises24 = __toESM(require("node:fs/promises"), 1);
     resolveSchemaPath = (fileName) => {
-      const binPath = process.argv[1];
-      if (binPath) {
-        return import_node_path18.default.resolve(
-          import_node_path18.default.dirname(binPath),
-          "..",
-          "codex",
-          fileName
-        );
+      const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
+      if (argv1) {
+        try {
+          const real = import_node_fs5.default.realpathSync(argv1);
+          return import_node_path18.default.resolve(import_node_path18.default.dirname(real), "..", "codex", fileName);
+        } catch {
+        }
+        try {
+          return import_node_path18.default.resolve(import_node_path18.default.dirname(argv1), "..", "codex", fileName);
+        } catch {
+        }
       }
       return import_node_path18.default.resolve(process.cwd(), "codex", fileName);
     };
@@ -24613,12 +24783,12 @@ ${bottom}
 });
 
 // src/devbox/commands/init/codex/local.ts
-var import_node_child_process9, import_node_fs3, import_promises25, import_node_path19, stripAnsi3, extractBoldText2, runCodexExec, runLocalSetupEnvSecretsScan, runLocalSetupExternalScan, runLocalSetupExtraArtifactsScan, runLocalServicesScan, toPosixPath, toRepoRelativePath, countSecretVars, buildEnvFileHint, buildExternalDependencyLabel, promptForPlanApproval, promptForServicesApproval;
+var import_node_child_process9, import_node_fs6, import_promises25, import_node_path19, stripAnsi3, extractBoldText2, runCodexExec, runLocalSetupEnvSecretsScan, runLocalSetupExternalScan, runLocalSetupExtraArtifactsScan, runLocalServicesScan, toPosixPath, toRepoRelativePath, countSecretVars, buildEnvFileHint, buildExternalDependencyLabel, promptForPlanApproval, promptForServicesApproval;
 var init_local = __esm({
   "src/devbox/commands/init/codex/local.ts"() {
     "use strict";
     import_node_child_process9 = require("node:child_process");
-    import_node_fs3 = require("node:fs");
+    import_node_fs6 = require("node:fs");
     import_promises25 = __toESM(require("node:fs/promises"), 1);
     import_node_path19 = __toESM(require("node:path"), 1);
     init_dist2();
@@ -24637,11 +24807,11 @@ var init_local = __esm({
       try {
         if (stdoutLogPath) {
           await import_promises25.default.mkdir(import_node_path19.default.dirname(stdoutLogPath), { recursive: true });
-          stdoutStream = (0, import_node_fs3.createWriteStream)(stdoutLogPath, { flags: "a" });
+          stdoutStream = (0, import_node_fs6.createWriteStream)(stdoutLogPath, { flags: "a" });
         }
         if (stderrLogPath) {
           await import_promises25.default.mkdir(import_node_path19.default.dirname(stderrLogPath), { recursive: true });
-          stderrStream = (0, import_node_fs3.createWriteStream)(stderrLogPath, { flags: "a" });
+          stderrStream = (0, import_node_fs6.createWriteStream)(stderrLogPath, { flags: "a" });
         }
       } catch {
         stdoutStream = null;
@@ -30485,11 +30655,11 @@ var init_services = __esm({
     };
     loadConfigFromSprite = async (client, canonical) => {
       const workdir = await resolveProjectWorkdir(client, canonical);
-      const path25 = workdir ? `${workdir.replace(/\/$/, "")}/devbox.toml` : null;
+      const path26 = workdir ? `${workdir.replace(/\/$/, "")}/devbox.toml` : null;
       if (!workdir) {
         return {
           workdir: null,
-          path: path25,
+          path: path26,
           content: null,
           services: {},
           missing: true,
@@ -30504,7 +30674,7 @@ var init_services = __esm({
         const content = Buffer.from(bytes).toString("utf8");
         return {
           workdir,
-          path: path25,
+          path: path26,
           content,
           services: parseServicesToml(content),
           missing: false
@@ -30513,7 +30683,7 @@ var init_services = __esm({
         if (error instanceof SpritesApiError && error.status === 404) {
           return {
             workdir,
-            path: path25,
+            path: path26,
             content: null,
             services: {},
             missing: true
@@ -30521,7 +30691,7 @@ var init_services = __esm({
         }
         return {
           workdir,
-          path: path25,
+          path: path26,
           content: null,
           services: {},
           missing: false,
@@ -30993,8 +31163,144 @@ var init_setup = __esm({
   }
 });
 
+// src/devbox/commands/version.ts
+var import_node_module, import_node_path24, parseVersionArgs, readPackageVersion, tryReadDaemonInfo, runVersion;
+var init_version = __esm({
+  "src/devbox/commands/version.ts"() {
+    "use strict";
+    import_node_module = require("node:module");
+    import_node_path24 = __toESM(require("node:path"), 1);
+    init_src();
+    init_src();
+    init_controlPlane();
+    init_daemonClient();
+    parseVersionArgs = (args) => {
+      const parsed = { json: false };
+      for (const arg of args) {
+        if (!arg) continue;
+        if (arg === "--json") {
+          parsed.json = true;
+          continue;
+        }
+        if (arg === "--help" || arg === "-h") {
+          throw new Error("help_requested");
+        }
+        if (arg.startsWith("-")) {
+          throw new Error(`Unknown version flag: ${arg}`);
+        }
+        throw new Error(`Unexpected argument: ${arg}`);
+      }
+      return parsed;
+    };
+    readPackageVersion = () => {
+      const fromArgv = typeof process.argv[1] === "string" ? process.argv[1] : "";
+      const from = fromArgv ? import_node_path24.default.resolve(fromArgv) : import_node_path24.default.join(process.cwd(), "dvb");
+      const require3 = (0, import_node_module.createRequire)(from);
+      try {
+        const pkg = require3("@boxes-dev/dvb/package.json");
+        return typeof pkg.version === "string" ? pkg.version : "unknown";
+      } catch {
+        return "unknown";
+      }
+    };
+    tryReadDaemonInfo = async (socketPath) => {
+      try {
+        const health = await requestJson3(
+          socketPath,
+          "GET",
+          "/health",
+          DAEMON_TIMEOUT_MS.health
+        );
+        if (health.status !== 200 || !health.body.ok) return null;
+        const version2 = await requestJson3(
+          socketPath,
+          "GET",
+          "/version",
+          DAEMON_TIMEOUT_MS.quick
+        );
+        return {
+          health: health.body,
+          version: version2.status === 200 ? version2.body : null
+        };
+      } catch {
+        return null;
+      }
+    };
+    runVersion = async (args) => {
+      const parsed = parseVersionArgs(args);
+      const dvbVersion = readPackageVersion();
+      const nodeVersion = process.versions.node;
+      const controlPlaneUrl = getControlPlaneUrl();
+      const convexUrl = getConvexUrl();
+      const homeDir = process.env.HOME?.trim();
+      const config = await loadConfig(homeDir ? { homeDir } : void 0);
+      const store = await createSecretStore(
+        config?.tokenStore,
+        homeDir ? { homeDir } : void 0
+      );
+      const spritesTokenPresent = Boolean(await store.getToken());
+      const controlPlaneTokenPresent = Boolean(await store.getControlPlaneToken());
+      const controlPlaneRefreshTokenPresent = Boolean(
+        await store.getControlPlaneRefreshToken()
+      );
+      const socketInfo = resolveSocketInfo();
+      const daemon = await tryReadDaemonInfo(socketInfo.socketPath);
+      if (parsed.json) {
+        console.log(
+          JSON.stringify(
+            {
+              dvb: { version: dvbVersion },
+              node: { version: nodeVersion },
+              auth: {
+                spritesToken: spritesTokenPresent,
+                controlPlaneToken: controlPlaneTokenPresent,
+                controlPlaneRefreshToken: controlPlaneRefreshTokenPresent
+              },
+              config: {
+                controlPlaneUrl,
+                convexUrl,
+                socketPath: socketInfo.socketPath
+              },
+              dvbd: daemon ? {
+                pid: daemon.health.pid,
+                startedAt: daemon.health.startedAt,
+                apiVersion: daemon.version?.apiVersion ?? null,
+                features: daemon.version?.features ?? null
+              } : null
+            },
+            null,
+            2
+          )
+        );
+        return;
+      }
+      console.log(`dvb ${dvbVersion}`);
+      console.log(`node ${nodeVersion}`);
+      console.log(`control plane: ${controlPlaneUrl ?? "(not set/embedded)"}`);
+      console.log(`convex: ${convexUrl ?? "(not set/embedded)"}`);
+      console.log(
+        `auth: sprites=${spritesTokenPresent ? "ok" : "missing"} control_plane=${controlPlaneTokenPresent ? "ok" : "missing"}`
+      );
+      console.log(`socket: ${socketInfo.socketPath}`);
+      if (daemon) {
+        const apiVersion = daemon.version?.apiVersion;
+        const features = Array.isArray(daemon.version?.features) ? daemon.version?.features.join(", ") : "";
+        console.log(`dvbd: running (pid ${daemon.health.pid})`);
+        if (typeof apiVersion === "number") {
+          console.log(`dvbd api: ${apiVersion}`);
+        }
+        if (features) {
+          console.log(`dvbd features: ${features}`);
+        }
+      } else {
+        console.log("dvbd: not running");
+      }
+    };
+  }
+});
+
 // src/devbox/commands/wezterm.ts
-var import_node_crypto13, import_node_child_process11, import_promises31, import_node_os10, import_node_path24, 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, escapeRegExp, resolveCliName2, resolveDvbCommand, formatLuaArgs, resolveWeztermProxyEnv, buildProxyCommand, buildDomainBlock, canAppendToConfig, countReturns, applyReturnTableTransform, insertBlock, runWeztermSetup, startWeztermDomain, runWezterm;
+var import_node_crypto13, import_node_child_process11, import_promises31, import_node_os10, import_node_path25, 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, escapeRegExp, resolveCliName2, resolveDvbCommand, formatLuaArgs, resolveWeztermProxyEnv, buildProxyCommand, buildDomainBlock, canAppendToConfig, countReturns, applyReturnTableTransform, insertBlock, runWeztermSetup, startWeztermDomain, runWezterm;
 var init_wezterm = __esm({
   "src/devbox/commands/wezterm.ts"() {
     "use strict";
@@ -31002,7 +31308,7 @@ var init_wezterm = __esm({
     import_node_child_process11 = require("node:child_process");
     import_promises31 = __toESM(require("node:fs/promises"), 1);
     import_node_os10 = __toESM(require("node:os"), 1);
-    import_node_path24 = __toESM(require("node:path"), 1);
+    import_node_path25 = __toESM(require("node:path"), 1);
     import_promises32 = __toESM(require("node:readline/promises"), 1);
     init_src();
     init_daemonClient();
@@ -31194,11 +31500,11 @@ var init_wezterm = __esm({
         const homeDir = import_node_os10.default.homedir();
         if (!homeDir) return;
         try {
-          const logDir = import_node_path24.default.join(resolveDevboxDir(homeDir), "wezterm");
+          const logDir = import_node_path25.default.join(resolveDevboxDir(homeDir), "wezterm");
           await import_promises31.default.mkdir(logDir, { recursive: true });
           const line = `${(/* @__PURE__ */ new Date()).toISOString()} ${message}
 `;
-          await import_promises31.default.appendFile(import_node_path24.default.join(logDir, WEZTERM_PROXY_LOG_NAME), line, "utf8");
+          await import_promises31.default.appendFile(import_node_path25.default.join(logDir, WEZTERM_PROXY_LOG_NAME), line, "utf8");
         } catch {
         }
       };
@@ -31441,16 +31747,16 @@ var init_wezterm = __esm({
       }
       const shell = process.env.SHELL ?? "";
       if (shell.includes("zsh")) {
-        return import_node_path24.default.join(homeDir, ".zshrc");
+        return import_node_path25.default.join(homeDir, ".zshrc");
       }
       if (shell.includes("bash")) {
-        const profile = import_node_path24.default.join(homeDir, ".bash_profile");
+        const profile = import_node_path25.default.join(homeDir, ".bash_profile");
         if (await fileExists(profile)) {
           return profile;
         }
-        return import_node_path24.default.join(homeDir, ".bashrc");
+        return import_node_path25.default.join(homeDir, ".bashrc");
       }
-      return import_node_path24.default.join(homeDir, ".profile");
+      return import_node_path25.default.join(homeDir, ".profile");
     };
     ensureWeztermOnPath = async () => {
       if (await hasWeztermOnPath()) {
@@ -31507,7 +31813,7 @@ ${content ? "\n" : ""}${WEZTERM_PATH_EXPORT}
     expandPath = (value) => {
       if (value.startsWith("~/")) {
         const homeDir = process.env.HOME ?? "";
-        return homeDir ? import_node_path24.default.join(homeDir, value.slice(2)) : value;
+        return homeDir ? import_node_path25.default.join(homeDir, value.slice(2)) : value;
       }
       return value;
     };
@@ -31517,8 +31823,8 @@ ${content ? "\n" : ""}${WEZTERM_PATH_EXPORT}
         throw new Error("HOME is not set; pass --path to wezterm setup.");
       }
       const candidates = [
-        import_node_path24.default.join(homeDir, ".wezterm.lua"),
-        import_node_path24.default.join(homeDir, ".config", "wezterm", "wezterm.lua")
+        import_node_path25.default.join(homeDir, ".wezterm.lua"),
+        import_node_path25.default.join(homeDir, ".config", "wezterm", "wezterm.lua")
       ];
       for (const candidate of candidates) {
         try {
@@ -31539,7 +31845,7 @@ ${content ? "\n" : ""}${WEZTERM_PATH_EXPORT}
     resolveDvbCommand = async () => {
       const scriptPath = process.argv[1];
       if (scriptPath) {
-        const candidate = import_node_path24.default.isAbsolute(scriptPath) ? scriptPath : import_node_path24.default.resolve(process.cwd(), scriptPath);
+        const candidate = import_node_path25.default.isAbsolute(scriptPath) ? scriptPath : import_node_path25.default.resolve(process.cwd(), scriptPath);
         try {
           await import_promises31.default.access(candidate);
           return [process.execPath, candidate];
@@ -31679,7 +31985,7 @@ ${block}`;
         }
       }
       if (updated) {
-        await import_promises31.default.mkdir(import_node_path24.default.dirname(configPath), { recursive: true });
+        await import_promises31.default.mkdir(import_node_path25.default.dirname(configPath), { recursive: true });
         await import_promises31.default.writeFile(configPath, nextContent, "utf8");
         console.log(`Updated WezTerm config: ${configPath}`);
       } else {
@@ -31780,10 +32086,12 @@ var init_cli = __esm({
     init_sessions2();
     init_services();
     init_setup();
+    init_version();
     init_wezterm();
     init_completions();
     printUsage = () => {
       console.log("Usage:");
+      console.log("  dvb --version");
       console.log("  dvb setup [--token <token>] [--org <slug>]");
       console.log("              [--api-base-url <url>] [--no-verify] [--json]");
       console.log("  dvb logout [--json]");
@@ -31836,6 +32144,7 @@ var init_cli = __esm({
       console.log(
         "  dvb wezterm [<box>] [--port <port>] [--domain <name>] [--path <path>]"
       );
+      console.log("  dvb version [--json]");
     };
     main2 = async () => {
       const args = process.argv.slice(2);
@@ -31843,9 +32152,25 @@ var init_cli = __esm({
         printUsage();
         return;
       }
+      if (args[0] === "--version") {
+        await runVersion([]);
+        return;
+      }
       if (args[0] !== "complete" && args[0] !== "completions") {
         await maybeAutoUpdateCompletions();
       }
+      if (args[0] === "version") {
+        try {
+          await runVersion(args.slice(1));
+        } catch (error) {
+          if (error instanceof Error && error.message === "help_requested") {
+            printUsage();
+            return;
+          }
+          throw error;
+        }
+        return;
+      }
       if (args[0] === "setup") {
         await runSetup(args.slice(1));
         return;
@@ -31929,9 +32254,9 @@ var init_cli = __esm({
 });
 
 // src/bin/dvb.ts
-var import_node_fs4 = __toESM(require("node:fs"), 1);
+var import_node_fs7 = __toESM(require("node:fs"), 1);
 var import_node_os11 = __toESM(require("node:os"), 1);
-var import_node_path25 = __toESM(require("node:path"), 1);
+var import_node_path26 = __toESM(require("node:path"), 1);
 init_src();
 var MIN_NODE_MAJOR = 24;
 var assertNodeVersion = () => {
@@ -31986,10 +32311,10 @@ run().catch((error) => {
     const homeDir = import_node_os11.default.homedir();
     if (homeDir) {
       try {
-        const logDir = import_node_path25.default.join(resolveDevboxDir(homeDir), "wezterm");
-        import_node_fs4.default.mkdirSync(logDir, { recursive: true });
-        import_node_fs4.default.appendFileSync(
-          import_node_path25.default.join(logDir, "proxy.log"),
+        const logDir = import_node_path26.default.join(resolveDevboxDir(homeDir), "wezterm");
+        import_node_fs7.default.mkdirSync(logDir, { recursive: true });
+        import_node_fs7.default.appendFileSync(
+          import_node_path26.default.join(logDir, "proxy.log"),
           `${(/* @__PURE__ */ new Date()).toISOString()} ${message}
 `
         );