@superblocksteam/cli 2.0.115-next.1 → 2.0.115-next.2

package/dist/{html-ADAJHV4U.js → html-7VSXMGZ5.js}

@@ -1,7 +1,7 @@
 if (typeof process === 'object' && process !== null &&
     process.env !== null && typeof process.env === 'object') {
   process.env.DD_GIT_REPOSITORY_URL = 'https://token@github.com/superblocksteam/superblocks.git';
-  process.env.DD_GIT_COMMIT_SHA = 'd1f96f3ac0861a77e75e79ae5dd348f2ed4ecd8d';
+  process.env.DD_GIT_COMMIT_SHA = '48ad3b32fbd495c6e994b0da4e3133b280a349d1';
 }
 import { createRequire as $dd_createRequire } from 'module';
 import { fileURLToPath as $dd_fileURLToPath } from 'url';
@@ -12,7 +12,7 @@ globalThis.__dirname ??= $dd_dirname(globalThis.__filename);
 
 import {
   init_cjs_shims
-} from "./chunk-F2XDCV5P.js";
+} from "./chunk-VXFKJXMK.js";
 
 // ../../../../node_modules/.pnpm/prettier@3.8.1/node_modules/prettier/plugins/html.mjs
 init_cjs_shims();
@@ -2946,4 +2946,4 @@ export {
   Qr as parsers,
   Ll as printers
 };
-//# sourceMappingURL=html-ADAJHV4U.js.map
+//# sourceMappingURL=html-7VSXMGZ5.js.map

package/dist/{http-NN4HGFY6.js → http-MSR7AOQE.js}

@@ -1,7 +1,7 @@
 if (typeof process === 'object' && process !== null &&
     process.env !== null && typeof process.env === 'object') {
   process.env.DD_GIT_REPOSITORY_URL = 'https://token@github.com/superblocksteam/superblocks.git';
-  process.env.DD_GIT_COMMIT_SHA = 'd1f96f3ac0861a77e75e79ae5dd348f2ed4ecd8d';
+  process.env.DD_GIT_COMMIT_SHA = '48ad3b32fbd495c6e994b0da4e3133b280a349d1';
 }
 import { createRequire as $dd_createRequire } from 'module';
 import { fileURLToPath as $dd_fileURLToPath } from 'url';
@@ -19,18 +19,18 @@ import {
   package_default,
   resolveProfile,
   toolDefinitions
-} from "./chunk-TJ6ILHHH.js";
-import "./chunk-5FASNVKR.js";
-import "./chunk-46VFFXGY.js";
-import "./chunk-5TLY55P3.js";
-import "./chunk-QZMOWQO2.js";
-import "./chunk-JF3FCUWO.js";
-import "./chunk-5BQRSW56.js";
-import "./chunk-EV7NKYAZ.js";
-import "./chunk-PGRPKVAA.js";
+} from "./chunk-E3HFSYVC.js";
+import "./chunk-T6NGNMCE.js";
+import "./chunk-XTNEKI3G.js";
+import "./chunk-3CYENCYH.js";
+import "./chunk-ZNPRMZWK.js";
+import "./chunk-UZ4QIFLO.js";
+import "./chunk-OGVVEDHP.js";
+import "./chunk-X35MZKDE.js";
+import "./chunk-A6T7U33M.js";
 import {
   init_cjs_shims
-} from "./chunk-F2XDCV5P.js";
+} from "./chunk-VXFKJXMK.js";
 
 // ../mcp-server/dist/http.js
 init_cjs_shims();
