@boxes-dev/dvb-runtime 1.0.189 → 1.0.191

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]="d891e41c-960d-5274-8d0e-b6e180994258")}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]="12cda96d-089f-5b95-b67d-05e388742689")}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.189";
-      const rawGitSha = "1ace2775538b3d0be8520ebddb5323148f994dd2";
+      const rawPackageVersion = "1.0.191";
+      const rawGitSha = "cfde4319652d34938c2d325010794ab69d2e8d60";
       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.189";
-      const rawGitSha = "1ace2775538b3d0be8520ebddb5323148f994dd2";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.189+1ace2775538b3d0be8520ebddb5323148f994dd2";
+      const rawPackageVersion = "1.0.191";
+      const rawGitSha = "cfde4319652d34938c2d325010794ab69d2e8d60";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.191+cfde4319652d34938c2d325010794ab69d2e8d60";
       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.189";
+      const raw = "1.0.191";
       return trimVersion(raw);
     };
     readNearestPackageMetadata = (basePath) => {
@@ -215309,7 +215309,7 @@ var init_prompts = __esm({
 });
 
 // src/devbox/commands/init/codex/events.ts
-var stripAnsi2, extractBoldText, normalizeProgressMessage, toRecord, extractTodoListProgress, extractProgressFromJsonLine, extractThreadIdFromJsonLine;
+var stripAnsi2, extractBoldText, normalizeProgressMessage, toRecord, toProgressUpdate, truncate2, stripShellWrapper, splitShellSegments, tokenizeShellSegment, unquoteToken, isEnvAssignment, isRedirectionToken, isPathLikeToken, isSimpleWordToken, isOptionToken, isInformativeSimpleToken, summarizeShellSegment, isNoopCommandSummary, summarizeCommandSequence, summarizeCommandExecution, extractCommandExecutionProgress, extractTodoListProgress, extractProgressUpdateFromJsonLine, extractThreadIdFromJsonLine, extractTurnFailureFromJsonLine;
 var init_events = __esm({
   "src/devbox/commands/init/codex/events.ts"() {
     "use strict";
@@ -215330,6 +215330,173 @@ var init_events = __esm({
       return normalized;
     };
     toRecord = (value) => typeof value === "object" && value !== null ? value : null;
+    toProgressUpdate = (kind, value) => {
+      const message = normalizeProgressMessage(value);
+      return message ? { kind, message } : null;
+    };
+    truncate2 = (value, max = 72) => value.length <= max ? value : `${value.slice(0, max - 3).trimEnd()}...`;
+    stripShellWrapper = (command) => {
+      const trimmed = command.trim();
+      const shellMatch = trimmed.match(/^\/bin\/(?:bash|zsh|sh)\s+-lc\s+([\s\S]+)$/);
+      const unwrapped = shellMatch?.[1]?.trim() ?? trimmed;
+      if (unwrapped.startsWith("'") && unwrapped.endsWith("'") || unwrapped.startsWith('"') && unwrapped.endsWith('"')) {
+        return unwrapped.slice(1, -1).trim();
+      }
+      return unwrapped;
+    };
+    splitShellSegments = (script) => {
+      const segments = [];
+      let current = "";
+      let quote = null;
+      for (let idx = 0; idx < script.length; idx += 1) {
+        const ch = script[idx];
+        const next = script[idx + 1] ?? "";
+        const prev = script[idx - 1] ?? "";
+        if (quote) {
+          current += ch;
+          if (ch === quote && prev !== "\\") {
+            quote = null;
+          }
+          continue;
+        }
+        if (ch === "'" || ch === '"' || ch === "`") {
+          quote = ch;
+          current += ch;
+          continue;
+        }
+        if (ch === "\n" || ch === ";") {
+          const segment = current.trim();
+          if (segment) segments.push(segment);
+          current = "";
+          continue;
+        }
+        if ((ch === "&" || ch === "|") && next === ch) {
+          const segment = current.trim();
+          if (segment) segments.push(segment);
+          current = "";
+          idx += 1;
+          continue;
+        }
+        if (ch === "|") {
+          const segment = current.trim();
+          if (segment) segments.push(segment);
+          current = "";
+          continue;
+        }
+        current += ch;
+      }
+      const tail = current.trim();
+      if (tail) segments.push(tail);
+      return segments;
+    };
+    tokenizeShellSegment = (segment) => {
+      const tokens = [];
+      let current = "";
+      let quote = null;
+      for (let idx = 0; idx < segment.length; idx += 1) {
+        const ch = segment[idx];
+        const prev = segment[idx - 1] ?? "";
+        if (quote) {
+          current += ch;
+          if (ch === quote && prev !== "\\") {
+            quote = null;
+          }
+          continue;
+        }
+        if (ch === "'" || ch === '"' || ch === "`") {
+          quote = ch;
+          current += ch;
+          continue;
+        }
+        if (/\s/.test(ch)) {
+          if (current) {
+            tokens.push(current);
+            current = "";
+          }
+          continue;
+        }
+        current += ch;
+      }
+      if (current) tokens.push(current);
+      return tokens;
+    };
+    unquoteToken = (token) => {
+      const trimmed = token.trim();
+      const unwrapped = trimmed.startsWith("'") && trimmed.endsWith("'") || trimmed.startsWith('"') && trimmed.endsWith('"') || trimmed.startsWith("`") && trimmed.endsWith("`") ? trimmed.slice(1, -1) : trimmed;
+      return unwrapped.replace(/\\(["'`\\])/g, "$1").replace(/[\[\]{}]/g, "").trim();
+    };
+    isEnvAssignment = (token) => /^[A-Za-z_][A-Za-z0-9_]*=.*/.test(token);
+    isRedirectionToken = (token) => token === "|" || token === "<" || token === ">" || token === ">>" || /^[0-9]*[<>]/.test(token);
+    isPathLikeToken = (token) => !/\s/.test(token) && /[./]/.test(token) && !token.startsWith("!") && !/[*?()[\]{}|\\]/.test(token);
+    isSimpleWordToken = (token) => /^[A-Za-z0-9_.:-]+$/.test(token) && !isPathLikeToken(token);
+    isOptionToken = (token) => /^--?[A-Za-z0-9][A-Za-z0-9-]*$/.test(token);
+    isInformativeSimpleToken = (token) => isSimpleWordToken(token) && !/^\d+$/.test(token) && token.length > 1;
+    summarizeShellSegment = (segment) => {
+      const tokens = tokenizeShellSegment(segment).map((token) => unquoteToken(token)).filter((token) => token.length > 0);
+      if (tokens.length === 0) return "shell command";
+      let start = 0;
+      while (start < tokens.length && isEnvAssignment(tokens[start])) {
+        start += 1;
+      }
+      const commandTokens = tokens.slice(start);
+      if (commandTokens.length === 0) return "shell command";
+      const executable = commandTokens[0];
+      if (executable === "command" && commandTokens[1] === "-v" && commandTokens[2]) {
+        return truncate2(`command -v ${commandTokens[2]}`);
+      }
+      const args = commandTokens.slice(1).filter((token) => !isRedirectionToken(token));
+      const nonOptionArgs = args.filter((token) => !isOptionToken(token));
+      const simpleSubcommand = nonOptionArgs.find((token) => isInformativeSimpleToken(token)) ?? null;
+      if (simpleSubcommand) {
+        return truncate2(`${executable} ${simpleSubcommand}`);
+      }
+      const pathArg = nonOptionArgs.find((token) => isPathLikeToken(token)) ?? null;
+      if (pathArg) {
+        return truncate2(`${executable} ${pathArg}`);
+      }
+      const optionArg = args.find((token) => isOptionToken(token)) ?? null;
+      if (optionArg) {
+        return truncate2(`${executable} ${optionArg}`);
+      }
+      return truncate2(executable);
+    };
+    isNoopCommandSummary = (summary) => summary === ":" || summary === "true";
+    summarizeCommandSequence = (segments) => {
+      const meaningful = segments.filter((segment) => !isNoopCommandSummary(segment));
+      if (meaningful.length === 0) return "shell command";
+      const probeTarget = meaningful[0]?.match(/^command -v (.+)$/)?.[1] ?? null;
+      const reduced = probeTarget && meaningful[1]?.startsWith(`${probeTarget} `) ? meaningful.slice(1) : meaningful;
+      if (reduced.length === 1) return reduced[0];
+      const previewLimit = 3;
+      const preview = reduced.slice(0, previewLimit).join("; ");
+      if (reduced.length <= previewLimit) return truncate2(preview);
+      return truncate2(`${preview}; +${reduced.length - previewLimit} more`);
+    };
+    summarizeCommandExecution = (command) => {
+      const segments = splitShellSegments(stripShellWrapper(command)).map(
+        summarizeShellSegment
+      );
+      return summarizeCommandSequence(segments);
+    };
+    extractCommandExecutionProgress = (record, item) => {
+      if (item.type !== "command_execution" || typeof item.command !== "string") {
+        return null;
+      }
+      const summary = summarizeCommandExecution(item.command);
+      const exitCode = typeof item.exit_code === "number" ? item.exit_code : null;
+      const recordType = typeof record.type === "string" ? record.type : null;
+      const status = typeof item.status === "string" ? item.status : null;
+      if (recordType === "item.completed" || status === "completed") {
+        if (exitCode !== null && exitCode !== 0) {
+          return toProgressUpdate("command", `failed ${summary} (exit ${exitCode})`);
+        }
+        return toProgressUpdate("command", `done ${summary}`);
+      }
+      if (recordType === "item.started" || status === "in_progress") {
+        return toProgressUpdate("command", `run ${summary}`);
+      }
+      return 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);
@@ -215340,9 +215507,9 @@ var init_events = __esm({
       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);
+      return toProgressUpdate("todo", summary);
     };
-    extractProgressFromJsonLine = (line) => {
+    extractProgressUpdateFromJsonLine = (line) => {
       const trimmed = line.trim();
       if (!trimmed.startsWith("{")) return null;
       let parsed;
@@ -215354,23 +215521,28 @@ var init_events = __esm({
       const record = toRecord(parsed);
       if (!record) return null;
       if (record.type === "error" && typeof record.message === "string") {
-        return normalizeProgressMessage(record.message);
+        return toProgressUpdate("command", record.message);
       }
       if (record.type === "reasoning") {
-        return normalizeProgressMessage(
+        return toProgressUpdate(
+          "reasoning",
           extractBoldText(String(record.text ?? "")) ?? String(record.text ?? "")
         );
       }
       const item = toRecord(record.item);
       if (!item) return null;
       if (item.type === "reasoning") {
-        return normalizeProgressMessage(
+        return toProgressUpdate(
+          "reasoning",
           extractBoldText(String(item.text ?? "")) ?? String(item.text ?? "")
         );
       }
+      const commandProgress = extractCommandExecutionProgress(record, item);
+      if (commandProgress) return commandProgress;
       const todoProgress = extractTodoListProgress(item);
       if (todoProgress) return todoProgress;
-      return normalizeProgressMessage(
+      return toProgressUpdate(
+        "reasoning",
         extractBoldText(String(item.text ?? "")) ?? String(item.text ?? "")
       );
     };
@@ -215388,6 +215560,26 @@ var init_events = __esm({
       const threadId2 = record.thread_id;
       return typeof threadId2 === "string" && threadId2.length > 0 ? threadId2 : null;
     };
+    extractTurnFailureFromJsonLine = (line) => {
+      const trimmed = line.trim();
+      if (!trimmed.startsWith("{")) return null;
+      let parsed;
+      try {
+        parsed = JSON.parse(trimmed);
+      } catch {
+        return null;
+      }
+      const record = toRecord(parsed);
+      if (!record || record.type !== "turn.failed") return null;
+      const error2 = toRecord(record.error);
+      if (typeof error2?.message === "string" && error2.message.trim().length > 0) {
+        return error2.message.trim();
+      }
+      if (typeof record.message === "string" && record.message.trim().length > 0) {
+        return record.message.trim();
+      }
+      return "Codex turn failed.";
+    };
   }
 });
 
@@ -215921,7 +216113,7 @@ fi`
       let stderrBuffer = "";
       let exitCode = null;
       let resolved = false;
-      let lastProgress = null;
+      let lastProgressKey = null;
       let threadId2 = null;
       const handleLine = (line) => {
         const clean = stripAnsi2(line);
@@ -215932,18 +216124,21 @@ fi`
           }
         }
         if (!onProgress) return;
-        const parsed = extractProgressFromJsonLine(clean);
+        const parsed = extractProgressUpdateFromJsonLine(clean);
         if (parsed) {
-          if (parsed === lastProgress) return;
-          lastProgress = parsed;
+          const progressKey2 = `${parsed.kind}:${parsed.message}`;
+          if (progressKey2 === lastProgressKey) return;
+          lastProgressKey = progressKey2;
           onProgress(parsed);
           return;
         }
         if (clean.trimStart().startsWith("{")) return;
         const bold = normalizeProgressMessage(extractBoldText(clean));
-        if (!bold || bold === lastProgress) return;
-        lastProgress = bold;
-        onProgress(bold);
+        if (!bold) return;
+        const progressKey = `reasoning:${bold}`;
+        if (progressKey === lastProgressKey) return;
+        lastProgressKey = progressKey;
+        onProgress({ kind: "reasoning", message: bold });
       };
       const handleChunk = (text, buffer, update, sink) => {
         let next = buffer + text;
@@ -216562,7 +216757,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, 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, LOOPBACK_RELAY_HEALTH_TIMEOUT_MS, loopbackRelayHealthChecks, buildRetryPrompt, formatCodexRetryProgress, describeLoopbackRelayHealthError, createLoopbackRelayHealthError, ensureLoopbackRelayHealthy, classifyCodexExecFailure, 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";
@@ -216598,6 +216793,8 @@ var init_local = __esm({
         return false;
       }
     };
+    LOOPBACK_RELAY_HEALTH_TIMEOUT_MS = 3e3;
+    loopbackRelayHealthChecks = /* @__PURE__ */ new Map();
     buildRetryPrompt = (basePrompt, retryFeedback) => retryFeedback ? [
       basePrompt,
       "",
@@ -216618,6 +216815,147 @@ var init_local = __esm({
       const mode = sessionId ? "continuing existing session" : "starting a fresh session";
       return `retry ${nextAttempt}/${maxAttempts} in ${delaySeconds}s (${mode}): ${formatRetryReason(reason)}`;
     };
+    describeLoopbackRelayHealthError = (error2) => {
+      if (error2 instanceof DOMException && error2.name === "TimeoutError") {
+        return "timed out";
+      }
+      const code2 = error2?.code ?? error2?.cause?.code;
+      if (code2 === "ECONNREFUSED") return "was refused";
+      if (code2 === "ENOTFOUND" || code2 === "EAI_AGAIN" || code2 === "ETIMEDOUT") {
+        return "was unreachable";
+      }
+      return error2 instanceof Error ? error2.message : String(error2);
+    };
+    createLoopbackRelayHealthError = ({
+      healthUrl,
+      detail
+    }) => new Error(
+      `Codex scan failed: local relay health check ${detail} at ${healthUrl}. Start or restart it with \`just dev\` and retry with \`dvb init --resume\`.`
+    );
+    ensureLoopbackRelayHealthy = async (relayBaseUrl) => {
+      if (!isLoopbackRelayUrl(relayBaseUrl)) return;
+      const normalizedRelayBaseUrl = new URL(relayBaseUrl).toString();
+      const inFlight = loopbackRelayHealthChecks.get(normalizedRelayBaseUrl);
+      if (inFlight) {
+        return await inFlight;
+      }
+      const healthUrl = new URL("/health", normalizedRelayBaseUrl).toString();
+      const check = (async () => {
+        try {
+          const response = await fetch(healthUrl, {
+            method: "GET",
+            signal: AbortSignal.timeout(LOOPBACK_RELAY_HEALTH_TIMEOUT_MS)
+          });
+          if (!response.ok) {
+            throw createLoopbackRelayHealthError({
+              healthUrl,
+              detail: `returned HTTP ${response.status}`
+            });
+          }
+        } catch (error2) {
+          if (error2 instanceof Error && error2.message.includes("local relay health check")) {
+            throw error2;
+          }
+          throw createLoopbackRelayHealthError({
+            healthUrl,
+            detail: describeLoopbackRelayHealthError(error2)
+          });
+        }
+      })();
+      loopbackRelayHealthChecks.set(normalizedRelayBaseUrl, check);
+      try {
+        await check;
+      } catch (error2) {
+        if (loopbackRelayHealthChecks.get(normalizedRelayBaseUrl) === check) {
+          loopbackRelayHealthChecks.delete(normalizedRelayBaseUrl);
+        }
+        throw error2;
+      }
+    };
+    classifyCodexExecFailure = ({
+      combinedOutput,
+      detail,
+      exitCode,
+      turnFailedMessage
+    }) => {
+      const failureOutput = turnFailedMessage ? `${combinedOutput}
+${turnFailedMessage}` : combinedOutput;
+      if (isRelayUsageLimitExceeded(failureOutput)) {
+        return {
+          error: new Error(
+            "Codex scan failed: OpenAI usage limit exceeded. Run `dvb setup --codex-auth byo` to use your own Codex auth, then retry with `dvb init --resume`."
+          ),
+          retryable: false
+        };
+      }
+      if (isRelayForbidden(failureOutput)) {
+        return {
+          error: new Error(
+            "Codex scan failed: relay proxy returned 403 forbidden. If you're using a dev/local relay config, keep local scans on that relay or run `dvb setup --codex-auth byo`, then retry with `dvb init --resume`."
+          ),
+          retryable: false
+        };
+      }
+      if (isRelayMissingOpenAiProxyConfiguration(failureOutput)) {
+        return {
+          error: new Error(
+            "Codex scan failed: relay proxy is missing OPENAI_API_KEY configuration. Re-run `just dev` so the relay tunnel deploy includes OPENAI_API_KEY, then retry with `dvb init --resume`."
+          ),
+          retryable: false
+        };
+      }
+      if (isStreamDisconnected(failureOutput)) {
+        const requestUrl = extractRequestUrl(failureOutput);
+        if (requestUrl && isLoopbackRelayUrl(requestUrl)) {
+          return {
+            error: new Error(
+              `Codex scan failed: local relay is unreachable at ${requestUrl}. This dev CLI is configured for a local relay; start it with \`just dev\` and retry with \`dvb init --resume\`.`
+            ),
+            retryable: false
+          };
+        }
+        const requestTarget = requestUrl ?? "relay /v1/responses endpoint";
+        return {
+          error: new Error(
+            `Codex scan failed: transport disconnected while calling ${requestTarget}. Check relay health/auth and retry with \`dvb init --resume\`.`
+          ),
+          retryable: true
+        };
+      }
+      if (/no last agent message/i.test(failureOutput)) {
+        return {
+          error: new Error(
+            "Codex scan failed: Codex session ended without a final response. Retry with `dvb init --resume`."
+          ),
+          retryable: true
+        };
+      }
+      if (turnFailedMessage) {
+        const normalized = turnFailedMessage.trim();
+        return {
+          error: new Error(
+            normalized ? `Codex scan failed: ${normalized}` : "Codex scan failed: Codex turn failed."
+          ),
+          retryable: true
+        };
+      }
+      if (exitCode === null) {
+        return {
+          error: new Error(
+            "Codex scan failed: Codex session ended before reporting an exit status. Retry with `dvb init --resume`."
+          ),
+          retryable: true
+        };
+      }
+      if (exitCode === 0) {
+        return null;
+      }
+      const suffix = detail ? `: ${detail}` : "";
+      return {
+        error: new Error(`codex exec failed (exit ${exitCode})${suffix}`),
+        retryable: false
+      };
+    };
     runCodexExec = async (cwd, commandArgs, onProgress, logOptions = {}) => {
       const {
         stdoutLogPath,
@@ -216680,6 +217018,9 @@ var init_local = __esm({
         await new Promise((resolve2) => stream.end(() => resolve2()));
       };
       try {
+        if (proxyOptions) {
+          await ensureLoopbackRelayHealthy(proxyOptions.relayBaseUrl);
+        }
         let resumeThreadId = commandArgs.resumeThreadId;
         let prompt = commandArgs.prompt;
         const runAttempt = async (attemptArgs, attemptResumeThreadId) => await new Promise((resolve2, reject) => {
@@ -216696,8 +217037,9 @@ var init_local = __esm({
           let stderr = "";
           let stdoutBuffer = "";
           let stderrBuffer = "";
-          let lastProgress = null;
+          let lastProgressKey = null;
           let threadId2 = null;
+          let turnFailedMessage = null;
           const handleLine = (line) => {
             const clean = stripAnsi2(line);
             if (!threadId2) {
@@ -216706,19 +217048,26 @@ var init_local = __esm({
                 threadId2 = parsedThreadId;
               }
             }
+            const parsedTurnFailure = extractTurnFailureFromJsonLine(clean);
+            if (parsedTurnFailure && !turnFailedMessage) {
+              turnFailedMessage = parsedTurnFailure;
+            }
             if (!onProgress) return;
-            const parsed = extractProgressFromJsonLine(clean);
+            const parsed = extractProgressUpdateFromJsonLine(clean);
             if (parsed) {
-              if (parsed === lastProgress) return;
-              lastProgress = parsed;
+              const progressKey2 = `${parsed.kind}:${parsed.message}`;
+              if (progressKey2 === lastProgressKey) return;
+              lastProgressKey = progressKey2;
               onProgress(parsed);
               return;
             }
             if (clean.trimStart().startsWith("{")) return;
             const bold = normalizeProgressMessage(extractBoldText(clean));
-            if (!bold || bold === lastProgress) return;
-            lastProgress = bold;
-            onProgress(bold);
+            if (!bold) return;
+            const progressKey = `reasoning:${bold}`;
+            if (progressKey === lastProgressKey) return;
+            lastProgressKey = progressKey;
+            onProgress({ kind: "reasoning", message: bold });
           };
           const consume = (chunk, buffer, update) => {
             let next = buffer + chunk.toString();
@@ -216749,79 +217098,25 @@ var init_local = __esm({
           child.on("close", (code2) => {
             if (stdoutBuffer) handleLine(stdoutBuffer);
             if (stderrBuffer) handleLine(stderrBuffer);
-            if (code2 === 0) {
-              resolve2({ threadId: threadId2 ?? attemptResumeThreadId });
-              return;
-            }
             const combinedOutput = `${stderr}
 ${stdout}`;
             const detail = stderr.trim() || stdout.trim();
             const sessionId = threadId2 ?? attemptResumeThreadId;
-            if (isRelayUsageLimitExceeded(combinedOutput)) {
-              reject(
-                new Error(
-                  "Codex scan failed: OpenAI usage limit exceeded. Run `dvb setup --codex-auth byo` to use your own Codex auth, then retry with `dvb init --resume`."
-                )
-              );
-              return;
-            }
-            if (isRelayForbidden(combinedOutput)) {
-              reject(
-                new Error(
-                  "Codex scan failed: relay proxy returned 403 forbidden. If you're using a dev/local relay config, keep local scans on that relay or run `dvb setup --codex-auth byo`, then retry with `dvb init --resume`."
-                )
-              );
-              return;
-            }
-            if (isRelayMissingOpenAiProxyConfiguration(combinedOutput)) {
-              reject(
-                new Error(
-                  "Codex scan failed: relay proxy is missing OPENAI_API_KEY configuration. Re-run `just dev` so the relay tunnel deploy includes OPENAI_API_KEY, then retry with `dvb init --resume`."
-                )
-              );
-              return;
-            }
-            if (isStreamDisconnected(combinedOutput)) {
-              const requestUrl = extractRequestUrl(combinedOutput);
-              if (requestUrl && isLoopbackRelayUrl(requestUrl)) {
-                reject(
-                  new Error(
-                    `Codex scan failed: local relay is unreachable at ${requestUrl}. This dev CLI is configured for a local relay; start it with \`just dev\` and retry with \`dvb init --resume\`.`
-                  )
-                );
-                return;
-              }
-              const requestTarget = requestUrl ?? "relay /v1/responses endpoint";
-              reject(
-                new RetryableCodexExecError(
-                  `Codex scan failed: transport disconnected while calling ${requestTarget}. Check relay health/auth and retry with \`dvb init --resume\`.`,
-                  sessionId
-                )
-              );
+            const failure = classifyCodexExecFailure({
+              combinedOutput,
+              detail,
+              exitCode: code2,
+              turnFailedMessage
+            });
+            if (!failure) {
+              resolve2({ threadId: sessionId });
               return;
             }
-            if (/no last agent message/i.test(combinedOutput)) {
-              reject(
-                new RetryableCodexExecError(
-                  "Codex scan failed: Codex session ended without a final response. Retry with `dvb init --resume`.",
-                  sessionId
-                )
-              );
+            if (failure.retryable) {
+              reject(new RetryableCodexExecError(failure.error.message, sessionId));
               return;
             }
-            if (code2 === null) {
-              reject(
-                new RetryableCodexExecError(
-                  "Codex scan failed: Codex session ended before reporting an exit status. Retry with `dvb init --resume`.",
-                  sessionId
-                )
-              );
-              return;
-            }
-            const suffix = detail ? `: ${detail}` : "";
-            reject(
-              new Error(`codex exec failed (exit ${code2 ?? "unknown"})${suffix}`)
-            );
+            reject(failure.error);
           });
         });
         for (let attempt = 1; attempt <= DEFAULT_CODEX_EXEC_MAX_ATTEMPTS; attempt += 1) {
@@ -216922,7 +217217,10 @@ ${stdout}`;
           trustedPaths: [cwd],
           ...onProgress ? {
             onRetry: (info) => {
-              onProgress(formatCodexRetryProgress(info));
+              onProgress({
+                kind: "command",
+                message: formatCodexRetryProgress(info)
+              });
             }
           } : {}
         }
@@ -217003,7 +217301,10 @@ ${stdout}`;
           trustedPaths: homeDir2 ? [cwd, homeDir2] : [cwd],
           ...onProgress ? {
             onRetry: (info) => {
-              onProgress(formatCodexRetryProgress(info));
+              onProgress({
+                kind: "command",
+                message: formatCodexRetryProgress(info)
+              });
             }
           } : {}
         }
@@ -217075,7 +217376,10 @@ ${stdout}`;
           trustedPaths: [cwd],
           ...onProgress ? {
             onRetry: (info) => {
-              onProgress(formatCodexRetryProgress(info));
+              onProgress({
+                kind: "command",
+                message: formatCodexRetryProgress(info)
+              });
             }
           } : {}
         }
@@ -217156,7 +217460,10 @@ ${stdout}`;
           trustedPaths: homeDir2 ? [cwd, homeDir2] : [cwd],
           ...onProgress ? {
             onRetry: (info) => {
-              onProgress(formatCodexRetryProgress(info));
+              onProgress({
+                kind: "command",
+                message: formatCodexRetryProgress(info)
+              });
             }
           } : {}
         }
@@ -218442,8 +218749,8 @@ codex login`
               "-c",
               remoteCodexCommand
             ],
-            onProgress: (message) => {
-              status.stage(`Apply setup plan - ${message}`);
+            onProgress: (update) => {
+              status.stage(`Apply setup plan - ${update.message}`);
             }
           });
           let attemptLastMessage = "";
@@ -218507,6 +218814,66 @@ codex login`
   }
 });
 
+// src/devbox/commands/init/scanProgress.ts
+var createInitialScanRowState, applyScanRowStatus, applyScanRowProgressUpdate, formatScanRow;
+var init_scanProgress = __esm({
+  "src/devbox/commands/init/scanProgress.ts"() {
+    "use strict";
+    createInitialScanRowState = (status) => ({
+      status,
+      todo: null,
+      reasoning: null,
+      command: null
+    });
+    applyScanRowStatus = (state, status) => ({
+      status,
+      todo: null,
+      reasoning: null,
+      command: null
+    });
+    applyScanRowProgressUpdate = (state, update) => {
+      if (update.kind === "todo") {
+        return {
+          status: null,
+          todo: update.message,
+          reasoning: null,
+          command: null
+        };
+      }
+      if (update.kind === "reasoning") {
+        return {
+          ...state,
+          status: null,
+          reasoning: update.message,
+          command: null
+        };
+      }
+      return {
+        ...state,
+        status: null,
+        command: update.message
+      };
+    };
+    formatScanRow = ({
+      label,
+      state,
+      formatLabel
+    }) => {
+      const primary = state.todo ?? state.status ?? state.reasoning ?? state.command ?? "starting";
+      const lines = [primary];
+      if (state.reasoning && state.reasoning !== primary) {
+        lines.push(state.reasoning);
+      }
+      if (state.command && state.command !== primary && state.command !== state.reasoning) {
+        lines.push(state.command);
+      }
+      const prefix = `${formatLabel(label)}: `;
+      const indent = " ".repeat(label.length + 2);
+      return lines.map((line, index) => `${index === 0 ? prefix : indent}${line}`).join("\n");
+    };
+  }
+});
+
 // src/devbox/commands/init/setupArtifactsValidation.ts
 var import_promises28, import_node_path32, expandHomePath2, resolveArtifactSourcePath, isMissingPathError, addMissingForCategory, collectMissingSetupArtifacts, remapSelectedPathEntries;
 var init_setupArtifactsValidation = __esm({
@@ -218647,6 +219014,7 @@ var init_setupPlanFlow = __esm({
     init_codex();
     init_scanStatus();
     init_progress();
+    init_scanProgress();
     init_setupArtifactsValidation();
     SETUP_ARTIFACT_REGEN_MAX_ATTEMPTS = 3;
     toPosixPath2 = (value) => value.split(import_node_path33.default.sep).join(import_node_path33.default.posix.sep);
@@ -219048,17 +219416,26 @@ var init_setupPlanFlow = __esm({
               const resetColor = "\x1B[39m";
               return `${undim}${teal}${bold}${label}${resetColor}${undim}${dim}`;
             };
-            const formatRow = (label, message) => {
-              const normalized = message.replace(/\r?\n/g, " ").trim();
-              return `${colorCategory(label)}: ${normalized}`;
-            };
             const envSecretsRow = log3.group("");
             const externalRow = log3.group("");
             const extraArtifactsRow = log3.group("");
             const servicesRow = log3.group("");
-            const makeUpdater = (row, label) => (message) => {
-              if (!active) return;
-              row.message(formatRow(label, message));
+            const makeUpdater = (row, label) => {
+              let state = createInitialScanRowState("starting");
+              const render = () => {
+                row.message(
+                  formatScanRow({
+                    label,
+                    state,
+                    formatLabel: colorCategory
+                  })
+                );
+              };
+              return (message) => {
+                if (!active) return;
+                state = typeof message === "string" ? applyScanRowStatus(state, message) : applyScanRowProgressUpdate(state, message);
+                render();
+              };
             };
             const updateEnvSecrets = makeUpdater(envSecretsRow, "env/secrets");
             const updateExternal = makeUpdater(externalRow, "external");
@@ -219188,7 +219565,7 @@ var init_setupPlanFlow = __esm({
                     envSecretsMissing
                   ),
                   ...initCodexProxyOptions ? { proxyOptions: initCodexProxyOptions } : {},
-                  onProgress: (message) => status.stage(`Rescan env/secrets - ${message}`)
+                  onProgress: (update) => status.stage(`Rescan env/secrets - ${update.message}`)
                 });
                 saveScanThreadId("envSecretsThreadId", threadId2);
               },
@@ -219233,7 +219610,7 @@ var init_setupPlanFlow = __esm({
                     externalMissing
                   ),
                   ...initCodexProxyOptions ? { proxyOptions: initCodexProxyOptions } : {},
-                  onProgress: (message) => status.stage(`Rescan external - ${message}`)
+                  onProgress: (update) => status.stage(`Rescan external - ${update.message}`)
                 });
                 saveScanThreadId("externalThreadId", threadId2);
               },
@@ -219273,7 +219650,7 @@ var init_setupPlanFlow = __esm({
                     extraArtifactsMissing
                   ),
                   ...initCodexProxyOptions ? { proxyOptions: initCodexProxyOptions } : {},
-                  onProgress: (message) => status.stage(`Rescan extra artifacts - ${message}`)
+                  onProgress: (update) => status.stage(`Rescan extra artifacts - ${update.message}`)
                 });
                 saveScanThreadId("extraArtifactsThreadId", threadId2);
               },
@@ -229873,4 +230250,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=d891e41c-960d-5274-8d0e-b6e180994258
+//# debugId=12cda96d-089f-5b95-b67d-05e388742689