@boxes-dev/dvb 0.2.45 → 0.2.47

package/dist/bin/dvb.cjs

@@ -423,7 +423,7 @@ var init_repo = __esm({
 });
 
 // ../core/src/sprites.ts
-var import_node_crypto, import_node_util, import_ws, SpritesApiError, logger, USE_INTERNAL_SERVICE_API, INTERNAL_SERVICE_SIGNAL_TIMEOUT_SECONDS, toWebSocketErrorInfo, toWsUrl, shellQuote, requestJson, listSprites, requestNdjson, writeFile, normalizeServiceRecord, readFile, openExecSocket, attachExecSocket, openProxySocket, listExecSessions, listServices, internalServicesRequest, createCheckpointInternal, listServicesInternal, getServiceInternal, createServiceInternal, startServiceInternal, stopServiceInternal, execCommand, createSpritesClient;
+var import_node_crypto, import_node_util, import_ws, SpritesApiError, logger, USE_INTERNAL_SERVICE_API, INTERNAL_SERVICE_SIGNAL_TIMEOUT_SECONDS, toWebSocketErrorInfo, toWsUrl, shellQuote, DEFAULT_SPRITES_HTTP_TIMEOUT_MS_IDEMPOTENT, DEFAULT_SPRITES_HTTP_TIMEOUT_MS_NON_IDEMPOTENT, DEFAULT_SPRITES_HTTP_MAX_ATTEMPTS, SPRITES_HTTP_RETRYABLE_STATUSES, delay, isIdempotentMethod, computeRetryDelayMs, isAbortError, getErrorCode, isRetryableFetchError, shouldRetrySpritesRequest, withSpritesRetry, requestJson, listSprites, requestNdjson, writeFile, normalizeServiceRecord, readFile, openExecSocket, attachExecSocket, openProxySocket, listExecSessions, listServices, internalServicesRequest, createCheckpointInternal, listServicesInternal, getServiceInternal, createServiceInternal, startServiceInternal, stopServiceInternal, execCommand, createSpritesClient;
 var init_sprites = __esm({
   "../core/src/sprites.ts"() {
     "use strict";
@@ -491,39 +491,126 @@ var init_sprites = __esm({
       return new URL(path26, `${protocol}//${base.host}`);
     };
     shellQuote = (value) => `'${value.replace(/'/g, `'\\''`)}'`;
-    requestJson = async (apiBaseUrl, token, method, path26, body) => {
-      const requestId = (0, import_node_crypto.randomUUID)();
-      const url = new URL(path26, apiBaseUrl);
-      const headers = {
-        authorization: `Bearer ${token}`,
-        "x-request-id": requestId
-      };
-      if (body) {
-        headers["content-type"] = "application/json";
-      }
-      const init = { method, headers };
-      if (body) {
-        init.body = JSON.stringify(body);
+    DEFAULT_SPRITES_HTTP_TIMEOUT_MS_IDEMPOTENT = 5e3;
+    DEFAULT_SPRITES_HTTP_TIMEOUT_MS_NON_IDEMPOTENT = 2e4;
+    DEFAULT_SPRITES_HTTP_MAX_ATTEMPTS = 5;
+    SPRITES_HTTP_RETRYABLE_STATUSES = /* @__PURE__ */ new Set([408, 409, 425, 429, 500, 502, 503, 504]);
+    delay = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    isIdempotentMethod = (method) => {
+      const normalized = method.toUpperCase();
+      return normalized === "GET" || normalized === "HEAD" || normalized === "PUT" || normalized === "DELETE" || normalized === "OPTIONS";
+    };
+    computeRetryDelayMs = (attempt) => {
+      const base = 250;
+      const cap = 2500;
+      const exp = Math.min(cap, base * 2 ** Math.max(0, attempt - 1));
+      const jitter = Math.floor(Math.random() * 120);
+      return exp + jitter;
+    };
+    isAbortError = (error) => error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted"));
+    getErrorCode = (error) => {
+      if (!error || typeof error !== "object") return void 0;
+      const record = error;
+      const code2 = record.code;
+      return typeof code2 === "string" || typeof code2 === "number" ? String(code2) : void 0;
+    };
+    isRetryableFetchError = (error) => {
+      if (isAbortError(error)) return true;
+      if (error instanceof TypeError) return true;
+      const code2 = getErrorCode(error);
+      return code2 === "ECONNRESET" || code2 === "ETIMEDOUT" || code2 === "EAI_AGAIN" || code2 === "ENOTFOUND" || code2 === "ECONNREFUSED";
+    };
+    shouldRetrySpritesRequest = (method, error) => {
+      if (!isIdempotentMethod(method)) return false;
+      if (error instanceof SpritesApiError) {
+        return SPRITES_HTTP_RETRYABLE_STATUSES.has(error.status);
+      }
+      return isRetryableFetchError(error);
+    };
+    withSpritesRetry = async (options) => {
+      const opId = (0, import_node_crypto.randomUUID)();
+      const timeoutMs = options.timeoutMs ?? (isIdempotentMethod(options.method) ? DEFAULT_SPRITES_HTTP_TIMEOUT_MS_IDEMPOTENT : DEFAULT_SPRITES_HTTP_TIMEOUT_MS_NON_IDEMPOTENT);
+      const maxAttemptsRaw = options.maxAttempts ?? DEFAULT_SPRITES_HTTP_MAX_ATTEMPTS;
+      const maxAttempts = isIdempotentMethod(options.method) ? Math.max(1, maxAttemptsRaw) : 1;
+      for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        const requestId = (0, import_node_crypto.randomUUID)();
+        const controller = new AbortController();
+        const timeoutHandle = typeof timeoutMs === "number" && timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : null;
+        try {
+          logger.info("sprites_request", {
+            opId,
+            attempt,
+            requestId,
+            method: options.method,
+            path: options.path,
+            timeoutMs
+          });
+          return await options.run(controller.signal, requestId);
+        } catch (error) {
+          const retryable = shouldRetrySpritesRequest(options.method, error);
+          const remaining = maxAttempts - attempt;
+          if (!retryable || remaining <= 0) {
+            throw error;
+          }
+          const delayMs = computeRetryDelayMs(attempt);
+          logger.warn("sprites_http_retry", {
+            opId,
+            attempt,
+            requestId,
+            method: options.method,
+            path: options.path,
+            timeoutMs,
+            delayMs,
+            remainingAttempts: remaining,
+            errorName: error instanceof Error ? error.name : void 0,
+            errorMessage: error instanceof Error ? error.message : String(error),
+            errorCode: getErrorCode(error),
+            ...error instanceof SpritesApiError ? { status: error.status } : {}
+          });
+          await delay(delayMs);
+        } finally {
+          if (timeoutHandle) clearTimeout(timeoutHandle);
+        }
       }
-      logger.info("sprites_request", { requestId, method, path: path26 });
-      const response = await fetch(url, init);
-      const text = await response.text();
-      logger.info("sprites_response", {
-        requestId,
+      throw new Error(`Sprites request failed: ${options.method} ${options.path}`);
+    };
+    requestJson = async (apiBaseUrl, token, method, path26, body) => {
+      return await withSpritesRetry({
         method,
         path: path26,
-        status: response.status
+        run: async (signal, requestId) => {
+          const url = new URL(path26, apiBaseUrl);
+          const headers = {
+            authorization: `Bearer ${token}`,
+            "x-request-id": requestId
+          };
+          if (body) {
+            headers["content-type"] = "application/json";
+          }
+          const init = { method, headers, signal };
+          if (body) {
+            init.body = JSON.stringify(body);
+          }
+          const response = await fetch(url, init);
+          const text = await response.text();
+          logger.info("sprites_response", {
+            requestId,
+            method,
+            path: path26,
+            status: response.status
+          });
+          if (!response.ok) {
+            const snippet = text.trim().slice(0, 200);
+            throw new SpritesApiError(response.status, method, path26, snippet);
+          }
+          if (!text) return null;
+          try {
+            return JSON.parse(text);
+          } catch {
+            return text;
+          }
+        }
       });
-      if (!response.ok) {
-        const snippet = text.trim().slice(0, 200);
-        throw new SpritesApiError(response.status, method, path26, snippet);
-      }
-      if (!text) return null;
-      try {
-        return JSON.parse(text);
-      } catch {
-        return text;
-      }
     };
     listSprites = async (apiBaseUrl, token, options) => {
       const params = new URLSearchParams();
@@ -564,88 +651,99 @@ var init_sprites = __esm({
       return response;
     };
     requestNdjson = async (apiBaseUrl, token, method, path26, body) => {
-      const requestId = (0, import_node_crypto.randomUUID)();
-      const url = new URL(path26, apiBaseUrl);
-      const headers = {
-        authorization: `Bearer ${token}`,
-        "x-request-id": requestId
-      };
-      if (body) {
-        headers["content-type"] = "application/json";
-      }
-      const init = { method, headers };
-      if (body) {
-        init.body = JSON.stringify(body);
-      }
-      logger.info("sprites_request", { requestId, method, path: path26 });
-      const response = await fetch(url, init);
-      logger.info("sprites_response", {
-        requestId,
+      return await withSpritesRetry({
         method,
         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, path26, snippet);
-      }
-      const lines = text.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
-      const events = [];
-      for (const line of lines) {
-        try {
-          const parsed = JSON.parse(line);
-          if (Array.isArray(parsed)) {
-            for (const entry of parsed) {
-              if (entry && typeof entry === "object") {
-                events.push(entry);
-              } else {
-                events.push({ value: entry });
+        run: async (signal, requestId) => {
+          const url = new URL(path26, apiBaseUrl);
+          const headers = {
+            authorization: `Bearer ${token}`,
+            "x-request-id": requestId
+          };
+          if (body) {
+            headers["content-type"] = "application/json";
+          }
+          const init = { method, headers, signal };
+          if (body) {
+            init.body = JSON.stringify(body);
+          }
+          const response = await fetch(url, init);
+          logger.info("sprites_response", {
+            requestId,
+            method,
+            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, path26, snippet);
+          }
+          const lines = text.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
+          const events = [];
+          for (const line of lines) {
+            try {
+              const parsed = JSON.parse(line);
+              if (Array.isArray(parsed)) {
+                for (const entry of parsed) {
+                  if (entry && typeof entry === "object") {
+                    events.push(entry);
+                  } else {
+                    events.push({ value: entry });
+                  }
+                }
+                continue;
+              }
+              if (parsed && typeof parsed === "object") {
+                events.push(parsed);
+                continue;
               }
+              events.push({ value: parsed });
+            } catch {
+              events.push({ raw: line });
             }
-            continue;
           }
-          if (parsed && typeof parsed === "object") {
-            events.push(parsed);
-            continue;
-          }
-          events.push({ value: parsed });
-        } catch {
-          events.push({ raw: line });
+          return events;
         }
-      }
-      return events;
+      });
     };
     writeFile = async (apiBaseUrl, token, name, remotePath, data) => {
-      const requestId = (0, import_node_crypto.randomUUID)();
       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: path26,
-        name,
-        remotePath,
-        size: data.length
-      });
-      const response = await fetch(url, {
+      await withSpritesRetry({
         method: "PUT",
-        headers: {
-          authorization: `Bearer ${token}`,
-          "content-type": "application/octet-stream",
-          "x-request-id": requestId
-        },
-        body: data
-      });
-      logger.info("sprites_fs_write_response", {
-        requestId,
         path: path26,
-        status: response.status
+        run: async (signal, requestId) => {
+          logger.info("sprites_fs_write", {
+            requestId,
+            path: path26,
+            name,
+            remotePath,
+            size: data.length
+          });
+          const response = await fetch(url, {
+            method: "PUT",
+            headers: {
+              authorization: `Bearer ${token}`,
+              "content-type": "application/octet-stream",
+              "x-request-id": requestId
+            },
+            body: data,
+            signal
+          });
+          logger.info("sprites_fs_write_response", {
+            requestId,
+            path: path26,
+            status: response.status
+          });
+          if (!response.ok) {
+            const snippet = (await response.text()).trim().slice(0, 200);
+            throw new SpritesApiError(response.status, "PUT", path26, snippet);
+          }
+        }
       });
-      if (!response.ok) {
-        throw new Error(`Sprites FS write failed: ${response.status}`);
-      }
     };
     normalizeServiceRecord = (entry) => {
       const rawName = entry.name;
@@ -676,38 +774,44 @@ var init_sprites = __esm({
       return service;
     };
     readFile = async (apiBaseUrl, token, name, options) => {
-      const requestId = (0, import_node_crypto.randomUUID)();
       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: path26,
-        name,
-        remotePath: options.path,
-        workingDir: options.workingDir
-      });
-      const response = await fetch(url, {
+      return await withSpritesRetry({
         method: "GET",
-        headers: {
-          authorization: `Bearer ${token}`,
-          "x-request-id": requestId
-        }
-      });
-      logger.info("sprites_fs_read_response", {
-        requestId,
         path: path26,
-        status: response.status
+        run: async (signal, requestId) => {
+          logger.info("sprites_fs_read", {
+            requestId,
+            path: path26,
+            name,
+            remotePath: options.path,
+            workingDir: options.workingDir
+          });
+          const response = await fetch(url, {
+            method: "GET",
+            headers: {
+              authorization: `Bearer ${token}`,
+              "x-request-id": requestId
+            },
+            signal
+          });
+          logger.info("sprites_fs_read_response", {
+            requestId,
+            path: path26,
+            status: response.status
+          });
+          if (!response.ok) {
+            const snippet = (await response.text()).trim().slice(0, 200);
+            throw new SpritesApiError(response.status, "GET", path26, snippet);
+          }
+          const buffer = await response.arrayBuffer();
+          return new Uint8Array(buffer);
+        }
       });
-      if (!response.ok) {
-        const snippet = (await response.text()).trim().slice(0, 200);
-        throw new SpritesApiError(response.status, "GET", path26, snippet);
-      }
-      const buffer = await response.arrayBuffer();
-      return new Uint8Array(buffer);
     };
     openExecSocket = (apiBaseUrl, token, name, options) => {
       const url = toWsUrl(apiBaseUrl, `/v1/sprites/${name}/exec`);
@@ -4748,27 +4852,27 @@ var init_authentication_manager = __esm({
           );
           return;
         }
-        let delay2 = Math.min(
+        let delay3 = Math.min(
           MAXIMUM_REFRESH_DELAY,
           (tokenValiditySeconds - this.refreshTokenLeewaySeconds) * 1e3
         );
-        if (delay2 <= 0) {
+        if (delay3 <= 0) {
           this.logger.warn(
             `Refetching auth token immediately, configured leeway ${this.refreshTokenLeewaySeconds}s is larger than the token's lifetime ${tokenValiditySeconds}s`
           );
-          delay2 = 0;
+          delay3 = 0;
         }
         const refetchTokenTimeoutId = setTimeout(() => {
           this._logVerbose("running scheduled token refetch");
           void this.refetchToken();
-        }, delay2);
+        }, delay3);
         this.setAuthState({
           state: "waitingForScheduledRefetch",
           refetchTokenTimeoutId,
           config: this.authState.config
         });
         this._logVerbose(
-          `scheduled preemptive auth token refetching in ${delay2}ms`
+          `scheduled preemptive auth token refetching in ${delay3}ms`
         );
       }
       // Protects against simultaneous calls to `setConfig`
