@boxes-dev/dvb 1.0.36 → 1.0.37

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]="c5ff8eeb-e556-5c16-a965-f352e4d938da")}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]="40d741de-8ab0-5af9-b40e-d750caa3ceab")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88634,8 +88634,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.36";
-      const rawGitSha = "d6a6bd50edec94cd8671adc34f32d1c623f98e89";
+      const rawPackageVersion = "1.0.37";
+      const rawGitSha = "c3f5a2ab47817d9cb07bb8bc3ef137c6aeccdfcf";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120623,9 +120623,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.36";
-      const rawGitSha = "d6a6bd50edec94cd8671adc34f32d1c623f98e89";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.36+d6a6bd50edec94cd8671adc34f32d1c623f98e89";
+      const rawPackageVersion = "1.0.37";
+      const rawGitSha = "c3f5a2ab47817d9cb07bb8bc3ef137c6aeccdfcf";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.37+c3f5a2ab47817d9cb07bb8bc3ef137c6aeccdfcf";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -139928,6 +139928,7 @@ var init_completions = __esm({
       addValueOption(init3, "alias", "Alias for the devbox");
       addValueOption(init3, "name", "Canonical devbox name");
       addStaticOption(init3, "force", "Force provisioning");
+      addStaticOption(init3, "yes", "Skip force destroy confirmation");
       addStaticOption(init3, "resume", "Resume a previous init");
       addStaticOption(init3, "status", "Show init status and checkpoint info");
       addStaticOption(init3, "json", "Output JSON");
@@ -142375,6 +142376,64 @@ var init_daemon = __esm({
   }
 });
 