@@ -313,4 +313,4 @@ async function startHttpServer(options = {}) {
 export {
   startHttpServer
 };
-//# sourceMappingURL=http-NN4HGFY6.js.map
+//# sourceMappingURL=http-MSR7AOQE.js.map

package/dist/index.js

@@ -1,7 +1,7 @@
 if (typeof process === 'object' && process !== null &&
     process.env !== null && typeof process.env === 'object') {
   process.env.DD_GIT_REPOSITORY_URL = 'https://token@github.com/superblocksteam/superblocks.git';
-  process.env.DD_GIT_COMMIT_SHA = 'd1f96f3ac0861a77e75e79ae5dd348f2ed4ecd8d';
+  process.env.DD_GIT_COMMIT_SHA = '48ad3b32fbd495c6e994b0da4e3133b280a349d1';
 }
 import { createRequire as $dd_createRequire } from 'module';
 import { fileURLToPath as $dd_fileURLToPath } from 'url';
@@ -15,7 +15,7 @@ import {
   configPathForClient,
   labelForClient,
   mergeMcpConfig
-} from "./chunk-FLDCO2JA.js";
+} from "./chunk-Z2JDWKOY.js";
 import {
   AUTO_UPGRADE_EXIT_CODE,
   AuthHotReloadServer,
@@ -41,6 +41,7 @@ import {
   cyanBright,
   deleteResourcesAndUpdateRootConfig,
   dev,
+  didPackageJsonSnapshotChange,
   extractApiName,
   fetchAndWriteApplication,
   getAllSocketFiles,
@@ -62,15 +63,19 @@ import {
   isSocketAlive,
   magenta,
   modeFlagValuesMap,
+  packageJsonSnapshotDiagnostic,
   preWarmViteCache,
   readApiFromDisk,
   readApplicationFromDisk,
   readMultiPageApplicationFromDisk,
+  readPackageJsonSnapshot,
+  readPackageJsonSnapshotWithSource,
   red,
   removeResourceFromDisk,
   require_dist,
   require_dist2,
   require_semver,
+  restoreManagedPackageDependencies,
   socketDirectoryExists,
   sortByKey,
   tryDecodeJwtToken,
@@ -79,28 +84,28 @@ import {
   writeApplicationToDisk,
   writeResourceToDisk,
   yellow
-} from "./chunk-5FASNVKR.js";
-import "./chunk-46VFFXGY.js";
+} from "./chunk-T6NGNMCE.js";
+import "./chunk-XTNEKI3G.js";
 import {
   require_enquirer
-} from "./chunk-N26IC7EV.js";
+} from "./chunk-OTZ4NWXP.js";
 import {
   init_lodash,
   isEmpty_default,
   require_lib
-} from "./chunk-5TLY55P3.js";
+} from "./chunk-3CYENCYH.js";
 import {
   require_rfdc
-} from "./chunk-QZMOWQO2.js";
-import "./chunk-JF3FCUWO.js";
-import "./chunk-5BQRSW56.js";
-import "./chunk-EV7NKYAZ.js";
-import "./chunk-PGRPKVAA.js";
+} from "./chunk-ZNPRMZWK.js";
+import "./chunk-UZ4QIFLO.js";
+import "./chunk-OGVVEDHP.js";
+import "./chunk-X35MZKDE.js";
+import "./chunk-A6T7U33M.js";
 import {
   __commonJS,
   __toESM,
   init_cjs_shims
-} from "./chunk-F2XDCV5P.js";
+} from "./chunk-VXFKJXMK.js";
 
 // ../../../../node_modules/.pnpm/eventemitter3@5.0.1/node_modules/eventemitter3/index.js
 var require_eventemitter3 = __commonJS({
@@ -1012,7 +1017,7 @@ async function createPrompt(options, settings) {
     enquirer3 = settings.enquirer;
   } else {
     try {
-      enquirer3 = await import("./enquirer-4RT6U562.js").then((imported) => imported.default ? new imported.default() : new imported());
+      enquirer3 = await import("./enquirer-WAU3IEFL.js").then((imported) => imported.default ? new imported.default() : new imported());
     } catch (e) {
       if (this instanceof TaskWrapper) {
         this.task.prompt = new PromptError("Enquirer is a peer dependency that must be installed separately.");
@@ -1220,9 +1225,9 @@ var _DefaultRenderer = class {
     return typeof bottomBar === "number" && bottomBar !== 0 || typeof bottomBar === "boolean" && bottomBar !== false || !task.hasTitle();
   }
   async render() {
-    const { createLogUpdate } = await import("./log-update-SVXICKYR.js");
-    const { default: truncate } = await import("./cli-truncate-USLGLIKO.js");
-    const { default: wrap } = await import("./wrap-ansi-GVBXECGG.js");
+    const { createLogUpdate } = await import("./log-update-BHKRLINV.js");
+    const { default: truncate } = await import("./cli-truncate-UKEKQY5H.js");
+    const { default: wrap } = await import("./wrap-ansi-SIH5FW5X.js");
     this.updater = createLogUpdate(this.logger.process.stdout);
     this.truncate = truncate;
     this.wrap = wrap;
@@ -4804,6 +4809,8 @@ var Dev = class _Dev extends AuthenticatedCommand {
   // pod already ships with the latest CLI, but the user's package.json still
   // needs to be synced to the target @superblocksteam/library version.
   warmStandbyActivated = false;
+  forcePackageInstall = false;
+  packageJsonSnapshotBeforeRestore;
   authHotReloadServer;
   getAuthTokenTimeoutMs() {
     return 5 * 60 * 1e3;
@@ -5007,8 +5014,11 @@ var Dev = class _Dev extends AuthenticatedCommand {
       autoUpgradeMode,
       sdk,
       prefetchedApplication,
-      skipSync: false
+      skipSync: false,
       // DBFS runs alongside S3 during migration (D-25)
+      forcePackageInstall: this.forcePackageInstall,
+      packageJsonSnapshotBeforeRestore: this.packageJsonSnapshotBeforeRestore,
+      normalizeManagedPackageDependencies: this.warmStandbyActivated
     });
   }
   async onTokenReceived(token) {
@@ -5338,8 +5348,12 @@ var Dev = class _Dev extends AuthenticatedCommand {
         branch: activationConfig.branch
       })
     );
+    this.forcePackageInstall = false;
+    this.packageJsonSnapshotBeforeRestore = void 0;
     if (activationConfig.downloadURL) {
       try {
+        const packageJsonBeforeRestore = await readPackageJsonSnapshotWithSource(process.cwd());
+        this.packageJsonSnapshotBeforeRestore = packageJsonBeforeRestore.snapshot;
         logger.info("Downloading workspace archive...");
         const downloadStart = Date.now();
         const downloadResp = await fetch(activationConfig.downloadURL, {
@@ -5365,12 +5379,22 @@ var Dev = class _Dev extends AuthenticatedCommand {
               stdio: ["pipe", "inherit", "pipe"]
             }
           );
+          let settled = false;
+          let zstdExitCode;
+          let tarExitCode;
+          const rejectOnce = (error) => {
+            if (settled) {
+              return;
+            }
+            settled = true;
+            rejectExtract(error);
+          };
           zstdProc.stdout.pipe(tarProc.stdin);
           zstdProc.stdin.on("error", (err) => {
-            rejectExtract(new Error(`zstd stdin stream error: ${err.message}`));
+            rejectOnce(new Error(`zstd stdin stream error: ${err.message}`));
           });
           tarProc.stdin.on("error", (err) => {
-            rejectExtract(new Error(`tar stdin stream error: ${err.message}`));
+            rejectOnce(new Error(`tar stdin stream error: ${err.message}`));
           });
           const reader = downloadResp.body.getReader();
           const pump = async () => {
@@ -5388,43 +5412,79 @@ var Dev = class _Dev extends AuthenticatedCommand {
           pump().catch((e) => {
             zstdProc.kill();
             tarProc.kill();
-            rejectExtract(e);
+            rejectOnce(e);
           });
-          let stderr = "";
+          let zstdStderr = "";
+          let tarStderr = "";
           zstdProc.stderr.on("data", (chunk) => {
-            stderr += chunk.toString();
+            zstdStderr += chunk.toString();
           });
           tarProc.stderr?.on("data", (chunk) => {
-            stderr += chunk.toString();
-          });
-          let zstdExitCode = null;
-          zstdProc.on("close", (code) => {
-            zstdExitCode = code;
+            tarStderr += chunk.toString();
           });
-          tarProc.on("close", (code) => {
-            if (zstdExitCode !== null && zstdExitCode !== 0) {
+          const finishIfClosed = () => {
+            if (settled || zstdExitCode === void 0 || tarExitCode === void 0) {
+              return;
+            }
+            settled = true;
+            if (zstdExitCode !== 0) {
               rejectExtract(
                 new Error(
-                  `zstd decompression failed (code ${zstdExitCode}): ${stderr}`
+                  `zstd decompression failed (code ${zstdExitCode}): ${zstdStderr}`
                 )
               );
-            } else if (code === 0) {
-              resolveExtract();
-            } else {
+            } else if (tarExitCode !== 0) {
               rejectExtract(
-                new Error(`tar extract failed (code ${code}): ${stderr}`)
+                new Error(
+                  `tar extract failed (code ${tarExitCode}): ${tarStderr}`
+                )
               );
+            } else {
+              resolveExtract();
             }
+          };
+          zstdProc.on("close", (code) => {
+            zstdExitCode = code;
+            finishIfClosed();
           });
-          tarProc.on("error", rejectExtract);
-          zstdProc.on("error", rejectExtract);
+          tarProc.on("close", (code) => {
+            tarExitCode = code;
+            finishIfClosed();
+          });
+          tarProc.on("error", rejectOnce);
+          zstdProc.on("error", rejectOnce);
         });
         logger.info(
           `Workspace extracted in ${Date.now() - extractStart}ms (total ${Date.now() - downloadStart}ms)`
         );
+        if (await restoreManagedPackageDependencies(
+          process.cwd(),
+          packageJsonBeforeRestore.packageJson
+        )) {
+          logger.info(
+            "Restored managed package dependencies to the warm template versions before package comparison"
+          );
+        }
+        const packageJsonAfterRestore = await readPackageJsonSnapshot(
+          process.cwd()
+        );
+        this.forcePackageInstall = didPackageJsonSnapshotChange(
+          packageJsonBeforeRestore.snapshot,
+          packageJsonAfterRestore
+        );
+        logger.info("Warm restore package install decision", {
+          forcePackageInstall: this.forcePackageInstall,
+          packageJsonSnapshotBeforeRestore: packageJsonSnapshotDiagnostic(
+            packageJsonBeforeRestore.snapshot
+          ),
+          packageJsonSnapshotAfterRestore: packageJsonSnapshotDiagnostic(
+            packageJsonAfterRestore
+          )
+        });
       } catch (error) {
+        this.forcePackageInstall = true;
         logger.warn(
-          `Workspace download/extract failed, DBFS will fill the gap: ${error}`
+          `Workspace download/extract failed, DBFS will fill the gap and package install will be forced if package.json remains changed: ${error}`
         );
       }
     }
@@ -6259,12 +6319,12 @@ var McpServe = class _McpServe extends Command9 {
           "HTTP transport requires auth token. Pass --http-token <token> or set SUPERBLOCKS_MCP_HTTP_TOKEN."
         );
       }
-      const { startHttpServer } = await import("./http-NN4HGFY6.js");
+      const { startHttpServer } = await import("./http-MSR7AOQE.js");
       await startHttpServer({ port: flags.port, authToken: httpToken });
       await new Promise(() => {
       });
     } else {
-      const { startServer } = await import("./dist-D4IU4RYL.js");
+      const { startServer } = await import("./dist-7YC735LL.js");
       await startServer();
       await new Promise((resolve2) => {
         process.stdin.once("end", () => resolve2());