@boxes-dev/dvb 0.2.34 → 0.2.36

package/dist/devbox/commands/init/index.js

@@ -17,7 +17,7 @@ import { readRepoMarker, writeRepoMarker } from "./registry.js";
 import { INIT_STEP_KEYS, readInitState, writeInitState } from "./state.js";
 import { ensureSshConfig, ensureSshKey, copyToClipboard, openBrowser, parseGitRemote, readRemoteOrigin, setRemoteOrigin, verifySshAuth, } from "./ssh.js";
 import { ensureKnownHostsFile, ensureLocalMountKey, ensureRemoteMountAccess, ensureSshdService, readLocalMountPublicKey, } from "../mountSsh.js";
-import { createSetupArtifacts, promptForPlanApproval, promptForServicesApproval, readSetupPlan, readSetupEnvSecretsPlan, readSetupExternalPlan, readSetupExtraArtifactsPlan, readServicesPlan, runLocalServicesScan, runLocalSetupEnvSecretsScan, runLocalSetupExternalScan, runLocalSetupExtraArtifactsScan, runRemoteCodexSetup, uploadSetupPlan, mergeSetupScans, writeSetupPlan, writeSetupEnvSecretsSchema, writeSetupExternalSchema, writeSetupExtraArtifactsSchema, writeServicesPlan, writeServicesSchema, } from "./codex/index.js";
+import { createSetupArtifacts, promptForPlanApproval, promptForServicesApproval, readSetupPlan, readSetupEnvSecretsPlan, readSetupExternalPlan, readSetupExtraArtifactsPlan, readServicesPlan, runLocalServicesScan, runLocalSetupEnvSecretsScan, runLocalSetupExternalScan, runLocalSetupExtraArtifactsScan, runRemoteCodexSetup, uploadSetupPlan, mergeSetupScans, writeSetupPlan, writeSetupEnvSecretsSchema, writeSetupExternalSchema, writeSetupExtraArtifactsSchema, writeServicesSchema, } from "./codex/index.js";
 import { mergeServicesToml, splitShellCommand, } from "../servicesToml.js";
 import { runInitStep } from "./progress.js";
 const resolveInitStatus = (steps, complete) => {
@@ -57,7 +57,6 @@ const migrateLegacyRepoDevboxDir = async ({ repoRoot, projectDir, }) => {
         "box.json",
         "init-state.json",
         "setup.json",
-        "services.json",
         "setup-artifacts.tgz",
         "setup-artifacts.json",
         "scans",
@@ -86,7 +85,7 @@ const buildServicesTomlUpdates = (services) => {
     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;
@@ -160,7 +159,7 @@ const enableRemoteServices = async ({ client, canonical, services, status, }) =>
     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 ?? "");
@@ -625,12 +624,12 @@ export const runInit = async (args) => {
             }
             const setupDir = projectDir;
             const setupPath = path.join(setupDir, "setup.json");
-            const servicesPath = path.join(setupDir, "services.json");
+            let setupPlan;
             try {
-                await fs.access(setupPath);
+                setupPlan = await readSetupPlan(setupPath);
             }
             catch {
-                throw new Error(`Missing setup plan (${setupPath}). Run \`dvb init\` first.`);
+                throw new Error(`Missing or invalid setup plan (${setupPath}). Run \`dvb init\` first.`);
             }
             const localArtifactsBundlePath = path.join(setupDir, "setup-artifacts.tgz");
             const localArtifactsManifestPath = path.join(setupDir, "setup-artifacts.json");
@@ -690,13 +689,6 @@ export const runInit = async (args) => {
             const remoteArtifactsBundlePath = path.posix.join(expandedWorkdir, ".devbox", "setup-artifacts.tgz");
             const remoteArtifactsManifestPath = path.posix.join(expandedWorkdir, ".devbox", "setup-artifacts.json");
             const pathSetup = 'export PATH="$(npm bin -g 2>/dev/null):$PATH"';
-            let servicesPlan = null;
-            try {
-                servicesPlan = await readServicesPlan(servicesPath);
-            }
-            catch {
-                servicesPlan = null;
-            }
             await runInitStep({
                 enabled: progressEnabled,
                 title: "Configuring git safe.directory",
@@ -779,7 +771,7 @@ export const runInit = async (args) => {
                     await enableRemoteServices({
                         client,
                         canonical,
-                        services: servicesPlan?.backgroundServices ?? [],
+                        services: setupPlan.services.backgroundServices,
                         status,
                     });
                 },
@@ -798,7 +790,7 @@ export const runInit = async (args) => {
                         socketInfo,
                         status,
                         pathSetup,
-                        entrypoints: servicesPlan?.appEntrypoints ?? [],
+                        entrypoints: setupPlan.services.appEntrypoints,
                     });
                 },
             });
@@ -1094,22 +1086,20 @@ export const runInit = async (args) => {
         });
         const setupDir = projectDir;
         const setupPath = path.join(setupDir, "setup.json");
