@boxes-dev/dvb 1.0.64 → 1.0.65

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]="4c2dc0a8-a9b7-51c8-91d9-d939ecc88f96")}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]="c3ed3072-4c93-5461-97f3-5f404303f107")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88683,8 +88683,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.64";
-      const rawGitSha = "d2bdc33fe650217d15bebd2b8ae26e11d2d0cd33";
+      const rawPackageVersion = "1.0.65";
+      const rawGitSha = "38e55fd1bc87f0994f09522d4e932ccef8b98c10";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120672,9 +120672,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.64";
-      const rawGitSha = "d2bdc33fe650217d15bebd2b8ae26e11d2d0cd33";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.64+d2bdc33fe650217d15bebd2b8ae26e11d2d0cd33";
+      const rawPackageVersion = "1.0.65";
+      const rawGitSha = "38e55fd1bc87f0994f09522d4e932ccef8b98c10";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.65+38e55fd1bc87f0994f09522d4e932ccef8b98c10";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -204845,7 +204845,7 @@ var init_prompts = __esm({
 });
 
 // src/devbox/commands/init/codex/remote.ts
-var import_node_child_process8, stripAnsi2, extractBoldText, extractAuthUrl, extractLocalPort, isRelayForbidden, isRelayMissingOpenAiProxyConfiguration, buildEntrypointsBlock, renderRemoteApplyPromptFromTemplate, renderRemoteApplyPrompt, openBrowser3, ensureRemoteCodexInstalled, isRemoteCodexLoggedIn, runRemoteCodexLogin, runRemoteCodexExec;
+var import_node_child_process8, stripAnsi2, extractBoldText, extractAuthUrl, extractLocalPort, isRelayForbidden, isRelayMissingOpenAiProxyConfiguration, buildEntrypointsBlock, resolveRemoteApplyTemplateName, renderRemoteApplyPromptFromTemplate, renderRemoteApplyPrompt, openBrowser3, ensureRemoteCodexInstalled, isRemoteCodexLoggedIn, runRemoteCodexLogin, runRemoteCodexExec;
 var init_remote2 = __esm({
   "src/devbox/commands/init/codex/remote.ts"() {
     "use strict";
@@ -204890,6 +204890,7 @@ var init_remote2 = __esm({
       ];
       return lines.join("\n");
     };
+    resolveRemoteApplyTemplateName = (computeProvider) => computeProvider === "modal" ? "remote-apply-modal.md" : "remote-apply.md";
     renderRemoteApplyPromptFromTemplate = ({
       template,
       setupPath,
@@ -204906,9 +204907,12 @@ var init_remote2 = __esm({
       setupPath,
       artifactsBundle,
       artifactsManifest,
-      entrypoints
+      entrypoints,
+      computeProvider
     }) => {
-      const template = await readPromptTemplate("remote-apply.md");
+      const template = await readPromptTemplate(
+        resolveRemoteApplyTemplateName(computeProvider)
+      );
       return renderRemoteApplyPromptFromTemplate({
         template,
         setupPath,
@@ -207029,7 +207033,7 @@ var init_progress = __esm({
 });
 
 // src/devbox/commands/init/codex/index.ts
-var import_node_path27, import_node_crypto14, import_promises24, import_node_os14, resolveLocalCodexRoot, readLocalCodexAuthCache, syncLocalCodexAuthCacheToSprite, uploadSetupPlan, runRemoteCodexSetup;
+var import_node_path27, import_node_crypto14, import_promises24, import_node_os14, CODEX_REQUEST_URL_REGEX2, extractRequestUrl2, isLoopbackRelayUrl2, resolveLocalCodexAuthPathCandidates, readLocalCodexAuthCache, syncLocalCodexAuthCacheToSprite, uploadSetupPlan, runRemoteCodexSetup;
 var init_codex = __esm({
   "src/devbox/commands/init/codex/index.ts"() {
     "use strict";
@@ -207049,17 +207053,40 @@ var init_codex = __esm({
     init_proxy2();
     init_artifacts();
     init_progress();
-    resolveLocalCodexRoot = () => {
-      const configured = (process.env.CODEX_HOME ?? "").trim();
-      return configured || import_node_path27.default.join((0, import_node_os14.homedir)(), ".codex");
+    CODEX_REQUEST_URL_REGEX2 = /error sending request for url \(([^)]+)\)/i;
+    extractRequestUrl2 = (value) => {
+      const match2 = value.match(CODEX_REQUEST_URL_REGEX2);
+      const url = match2?.[1]?.trim();
+      return url && url.length > 0 ? url : null;
     };
-    readLocalCodexAuthCache = async () => {
-      const authPath = import_node_path27.default.join(resolveLocalCodexRoot(), "auth.json");
+    isLoopbackRelayUrl2 = (requestUrl) => {
       try {
-        return await import_promises24.default.readFile(authPath);
+        const url = new URL(requestUrl);
+        return url.hostname === "127.0.0.1" || url.hostname === "localhost" || url.hostname === "::1";
       } catch {
-        return null;
+        return false;
+      }
+    };
+    resolveLocalCodexAuthPathCandidates = () => {
+      const configured = (process.env.CODEX_HOME ?? "").trim();
+      const defaultRoot = import_node_path27.default.join((0, import_node_os14.homedir)(), ".codex");
+      const candidates = [import_node_path27.default.join(defaultRoot, "auth.json")];
+      if (configured) {
+        const configuredPath = import_node_path27.default.join(configured, "auth.json");
+        if (!candidates.includes(configuredPath)) {
+          candidates.unshift(configuredPath);
+        }
+      }
+      return candidates;
+    };
+    readLocalCodexAuthCache = async () => {
+      for (const authPath of resolveLocalCodexAuthPathCandidates()) {
+        try {
+          return await import_promises24.default.readFile(authPath);
+        } catch {
+        }
       }
+      return null;
     };
     syncLocalCodexAuthCacheToSprite = async ({
       client: client2,
@@ -207347,6 +207374,7 @@ var init_codex = __esm({
     runRemoteCodexSetup = async ({
       client: client2,
       spriteAlias,
+      computeProvider,
       expandedWorkdir,
       remoteSetupPath,
       remoteArtifactsBundlePath,
@@ -207359,18 +207387,13 @@ var init_codex = __esm({
       emitCodexOutput = true
     }) => {
       if (!proxyOptions) {
+        await syncLocalCodexAuthCacheToSprite({
+          client: client2,
+          spriteAlias,
+          status
+        });
         status.stage("Check Codex login");
-        let loggedIn = await isRemoteCodexLoggedIn(client2, spriteAlias);
-        if (!loggedIn) {
-          const synced = await syncLocalCodexAuthCacheToSprite({
-            client: client2,
-            spriteAlias,
-            status
-          });
-          if (synced) {
-            loggedIn = await isRemoteCodexLoggedIn(client2, spriteAlias);
-          }
-        }
+        const loggedIn = await isRemoteCodexLoggedIn(client2, spriteAlias);
         if (!loggedIn) {
           await requireDaemonFeatures(socketInfo.socketPath, ["ports"]);
           status.stage("Waiting for Codex login");
@@ -207474,7 +207497,8 @@ codex login`
         setupPath: remoteSetupPath,
         artifactsBundle: remoteArtifactsBundlePath,
         artifactsManifest: remoteArtifactsManifestPath,
-        entrypoints
+        entrypoints,
+        computeProvider
       });
       const codexLastMessagePath = "/home/sprite/.devbox/codex-setup-output.txt";
       const proxyRoot = proxyOptions ? `/home/sprite/.devbox/tmp/codex-proxy-${(0, import_node_crypto14.randomUUID)()}` : null;
@@ -207628,15 +207652,59 @@ codex login`
       };
       writeCodexOutput(process.stdout, execResult?.stdout, "stdout");
       writeCodexOutput(process.stderr, execResult?.stderr, "stderr");
-      if (!emitCodexOutput) return;
+      let lastMessage = "";
+      let lastMessageReadError = null;
       try {
         const bytes = await client2.readFile(spriteAlias, {
           path: codexLastMessagePath
         });
-        const message = Buffer.from(bytes).toString("utf8").trim();
-        if (message && !printedCodexStdout) {
+        lastMessage = Buffer.from(bytes).toString("utf8").trim();
+      } catch (error2) {
+        lastMessageReadError = error2 instanceof Error ? error2 : new Error(String(error2));
+      }
+      if (!lastMessage) {
+        const combinedOutputRaw = `${execResult?.stdout ?? ""}
+${execResult?.stderr ?? ""}`;
+        const combinedOutput = combinedOutputRaw.toLowerCase();
+        if (combinedOutput.includes("401 unauthorized")) {
+          throw new Error(
+            "codex exec failed: remote Codex auth returned 401 unauthorized. Re-run `dvb setup --codex-auth byo` (or ensure proxy auth is configured), then retry with `dvb init --resume`."
+          );
+        }
+        if (combinedOutput.includes("stream disconnected before completion")) {
+          const requestUrl = extractRequestUrl2(combinedOutputRaw);
+          if (requestUrl && isLoopbackRelayUrl2(requestUrl)) {
+            throw new Error(
+              `codex exec failed: local relay is unreachable at ${requestUrl}. Set a reachable remote relay URL (for example \`DEVBOX_REMOTE_RELAY_BASE_URL=https://relay.boxes.dev\`), run \`dvb setup\`, then retry with \`dvb init --resume\`.`
+            );
+          }
+          const requestTarget = requestUrl ?? "relay /v1/responses endpoint";
+          throw new Error(
+            `codex exec failed: proxy stream disconnected before completion while calling ${requestTarget}. Ensure relay connectivity from the remote devbox, then retry with \`dvb init --resume\`.`
+          );
+        }
+        if (combinedOutput.includes("no last agent message")) {
+          throw new Error(
+            "codex exec failed: Codex returned no final response. Setup was not applied; retry with `dvb init --resume`."
+          );
+        }
+        if (lastMessageReadError) {
+          throw new Error(
+            "codex exec failed: missing Codex final output file. Setup may not have run; retry with `dvb init --resume`."
+          );
+        }
+        throw new Error(
+          "codex exec failed: empty Codex final response. Setup was not applied; retry with `dvb init --resume`."
+        );
+      }
+      if (!emitCodexOutput) return;
+      try {
+        const stdoutText = execResult?.stdout ?? "";
+        const stdoutHasAssistantTurn = /\nassistant(\n|$)/i.test(stdoutText);
+        const shouldPrintLastMessage = !printedCodexStdout || !stdoutHasAssistantTurn || !stdoutText.includes(lastMessage);
+        if (shouldPrintLastMessage) {
           status.stop();
-          process.stdout.write(`${message}
+          process.stdout.write(`${lastMessage}
 `);
         }
       } catch {
@@ -210047,7 +210115,7 @@ var init_finalizeFlow = __esm({
               } else {
                 R2.warn("Could not copy the SSH key automatically.");
               }
-              const openBrowserPromptMessage = copied ? `Open ${remoteInfo.host} SSH key page in your browser? (SSH key copied to clipboard; paste it into the key box, then click "Add SSH key".)` : `Open ${remoteInfo.host} SSH key page in your browser?`;
+              const openBrowserPromptMessage = copied ? `SSH key copied to clipboard; click "Add SSH key". Open ${remoteInfo.host} SSH key page in your browser?` : `Open ${remoteInfo.host} SSH key page in your browser?`;
               const shouldOpen = await promptBeforeOpenBrowser({
                 url: remoteInfo.settingsUrl,
                 title: `${remoteInfo.host} SSH key page`,
@@ -210270,6 +210338,7 @@ var init_finalizeFlow = __esm({
             await runRemoteCodexSetup({
               client: client2,
               spriteAlias,
+              computeProvider,
               expandedWorkdir,
               remoteSetupPath,
               remoteArtifactsBundlePath,
@@ -217928,4 +217997,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=4c2dc0a8-a9b7-51c8-91d9-d939ecc88f96
+//# debugId=c3ed3072-4c93-5461-97f3-5f404303f107