@@ -19763,8 +19867,8 @@ var init_connect = __esm({
           pendingPortLogs.set(event.port, token2);
           const delays = [30, 60, 120, 200];
           void (async () => {
-            for (const delay2 of delays) {
-              await new Promise((resolve) => setTimeout(resolve, delay2));
+            for (const delay3 of delays) {
+              await new Promise((resolve) => setTimeout(resolve, delay3));
               if (pendingPortLogs.get(event.port) !== token2) {
                 return;
               }
@@ -22339,7 +22443,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, 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 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, logger8, truncateTail, shellQuote3, expandHome2, execWithLog, 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";
@@ -22358,7 +22462,6 @@ var init_remote = __esm({
     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;
@@ -22406,8 +22509,6 @@ var init_remote = __esm({
       });
       return result;
     };
-    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", {
@@ -22439,28 +22540,13 @@ var init_remote = __esm({
         "  sudo -n chown -R sprite:sprite /home/sprite/.devbox || true",
         "fi"
       ].join("\n");
-      let permsResult = await execWithLog(
+      const permsResult = await execWithLog(
         client,
         canonical,
         permissionsScript,
         "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(
@@ -23943,17 +24029,26 @@ var init_template = __esm({
 });
 
 // src/devbox/commands/init/codex/prompts.ts
-var import_promises23, import_node_path17, resolvePromptsDir, readPromptTemplate, loadPrompt, loadLocalEnvSecretsScanPrompt, loadLocalExternalScanPrompt, loadLocalExtraArtifactsScanPrompt, loadLocalServicesScanPrompt;
+var import_node_fs5, import_promises23, import_node_path17, resolvePromptsDir, readPromptTemplate, loadPrompt, loadLocalEnvSecretsScanPrompt, loadLocalExternalScanPrompt, loadLocalExtraArtifactsScanPrompt, loadLocalServicesScanPrompt;
 var init_prompts = __esm({
   "src/devbox/commands/init/codex/prompts.ts"() {
     "use strict";
+    import_node_fs5 = __toESM(require("node:fs"), 1);
     import_promises23 = __toESM(require("node:fs/promises"), 1);
     import_node_path17 = __toESM(require("node:path"), 1);
     init_template();
     resolvePromptsDir = () => {
-      const binPath = process.argv[1];
-      if (binPath) {
-        return import_node_path17.default.resolve(import_node_path17.default.dirname(binPath), "..", "prompts");
+      const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
+      if (argv1) {
+        try {
+          const real = import_node_fs5.default.realpathSync(argv1);
+          return import_node_path17.default.resolve(import_node_path17.default.dirname(real), "..", "prompts");
+        } catch {
+        }
+        try {
+          return import_node_path17.default.resolve(import_node_path17.default.dirname(argv1), "..", "prompts");
+        } catch {
+        }
       }
       return import_node_path17.default.resolve(process.cwd(), "prompts");
     };
@@ -24475,18 +24570,18 @@ fi`
 });
 
 // src/devbox/commands/init/codex/plan.ts
-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 import_node_path18, import_node_fs6, 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_node_fs6 = __toESM(require("node:fs"), 1);
     import_promises24 = __toESM(require("node:fs/promises"), 1);
     resolveSchemaPath = (fileName) => {
       const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
       if (argv1) {
         try {
-          const real = import_node_fs5.default.realpathSync(argv1);
+          const real = import_node_fs6.default.realpathSync(argv1);
           return import_node_path18.default.resolve(import_node_path18.default.dirname(real), "..", "codex", fileName);
         } catch {
         }
@@ -24783,12 +24878,12 @@ ${bottom}
 });
 
 // src/devbox/commands/init/codex/local.ts
-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 import_node_child_process9, import_node_fs7, 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_fs6 = require("node:fs");
+    import_node_fs7 = require("node:fs");
     import_promises25 = __toESM(require("node:fs/promises"), 1);
     import_node_path19 = __toESM(require("node:path"), 1);
     init_dist2();
@@ -24807,11 +24902,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_fs6.createWriteStream)(stdoutLogPath, { flags: "a" });
+          stdoutStream = (0, import_node_fs7.createWriteStream)(stdoutLogPath, { flags: "a" });
         }
         if (stderrLogPath) {
           await import_promises25.default.mkdir(import_node_path19.default.dirname(stderrLogPath), { recursive: true });
-          stderrStream = (0, import_node_fs6.createWriteStream)(stderrLogPath, { flags: "a" });
+          stderrStream = (0, import_node_fs7.createWriteStream)(stderrLogPath, { flags: "a" });
         }
       } catch {
         stdoutStream = null;
@@ -26746,7 +26841,7 @@ var init_progress = __esm({
 });
 
 // src/devbox/commands/init/index.ts
-var import_node_path22, import_promises28, import_node_os9, resolveInitStatus, mergeLocalPaths, ensurePrivateDir, migrateLegacyRepoDevboxDir, buildServicesTomlUpdates, extractCheckpointId, writeRemoteServicesToml, enableRemoteServices, throwInitCanceled, promptBeforeOpenBrowser, toPosixPath2, toRepoRelativePath2, isOutsideRepoPath, ensureWorkdirOwnership, ensureGitSafeDirectory, runInit;
+var import_node_path22, import_promises28, import_node_os9, resolveInitStatus, mergeLocalPaths, ensurePrivateDir, DEFAULT_INIT_STEP_RETRIES, INIT_STEP_RETRYABLE_STATUSES, delay2, computeRetryDelayMs2, getErrorCode2, parseExecUnexpectedResponseStatus, isRetryableInitError, retryInitStep, migrateLegacyRepoDevboxDir, buildServicesTomlUpdates, extractCheckpointId, writeRemoteServicesToml, enableRemoteServices, throwInitCanceled, promptBeforeOpenBrowser, toPosixPath2, toRepoRelativePath2, isOutsideRepoPath, ensureWorkdirOwnership, ensureGitSafeDirectory, runInit;
 var init_init = __esm({
   "src/devbox/commands/init/index.ts"() {
     "use strict";
@@ -26791,6 +26886,88 @@ var init_init = __esm({
       } catch {
       }
     };
+    DEFAULT_INIT_STEP_RETRIES = 3;
+    INIT_STEP_RETRYABLE_STATUSES = /* @__PURE__ */ new Set([
+      408,
+      409,
+      425,
+      429,
+      500,
+      502,
+      503,
+      504
+    ]);
+    delay2 = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    computeRetryDelayMs2 = (retryIndex) => {
+      const base = 500;
+      const cap = 5e3;
+      const exp = Math.min(cap, base * 2 ** Math.max(0, retryIndex - 1));
+      const jitter = Math.floor(Math.random() * 150);
+      return exp + jitter;
+    };
+    getErrorCode2 = (error) => {
+      if (!error || typeof error !== "object") return void 0;
+      const record = error;
+      const code2 = record.code;
+      return typeof code2 === "string" || typeof code2 === "number" ? String(code2) : void 0;
+    };
+    parseExecUnexpectedResponseStatus = (error) => {
+      if (!(error instanceof Error)) return null;
+      const match = /Unexpected server response: (\\d{3})/.exec(error.message);
+      if (!match) return null;
+      const status = Number(match[1]);
+      return Number.isFinite(status) ? status : null;
+    };
+    isRetryableInitError = (error) => {
+      if (error instanceof SpritesApiError) {
+        return INIT_STEP_RETRYABLE_STATUSES.has(error.status);
+      }
+      if (error instanceof TypeError) return true;
+      if (error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted"))) {
+        return true;
+      }
+      const execStatus = parseExecUnexpectedResponseStatus(error);
+      if (execStatus !== null) {
+        return INIT_STEP_RETRYABLE_STATUSES.has(execStatus);
+      }
+      const code2 = getErrorCode2(error);
+      return code2 === "ECONNRESET" || code2 === "ETIMEDOUT" || code2 === "EAI_AGAIN" || code2 === "ENOTFOUND" || code2 === "ECONNREFUSED";
+    };
+    retryInitStep = async ({
+      status,
+      title,
+      retries = DEFAULT_INIT_STEP_RETRIES,
+      shouldRetry = isRetryableInitError,
+      fn
+    }) => {
+      let lastError = null;
+      const maxRetries = Math.max(0, Math.floor(retries));
+      const attempts = maxRetries + 1;
+      for (let attempt = 1; attempt <= attempts; attempt += 1) {
+        try {
+          return await fn();
+        } catch (error) {
+          lastError = error;
+          const retryIndex = attempt;
+          if (retryIndex > maxRetries || !shouldRetry(error)) {
+            throw error;
+          }
+          status.stage(`${title} (retry ${retryIndex}/${maxRetries})`);
+          logger7.warn("init_step_retry", {
+            title,
+            retry: retryIndex,
+            retries: maxRetries,
+            errorName: error instanceof Error ? error.name : void 0,
+            errorMessage: error instanceof Error ? error.message : String(error),
+            errorCode: getErrorCode2(error),
+            ...error instanceof SpritesApiError ? { status: error.status } : {},
+            ...parseExecUnexpectedResponseStatus(error) !== null ? { execStatus: parseExecUnexpectedResponseStatus(error) } : {}
+          });
+          await delay2(computeRetryDelayMs2(retryIndex));
+        }
+      }
+      throw lastError instanceof Error ? lastError : new Error(`Init step failed: ${title}`);
+    };
     migrateLegacyRepoDevboxDir = async ({
       repoRoot,
       projectDir
@@ -26965,15 +27142,27 @@ var init_init = __esm({
       client,
       canonical,
       workdir,
-      status,
-      json
+      status
     }) => {
       const checkResult = await client.exec(canonical, [
         "/bin/bash",
         "-lc",
-        `if [ -d ${shellQuote3(workdir)} ]; then stat -c %U ${shellQuote3(workdir)}; fi`
+        [
+          "set -euo pipefail",
+          `dir=${shellQuote3(workdir)}`,
+          'if [ ! -d "$dir" ]; then',
+          '  echo "Missing workdir: $dir" >&2',
+          "  exit 1",
+          "fi",
+          'stat -c %U "$dir"'
+        ].join("\n")
       ]);
-      if (checkResult.exitCode !== 0) return;
+      if (checkResult.exitCode !== 0) {
+        const details = checkResult.stderr || checkResult.stdout || "";
+        throw new Error(
+          details ? `Failed to check workdir ownership: ${details.trim()}` : `Failed to check workdir ownership (exit ${checkResult.exitCode})`
+        );
+      }
       const owner = checkResult.stdout.trim();
       if (!owner || owner === "sprite") return;
       status.stage("Fixing workdir ownership");
@@ -26983,17 +27172,10 @@ var init_init = __esm({
         `sudo -n chown -R sprite:sprite ${shellQuote3(workdir)}`
       ]);
       if (chownResult.exitCode !== 0) {
-        logger7.warn("workdir_chown_failed", {
-          box: canonical,
-          workdir,
-          error: chownResult.stderr || chownResult.stdout
-        });
-        if (!json) {
-          status.stop();
-          console.warn(
-            "Warning: failed to update workdir ownership. Git may refuse to operate until ownership is fixed."
-          );
-        }
+        const details = chownResult.stderr || chownResult.stdout || "";
+        throw new Error(
+          details ? `Failed to update workdir ownership: ${details.trim()}` : `Failed to update workdir ownership (exit ${chownResult.exitCode})`
+        );
       }
     };
     ensureGitSafeDirectory = async ({
@@ -27357,7 +27539,7 @@ var init_init = __esm({
               fingerprint,
               phase: label
             });
-            return { id: null, comment, createdAt };
+            throw new Error("Checkpoint ID missing.");
           }
           const record = { id, comment, createdAt };
           if (initState) {
@@ -27536,13 +27718,17 @@ var init_init = __esm({
           });
           await runInitStep({
             enabled: progressEnabled,
-            title: "Snapshotting filesystem (pre-setup) (optional)",
-            fn: async ({ fail, ok }) => {
+            title: "Snapshotting filesystem (pre-setup)",
+            fn: async ({ status, fail, ok }) => {
               try {
-                const checkpoint = await recordCodexCheckpoint({
-                  client: client2,
-                  canonical: canonical2,
-                  phase: "preCodexSetup"
+                const checkpoint = await retryInitStep({
+                  status,
+                  title: "Snapshotting filesystem (pre-setup)",
+                  fn: async () => await recordCodexCheckpoint({
+                    client: client2,
+                    canonical: canonical2,
+                    phase: "preCodexSetup"
+                  })
                 });
                 if (checkpoint.id) {
                   ok(`Snapshot created: ${checkpoint.id}`);
@@ -27554,12 +27740,8 @@ var init_init = __esm({
                   phase: "pre-codex-setup",
                   error: error instanceof Error ? error.message : String(error)
                 });
-                fail("Snapshotting filesystem (pre-setup) (optional) (failed)");
-                if (!parsed.json) {
-                  console.warn(
-                    "Warning: failed to create pre-setup filesystem snapshot. Continuing without it."
-                  );
-                }
+                fail("Snapshotting filesystem (pre-setup) (failed)");
+                throw error;
               }
             }
           });
@@ -27595,13 +27777,17 @@ var init_init = __esm({
           });
           await runInitStep({
             enabled: progressEnabled,
-            title: "Snapshotting filesystem (post-setup) (optional)",
-            fn: async ({ fail, ok }) => {
+            title: "Snapshotting filesystem (post-setup)",
+            fn: async ({ status, fail, ok }) => {
               try {
-                const checkpoint = await recordCodexCheckpoint({
-                  client: client2,
-                  canonical: canonical2,
-                  phase: "postCodexSetup"
+                const checkpoint = await retryInitStep({
+                  status,
+                  title: "Snapshotting filesystem (post-setup)",
+                  fn: async () => await recordCodexCheckpoint({
+                    client: client2,
+                    canonical: canonical2,
+                    phase: "postCodexSetup"
+                  })
                 });
                 if (checkpoint.id) {
                   ok(`Snapshot created: ${checkpoint.id}`);
@@ -27613,12 +27799,8 @@ var init_init = __esm({
                   phase: "post-codex-setup",
                   error: error instanceof Error ? error.message : String(error)
                 });
-                fail("Snapshotting filesystem (post-setup) (optional) (failed)");
-                if (!parsed.json) {
-                  console.warn(
-                    "Warning: failed to create post-setup filesystem snapshot. Continuing without it."
-                  );
-                }
+                fail("Snapshotting filesystem (post-setup) (failed)");
+                throw error;
               }
             }
           });
@@ -27784,40 +27966,33 @@ var init_init = __esm({
           localPaths: projectLocalPaths
         });
         const updateRegistryProjectStatus = async (initStatus) => {
-          try {
-            await requestJson3(
-              socketInfo.socketPath,
-              "POST",
-              "/registry/upsert",
-              DAEMON_TIMEOUT_MS.registry,
-              {
-                project: buildProjectEntry(initStatus)
-              }
-            );
-          } catch (error) {
-            logger7.warn("registry_project_update_failed", {
-              box: canonical,
-              status: initStatus,
-              error: String(error)
-            });
-          }
+          await requestJson3(
+            socketInfo.socketPath,
+            "POST",
+            "/registry/upsert",
+            DAEMON_TIMEOUT_MS.registry,
+            {
+              project: buildProjectEntry(initStatus)
+            }
+          );
         };
         await runInitStep({
           enabled: progressEnabled,
           title: "Bootstrapping devbox",
-          fn: async ({ fail }) => {
+          fn: async ({ status, fail }) => {
             try {
-              await bootstrapDevbox(client, canonical);
+              await retryInitStep({
+                status,
+                title: "Bootstrapping devbox",
+                fn: async () => await bootstrapDevbox(client, canonical)
+              });
             } catch (error) {
               logger7.warn("devbox_bootstrap_failed", {
                 box: canonical,
                 error: String(error)
               });
               fail("Bootstrapping devbox (failed)");
-              if (!parsed.json) {
-                const message = error instanceof Error && error.message ? error.message : String(error);
-                console.warn(`Warning: devbox bootstrap failed. ${message}`);
-              }
+              throw error;
             }
           }
         });
@@ -27858,7 +28033,7 @@ var init_init = __esm({
           await runInitStep({
             enabled: progressEnabled,
             title: "Installing sprite daemon",
-            fn: async ({ fail }) => {
+            fn: async ({ status, fail }) => {
               try {
                 const convexUrl = getConvexUrl();
                 if (!controlPlaneToken) {
@@ -27880,12 +28055,16 @@ var init_init = __esm({
                 if (!heartbeatToken) {
                   throw new Error("Daemon token unavailable.");
                 }
-                await installSpriteDaemon({
-                  client,
-                  spriteName: canonical,
-                  release,
-                  convexUrl,
-                  heartbeatToken
+                await retryInitStep({
+                  status,
+                  title: "Installing sprite daemon",
+                  fn: async () => await installSpriteDaemon({
+                    client,
+                    spriteName: canonical,
+                    release,
+                    convexUrl,
+                    heartbeatToken
+                  })
                 });
                 await updateInitState({ steps: { daemonInstalled: true } });
               } catch (error) {
@@ -27894,12 +28073,7 @@ var init_init = __esm({
                   error: String(error)
                 });
                 fail("Installing sprite daemon (failed)");
-                if (!parsed.json) {
-                  const message = error instanceof Error && error.message ? error.message : String(error);
-                  console.warn(
-                    `Warning: failed to install sprite daemon. ${message}`
-                  );
-                }
+                throw error;
               }
             }
           });
@@ -27907,9 +28081,13 @@ var init_init = __esm({
         await runInitStep({
           enabled: progressEnabled,
           title: "Ensuring sprite daemon service",
-          fn: async ({ fail }) => {
+          fn: async ({ status, fail }) => {
             try {
-              await ensureSpriteDaemonService({ client, spriteName: canonical });
+              await retryInitStep({
+                status,
+                title: "Ensuring sprite daemon service",
+                fn: async () => await ensureSpriteDaemonService({ client, spriteName: canonical })
+              });
               await updateInitState({ steps: { daemonServiceEnsured: true } });
             } catch (error) {
               logger7.warn("sprite_daemon_service_failed", {
@@ -27917,12 +28095,7 @@ var init_init = __esm({
                 error: String(error)
               });
               fail("Ensuring sprite daemon service (failed)");
-              if (!parsed.json) {
-                const message = error instanceof Error && error.message ? error.message : String(error);
-                console.warn(
-                  `Warning: failed to ensure sprite daemon service. ${message}`
-                );
-              }
+              throw error;
             }
           }
         });
@@ -28792,12 +28965,15 @@ var init_init = __esm({
           enabled: progressEnabled,
           title: "Ensuring workdir ownership",
           fn: async ({ status }) => {
-            await ensureWorkdirOwnership({
-              client,
-              canonical,
-              workdir: expandedWorkdir,
+            await retryInitStep({
               status,
-              json: parsed.json === true
+              title: "Ensuring workdir ownership",
+              fn: async () => await ensureWorkdirOwnership({
+                client,
+                canonical,
+                workdir: expandedWorkdir,
+                status
+              })
             });
           }
         });
@@ -28822,13 +28998,19 @@ var init_init = __esm({
           await runInitStep({
             enabled: progressEnabled,
             title: "Configuring SSH mount access",
-            fn: async ({ fail }) => {
+            fn: async ({ status, fail }) => {
               try {
-                await ensureLocalMountKey();
-                await ensureKnownHostsFile();
-                const publicKey = await readLocalMountPublicKey();
-                await ensureRemoteMountAccess(client, canonical, publicKey);
-                await ensureSshdService(client, canonical);
+                await retryInitStep({
+                  status,
+                  title: "Configuring SSH mount access",
+                  fn: async () => {
+                    await ensureLocalMountKey();
+                    await ensureKnownHostsFile();
+                    const publicKey = await readLocalMountPublicKey();
+                    await ensureRemoteMountAccess(client, canonical, publicKey);
+                    await ensureSshdService(client, canonical);
+                  }
+                });
                 await updateInitState({ steps: { sshdConfigured: true } });
               } catch (error) {
                 logger7.warn("sshd_config_failed", {
@@ -28836,13 +29018,7 @@ var init_init = __esm({
                   error: String(error)
                 });
                 fail("Configuring SSH mount access (failed)");
-                if (!parsed.json) {
-                  const message = error instanceof Error && error.message ? error.message : String(error);
-                  console.warn(
-                    `Warning: failed to configure SSH mount access. ${message}`
-                  );
-                  console.warn(`To retry later: dvb mount ${alias}`);
-                }
+                throw error;
               }
             }
           });
@@ -29000,10 +29176,12 @@ var init_init = __esm({
         }
         const weztermMuxPresent = await runInitStep({
           enabled: progressEnabled,
-          title: "Ensuring WezTerm mux server (optional)",
-          fn: async ({ fail }) => {
-            try {
-              const installResult = !shouldResume || !initState?.steps.weztermMuxInstalled ? await ensureWeztermMuxInstalled({
+          title: "Ensuring WezTerm mux server",
+          fn: async ({ status }) => {
+            const installResult = await retryInitStep({
+              status,
+              title: "Ensuring WezTerm mux server",
+              fn: async () => !shouldResume || !initState?.steps.weztermMuxInstalled ? await ensureWeztermMuxInstalled({
                 client,
                 spriteName: canonical,
                 allowResolveAsset: true
@@ -29012,49 +29190,29 @@ var init_init = __esm({
                 spriteName: canonical,
                 // If the mux is missing on resume, we still need to resolve a GitHub asset.
                 allowResolveAsset: true
-              });
-              if (installResult.muxPresent) {
-                await updateInitState({ steps: { weztermMuxInstalled: true } });
-              }
-              return installResult.muxPresent;
-            } catch (error) {
-              logger7.warn("wezterm_mux_install_failed", {
-                box: canonical,
-                error: error instanceof Error ? error.message : String(error)
-              });
-              fail("Ensuring WezTerm mux server (optional) (failed)");
-              if (!parsed.json) {
-                const message = error instanceof Error && error.message ? error.message : String(error);
-                console.warn(
-                  `Warning: failed to install WezTerm mux server (optional). ${message}
-Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
-                );
-              }
-              return false;
+              })
+            });
+            if (installResult.muxPresent) {
+              await updateInitState({ steps: { weztermMuxInstalled: true } });
+              return true;
             }
+            throw new Error("WezTerm mux server unavailable.");
           }
         });
-        if (weztermMuxPresent && (!shouldResume || !initState?.steps.weztermMuxServiceEnsured)) {
+        if (!shouldResume || !initState?.steps.weztermMuxServiceEnsured) {
           await runInitStep({
             enabled: progressEnabled,
-            title: "Ensuring WezTerm mux service (optional)",
-            fn: async ({ fail }) => {
-              try {
-                await ensureWeztermMuxService({ client, spriteName: canonical });
-                await updateInitState({ steps: { weztermMuxServiceEnsured: true } });
-              } catch (error) {
-                logger7.warn("wezterm_mux_service_failed", {
-                  box: canonical,
-                  error: error instanceof Error ? error.message : String(error)
-                });
-                fail("Ensuring WezTerm mux service (optional) (failed)");
-                if (!parsed.json) {
-                  const message = error instanceof Error && error.message ? error.message : String(error);
-                  console.warn(
-                    `Warning: failed to ensure WezTerm mux service (optional). ${message}`
-                  );
-                }
+            title: "Ensuring WezTerm mux service",
+            fn: async ({ status }) => {
+              if (!weztermMuxPresent) {
+                throw new Error("WezTerm mux server unavailable.");
               }
+              await retryInitStep({
+                status,
+                title: "Ensuring WezTerm mux service",
+                fn: async () => await ensureWeztermMuxService({ client, spriteName: canonical })
+              });
+              await updateInitState({ steps: { weztermMuxServiceEnsured: true } });
             }
           });
         }
@@ -29121,21 +29279,13 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
         });
         await runInitStep({
           enabled: progressEnabled,
-          title: "Updating Codex config on sprite (optional)",
-          fn: async ({ fail }) => {
-            try {
-              await writeRemoteCodexConfig(client, canonical, repoName);
-            } catch (error) {
-              logger7.warn("codex_config_update_failed", {
-                error: String(error)
-              });
-              fail("Updating Codex config on sprite (optional) (failed)");
-              if (!parsed.json) {
-                console.warn(
-                  "Warning: failed to update /home/sprite/.codex/config.toml for full-access sandbox settings."
-                );
-              }
-            }
+          title: "Updating Codex config on sprite",
+          fn: async ({ status }) => {
+            await retryInitStep({
+              status,
+              title: "Updating Codex config on sprite",
+              fn: async () => await writeRemoteCodexConfig(client, canonical, repoName)
+            });
           }
         });
         const skipSetupArtifactsStage = skipCodexApply || shouldResume && initState?.steps.setupArtifactsStaged;
@@ -29159,13 +29309,17 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
         if (!skipCodexApply) {
           await runInitStep({
             enabled: progressEnabled,
-            title: "Snapshotting filesystem (pre-setup) (optional)",
-            fn: async ({ fail, ok }) => {
+            title: "Snapshotting filesystem (pre-setup)",
+            fn: async ({ status, fail, ok }) => {
               try {
-                const checkpoint = await recordCodexCheckpoint({
-                  client,
-                  canonical,
-                  phase: "preCodexSetup"
+                const checkpoint = await retryInitStep({
+                  status,
+                  title: "Snapshotting filesystem (pre-setup)",
+                  fn: async () => await recordCodexCheckpoint({
+                    client,
+                    canonical,
+                    phase: "preCodexSetup"
+                  })
                 });
                 if (checkpoint.id) {
                   ok(`Snapshot created: ${checkpoint.id}`);
@@ -29177,12 +29331,8 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
                   phase: "pre-codex-setup",
                   error: error instanceof Error ? error.message : String(error)
                 });
-                fail("Snapshotting filesystem (pre-setup) (optional) (failed)");
-                if (!parsed.json) {
-                  console.warn(
-                    "Warning: failed to create pre-setup filesystem snapshot. Continuing without it."
-                  );
-                }
+                fail("Snapshotting filesystem (pre-setup) (failed)");
+                throw error;
               }
             }
           });
@@ -29225,13 +29375,17 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
           );
           await runInitStep({
             enabled: progressEnabled,
-            title: "Snapshotting filesystem (post-setup) (optional)",
-            fn: async ({ fail, ok }) => {
+            title: "Snapshotting filesystem (post-setup)",
+            fn: async ({ status, fail, ok }) => {
               try {
-                const checkpoint = await recordCodexCheckpoint({
-                  client,
-                  canonical,
-                  phase: "postCodexSetup"
+                const checkpoint = await retryInitStep({
+                  status,
+                  title: "Snapshotting filesystem (post-setup)",
+                  fn: async () => await recordCodexCheckpoint({
+                    client,
+                    canonical,
+                    phase: "postCodexSetup"
+                  })
                 });
                 if (checkpoint.id) {
                   ok(`Snapshot created: ${checkpoint.id}`);
@@ -29243,12 +29397,8 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
                   phase: "post-codex-setup",
                   error: error instanceof Error ? error.message : String(error)
                 });
-                fail("Snapshotting filesystem (post-setup) (optional) (failed)");
-                if (!parsed.json) {
-                  console.warn(
-                    "Warning: failed to create post-setup filesystem snapshot. Continuing without it."
-                  );
-                }
+                fail("Snapshotting filesystem (post-setup) (failed)");
+                throw error;
               }
             }
           });
@@ -32254,7 +32404,7 @@ var init_cli = __esm({
 });
 
 // src/bin/dvb.ts
-var import_node_fs7 = __toESM(require("node:fs"), 1);
+var import_node_fs8 = __toESM(require("node:fs"), 1);
 var import_node_os11 = __toESM(require("node:os"), 1);
 var import_node_path26 = __toESM(require("node:path"), 1);
 init_src();
@@ -32312,8 +32462,8 @@ run().catch((error) => {
     if (homeDir) {
       try {
         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_fs8.default.mkdirSync(logDir, { recursive: true });
+        import_node_fs8.default.appendFileSync(
           import_node_path26.default.join(logDir, "proxy.log"),
           `${(/* @__PURE__ */ new Date()).toISOString()} ${message}
 `