-        const servicesPath = path.join(setupDir, "services.json");
         const scansDir = path.join(setupDir, "scans");
         const logDir = path.join(setupDir, "logs");
         const setupEnvSecretsScanPath = path.join(scansDir, "setup-env-secrets.json");
         const setupExternalScanPath = path.join(scansDir, "setup-external.json");
         const setupExtraArtifactsScanPath = path.join(scansDir, "setup-extra-artifacts.json");
+        const servicesScanPath = path.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 fs.mkdtemp(path.join(os.tmpdir(), "devbox-setup-"));
         try {
             await fs.mkdir(setupDir, { recursive: true, mode: 0o700 });
@@ -1129,7 +1119,7 @@ export const runInit = async (args) => {
             };
             const tryReadServicesPlan = async () => {
                 try {
-                    return await readServicesPlan(servicesPath);
+                    return await readServicesPlan(servicesScanPath);
                 }
                 catch {
                     return null;
@@ -1161,8 +1151,8 @@ export const runInit = async (args) => {
             };
             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
@@ -1184,7 +1174,7 @@ export const runInit = async (args) => {
                 shouldRetryCodexScan(extraArtifactsScan.scanFullyCompleted, extraArtifactsScan.extraArtifacts)) {
                 extraArtifactsScan = null;
             }
-            const needsServicesScan = !skipServicesPlan && !servicesPlan;
+            const needsServicesScan = needsSetupScan && !servicesPlan;
             const needsEnvSecretsScan = needsSetupScan && !envSecretsScan;
             const needsExternalScan = needsSetupScan && !externalScan;
             const needsExtraArtifactsScan = needsSetupScan && !extraArtifactsScan;
@@ -1300,12 +1290,12 @@ export const runInit = async (args) => {
                                 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, plan.appEntrypoints, plan.backgroundServices),
                         });
@@ -1317,7 +1307,7 @@ export const runInit = async (args) => {
                     ]);
                     if (needsServicesScan) {
                         if (!services) {
-                            throw new Error("Services plan missing.");
+                            throw new Error("Services scan missing.");
                         }
                         servicesPlan = services;
                     }
@@ -1331,11 +1321,18 @@ export const runInit = async (args) => {
                         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,
+                            services: {
+                                appEntrypoints: servicesPlan.appEntrypoints,
+                                backgroundServices: servicesPlan.backgroundServices,
+                            },
                         });
                         await writeSetupPlan(setupPath, merged);
                         setupPlan = merged;
@@ -1390,7 +1387,7 @@ export const runInit = async (args) => {
                             ? "starting"
                             : "cached"
                         : "skipped");
