@boxes-dev/dvb-runtime 1.0.186 → 1.0.188

package/dist/bin/dvb.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 "use strict";
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="dab189dc-59c8-54af-b40c-b5ea0eb33006")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="a0a101a2-0ead-5d3d-8af3-ec4f67fbac2d")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88688,8 +88688,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.186";
-      const rawGitSha = "f12e4dee5a3533b641109fa484a2599f48441723";
+      const rawPackageVersion = "1.0.188";
+      const rawGitSha = "184142c7c842dd6273dcfc369fbe788ce96777cc";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120881,9 +120881,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.186";
-      const rawGitSha = "f12e4dee5a3533b641109fa484a2599f48441723";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.186+f12e4dee5a3533b641109fa484a2599f48441723";
+      const rawPackageVersion = "1.0.188";
+      const rawGitSha = "184142c7c842dd6273dcfc369fbe788ce96777cc";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.188+184142c7c842dd6273dcfc369fbe788ce96777cc";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -124880,7 +124880,7 @@ var init_packageVersion = __esm({
       return import_node_path8.default.join(process.cwd(), "dvb");
     };
     readEmbeddedPackageVersion = () => {
-      const raw = "1.0.186";
+      const raw = "1.0.188";
       return trimVersion(raw);
     };
     readNearestPackageMetadata = (basePath) => {
@@ -215305,7 +215305,7 @@ var init_prompts = __esm({
 });
 
 // src/devbox/commands/init/codex/events.ts
-var stripAnsi2, extractBoldText, normalizeProgressMessage, toRecord, extractProgressFromJsonLine, extractThreadIdFromJsonLine;
+var stripAnsi2, extractBoldText, normalizeProgressMessage, toRecord, extractTodoListProgress, extractProgressFromJsonLine, extractThreadIdFromJsonLine;
 var init_events = __esm({
   "src/devbox/commands/init/codex/events.ts"() {
     "use strict";
@@ -215326,6 +215326,18 @@ var init_events = __esm({
       return normalized;
     };
     toRecord = (value) => typeof value === "object" && value !== null ? value : null;
+    extractTodoListProgress = (item) => {
+      if (item.type !== "todo_list" || !Array.isArray(item.items)) return null;
+      const entries = item.items.map((entry) => toRecord(entry)).filter((entry) => entry !== null);
+      if (entries.length === 0) return null;
+      const completedCount = entries.filter(
+        (entry) => entry.completed === true
+      ).length;
+      const pending = entries.find((entry) => entry.completed !== true) ?? entries.at(-1) ?? null;
+      const pendingText = pending && typeof pending.text === "string" ? pending.text : null;
+      const summary = pendingText ? `${completedCount}/${entries.length} ${pendingText}` : `${completedCount}/${entries.length} todo items`;
+      return normalizeProgressMessage(summary);
+    };
     extractProgressFromJsonLine = (line) => {
       const trimmed = line.trim();
       if (!trimmed.startsWith("{")) return null;
@@ -215337,13 +215349,23 @@ var init_events = __esm({
       }
       const record = toRecord(parsed);
       if (!record) return null;
+      if (record.type === "error" && typeof record.message === "string") {
+        return normalizeProgressMessage(record.message);
+      }
       if (record.type === "reasoning") {
         return normalizeProgressMessage(
           extractBoldText(String(record.text ?? "")) ?? String(record.text ?? "")
         );
       }
       const item = toRecord(record.item);
-      if (!item || item.type !== "reasoning") return null;
+      if (!item) return null;
+      if (item.type === "reasoning") {
+        return normalizeProgressMessage(
+          extractBoldText(String(item.text ?? "")) ?? String(item.text ?? "")
+        );
+      }
+      const todoProgress = extractTodoListProgress(item);
+      if (todoProgress) return todoProgress;
       return normalizeProgressMessage(
         extractBoldText(String(item.text ?? "")) ?? String(item.text ?? "")
       );
@@ -216324,6 +216346,75 @@ var init_retry = __esm({
   }
 });
 
+// src/devbox/commands/init/codex/localExecArgs.ts
+var buildCodexExecAttemptArgs, buildLocalStructuredOutputExecArgs;
+var init_localExecArgs = __esm({
+  "src/devbox/commands/init/codex/localExecArgs.ts"() {
+    "use strict";
+    buildCodexExecAttemptArgs = ({
+      initialArgs,
+      resumeExecArgs,
+      resumeSubcommandArgs,
+      prompt,
+      resumeThreadId
+    }) => resumeThreadId ? [
+      ...resumeExecArgs,
+      "resume",
+      ...resumeSubcommandArgs,
+      resumeThreadId,
+      prompt
+    ] : [...initialArgs, prompt];
+    buildLocalStructuredOutputExecArgs = ({
+      schemaPath,
+      outputPath
+    }) => ({
+      initialArgs: [
+        "--json",
+        "--sandbox",
+        "workspace-write",
+        "--output-schema",
+        schemaPath,
+        "-o",
+        outputPath
+      ],
+      resumeExecArgs: [
+        "--sandbox",
+        "workspace-write",
+        "--output-schema",
+        schemaPath
+      ],
+      resumeSubcommandArgs: ["--json", "-o", outputPath]
+    });
+  }
+});
+
+// src/devbox/commands/init/codex/scanStatus.ts
+var toRecord2, summarizeIncompleteScanResult, formatRetryReason;
+var init_scanStatus = __esm({
+  "src/devbox/commands/init/codex/scanStatus.ts"() {
+    "use strict";
+    toRecord2 = (value) => typeof value === "object" && value !== null ? value : null;
+    summarizeIncompleteScanResult = (value) => {
+      const record = toRecord2(value);
+      if (!record) return null;
+      const parts = [];
+      if (typeof record.scanFullyCompleted === "boolean") {
+        parts.push(`scanFullyCompleted=${String(record.scanFullyCompleted)}`);
+      }
+      for (const [key, entry] of Object.entries(record)) {
+        if (!Array.isArray(entry)) continue;
+        parts.push(`${key}=${entry.length}`);
+      }
+      return parts.length > 0 ? parts.join(", ") : null;
+    };
+    formatRetryReason = (reason) => {
+      const trimmed = reason.replace(/^Codex scan failed:\s*/i, "").trim();
+      if (trimmed.length <= 120) return trimmed;
+      return `${trimmed.slice(0, 117)}...`;
+    };
+  }
+});
+
 // src/devbox/commands/init/clack.ts
 var import_node_util4, apply, wrapLine, DEFAULT_MULTISELECT_HELP, multiselectWithHelp;
 var init_clack = __esm({
@@ -216467,7 +216558,7 @@ ${bottom}
 });
 
 // src/devbox/commands/init/codex/local.ts
-var import_node_child_process12, import_node_fs10, import_promises25, import_node_os15, import_node_path29, isRelayUsageLimitExceeded, isRelayForbidden, isRelayMissingOpenAiProxyConfiguration, CODEX_REQUEST_URL_REGEX, extractRequestUrl, isStreamDisconnected, isLoopbackRelayUrl, buildRetryPrompt, parseCodexExecArgs, buildCodexExecArgs, formatCodexRetryProgress, runCodexExec, runLocalSetupEnvSecretsScan, runLocalSetupExternalScan, runLocalSetupExtraArtifactsScan, runLocalServicesScan, toPosixPath, toRepoRelativePath, countSecretVars, buildEnvFileHint, buildExternalDependencyLabel, promptForPlanApproval, promptForServicesApproval;
+var import_node_child_process12, import_node_fs10, import_promises25, import_node_os15, import_node_path29, isRelayUsageLimitExceeded, isRelayForbidden, isRelayMissingOpenAiProxyConfiguration, CODEX_REQUEST_URL_REGEX, extractRequestUrl, isStreamDisconnected, isLoopbackRelayUrl, buildRetryPrompt, formatCodexRetryProgress, 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";
@@ -216482,6 +216573,8 @@ var init_local = __esm({
     init_execConfig();
     init_events();
     init_retry();
+    init_localExecArgs();
+    init_scanStatus();
     init_clack();
     isRelayUsageLimitExceeded = (value) => /usage limit exceeded/i.test(value) && /(?:relay\.boxes\.dev\/v1\/responses|\/v1\/responses)/i.test(value);
     isRelayForbidden = (value) => /(unexpected status 403 Forbidden|403 Forbidden: forbidden)/i.test(value) && /\/v1\/responses/i.test(value);
@@ -216509,52 +216602,19 @@ var init_local = __esm({
       "",
       "Re-run the scan and return corrected JSON."
     ].filter((line) => line.length > 0).join("\n") : basePrompt;
-    parseCodexExecArgs = (args) => {
-      if (args.length === 0) {
-        throw new Error("Missing Codex exec prompt.");
-      }
-      if (args[0] === "resume") {
-        if (args.length < 4) {
-          throw new Error("Invalid Codex resume exec arguments.");
-        }
-        const prompt2 = args.at(-1);
-        const resumeThreadId = args.at(-2);
-        if (!prompt2 || !resumeThreadId) {
-          throw new Error("Invalid Codex resume exec arguments.");
-        }
-        return {
-          sharedArgs: args.slice(1, -2),
-          prompt: prompt2,
-          resumeThreadId
-        };
-      }
-      const prompt = args.at(-1);
-      if (!prompt) {
-        throw new Error("Missing Codex exec prompt.");
-      }
-      return {
-        sharedArgs: args.slice(0, -1),
-        prompt,
-        resumeThreadId: null
-      };
-    };
-    buildCodexExecArgs = ({
-      sharedArgs,
-      prompt,
-      resumeThreadId
-    }) => resumeThreadId ? [...sharedArgs, "resume", resumeThreadId, prompt] : [...sharedArgs, prompt];
     formatCodexRetryProgress = ({
       attempt,
       maxAttempts,
       delayMs,
-      sessionId
+      sessionId,
+      reason
     }) => {
       const nextAttempt = attempt + 1;
       const delaySeconds = Math.max(1, Math.ceil(delayMs / 1e3));
       const mode = sessionId ? "continuing existing session" : "starting a fresh session";
-      return `retry ${nextAttempt}/${maxAttempts} in ${delaySeconds}s (${mode})`;
+      return `retry ${nextAttempt}/${maxAttempts} in ${delaySeconds}s (${mode}): ${formatRetryReason(reason)}`;
     };
-    runCodexExec = async (cwd, args, onProgress, logOptions = {}) => {
+    runCodexExec = async (cwd, commandArgs, onProgress, logOptions = {}) => {
       const {
         stdoutLogPath,
         stderrLogPath,
@@ -216616,9 +216676,8 @@ var init_local = __esm({
         await new Promise((resolve2) => stream.end(() => resolve2()));
       };
       try {
-        const baseArgs = parseCodexExecArgs(args);
-        let resumeThreadId = baseArgs.resumeThreadId;
-        let prompt = baseArgs.prompt;
+        let resumeThreadId = commandArgs.resumeThreadId;
+        let prompt = commandArgs.prompt;
         const runAttempt = async (attemptArgs, attemptResumeThreadId) => await new Promise((resolve2, reject) => {
           const child = (0, import_node_child_process12.spawn)(
             "codex",
@@ -216762,8 +216821,8 @@ ${stdout}`;
           });
         });
         for (let attempt = 1; attempt <= DEFAULT_CODEX_EXEC_MAX_ATTEMPTS; attempt += 1) {
-          const attemptArgs = buildCodexExecArgs({
-            sharedArgs: baseArgs.sharedArgs,
+          const attemptArgs = buildCodexExecAttemptArgs({
+            ...commandArgs,
             prompt,
             resumeThreadId
           });
@@ -216779,10 +216838,11 @@ ${stdout}`;
               attempt,
               maxAttempts: DEFAULT_CODEX_EXEC_MAX_ATTEMPTS,
               delayMs,
-              sessionId: resumeThreadId
+              sessionId: resumeThreadId,
+              reason: error2.message
             });
             await delay2(delayMs);
-            prompt = resumeThreadId ? "continue" : baseArgs.prompt;
+            prompt = resumeThreadId ? "continue" : commandArgs.prompt;
           }
         }
         throw new Error("Codex exec failed after retries.");
@@ -216843,27 +216903,26 @@ ${stdout}`;
         "utf8"
       );
       const prompt = buildRetryPrompt(localScanPrompt, retryFeedback);
-      const sharedArgs = [
-        "--json",
-        "--sandbox",
-        "workspace-write",
-        "--output-schema",
-        schemaPath,
-        "-o",
-        outputPath
-      ];
-      const args = resumeThreadId ? ["resume", ...sharedArgs, resumeThreadId, prompt] : [...sharedArgs, prompt];
-      const result = await runCodexExec(cwd, args, onProgress, {
-        stdoutLogPath,
-        stderrLogPath,
-        ...proxyOptions ? { proxyOptions } : {},
-        trustedPaths: [cwd],
-        ...onProgress ? {
-          onRetry: (info) => {
-            onProgress(formatCodexRetryProgress(info));
-          }
-        } : {}
-      });
+      const result = await runCodexExec(
+        cwd,
+        {
+          ...buildLocalStructuredOutputExecArgs({ schemaPath, outputPath }),
+          prompt,
+          resumeThreadId: resumeThreadId ?? null
+        },
+        onProgress,
+        {
+          stdoutLogPath,
+          stderrLogPath,
+          ...proxyOptions ? { proxyOptions } : {},
+          trustedPaths: [cwd],
+          ...onProgress ? {
+            onRetry: (info) => {
+              onProgress(formatCodexRetryProgress(info));
+            }
+          } : {}
+        }
+      );
       return result.threadId;
     };
     runLocalSetupExternalScan = async ({
@@ -216917,28 +216976,34 @@ ${stdout}`;
         "utf8"
       );
       const prompt = buildRetryPrompt(localScanPrompt, retryFeedback);
-      const sharedArgs = [
-        "--json",
-        "--sandbox",
-        "workspace-write",
-        ...homeDir2 ? ["--add-dir", homeDir2] : [],
-        "--output-schema",
+      const structuredArgs = buildLocalStructuredOutputExecArgs({
         schemaPath,
-        "-o",
         outputPath
-      ];
-      const args = resumeThreadId ? ["resume", ...sharedArgs, resumeThreadId, prompt] : [...sharedArgs, prompt];
-      const result = await runCodexExec(cwd, args, onProgress, {
-        stdoutLogPath,
-        stderrLogPath,
-        ...proxyOptions ? { proxyOptions } : {},
-        trustedPaths: homeDir2 ? [cwd, homeDir2] : [cwd],
-        ...onProgress ? {
-          onRetry: (info) => {
-            onProgress(formatCodexRetryProgress(info));
-          }
-        } : {}
       });
+      if (homeDir2) {
+        structuredArgs.initialArgs.splice(3, 0, "--add-dir", homeDir2);
+        structuredArgs.resumeExecArgs.push("--add-dir", homeDir2);
+      }
+      const result = await runCodexExec(
+        cwd,
+        {
+          ...structuredArgs,
+          prompt,
+          resumeThreadId: resumeThreadId ?? null
+        },
+        onProgress,
+        {
+          stdoutLogPath,
+          stderrLogPath,
+          ...proxyOptions ? { proxyOptions } : {},
+          trustedPaths: homeDir2 ? [cwd, homeDir2] : [cwd],
+          ...onProgress ? {
+            onRetry: (info) => {
+              onProgress(formatCodexRetryProgress(info));
+            }
+          } : {}
+        }
+      );
       return result.threadId;
     };
     runLocalSetupExtraArtifactsScan = async ({
@@ -216991,27 +217056,26 @@ ${stdout}`;
         "utf8"
       );
       const prompt = buildRetryPrompt(localScanPrompt, retryFeedback);
-      const sharedArgs = [
-        "--json",
-        "--sandbox",
-        "workspace-write",
-        "--output-schema",
-        schemaPath,
-        "-o",
-        outputPath
-      ];
-      const args = resumeThreadId ? ["resume", ...sharedArgs, resumeThreadId, prompt] : [...sharedArgs, prompt];
-      const result = await runCodexExec(cwd, args, onProgress, {
-        stdoutLogPath,
-        stderrLogPath,
-        ...proxyOptions ? { proxyOptions } : {},
-        trustedPaths: [cwd],
-        ...onProgress ? {
-          onRetry: (info) => {
-            onProgress(formatCodexRetryProgress(info));
-          }
-        } : {}
-      });
+      const result = await runCodexExec(
+        cwd,
+        {
+          ...buildLocalStructuredOutputExecArgs({ schemaPath, outputPath }),
+          prompt,
+          resumeThreadId: resumeThreadId ?? null
+        },
+        onProgress,
+        {
+          stdoutLogPath,
+          stderrLogPath,
+          ...proxyOptions ? { proxyOptions } : {},
+          trustedPaths: [cwd],
+          ...onProgress ? {
+            onRetry: (info) => {
+              onProgress(formatCodexRetryProgress(info));
+            }
+          } : {}
+        }
+      );
       return result.threadId;
     };
     runLocalServicesScan = async ({
@@ -217065,28 +217129,34 @@ ${stdout}`;
         "utf8"
       );
       const prompt = buildRetryPrompt(servicesScanPrompt, retryFeedback);
-      const sharedArgs = [
-        "--json",
-        "--sandbox",
-        "workspace-write",
-        ...homeDir2 ? ["--add-dir", homeDir2] : [],
-        "--output-schema",
+      const structuredArgs = buildLocalStructuredOutputExecArgs({
         schemaPath,
-        "-o",
         outputPath
-      ];
-      const args = resumeThreadId ? ["resume", ...sharedArgs, resumeThreadId, prompt] : [...sharedArgs, prompt];
-      const result = await runCodexExec(cwd, args, onProgress, {
-        stdoutLogPath,
-        stderrLogPath,
-        ...proxyOptions ? { proxyOptions } : {},
-        trustedPaths: homeDir2 ? [cwd, homeDir2] : [cwd],
-        ...onProgress ? {
-          onRetry: (info) => {
-            onProgress(formatCodexRetryProgress(info));
-          }
-        } : {}
       });
+      if (homeDir2) {
+        structuredArgs.initialArgs.splice(3, 0, "--add-dir", homeDir2);
+        structuredArgs.resumeExecArgs.push("--add-dir", homeDir2);
+      }
+      const result = await runCodexExec(
+        cwd,
+        {
+          ...structuredArgs,
+          prompt,
+          resumeThreadId: resumeThreadId ?? null
+        },
+        onProgress,
+        {
+          stdoutLogPath,
+          stderrLogPath,
+          ...proxyOptions ? { proxyOptions } : {},
+          trustedPaths: homeDir2 ? [cwd, homeDir2] : [cwd],
+          ...onProgress ? {
+            onRetry: (info) => {
+              onProgress(formatCodexRetryProgress(info));
+            }
+          } : {}
+        }
+      );
       return result.threadId;
     };
     toPosixPath = (value) => value.split(import_node_path29.default.sep).join(import_node_path29.default.posix.sep);
@@ -217574,6 +217644,7 @@ var init_codex = __esm({
     init_artifacts();
     init_progress();
     init_retry();
+    init_scanStatus();
     CODEX_REQUEST_URL_REGEX2 = /error sending request for url \(([^)]+)\)/i;
     CODEX_STREAM_DISCONNECT_DETAIL_REGEX = /stream disconnected before completion:\s*([^\n\r]+)/i;
     CODEX_SESSION_ID_REGEX = /session id:\s*([0-9a-f-]{20,})/i;
@@ -217629,12 +217700,13 @@ var init_codex = __esm({
       attempt,
       maxAttempts,
       delayMs,
-      sessionId
+      sessionId,
+      reason
     }) => {
       const nextAttempt = attempt + 1;
       const delaySeconds = Math.max(1, Math.ceil(delayMs / 1e3));
       const mode = sessionId ? "continuing existing session" : "starting a fresh session";
-      return `retry ${nextAttempt}/${maxAttempts} in ${delaySeconds}s (${mode})`;
+      return `retry ${nextAttempt}/${maxAttempts} in ${delaySeconds}s (${mode}): ${formatRetryReason(reason)}`;
     };
     classifyRemoteCodexSetupFailure = ({
       execResult,
@@ -218398,7 +218470,8 @@ codex login`
               attempt,
               maxAttempts: DEFAULT_CODEX_EXEC_MAX_ATTEMPTS,
               delayMs,
-              sessionId: resumeSessionId
+              sessionId: resumeSessionId,
+              reason: failure.error.message
             })}`
           );
           await delay2(delayMs);
@@ -218568,6 +218641,7 @@ var init_setupPlanFlow = __esm({
     import_node_os18 = __toESM(require("node:os"), 1);
     init_dist4();
     init_codex();
+    init_scanStatus();
     init_progress();
     init_setupArtifactsValidation();
     SETUP_ARTIFACT_REGEN_MAX_ATTEMPTS = 3;
@@ -218713,11 +218787,19 @@ var init_setupPlanFlow = __esm({
           try {
             await run2();
             let out = await read2();
-            if (shouldRetry(out)) {
-              update("retrying");
+            const needsImmediateRetry = shouldRetry(out);
+            if (needsImmediateRetry) {
+              const retrySummary = summarizeIncompleteScanResult(out);
+              update(retrySummary ? `retrying - ${retrySummary}` : "retrying");
               await import_promises29.default.rm(outputPath, { force: true });
               await run2();
               out = await read2();
+              if (shouldRetry(out)) {
+                const retrySummary2 = summarizeIncompleteScanResult(out);
+                throw new Error(
+                  retrySummary2 ? `${scanLabel} scan returned incomplete empty results after retry (${retrySummary2}).` : `${scanLabel} scan returned incomplete empty results after retry.`
+                );
+              }
             }
             update("done");
             return out;
@@ -221881,7 +221963,7 @@ var init_resolve = __esm({
 });
 
 // src/devbox/commands/init/provider/modal.ts
-var MODAL_TERMINATION_PROPAGATION_TIMEOUT_MS, MODAL_TERMINATION_PROPAGATION_POLL_INTERVAL_MS, sleep3, resolveModalControlPlaneToken, createModalResumeRestoreError, confirmTerminateExistingModalSandbox, waitForModalSandboxAbsenceAfterTermination, runModalProviderInitPhases;
+var MODAL_TERMINATION_PROPAGATION_TIMEOUT_MS, MODAL_TERMINATION_PROPAGATION_POLL_INTERVAL_MS, sleep3, resolveModalControlPlaneToken, createModalResumeRestoreError, confirmTerminateExistingModalSandbox, provisionModalSandboxAfterTermination, runModalProviderInitPhases;
 var init_modal = __esm({
   "src/devbox/commands/init/provider/modal.ts"() {
     "use strict";
@@ -221936,27 +222018,41 @@ var init_modal = __esm({
       }
       return true;
     };
-    waitForModalSandboxAbsenceAfterTermination = async ({
+    provisionModalSandboxAfterTermination = async ({
       alias,
       modalOperationOptions,
       timeoutMs = MODAL_TERMINATION_PROPAGATION_TIMEOUT_MS,
       pollIntervalMs = MODAL_TERMINATION_PROPAGATION_POLL_INTERVAL_MS
     }) => {
       const deadline = Date.now() + timeoutMs;
+      let lastSeenSandbox = null;
       while (true) {
-        const existing = await findModalSandbox(
+        try {
+          return await provisionModalSandbox(alias, modalOperationOptions);
+        } catch (error2) {
+          if (!isModalAlreadyExistsError(error2)) {
+            throw error2;
+          }
+        }
+        lastSeenSandbox = await findModalSandbox(
           { alias, includeFinished: true },
           modalOperationOptions
         );
-        if (!existing) {
-          return;
-        }
         const remainingMs = deadline - Date.now();
         if (remainingMs <= 0) {
+          if (lastSeenSandbox) {
+            throw new Error(
+              `Timed out waiting for modal sandbox alias "${alias}" to become available after termination. Last seen sandbox id "${lastSeenSandbox.sandboxId}" with status "${lastSeenSandbox.status}".`
+            );
+          }
           throw new Error(
-            `Timed out waiting for modal sandbox alias "${alias}" to disappear after termination. Last seen sandbox id "${existing.sandboxId}" with status "${existing.status}".`
+            `Timed out waiting for modal sandbox alias "${alias}" to become available after termination.`
           );
         }
+        await terminateModalSandboxesByAlias(alias, {
+          ...modalOperationOptions,
+          includeFinished: true
+        });
         await sleep3(Math.min(pollIntervalMs, remainingMs));
       }
     };
@@ -222133,15 +222229,12 @@ var init_modal = __esm({
                       `Modal reported ALREADY_EXISTS for alias "${alias}", but no matching sandbox was found to terminate.`
                     );
                   }
-                  status.stage("Waiting for Modal to finalize termination");
-                  await waitForModalSandboxAbsenceAfterTermination({
-                    alias,
-                    ...modalOperationOptions ? { modalOperationOptions } : {}
-                  });
-                  status.stage("Provisioning in Modal");
-                  const reprovisioned = await provisionModalSandbox(
-                    alias,
-                    modalOperationOptions
+                  status.stage("Waiting for Modal to release sandbox name");
+                  const reprovisioned = await provisionModalSandboxAfterTermination(
+                    {
+                      alias,
+                      ...modalOperationOptions ? { modalOperationOptions } : {}
+                    }
                   );
                   await recordProvisionedModal(reprovisioned);
                   return;
@@ -229775,4 +229868,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=dab189dc-59c8-54af-b40c-b5ea0eb33006
+//# debugId=a0a101a2-0ead-5d3d-8af3-ec4f67fbac2d