+// src/devbox/commands/destroyShared.ts
+var isHttpSuccess, checkSpriteExists, destroySpriteAndClearState;
+var init_destroyShared = __esm({
+  "src/devbox/commands/destroyShared.ts"() {
+    "use strict";
+    init_src();
+    init_daemonClient();
+    isHttpSuccess = (status) => status >= 200 && status < 300;
+    checkSpriteExists = async (client, canonical) => {
+      try {
+        await client.getSprite(canonical);
+        return true;
+      } catch (error2) {
+        if (error2 instanceof SpritesApiError && error2.status === 404) {
+          return false;
+        }
+        throw error2;
+      }
+    };
+    destroySpriteAndClearState = async ({
+      client,
+      canonical,
+      socketPath
+    }) => {
+      const spriteExisted = await checkSpriteExists(client, canonical);
+      if (spriteExisted) {
+        try {
+          await client.deleteSprite(canonical);
+        } catch (error2) {
+          if (!(error2 instanceof SpritesApiError && error2.status === 404)) {
+            throw error2;
+          }
+        }
+      }
+      const portsClear = await requestJson3(
+        socketPath,
+        "POST",
+        "/ports/clear",
+        DAEMON_TIMEOUT_MS.quick,
+        { box: canonical }
+      );
+      const registryRemove2 = await requestJson3(
+        socketPath,
+        "POST",
+        "/registry/remove",
+        DAEMON_TIMEOUT_MS.registry,
+        { canonical }
+      );
+      if (!isHttpSuccess(portsClear.status) || !isHttpSuccess(registryRemove2.status)) {
+        throw new Error(
+          "dvbd failed to clear local state. Restart dvbd and retry."
+        );
+      }
+      return { spriteExisted };
+    };
+  }
+});
+
 // src/devbox/commands/destroy.ts
 var import_promises12, import_promises13, import_node_os7, import_node_path13, isObject, readCanonicalFromJson, cleanupLocalProjectDirsForBox, parseDestroyArgs, confirmDestroy, runDestroy;
 var init_destroy = __esm({
@@ -142389,6 +142448,7 @@ var init_destroy = __esm({
     init_auth();
     init_statusLine();
     init_boxSelect();
+    init_destroyShared();
     isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
     readCanonicalFromJson = async (filePath) => {
       try {
@@ -142522,51 +142582,13 @@ var init_destroy = __esm({
         );
         const client = createSpritesClient({ apiBaseUrl, token });
         status.stage("Deleting devbox");
-        try {
-          await client.deleteSprite(canonical);
-        } catch (error2) {
-          if (error2 instanceof SpritesApiError && error2.status === 404) {
-            status.stage("Devbox already deleted", "warn");
-          } else if (error2 instanceof SpritesApiError) {
-            const deleteError = error2;
-            let spriteStillExists = true;
-            try {
-              const sprite = await client.getSprite(canonical);
-              spriteStillExists = Boolean(sprite);
-            } catch {
-              spriteStillExists = true;
-            }
-            if (spriteStillExists) {
-              throw deleteError;
-            }
-            status.stop();
-            console.error(
-              `Sprites delete failed but "${canonical}" is gone; cleaning local state.`
-            );
-          } else {
-            throw error2;
-          }
-        }
-        status.stage("Clearing local state");
-        const isOk = (statusCode) => statusCode >= 200 && statusCode < 300;
-        const portsClear = await requestJson3(
-          socketInfo.socketPath,
-          "POST",
-          "/ports/clear",
-          DAEMON_TIMEOUT_MS.quick,
-          { box: canonical }
-        );
-        const registryRemove2 = await requestJson3(
-          socketInfo.socketPath,
-          "POST",
-          "/registry/remove",
-          DAEMON_TIMEOUT_MS.registry,
-          { canonical }
-        );
-        if (!isOk(portsClear.status) || !isOk(registryRemove2.status)) {
-          throw new Error(
-            "dvbd failed to clear local state. Restart dvbd and retry."
-          );
+        const { spriteExisted } = await destroySpriteAndClearState({
+          client,
+          canonical,
+          socketPath: socketInfo.socketPath
+        });
+        if (!spriteExisted) {
+          status.stage("Devbox already deleted", "warn");
         }
         status.stage("Cleaning local project state");
         try {
@@ -142993,7 +143015,7 @@ var init_args = __esm({
   "src/devbox/commands/init/args.ts"() {
     "use strict";
     parseInitArgs = (args) => {
-      const parsed = { force: false };
+      const parsed = { force: false, yes: false };
       for (let i2 = 0; i2 < args.length; i2 += 1) {
         const arg = args[i2];
         if (arg === "--alias" && args[i2 + 1]) {
@@ -143014,6 +143036,10 @@ var init_args = __esm({
           parsed.force = true;
           continue;
         }
+        if (arg === "--yes") {
+          parsed.yes = true;
+          continue;
+        }
         if (arg === "--json") {
           parsed.json = true;
           continue;
@@ -147931,6 +147957,7 @@ var init_init = __esm({
     init_mountSsh();
     init_codex();
     init_servicesToml();
+    init_destroyShared();
     init_progress();
     requireDaemonJsonOk = (response, label) => {
       if (response.status >= 200 && response.status < 300) {
@@ -148386,7 +148413,7 @@ var init_init = __esm({
         let initState = detected.initState;
         const initFingerprintMismatch = detected.initFingerprintMismatch;
         if (parsed.status) {
-          if (parsed.resume || parsed.force || parsed.codexSetupOnly || parsed.alias || parsed.name) {
+          if (parsed.resume || parsed.force || parsed.yes || parsed.codexSetupOnly || parsed.alias || parsed.name) {
             throw new Error(
               "`dvb init --status` cannot be combined with other init flags (except --json)."
             );
@@ -148509,7 +148536,7 @@ var init_init = __esm({
               "  If init was started elsewhere, re-run `dvb init --resume` from that repo."
             );
             lines.push(
-              "  Otherwise, restart init with `dvb init --force` (re-provisions the remote workdir)."
+              "  Otherwise, restart init with `dvb init --force` (destroys and recreates the existing devbox)."
             );
           } else {
             lines.push("  (none)");
@@ -148571,17 +148598,29 @@ var init_init = __esm({
           initState = null;
         }
         const wantsResume = Boolean(parsed.resume);
-        if (parsed.force && initState && !initState.complete && !wantsResume) {
-          initState = null;
-        }
-        const shouldResume = Boolean(
-          wantsResume && initState && !initState.complete
-        );
         if (!parsed.codexSetupOnly && !wantsResume && initState && !initState.complete && !parsed.force) {
           throw new Error(
             "Previous init is incomplete. Run `dvb init --resume` to finish the previous init or `dvb init --force` to restart."
           );
         }
+        if (parsed.force && !wantsResume) {
+          const previousState = initState;
+          const freshState = {
+            version: 1,
+            fingerprint,
+            ...previousState?.canonical !== void 0 ? { canonical: previousState.canonical } : {},
+            ...previousState?.alias !== void 0 ? { alias: previousState.alias } : {},
+            ...previousState?.workdir !== void 0 ? { workdir: previousState.workdir } : {},
+            steps: {},
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            complete: false
+          };
+          initState = freshState;
+          await writeInitState(projectDir, freshState);
+        }
+        const shouldResume = Boolean(
+          wantsResume && initState && !initState.complete
+        );
         const ensureInitState = () => {
           if (!initState || initState.fingerprint !== fingerprint) {
             initState = {
@@ -148926,7 +148965,7 @@ var init_init = __esm({
             await requireDaemonFeatures(socketInfo.socketPath, ["registry"]);
           }
         });
-        const existingEntry = await runInitStep({
+        let existingEntry = await runInitStep({
           enabled: progressEnabled,
           title: "Checking sprites",
           fn: async () => {
@@ -149004,6 +149043,59 @@ var init_init = __esm({
             return { config: config4, client: client2, controlPlaneToken: controlPlaneToken2 };
           }
         });
+        if (parsed.force && existingEntry && !shouldResume) {
+          const forceCanonical = existingEntry.canonical;
+          await runInitStep({
+            enabled: progressEnabled,
+            title: "Destroying existing devbox (--force)",
+            fn: async ({ status }) => {
+              logger7.info("init_force_destroy_start", {
+                box: forceCanonical,
+                fingerprint
+              });
+              const spriteExists = await checkSpriteExists(client, forceCanonical);
+              if (spriteExists && !parsed.yes) {
+                if (!process.stdin.isTTY || parsed.json) {
+                  throw new Error(
+                    `--force would destroy existing devbox "${forceCanonical}". Re-run with --yes to confirm.`
+                  );
+                }
+                status.stop();
+                const confirmedDestroy = await Mt2({
+                  message: `Destroy existing devbox "${forceCanonical}" before re-running init with --force?`,
+                  active: "Destroy and continue",
+                  inactive: "Abort init",
+                  initialValue: false
+                });
+                if (Ct(confirmedDestroy)) {
+                  throwInitCanceled();
+                }
+                if (!confirmedDestroy) {
+                  throw new Error("Force init canceled.");
+                }
+                status.stage("Destroying existing devbox (--force)");
+              }
+              if (spriteExists) {
+                logger7.info("init_force_destroy_confirmed", {
+                  box: forceCanonical,
+                  fingerprint
+                });
+              }
+              await requireDaemonFeatures(socketInfo.socketPath, ["ports"]);
+              const result = await destroySpriteAndClearState({
+                client,
+                canonical: forceCanonical,
+                socketPath: socketInfo.socketPath
+              });
+              logger7.info("init_force_destroy_complete", {
+                box: forceCanonical,
+                fingerprint,
+                spriteExisted: result.spriteExisted
+              });
+            }
+          });
+          existingEntry = null;
+        }
         const username = import_node_os11.default.userInfo().username;
         let canonical = (shouldResume && initState?.canonical ? initState.canonical : null) ?? canonicalHint ?? `${username}-${slug}`;
         const knownAssociatedCanonicals = new Set(
@@ -155396,7 +155488,7 @@ var init_cli = __esm({
       console.log("  dvb uninstall [--dry-run] [--yes] [--json]");
       console.log("  dvb init [--alias <alias>] [--name <canonical>]");
       console.log(
-        "             [--force] [--resume] [--status] [--json] [--codex-setup-only]"
+        "             [--force] [--yes] [--resume] [--status] [--json] [--codex-setup-only]"
       );
       console.log(
         "  dvb connect [<box>[/<session>]] [-n <name>] [--command <cmd>] [--detach] [--no-log]"
@@ -155771,4 +155863,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=c5ff8eeb-e556-5c16-a965-f352e4d938da
+//# debugId=40d741de-8ab0-5af9-b40e-d750caa3ceab