-                    updateServices(skipServicesPlan ? "skipped" : needsServicesScan ? "starting" : "cached");
+                    updateServices(needsServicesScan ? "starting" : "cached");
                     try {
                         await runLocalEnvironmentAnalysis({
                             updateEnvSecrets,
@@ -1411,15 +1408,9 @@ export const runInit = async (args) => {
             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) {
@@ -1434,11 +1425,9 @@ export const runInit = async (args) => {
                 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 });
@@ -1446,26 +1435,21 @@ export const runInit = async (args) => {
             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 (!initState?.steps.setupExternalScanned) {
+                    backfillStepUpdate.setupExternalScanned = true;
+                }
+                if (!initState?.steps.setupExtraArtifactsScanned) {
+                    backfillStepUpdate.setupExtraArtifactsScanned = true;
                 }
-                if (approvedServices && !initState?.steps.servicesPlanScanned) {
+                if (!initState?.steps.setupPlanScanned) {
+                    backfillStepUpdate.setupPlanScanned = true;
+                }
+                if (!initState?.steps.servicesPlanScanned) {
                     backfillStepUpdate.servicesPlanScanned = true;
                 }
                 if (Object.keys(backfillStepUpdate).length > 0) {
@@ -1475,10 +1459,8 @@ export const runInit = async (args) => {
             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.");
                 }
@@ -1504,45 +1486,45 @@ export const runInit = async (args) => {
                     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(`  - ${toRepoRelativePath(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(`  - ${toRepoRelativePath(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(`  - ${toRepoRelativePath(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}`);
-                    for (const entry of setup.externalConfigs) {
+                    lines.push(`- External config/secret files: ${plan.externalConfigs.length}`);
+                    for (const entry of plan.externalConfigs) {
                         lines.push(`  - ${toRepoRelativePath(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}`);
-                    for (const entry of services.backgroundServices) {
+                    lines.push(`- Background services: ${plan.services.backgroundServices.length}`);
+                    for (const entry of plan.services.backgroundServices) {
                         lines.push(`  - ${entry.name}`);
                     }
                     const candidatePaths = 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);
                     }
@@ -1579,31 +1561,18 @@ export const runInit = async (args) => {
                     };
                 };
                 let draftSetup = setupPlan;
-                let draftServices = servicesPlan;
                 while (true) {
-                    const nextSetup = skipSetupPlan
-                        ? approvedPlan
-                        : 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 nextSetup = await promptForPlanApproval({
+                        plan: setupPlan,
+                        repoRoot,
+                        initialPlan: draftSetup,
+                    });
+                    const nextServices = await promptForServicesApproval({
+                        plan: setupPlan.services,
+                        initialSelection: draftSetup?.services ?? null,
                     });
+                    const nextPlan = { ...nextSetup, services: nextServices };
+                    const { summary, warning, hasRisk } = await buildApprovalSummary(nextPlan);
                     clackNote(summary, "Selected setup requirements");
                     if (warning) {
                         clackNote(warning, "Special attention");
@@ -1621,8 +1590,7 @@ export const runInit = async (args) => {
                         throwInitCanceled();
                     }
                     if (decision === "edit") {
-                        draftSetup = nextSetup;
-                        draftServices = nextServices;
+                        draftSetup = nextPlan;
                         continue;
                     }
                     if (hasRisk) {
@@ -1636,31 +1604,22 @@ export const runInit = async (args) => {
                             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,
@@ -1678,6 +1637,9 @@ export const runInit = async (args) => {
         finally {
             await fs.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({
@@ -2188,9 +2150,6 @@ export const runInit = async (args) => {
             });
         }
         if (!skipServicesConfig) {
-            if (!approvedServices) {
-                throw new Error("Missing services plan output.");
-            }
             await runInitStep({
                 enabled: progressEnabled,
                 title: "Writing devbox.toml services",
@@ -2199,7 +2158,7 @@ export const runInit = async (args) => {
                         client,
                         canonical,
                         workdir: expandedWorkdir,
-                        services: approvedServices.backgroundServices,
+                        services: approvedPlan.services.backgroundServices,
                     });
                     await updateInitState({ steps: { servicesConfigWritten: true } });
                 },
@@ -2326,7 +2285,7 @@ export const runInit = async (args) => {
                         await enableRemoteServices({
                             client,
                             canonical,
-                            services: approvedServices?.backgroundServices ?? [],
+                            services: approvedPlan.services.backgroundServices,
                             status,
                         });
                         await updateInitState({ steps: { servicesEnabled: true } });
@@ -2347,7 +2306,7 @@ export const runInit = async (args) => {
                         socketInfo,
                         status,
                         pathSetup,
-                        entrypoints: approvedServices?.appEntrypoints ?? [],
+                        entrypoints: approvedPlan.services.appEntrypoints,
                     });
                 },
             });