@boxes-dev/dvb 0.2.46 → 0.2.48

package/dist/bin/dvb.cjs

@@ -22443,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, delay2, 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";
@@ -22462,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;
@@ -22510,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 ");
-    delay2 = 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", {
@@ -22543,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 delay2(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(
@@ -26859,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";
@@ -26904,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
@@ -27078,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");
@@ -27096,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 ({
@@ -27470,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) {
@@ -27649,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}`);
@@ -27667,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;
               }
             }
           });
@@ -27708,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}`);
@@ -27726,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;
               }
             }
           });
@@ -27897,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;
             }
           }
         });
@@ -27971,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) {
@@ -27993,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) {
@@ -28007,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;
               }
             }
           });
@@ -28020,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", {
@@ -28030,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;
             }
           }
         });
@@ -28905,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
+              })
             });
           }
         });
@@ -28935,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", {
@@ -28949,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;
               }
             }
           });
@@ -29113,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
@@ -29125,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 } });
             }
           });
         }
@@ -29234,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;
@@ -29272,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}`);
@@ -29290,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;
               }
             }
           });
@@ -29338,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}`);
@@ -29356,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;
               }
             }
           });