@boxes-dev/dvb 0.2.35 → 0.2.36

package/dist/bin/dvb.cjs

@@ -23228,7 +23228,6 @@ var init_state = __esm({
       "setupPlanScanned",
       "servicesPlanScanned",
       "setupPlanWritten",
-      "servicesPlanWritten",
       "servicesConfigWritten",
       "workdirProvisioned",
       "gitSafeDirectoryConfigured",
@@ -24310,7 +24309,7 @@ fi`
 });
 
 // src/devbox/commands/init/codex/plan.ts
-var import_node_path18, import_promises24, resolveSchemaPath, writeSetupEnvSecretsSchema, writeSetupExternalSchema, writeSetupExtraArtifactsSchema, writeServicesSchema, isObject4, isSetupPlan, isSetupEnvSecretsPlan, isSetupExternalPlan, isSetupExtraArtifactsPlan, isServicesPlan, readSetupPlan, readSetupEnvSecretsPlan, readSetupExternalPlan, readSetupExtraArtifactsPlan, readServicesPlan, writeSetupPlan, mergeSetupScans, writeServicesPlan;
+var import_node_path18, import_promises24, resolveSchemaPath, writeSetupEnvSecretsSchema, writeSetupExternalSchema, writeSetupExtraArtifactsSchema, writeServicesSchema, isObject4, isServicesSelection, isSetupPlan, isSetupEnvSecretsPlan, isSetupExternalPlan, isSetupExtraArtifactsPlan, isServicesPlan, readSetupPlan, readSetupEnvSecretsPlan, readSetupExternalPlan, readSetupExtraArtifactsPlan, readServicesPlan, writeSetupPlan, mergeSetupScans;
 var init_plan = __esm({
   "src/devbox/commands/init/codex/plan.ts"() {
     "use strict";
@@ -24357,9 +24356,13 @@ var init_plan = __esm({
       return schemaPath;
     };
     isObject4 = (value) => typeof value === "object" && value !== null;
+    isServicesSelection = (value) => {
+      if (!isObject4(value)) return false;
+      return Array.isArray(value.appEntrypoints) && Array.isArray(value.backgroundServices);
+    };
     isSetupPlan = (value) => {
       if (!isObject4(value)) return false;
-      return typeof value.schemaVersion === "number" && Array.isArray(value.envFiles) && Array.isArray(value.secretFiles) && Array.isArray(value.extraArtifacts) && Array.isArray(value.externalDependencies) && Array.isArray(value.externalConfigs);
+      return typeof value.schemaVersion === "number" && Array.isArray(value.envFiles) && Array.isArray(value.secretFiles) && Array.isArray(value.extraArtifacts) && Array.isArray(value.externalDependencies) && Array.isArray(value.externalConfigs) && isServicesSelection(value.services);
     };
     isSetupEnvSecretsPlan = (value) => {
       if (!isObject4(value)) return false;
@@ -24423,7 +24426,8 @@ var init_plan = __esm({
     mergeSetupScans = ({
       envSecrets,
       external,
-      extraArtifacts
+      extraArtifacts,
+      services
     }) => {
       const dedupeBy = (items, key) => {
         const seen = /* @__PURE__ */ new Set();
@@ -24457,17 +24461,15 @@ var init_plan = __esm({
         (entry) => entry.name
       ).sort((a2, b) => a2.name.localeCompare(b.name));
       return {
-        schemaVersion: 2,
+        schemaVersion: 3,
         envFiles,
         secretFiles,
         extraArtifacts: mergedExtraArtifacts,
         externalDependencies,
-        externalConfigs
+        externalConfigs,
+        services
       };
     };
-    writeServicesPlan = async (servicesPath, plan) => {
-      await import_promises24.default.writeFile(servicesPath, JSON.stringify(plan, null, 2), "utf8");
-    };
   }
 });
 
@@ -24905,6 +24907,7 @@ var init_local = __esm({
         `codex-local-services-scan-${stamp}.meta.json`
       );
       await import_promises25.default.mkdir(logDir, { recursive: true, mode: 448 });
+      await import_promises25.default.mkdir(import_node_path19.default.dirname(outputPath), { recursive: true, mode: 448 });
       try {
         await import_promises25.default.chmod(logDir, 448);
       } catch {
@@ -25050,12 +25053,13 @@ ${usageText}`;
         externalDependencies: plan.externalDependencies.filter(
           (entry) => externalDependencySet.has(entry.name)
         ),
-        externalConfigs: plan.externalConfigs.filter((entry) => externalConfigSet.has(entry.path))
+        externalConfigs: plan.externalConfigs.filter((entry) => externalConfigSet.has(entry.path)),
+        services: initialPlan?.services ?? plan.services
       };
     };
     promptForServicesApproval = async ({
       plan,
-      initialPlan
+      initialSelection
     }) => {
       R2.step("Review run services findings");
       const appEntrypointOptions = plan.appEntrypoints.map((entry) => ({
@@ -25071,7 +25075,7 @@ ${usageText}`;
       const appEntrypointSelection = plan.appEntrypoints.length === 0 ? [] : await multiselectWithHelp({
         message: "Select app entrypoints to validate setup",
         options: appEntrypointOptions,
-        initialValues: initialPlan?.appEntrypoints.map((entry) => entry.command) ?? plan.appEntrypoints.map((entry) => entry.command),
+        initialValues: initialSelection?.appEntrypoints.map((entry) => entry.command) ?? plan.appEntrypoints.map((entry) => entry.command),
         required: false
       });
       if (Ct(appEntrypointSelection)) {
@@ -25081,7 +25085,7 @@ ${usageText}`;
       const backgroundServiceSelection = plan.backgroundServices.length === 0 ? [] : await multiselectWithHelp({
         message: "Select background services to run in the devbox",
         options: backgroundServiceOptions,
-        initialValues: initialPlan?.backgroundServices.map((entry) => entry.name) ?? plan.backgroundServices.map((entry) => entry.name),
+        initialValues: initialSelection?.backgroundServices.map((entry) => entry.name) ?? plan.backgroundServices.map((entry) => entry.name),
         required: false
       });
       if (Ct(backgroundServiceSelection)) {
@@ -25091,8 +25095,6 @@ ${usageText}`;
       const appEntrypointSet = new Set(appEntrypointSelection);
       const backgroundServiceSet = new Set(backgroundServiceSelection);
       return {
-        schemaVersion: plan.schemaVersion,
-        scanFullyCompleted: plan.scanFullyCompleted,
         appEntrypoints: plan.appEntrypoints.filter(
           (entry) => appEntrypointSet.has(entry.command)
         ),
@@ -26635,7 +26637,6 @@ var init_init = __esm({
         "box.json",
         "init-state.json",
         "setup.json",
-        "services.json",
         "setup-artifacts.tgz",
         "setup-artifacts.json",
         "scans",
@@ -26660,7 +26661,7 @@ var init_init = __esm({
       for (const service of services) {
         const name = service.name.trim();
         if (!name) {
-          throw new Error("Service name is required in services.json.");
+          throw new Error("Service name is required in setup.json services.");
         }
         const parts = splitShellCommand(service.command ?? "");
         const [cmd, ...args] = parts;
@@ -26738,7 +26739,7 @@ var init_init = __esm({
       for (const service of services) {
         const name = service.name.trim();
         if (!name) {
-          throw new Error("Service name is required in services.json.");
+          throw new Error("Service name is required in setup.json services.");
         }
         status?.stage(`Enabling service: ${name}`);
         const parts = splitShellCommand(service.command ?? "");
@@ -27237,13 +27238,11 @@ var init_init = __esm({
           }
           const setupDir2 = projectDir;
           const setupPath2 = import_node_path22.default.join(setupDir2, "setup.json");
-          const servicesPath2 = import_node_path22.default.join(setupDir2, "services.json");
+          let setupPlan;
           try {
-            await import_promises28.default.access(setupPath2);
+            setupPlan = await readSetupPlan(setupPath2);
           } catch {
-            throw new Error(
-              `Missing setup plan (${setupPath2}). Run \`dvb init\` first.`
-            );
+            throw new Error(`Missing or invalid setup plan (${setupPath2}). Run \`dvb init\` first.`);
           }
           const localArtifactsBundlePath = import_node_path22.default.join(
             setupDir2,
@@ -27322,12 +27321,6 @@ var init_init = __esm({
             "setup-artifacts.json"
           );
           const pathSetup2 = 'export PATH="$(npm bin -g 2>/dev/null):$PATH"';
-          let servicesPlan = null;
-          try {
-            servicesPlan = await readServicesPlan(servicesPath2);
-          } catch {
-            servicesPlan = null;
-          }
           await runInitStep({
             enabled: progressEnabled,
             title: "Configuring git safe.directory",
@@ -27407,7 +27400,7 @@ var init_init = __esm({
               await enableRemoteServices({
                 client: client2,
                 canonical: canonical2,
-                services: servicesPlan?.backgroundServices ?? [],
+                services: setupPlan.services.backgroundServices,
                 status
               });
             }
@@ -27426,7 +27419,7 @@ var init_init = __esm({
                 socketInfo: socketInfo2,
                 status,
                 pathSetup: pathSetup2,
-                entrypoints: servicesPlan?.appEntrypoints ?? []
+                entrypoints: setupPlan.services.appEntrypoints
               });
             }
           });
@@ -27765,7 +27758,6 @@ var init_init = __esm({
         });
         const setupDir = projectDir;
         const setupPath = import_node_path22.default.join(setupDir, "setup.json");
-        const servicesPath = import_node_path22.default.join(setupDir, "services.json");
         const scansDir = import_node_path22.default.join(setupDir, "scans");
         const logDir = import_node_path22.default.join(setupDir, "logs");
         const setupEnvSecretsScanPath = import_node_path22.default.join(scansDir, "setup-env-secrets.json");
@@ -27774,16 +27766,15 @@ var init_init = __esm({
           scansDir,
           "setup-extra-artifacts.json"
         );
+        const servicesScanPath = import_node_path22.default.join(scansDir, "services.json");
         let setupArtifacts = null;
         const nonInteractive = !process.stdin.isTTY || parsed.json;
         const skipSetupPlan = shouldResume && initState?.steps.setupPlanWritten;
-        const skipServicesPlan = shouldResume && initState?.steps.servicesPlanWritten;
         const skipServicesConfig = shouldResume && initState?.steps.servicesConfigWritten;
         const skipServicesEnable = shouldResume && initState?.steps.servicesEnabled;
         const skipSetupUpload = nonInteractive || shouldResume && initState?.steps.setupUploaded;
         const skipCodexApply = nonInteractive || shouldResume && initState?.steps.codexApplied;
         let approvedPlan = null;
-        let approvedServices = null;
         const setupTempDir = await import_promises28.default.mkdtemp(
           import_node_path22.default.join(import_node_os9.default.tmpdir(), "devbox-setup-")
         );
@@ -27802,7 +27793,7 @@ var init_init = __esm({
           };
           const tryReadServicesPlan = async () => {
             try {
-              return await readServicesPlan(servicesPath);
+              return await readServicesPlan(servicesScanPath);
             } catch {
               return null;
             }
@@ -27830,8 +27821,8 @@ var init_init = __esm({
           };
           const shouldRetryCodexScan = (scanFullyCompleted, ...arrays) => !scanFullyCompleted && arrays.every((array) => array.length === 0);
           let setupPlan = skipSetupPlan || !shouldResume ? null : await tryReadSetupPlan();
-          let servicesPlan = skipServicesPlan || !shouldResume ? null : await tryReadServicesPlan();
           const needsSetupScan = !skipSetupPlan && !setupPlan;
+          let servicesPlan = !needsSetupScan || !shouldResume ? null : await tryReadServicesPlan();
           let envSecretsScan = !needsSetupScan || !shouldResume ? null : await tryReadEnvSecretsScan();
           let externalScan = !needsSetupScan || !shouldResume ? null : await tryReadExternalScan();
           let extraArtifactsScan = !needsSetupScan || !shouldResume ? null : await tryReadExtraArtifactsScan();
@@ -27862,7 +27853,7 @@ var init_init = __esm({
           )) {
             extraArtifactsScan = null;
           }
-          const needsServicesScan = !skipServicesPlan && !servicesPlan;
+          const needsServicesScan = needsSetupScan && !servicesPlan;
           const needsEnvSecretsScan = needsSetupScan && !envSecretsScan;
           const needsExternalScan = needsSetupScan && !externalScan;
           const needsExtraArtifactsScan = needsSetupScan && !extraArtifactsScan;
@@ -27983,12 +27974,12 @@ var init_init = __esm({
                   cwd: repoRoot,
                   logDir,
                   schemaPath: servicesSchemaPath,
-                  outputPath: servicesPath,
+                  outputPath: servicesScanPath,
                   homeDir: localHomeDir,
                   onProgress: updateServices
                 }),
-                read: async () => await readServicesPlan(servicesPath),
-                outputPath: servicesPath,
+                read: async () => await readServicesPlan(servicesScanPath),
+                outputPath: servicesScanPath,
                 update: updateServices,
                 shouldRetry: (plan) => shouldRetryCodexScan(
                   plan.scanFullyCompleted,
@@ -28004,7 +27995,7 @@ var init_init = __esm({
               ]);
               if (needsServicesScan) {
                 if (!services) {
-                  throw new Error("Services plan missing.");
+                  throw new Error("Services scan missing.");
                 }
                 servicesPlan = services;
               }
@@ -28018,11 +28009,18 @@ var init_init = __esm({
                 if (!extraArtifacts) {
                   throw new Error("Extra artifacts scan missing.");
                 }
+                if (!servicesPlan) {
+                  throw new Error("Services scan missing.");
+                }
                 updateEnvSecrets("merging setup plan");
                 const merged = mergeSetupScans({
                   envSecrets,
                   external,
-                  extraArtifacts
+                  extraArtifacts,
+                  services: {
+                    appEntrypoints: servicesPlan.appEntrypoints,
+                    backgroundServices: servicesPlan.backgroundServices
+                  }
                 });
                 await writeSetupPlan(setupPath, merged);
                 setupPlan = merged;
@@ -28084,7 +28082,7 @@ var init_init = __esm({
                 needsSetupScan ? needsExtraArtifactsScan ? "starting" : "cached" : "skipped"
               );
               updateServices(
-                skipServicesPlan ? "skipped" : needsServicesScan ? "starting" : "cached"
+                needsServicesScan ? "starting" : "cached"
               );
               try {
                 await runLocalEnvironmentAnalysis({
@@ -28105,15 +28103,9 @@ var init_init = __esm({
           if (!skipSetupPlan && !setupPlan) {
             setupPlan = await readSetupPlan(setupPath);
           }
-          if (!skipServicesPlan && !servicesPlan) {
-            servicesPlan = await readServicesPlan(servicesPath);
-          }
           if (!skipSetupPlan && !setupPlan) {
             throw new Error("Setup plan missing.");
           }
-          if (!skipServicesPlan && !servicesPlan) {
-            throw new Error("Services plan missing.");
-          }
           const scanStepUpdate = {};
           if (!skipSetupPlan && setupPlan) {
             if (!initState?.steps.setupEnvSecretsScanned) {
@@ -28128,9 +28120,9 @@ var init_init = __esm({
             if (!initState?.steps.setupPlanScanned) {
               scanStepUpdate.setupPlanScanned = true;
             }
-          }
-          if (!skipServicesPlan && servicesPlan && !initState?.steps.servicesPlanScanned) {
-            scanStepUpdate.servicesPlanScanned = true;
+            if (!initState?.steps.servicesPlanScanned) {
+              scanStepUpdate.servicesPlanScanned = true;
+            }
           }
           if (Object.keys(scanStepUpdate).length > 0) {
             await updateInitState({ steps: scanStepUpdate });
@@ -28138,26 +28130,21 @@ var init_init = __esm({
           if (skipSetupPlan) {
             approvedPlan = await readSetupPlan(setupPath);
           }
-          if (skipServicesPlan) {
-            approvedServices = await readServicesPlan(servicesPath);
-          }
-          if (shouldResume && (approvedPlan || approvedServices)) {
+          if (shouldResume && approvedPlan) {
             const backfillStepUpdate = {};
-            if (approvedPlan) {
-              if (!initState?.steps.setupEnvSecretsScanned) {
-                backfillStepUpdate.setupEnvSecretsScanned = true;
-              }
-              if (!initState?.steps.setupExternalScanned) {
-                backfillStepUpdate.setupExternalScanned = true;
-              }
-              if (!initState?.steps.setupExtraArtifactsScanned) {
-                backfillStepUpdate.setupExtraArtifactsScanned = true;
-              }
-              if (!initState?.steps.setupPlanScanned) {
-                backfillStepUpdate.setupPlanScanned = true;
-              }
+            if (!initState?.steps.setupEnvSecretsScanned) {
+              backfillStepUpdate.setupEnvSecretsScanned = true;
             }
-            if (approvedServices && !initState?.steps.servicesPlanScanned) {
+            if (!initState?.steps.setupExternalScanned) {
+              backfillStepUpdate.setupExternalScanned = true;
+            }
+            if (!initState?.steps.setupExtraArtifactsScanned) {
+              backfillStepUpdate.setupExtraArtifactsScanned = true;
+            }
+            if (!initState?.steps.setupPlanScanned) {
+              backfillStepUpdate.setupPlanScanned = true;
+            }
+            if (!initState?.steps.servicesPlanScanned) {
               backfillStepUpdate.servicesPlanScanned = true;
             }
             if (Object.keys(backfillStepUpdate).length > 0) {
@@ -28166,8 +28153,7 @@ var init_init = __esm({
           }
           if (nonInteractive) {
             if (setupPlan) approvedPlan = setupPlan;
-            if (servicesPlan) approvedServices = servicesPlan;
-          } else if (setupPlan || servicesPlan) {
+          } else if (!skipSetupPlan && setupPlan) {
             if (!process.stdin.isTTY || parsed.json) {
               throw new Error("Interactive terminal required to approve setup.");
             }
@@ -28189,54 +28175,51 @@ var init_init = __esm({
               statCache.set(candidatePath, info);
               return info;
             };
-            const buildApprovalSummary = async ({
-              setup,
-              services
-            }) => {
+            const buildApprovalSummary = async (plan) => {
               const lines = [];
               lines.push("Setup");
-              lines.push(`- .env files: ${setup.envFiles.length}`);
-              for (const entry of setup.envFiles) {
+              lines.push(`- .env files: ${plan.envFiles.length}`);
+              for (const entry of plan.envFiles) {
                 lines.push(`  - ${toRepoRelativePath2(repoRoot, entry.path)}`);
               }
-              lines.push(`- Secret/config files: ${setup.secretFiles.length}`);
-              for (const entry of setup.secretFiles) {
+              lines.push(`- Secret/config files: ${plan.secretFiles.length}`);
+              for (const entry of plan.secretFiles) {
                 lines.push(`  - ${toRepoRelativePath2(repoRoot, entry.path)}`);
               }
-              lines.push(`- Other artifacts: ${setup.extraArtifacts.length}`);
-              for (const entry of setup.extraArtifacts) {
+              lines.push(`- Other artifacts: ${plan.extraArtifacts.length}`);
+              for (const entry of plan.extraArtifacts) {
                 lines.push(`  - ${toRepoRelativePath2(repoRoot, entry.path)}`);
               }
-              lines.push(`- External dependencies: ${setup.externalDependencies.length}`);
-              for (const entry of setup.externalDependencies) {
+              lines.push(`- External dependencies: ${plan.externalDependencies.length}`);
+              for (const entry of plan.externalDependencies) {
                 lines.push(
                   `  - ${entry.version ? `${entry.name}@${entry.version}` : entry.name}`
                 );
               }
               lines.push(
-                `- External config/secret files: ${setup.externalConfigs.length}`
+                `- External config/secret files: ${plan.externalConfigs.length}`
               );
-              for (const entry of setup.externalConfigs) {
+              for (const entry of plan.externalConfigs) {
                 lines.push(`  - ${toRepoRelativePath2(repoRoot, entry.path)}`);
               }
               lines.push("");
               lines.push("Services");
-              lines.push(`- App entrypoints: ${services.appEntrypoints.length}`);
-              for (const entry of services.appEntrypoints) {
+              lines.push(`- App entrypoints: ${plan.services.appEntrypoints.length}`);
+              for (const entry of plan.services.appEntrypoints) {
                 lines.push(`  - ${entry.command}`);
               }
               lines.push(
-                `- Background services: ${services.backgroundServices.length}`
+                `- Background services: ${plan.services.backgroundServices.length}`
               );
-              for (const entry of services.backgroundServices) {
+              for (const entry of plan.services.backgroundServices) {
                 lines.push(`  - ${entry.name}`);
               }
               const candidatePaths = /* @__PURE__ */ new Set();
               for (const entry of [
-                ...setup.envFiles,
-                ...setup.secretFiles,
-                ...setup.extraArtifacts,
-                ...setup.externalConfigs
+                ...plan.envFiles,
+                ...plan.secretFiles,
+                ...plan.extraArtifacts,
+                ...plan.externalConfigs
               ]) {
                 candidatePaths.add(entry.path);
               }
@@ -28271,27 +28254,18 @@ var init_init = __esm({
               };
             };
             let draftSetup = setupPlan;
-            let draftServices = servicesPlan;
             while (true) {
-              const nextSetup = skipSetupPlan ? approvedPlan : await promptForPlanApproval({
+              const nextSetup = await promptForPlanApproval({
                 plan: setupPlan,
                 repoRoot,
                 initialPlan: draftSetup
               });
-              const nextServices = skipServicesPlan ? approvedServices : await promptForServicesApproval({
-                plan: servicesPlan,
-                initialPlan: draftServices
-              });
-              if (!nextSetup) {
-                throw new Error("Setup plan missing.");
-              }
-              if (!nextServices) {
-                throw new Error("Services plan missing.");
-              }
-              const { summary, warning, hasRisk } = await buildApprovalSummary({
-                setup: nextSetup,
-                services: nextServices
+              const nextServices = await promptForServicesApproval({
+                plan: setupPlan.services,
+                initialSelection: draftSetup?.services ?? null
               });
+              const nextPlan = { ...nextSetup, services: nextServices };
+              const { summary, warning, hasRisk } = await buildApprovalSummary(nextPlan);
               kt2(summary, "Selected setup requirements");
               if (warning) {
                 kt2(warning, "Special attention");
@@ -28309,8 +28283,7 @@ var init_init = __esm({
                 throwInitCanceled();
               }
               if (decision === "edit") {
-                draftSetup = nextSetup;
-                draftServices = nextServices;
+                draftSetup = nextPlan;
                 continue;
               }
               if (hasRisk) {
@@ -28324,31 +28297,22 @@ var init_init = __esm({
                   throwInitCanceled();
                 }
                 if (!confirmed) {
-                  draftSetup = nextSetup;
-                  draftServices = nextServices;
+                  draftSetup = nextPlan;
                   continue;
                 }
               }
-              approvedPlan = nextSetup;
-              approvedServices = nextServices;
+              approvedPlan = nextPlan;
               break;
             }
           }
           if (!approvedPlan) {
             throw new Error("Setup plan missing.");
           }
-          if (!approvedServices) {
-            throw new Error("Services plan missing.");
-          }
           const ensuredPlan = approvedPlan;
           if (!skipSetupPlan) {
             await writeSetupPlan(setupPath, ensuredPlan);
             await updateInitState({ steps: { setupPlanWritten: true } });
           }
-          if (!skipServicesPlan) {
-            await writeServicesPlan(servicesPath, approvedServices);
-            await updateInitState({ steps: { servicesPlanWritten: true } });
-          }
           if (!skipSetupUpload) {
             setupArtifacts = await runInitStep({
               enabled: progressEnabled,
@@ -28365,6 +28329,9 @@ var init_init = __esm({
         } finally {
           await import_promises28.default.rm(setupTempDir, { recursive: true, force: true });
         }
+        if (!approvedPlan) {
+          throw new Error("Setup plan missing.");
+        }
         const skipProvision = shouldResume && initState?.steps.workdirProvisioned;
         if (skipProvision && !skipSetupUpload) {
           await runInitStep({
@@ -28922,9 +28889,6 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
           });
         }
         if (!skipServicesConfig) {
-          if (!approvedServices) {
-            throw new Error("Missing services plan output.");
-          }
           await runInitStep({
             enabled: progressEnabled,
             title: "Writing devbox.toml services",
@@ -28933,7 +28897,7 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
                 client,
                 canonical,
                 workdir: expandedWorkdir,
-                services: approvedServices.backgroundServices
+                services: approvedPlan.services.backgroundServices
               });
               await updateInitState({ steps: { servicesConfigWritten: true } });
             }
@@ -29060,7 +29024,7 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
                 await enableRemoteServices({
                   client,
                   canonical,
-                  services: approvedServices?.backgroundServices ?? [],
+                  services: approvedPlan.services.backgroundServices,
                   status
                 });
                 await updateInitState({ steps: { servicesEnabled: true } });
@@ -29081,7 +29045,7 @@ Tip: re-run with DEVBOX_LOG_LEVEL=info to see Sprite exec logs on stderr.`
                 socketInfo,
                 status,
                 pathSetup,
-                entrypoints: approvedServices?.appEntrypoints ?? []
+                entrypoints: approvedPlan.services.appEntrypoints
               });
             }
           });

package/dist/devbox/commands/init/codex/local.d.ts

@@ -1,4 +1,4 @@
-import type { ServicesPlan, SetupPlan } from "./plan.js";
+import type { ServicesSelection, SetupPlan } from "./plan.js";
 declare const runLocalSetupEnvSecretsScan: ({ cwd, logDir, schemaPath, outputPath, onProgress, }: {
     cwd: string;
     logDir: string;
@@ -34,9 +34,9 @@ declare const promptForPlanApproval: ({ plan, repoRoot, initialPlan, }: {
     repoRoot: string;
     initialPlan?: SetupPlan | null;
 }) => Promise<SetupPlan>;
-declare const promptForServicesApproval: ({ plan, initialPlan, }: {
-    plan: ServicesPlan;
-    initialPlan?: ServicesPlan | null;
-}) => Promise<ServicesPlan>;
+declare const promptForServicesApproval: ({ plan, initialSelection, }: {
+    plan: ServicesSelection;
+    initialSelection?: ServicesSelection | null;
+}) => Promise<ServicesSelection>;
 export { promptForPlanApproval, promptForServicesApproval, runLocalServicesScan, runLocalSetupEnvSecretsScan, runLocalSetupExternalScan, runLocalSetupExtraArtifactsScan, };
 //# sourceMappingURL=local.d.ts.map

package/dist/devbox/commands/init/codex/local.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../../../../src/devbox/commands/init/codex/local.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAMV,YAAY,EACZ,SAAS,EACV,MAAM,WAAW,CAAC;AA4HnB,QAAA,MAAM,2BAA2B,GAAU,sDAMxC;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,kBAkDA,CAAC;AAEF,QAAA,MAAM,yBAAyB,GAAU,+DAOtC;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,kBAmDA,CAAC;AAEF,QAAA,MAAM,+BAA+B,GAAU,sDAM5C;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,kBAkDA,CAAC;AAEF,QAAA,MAAM,oBAAoB,GAAU,+DAOjC;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,kBAkDA,CAAC;AA2BF,QAAA,MAAM,qBAAqB,GAAU,kCAIlC;IACD,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;CAChC,KAAG,OAAO,CAAC,SAAS,CA6HpB,CAAC;AAEF,QAAA,MAAM,yBAAyB,GAAU,wBAGtC;IACD,IAAI,EAAE,YAAY,CAAC;IACnB,WAAW,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CACnC,KAAG,OAAO,CAAC,YAAY,CA2DvB,CAAC;AAEF,OAAO,EACL,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,+BAA+B,GAChC,CAAC"}
+{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../../../../src/devbox/commands/init/codex/local.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAMV,iBAAiB,EACjB,SAAS,EACV,MAAM,WAAW,CAAC;AA4HnB,QAAA,MAAM,2BAA2B,GAAU,sDAMxC;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,kBAkDA,CAAC;AAEF,QAAA,MAAM,yBAAyB,GAAU,+DAOtC;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,kBAmDA,CAAC;AAEF,QAAA,MAAM,+BAA+B,GAAU,sDAM5C;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,kBAkDA,CAAC;AAEF,QAAA,MAAM,oBAAoB,GAAU,+DAOjC;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,kBAmDA,CAAC;AA2BF,QAAA,MAAM,qBAAqB,GAAU,kCAIlC;IACD,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;CAChC,KAAG,OAAO,CAAC,SAAS,CA8HpB,CAAC;AAEF,QAAA,MAAM,yBAAyB,GAAU,6BAGtC;IACD,IAAI,EAAE,iBAAiB,CAAC;IACxB,gBAAgB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC7C,KAAG,OAAO,CAAC,iBAAiB,CAyD5B,CAAC;AAEF,OAAO,EACL,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,+BAA+B,GAChC,CAAC"}

package/dist/devbox/commands/init/codex/local.js

@@ -213,6 +213,7 @@ const runLocalServicesScan = async ({ cwd, logDir, schemaPath, outputPath, homeD
     const stderrLogPath = path.join(logDir, `codex-local-services-scan-${stamp}.stderr.log`);
     const metaLogPath = path.join(logDir, `codex-local-services-scan-${stamp}.meta.json`);
     await fs.mkdir(logDir, { recursive: true, mode: 0o700 });
+    await fs.mkdir(path.dirname(outputPath), { recursive: true, mode: 0o700 });
     try {
         await fs.chmod(logDir, 0o700);
     }
@@ -362,9 +363,10 @@ const promptForPlanApproval = async ({ plan, repoRoot, initialPlan, }) => {
         extraArtifacts: plan.extraArtifacts.filter((entry) => extraArtifactSet.has(entry.path)),
         externalDependencies: plan.externalDependencies.filter((entry) => externalDependencySet.has(entry.name)),
         externalConfigs: plan.externalConfigs.filter((entry) => externalConfigSet.has(entry.path)),
+        services: initialPlan?.services ?? plan.services,
     };
 };
-const promptForServicesApproval = async ({ plan, initialPlan, }) => {
+const promptForServicesApproval = async ({ plan, initialSelection, }) => {
     log.step("Review run services findings");
     const appEntrypointOptions = plan.appEntrypoints.map((entry) => ({
         value: entry.command,
@@ -381,7 +383,7 @@ const promptForServicesApproval = async ({ plan, initialPlan, }) => {
         : await multiselectWithHelp({
             message: "Select app entrypoints to validate setup",
             options: appEntrypointOptions,
-            initialValues: initialPlan?.appEntrypoints.map((entry) => entry.command) ??
+            initialValues: initialSelection?.appEntrypoints.map((entry) => entry.command) ??
                 plan.appEntrypoints.map((entry) => entry.command),
             required: false,
         });
@@ -394,7 +396,7 @@ const promptForServicesApproval = async ({ plan, initialPlan, }) => {
         : await multiselectWithHelp({
             message: "Select background services to run in the devbox",
             options: backgroundServiceOptions,
-            initialValues: initialPlan?.backgroundServices.map((entry) => entry.name) ??
+            initialValues: initialSelection?.backgroundServices.map((entry) => entry.name) ??
                 plan.backgroundServices.map((entry) => entry.name),
             required: false,
         });
@@ -405,8 +407,6 @@ const promptForServicesApproval = async ({ plan, initialPlan, }) => {
     const appEntrypointSet = new Set(appEntrypointSelection);
     const backgroundServiceSet = new Set(backgroundServiceSelection);
     return {
-        schemaVersion: plan.schemaVersion,
-        scanFullyCompleted: plan.scanFullyCompleted,
         appEntrypoints: plan.appEntrypoints.filter((entry) => appEntrypointSet.has(entry.command)),
         backgroundServices: plan.backgroundServices.filter((entry) => backgroundServiceSet.has(entry.name)),
     };