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

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @superblocksteam/sdk@2.0.115-next.1 build /home/runner/work/superblocks/superblocks/packages/cli/packages/sdk
+> @superblocksteam/sdk@2.0.115-next.2 build /home/runner/work/superblocks/superblocks/packages/cli/packages/sdk
 > tsc --build
 

package/dist/cli-replacement/dev-s3-restore.test.d.mts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=dev-s3-restore.test.d.mts.map

package/dist/cli-replacement/dev-s3-restore.test.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-s3-restore.test.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev-s3-restore.test.mts"],"names":[],"mappings":""}

package/dist/cli-replacement/dev-s3-restore.test.mjs

@@ -0,0 +1,457 @@
+import * as fs from "node:fs/promises";
+import * as http from "node:http";
+import * as os from "node:os";
+import * as path from "node:path";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { packageJsonSnapshot } from "./package-json-snapshot.mjs";
+const execMock = vi.fn();
+vi.mock("node:child_process", () => ({
+    default: { exec: execMock },
+    exec: execMock,
+}));
+vi.mock("node:readline", () => ({
+    default: {
+        createInterface: vi.fn(() => ({ question: vi.fn(), close: vi.fn() })),
+    },
+    createInterface: vi.fn(() => ({ question: vi.fn(), close: vi.fn() })),
+}));
+vi.mock("fs-extra", () => ({
+    default: {
+        existsSync: vi.fn(() => true),
+        readFileSync: vi.fn(() => "{}"),
+    },
+}));
+vi.mock("package-manager-detector/detect", () => ({
+    detect: vi.fn(async () => ({
+        name: "npm",
+        agent: "npm",
+        version: "10.0.0",
+    })),
+}));
+vi.mock("package-manager-detector", () => ({
+    resolveCommand: vi.fn(() => ({
+        command: "npm",
+        args: ["install", "--fund=false", "--audit=false"],
+    })),
+}));
+vi.mock("read-pkg", () => ({
+    readPackage: vi.fn(async () => ({
+        name: "test-app",
+        dependencies: { "@superblocksteam/library": "1.0.0" },
+    })),
+}));
+const mockLogger = {
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+};
+vi.mock("../telemetry/logging.js", () => ({
+    getLogger: () => mockLogger,
+    getErrorMeta: vi.fn(() => ({})),
+}));
+vi.mock("../telemetry/index.js", () => ({
+    getTracer: () => ({
+        startActiveSpan: vi.fn(async (_name, fn) => fn({ end: vi.fn(), setStatus: vi.fn() })),
+    }),
+}));
+vi.mock("@opentelemetry/api", () => ({
+    SpanStatusCode: { ERROR: 2 },
+}));
+vi.mock("colorette", () => ({
+    green: (s) => s,
+}));
+vi.mock("@superblocksteam/shared", () => ({
+    buildGithubSuperblocksSyncWorkflow: vi.fn(),
+    buildGithubSuperblocksSyncWorkflowFromBaseUrl: vi.fn(),
+    ConflictError: class ConflictError extends Error {
+    },
+    DEFAULT_NON_GIT_BRANCH: "__non_git__",
+    isGitHubRemoteUrl: vi.fn(() => false),
+    NotFoundError: class NotFoundError extends Error {
+    },
+    SUPERBLOCKS_LIVE_GIT_BRANCH: "__live__",
+}));
+vi.mock("@superblocksteam/util", () => ({
+    maskUnixSignals: async function maskUnixSignals(fn) {
+        return fn();
+    },
+}));
+vi.mock("@superblocksteam/vite-plugin-file-sync/ai-service", () => ({
+    AiService: class {
+        initialize = vi.fn(async () => undefined);
+        removeIntegrationCache = vi.fn(async () => undefined);
+        chatSessionStore = { invalidateCache: vi.fn() };
+    },
+    AiServiceFeatureFlags: class {
+        static create = vi.fn(() => ({}));
+    },
+    SnapshotManager: class {
+        executePendingRestore = vi.fn(async () => false);
+    },
+    isSdkApiTemplate: vi.fn(() => false),
+}));
+vi.mock("@superblocksteam/vite-plugin-file-sync/git-service", () => ({
+    createGitService: vi.fn(async () => undefined),
+}));
+const mockLockService = {
+    acquireLock: vi.fn(async () => undefined),
+    shutdown: vi.fn(async () => undefined),
+    shutdownAndExit: vi.fn(async () => undefined),
+    setIsRestarting: vi.fn(),
+    isLocked: false,
+    connectedUsers: [],
+    wasRecentlyActive: false,
+    timeSinceLastActivity: 0,
+};
+vi.mock("@superblocksteam/vite-plugin-file-sync/lock-service", () => ({
+    LockService: class {
+        acquireLock = mockLockService.acquireLock;
+        shutdown = mockLockService.shutdown;
+        shutdownAndExit = mockLockService.shutdownAndExit;
+        setIsRestarting = mockLockService.setIsRestarting;
+        isLocked = mockLockService.isLocked;
+        connectedUsers = mockLockService.connectedUsers;
+        wasRecentlyActive = mockLockService.wasRecentlyActive;
+        timeSinceLastActivity = mockLockService.timeSinceLastActivity;
+    },
+    LockType: { CSB: "CSB", LOCAL: "LOCAL" },
+}));
+vi.mock("@superblocksteam/vite-plugin-file-sync/operation-queue", () => ({
+    OperationQueue: class {
+        enqueue = vi.fn(async (fn) => fn());
+    },
+}));
+vi.mock("@superblocksteam/vite-plugin-file-sync/server-rpc", () => ({
+    AutoConnectingRpcClient: class {
+    },
+}));
+const mockSyncService = {
+    downloadDirectory: vi.fn(async () => undefined),
+    uploadDirectory: vi.fn(async () => undefined),
+    uploadDirectoryNowIfNeeded: vi.fn(async () => undefined),
+    cancelPendingSync: vi.fn(),
+};
+vi.mock("@superblocksteam/vite-plugin-file-sync/sync-service", () => ({
+    SyncService: class {
+        downloadDirectory = mockSyncService.downloadDirectory;
+        uploadDirectory = mockSyncService.uploadDirectory;
+        uploadDirectoryNowIfNeeded = mockSyncService.uploadDirectoryNowIfNeeded;
+        cancelPendingSync = mockSyncService.cancelPendingSync;
+    },
+}));
+vi.mock("@superblocksteam/vite-plugin-file-sync/draft-interface", () => ({}));
+vi.mock("./version-detection.js", () => ({
+    getCurrentCliVersion: vi.fn(async () => ({
+        version: "2.0.0",
+        alias: undefined,
+    })),
+}));
+const mockCheckVersions = vi.fn(async () => ({
+    cliUpdated: false,
+    upgradePromises: [],
+}));
+vi.mock("./automatic-upgrades.js", () => ({
+    checkVersionsAndWritePackageJson: (...args) => mockCheckVersions(...args),
+}));
+vi.mock("./git-repo-setup.mjs", () => ({
+    ensureRemoteHasDefaultBranch: vi.fn(async () => undefined),
+    getGitErrorFields: vi.fn(() => ({})),
+}));
+const mockCreateDevServer = vi.fn(async () => http.createServer());
+vi.mock("../dev-utils/dev-server.mjs", () => ({
+    createDevServer: (...args) => mockCreateDevServer(...args),
+}));
+vi.mock("../index.js", () => ({
+    AUTO_UPGRADE_EXIT_CODE: 99,
+}));
+function buildMockSdk() {
+    return {
+        hashLocalDirectory: vi.fn(async () => ({ hash: "same" })),
+        dbfsGetApplicationDirectoryHash: vi.fn(async () => "same"),
+        getApplicationGitConfig: vi.fn(async () => null),
+        fetchCurrentUser: vi.fn(async () => ({
+            user: {
+                id: "user-1",
+                name: "Test User",
+                email: "test@example.com",
+                currentOrganizationId: "org-1",
+            },
+            organizations: [{ id: "org-1", pluginExecutionVersions: {} }],
+            flagBootstrap: {},
+        })),
+        getFeatureFlagsForCurrentUser: vi.fn(async () => ({
+            devServerCloudInactivityTimeoutMinutes: () => 30,
+            devServerLocalInactivityTimeoutMinutes: () => 30,
+            enableSessionRecording: () => false,
+        })),
+        getFeatureFlagsForUser: vi.fn(() => ({
+            devServerCloudInactivityTimeoutMinutes: () => 30,
+            devServerLocalInactivityTimeoutMinutes: () => 30,
+        })),
+    };
+}
+function buildDevOptions(overrides = {}) {
+    return {
+        cwd: "/tmp/test-app",
+        downloadFirst: true,
+        applicationConfig: {
+            id: "app-test",
+            branchName: "main",
+        },
+        tokenConfig: {
+            superblocksBaseUrl: "https://example.test",
+            token: "test-token",
+        },
+        tokenManager: {
+            getToken: vi.fn(() => "test-token"),
+            onTokenRefresh: vi.fn(),
+        },
+        getCurrentToken: vi.fn(() => "test-token"),
+        sdk: buildMockSdk(),
+        ...overrides,
+    };
+}
+function setupExecMock() {
+    execMock.mockImplementation((_cmd, _opts, cb) => {
+        if (typeof _opts === "function") {
+            _opts(null, {
+                stdout: "installed",
+            });
+        }
+        else if (cb) {
+            cb(null, { stdout: "installed" });
+        }
+    });
+}
+function expectInstallToHaveRun() {
+    const installCall = execMock.mock.calls.find((call) => typeof call[0] === "string" && call[0].includes("install"));
+    expect(installCall).toBeDefined();
+}
+describe("dev startup after S3 workspace restore", () => {
+    beforeEach(async () => {
+        vi.clearAllMocks();
+        setupExecMock();
+        mockCheckVersions.mockResolvedValue({
+            cliUpdated: false,
+            upgradePromises: [],
+        });
+        const { readPackage } = await import("read-pkg");
+        readPackage.mockResolvedValue({
+            name: "test-app",
+            dependencies: { "@superblocksteam/library": "1.0.0" },
+        });
+    });
+    it("keeps the existing no-op path when package.json is unchanged", async () => {
+        const { dev } = await import("./dev.mjs");
+        await dev(buildDevOptions());
+        expect(execMock).not.toHaveBeenCalled();
+        expect(mockLogger.info).toHaveBeenCalledWith("Package install decision", expect.objectContaining({
+            packageJsonRequiresInstall: false,
+            forcePackageInstall: false,
+            upgradePromiseCount: 0,
+        }));
+    });
+    it("runs npm install when auto-upgrade only rewrites @superblocksteam/library", async () => {
+        const { readPackage } = await import("read-pkg");
+        readPackage
+            .mockResolvedValueOnce({
+            name: "test-app",
+            dependencies: { "@superblocksteam/library": "1.0.0" },
+        })
+            .mockResolvedValueOnce({
+            name: "test-app",
+            dependencies: { "@superblocksteam/library": "2.0.0" },
+        });
+        const { dev } = await import("./dev.mjs");
+        await dev(buildDevOptions());
+        expectInstallToHaveRun();
+    });
+    it("normalizes library drift introduced by warm DBFS download before package comparison", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "sdk-dev-dbfs-"));
+        const warmPackageJson = {
+            name: "test-app",
+            dependencies: {
+                "@superblocksteam/library": "2.0.0",
+                react: "19.0.0",
+            },
+        };
+        const staleLibraryPackageJson = {
+            name: "test-app",
+            dependencies: {
+                "@superblocksteam/library": "1.0.0",
+                react: "19.0.0",
+            },
+        };
+        try {
+            await fs.writeFile(path.join(tmpDir, "package.json"), JSON.stringify(warmPackageJson, null, 2));
+            const { readPackage } = await import("read-pkg");
+            readPackage.mockImplementation(async ({ cwd }) => JSON.parse(await fs.readFile(path.join(cwd, "package.json"), "utf-8")));
+            mockSyncService.downloadDirectory.mockImplementationOnce(async () => {
+                await fs.writeFile(path.join(tmpDir, "package.json"), JSON.stringify(staleLibraryPackageJson, null, 2));
+            });
+            const sdk = buildMockSdk();
+            sdk.hashLocalDirectory = vi.fn(async () => ({ hash: "local" }));
+            sdk.dbfsGetApplicationDirectoryHash = vi.fn(async () => "server");
+            const { dev } = await import("./dev.mjs");
+            await dev(buildDevOptions({
+                cwd: tmpDir,
+                sdk,
+                normalizeManagedPackageDependencies: true,
+            }));
+            const finalPackageJson = JSON.parse(await fs.readFile(path.join(tmpDir, "package.json"), "utf-8"));
+            expect(finalPackageJson.dependencies["@superblocksteam/library"]).toBe("2.0.0");
+            expect(execMock).not.toHaveBeenCalled();
+        }
+        finally {
+            await fs.rm(tmpDir, { recursive: true, force: true });
+        }
+    });
+    it("normalizes managed template dependency drift introduced by warm DBFS download before package comparison", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "sdk-dev-dbfs-"));
+        const warmPackageJson = {
+            name: "test-app",
+            dependencies: {
+                "@superblocksteam/library": "2.0.0",
+                "@superblocksteam/sdk-api": "2.0.0",
+                react: "19.0.0",
+            },
+        };
+        const staleManagedPackageJson = {
+            name: "test-app",
+            dependencies: {
+                "@superblocksteam/library": "2.0.0",
+                "@superblocksteam/sdk-api": "1.0.0",
+                react: "19.0.0",
+            },
+        };
+        try {
+            await fs.writeFile(path.join(tmpDir, "package.json"), JSON.stringify(warmPackageJson, null, 2));
+            const { readPackage } = await import("read-pkg");
+            readPackage.mockImplementation(async ({ cwd }) => JSON.parse(await fs.readFile(path.join(cwd, "package.json"), "utf-8")));
+            mockSyncService.downloadDirectory.mockImplementationOnce(async () => {
+                await fs.writeFile(path.join(tmpDir, "package.json"), JSON.stringify(staleManagedPackageJson, null, 2));
+            });
+            const sdk = buildMockSdk();
+            sdk.hashLocalDirectory = vi.fn(async () => ({ hash: "local" }));
+            sdk.dbfsGetApplicationDirectoryHash = vi.fn(async () => "server");
+            const { dev } = await import("./dev.mjs");
+            await dev(buildDevOptions({
+                cwd: tmpDir,
+                sdk,
+                normalizeManagedPackageDependencies: true,
+            }));
+            const finalPackageJson = JSON.parse(await fs.readFile(path.join(tmpDir, "package.json"), "utf-8"));
+            expect(finalPackageJson.dependencies["@superblocksteam/sdk-api"]).toBe("2.0.0");
+            expect(execMock).not.toHaveBeenCalled();
+        }
+        finally {
+            await fs.rm(tmpDir, { recursive: true, force: true });
+        }
+    });
+    it("does not normalize library drift for normal DBFS download-first startup", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "sdk-dev-dbfs-"));
+        const localPackageJson = {
+            name: "test-app",
+            dependencies: {
+                "@superblocksteam/library": "2.0.0",
+                react: "19.0.0",
+            },
+        };
+        const serverPackageJson = {
+            name: "test-app",
+            dependencies: {
+                "@superblocksteam/library": "1.0.0",
+                react: "19.0.0",
+            },
+        };
+        try {
+            await fs.writeFile(path.join(tmpDir, "package.json"), JSON.stringify(localPackageJson, null, 2));
+            const { readPackage } = await import("read-pkg");
+            readPackage.mockImplementation(async ({ cwd }) => JSON.parse(await fs.readFile(path.join(cwd, "package.json"), "utf-8")));
+            mockSyncService.downloadDirectory.mockImplementationOnce(async () => {
+                await fs.writeFile(path.join(tmpDir, "package.json"), JSON.stringify(serverPackageJson, null, 2));
+            });
+            const sdk = buildMockSdk();
+            sdk.hashLocalDirectory = vi.fn(async () => ({ hash: "local" }));
+            sdk.dbfsGetApplicationDirectoryHash = vi.fn(async () => "server");
+            const { dev } = await import("./dev.mjs");
+            await dev(buildDevOptions({
+                cwd: tmpDir,
+                sdk,
+            }));
+            const finalPackageJson = JSON.parse(await fs.readFile(path.join(tmpDir, "package.json"), "utf-8"));
+            expect(finalPackageJson.dependencies["@superblocksteam/library"]).toBe("1.0.0");
+            expectInstallToHaveRun();
+        }
+        finally {
+            await fs.rm(tmpDir, { recursive: true, force: true });
+        }
+    });
+    it("runs npm install when S3 restore changes package.json install inputs", async () => {
+        const { dev } = await import("./dev.mjs");
+        await dev(buildDevOptions({
+            forcePackageInstall: true,
+        }));
+        expectInstallToHaveRun();
+        expect(mockLogger.info).toHaveBeenCalledWith("Package install decision", expect.objectContaining({
+            packageJsonRequiresInstall: false,
+            forcePackageInstall: true,
+            upgradePromiseCount: 0,
+        }));
+    });
+    it("uploads local package state when S3 restore forces package installation", async () => {
+        const { dev } = await import("./dev.mjs");
+        await dev(buildDevOptions({
+            forcePackageInstall: true,
+        }));
+        expect(mockSyncService.uploadDirectory).toHaveBeenCalledWith("cli:sdk");
+        expect(mockSyncService.uploadDirectoryNowIfNeeded).toHaveBeenCalledWith("cli:sdk");
+    });
+    it("clears forced npm install when DBFS restores package.json to the pre-restore install inputs", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "sdk-dev-dbfs-"));
+        const warmPackageJson = {
+            name: "test-app",
+            dependencies: {
+                "@superblocksteam/library": "2.0.0",
+                react: "19.0.0",
+            },
+        };
+        const restoredPackageJson = {
+            name: "test-app",
+            dependencies: {
+                "@superblocksteam/library": "2.0.0",
+                random: "1.0.0",
+                react: "19.0.0",
+            },
+        };
+        try {
+            await fs.writeFile(path.join(tmpDir, "package.json"), JSON.stringify(restoredPackageJson, null, 2));
+            const { readPackage } = await import("read-pkg");
+            readPackage.mockImplementation(async ({ cwd }) => JSON.parse(await fs.readFile(path.join(cwd, "package.json"), "utf-8")));
+            mockSyncService.downloadDirectory.mockImplementationOnce(async () => {
+                await fs.writeFile(path.join(tmpDir, "package.json"), JSON.stringify(warmPackageJson, null, 2));
+            });
+            const sdk = buildMockSdk();
+            sdk.hashLocalDirectory = vi.fn(async () => ({ hash: "local" }));
+            sdk.dbfsGetApplicationDirectoryHash = vi.fn(async () => "server");
+            const { dev } = await import("./dev.mjs");
+            await dev(buildDevOptions({
+                cwd: tmpDir,
+                forcePackageInstall: true,
+                packageJsonSnapshotBeforeRestore: packageJsonSnapshot(warmPackageJson),
+                sdk,
+            }));
+            expect(execMock).not.toHaveBeenCalled();
+            expect(mockLogger.info).toHaveBeenCalledWith("Package install decision", expect.objectContaining({
+                forcePackageInstall: false,
+                forcePackageInstallRequested: true,
+                packageJsonRequiresInstall: false,
+            }));
+        }
+        finally {
+            await fs.rm(tmpDir, { recursive: true, force: true });
+        }
+    });
+});
+//# sourceMappingURL=dev-s3-restore.test.mjs.map

package/dist/cli-replacement/dev-s3-restore.test.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-s3-restore.test.mjs","sourceRoot":"","sources":["../../src/cli-replacement/dev-s3-restore.test.mts"],"names":[],"mappings":"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"}

package/dist/cli-replacement/dev.d.mts

@@ -1,6 +1,7 @@
 import type { Server as HttpServer } from "node:http";
 import type { AuthHotReloadServer, MultiPageApplicationWrapper, TokenManager, SuperblocksSdk } from "../index.js";
 import type { ApplicationConfig, TokenConfig } from "../types/index.js";
+import { type PackageJsonSnapshot } from "./package-json-snapshot.mjs";
 export declare enum DevServerAutoUpgradeMode {
     SKIP = "skip-upgrade",
     FORCE = "force-upgrade",
@@ -34,5 +35,11 @@ export declare function dev(options: {
     prefetchedApplication?: MultiPageApplicationWrapper;
     /** Pre-existing HTTP server from warm standby mode (avoids port gap on transition). */
     existingServer?: HttpServer;
+    /** Force package installation when the caller has detected dependency drift. */
+    forcePackageInstall?: boolean;
+    /** Package snapshot before S3 workspace restore; used to refresh forced install after DBFS sync. */
+    packageJsonSnapshotBeforeRestore?: PackageJsonSnapshot | null;
+    /** Restore managed warm-template package pins after DBFS download in S3 warm restore flow. */
+    normalizeManagedPackageDependencies?: boolean;
 }): Promise<void>;
 //# sourceMappingURL=dev.d.mts.map

package/dist/cli-replacement/dev.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AAwCtD,OAAO,KAAK,EACV,mBAAmB,EACnB,2BAA2B,EAC3B,YAAY,EACZ,cAAc,EACf,MAAM,aAAa,CAAC;AAGrB,OAAO,KAAK,EACV,iBAAiB,EAEjB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAkM3B,oBAAY,wBAAwB;IAClC,IAAI,iBAAiB;IACrB,KAAK,kBAAkB;IACvB;;;;;;OAMG;IACH,aAAa,kBAAkB;CAChC;AAED,wBAAsB,GAAG,CAAC,OAAO,EAAE;IAEjC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,MAAM,CAAC;IAGvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IAGzB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAG1C,eAAe,CAAC,EAAE,wBAAwB,CAAC;IAG3C,MAAM,CAAC,EAAE,WAAW,CAAC;IAGrB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,GAAG,EAAE,cAAc,CAAC;IAEpB,mGAAmG;IACnG,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;IAEpD,uFAAuF;IACvF,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,iBA0uBA"}
+{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AAwCtD,OAAO,KAAK,EACV,mBAAmB,EACnB,2BAA2B,EAC3B,YAAY,EACZ,cAAc,EACf,MAAM,aAAa,CAAC;AAGrB,OAAO,KAAK,EACV,iBAAiB,EAEjB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAIL,KAAK,mBAAmB,EAEzB,MAAM,6BAA6B,CAAC;AA6LrC,oBAAY,wBAAwB;IAClC,IAAI,iBAAiB;IACrB,KAAK,kBAAkB;IACvB;;;;;;OAMG;IACH,aAAa,kBAAkB;CAChC;AAED,wBAAsB,GAAG,CAAC,OAAO,EAAE;IAEjC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,MAAM,CAAC;IAGvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IAGzB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAG1C,eAAe,CAAC,EAAE,wBAAwB,CAAC;IAG3C,MAAM,CAAC,EAAE,WAAW,CAAC;IAGrB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,GAAG,EAAE,cAAc,CAAC;IAEpB,mGAAmG;IACnG,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;IAEpD,uFAAuF;IACvF,cAAc,CAAC,EAAE,UAAU,CAAC;IAE5B,gFAAgF;IAChF,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,oGAAoG;IACpG,gCAAgC,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAE9D,8FAA8F;IAC9F,mCAAmC,CAAC,EAAE,OAAO,CAAC;CAC/C,iBAmzBA"}

package/dist/cli-replacement/dev.mjs

@@ -22,6 +22,7 @@ import { getTracer } from "../telemetry/index.js";
 import { getErrorMeta, getLogger } from "../telemetry/logging.js";
 import { checkVersionsAndWritePackageJson } from "./automatic-upgrades.js";
 import { ensureRemoteHasDefaultBranch, getGitErrorFields, } from "./git-repo-setup.mjs";
+import { didPackageJsonSnapshotChange, packageJsonSnapshot, packageJsonSnapshotDiagnostic, restoreManagedPackageDependencies, } from "./package-json-snapshot.mjs";
 import { getCurrentCliVersion } from "./version-detection.js";
 const exec = promisify(child_process.exec);
 const passErrorToVSCode = (message, logger) => {
@@ -353,11 +354,17 @@ export async function dev(options) {
                             throw new Error("Choose either --download-first or --upload-first");
                         }
                         let hasPackageChanged = false;
+                        let packageJsonRequiresInstall = false;
+                        const hasPackageJsonSnapshotBeforeRestore = options.packageJsonSnapshotBeforeRestore !== undefined;
                         const packageJsonBefore = await readPkgJson(cwd);
                         if (downloadFirst && !isSynced) {
                             await tracer.startActiveSpan("downloadFirst", async (span) => {
                                 logger.info(`Starting download of branch '${activeDbfsBranchName}'`);
                                 await syncService.downloadDirectory();
+                                if (options.normalizeManagedPackageDependencies &&
+                                    (await restoreManagedPackageDependencies(cwd, packageJsonBefore))) {
+                                    logger.info("Restored managed package dependencies to the warm template versions after DBFS download");
+                                }
                                 span.end();
                             });
                         }
@@ -550,6 +557,9 @@ export async function dev(options) {
                             });
                         }
                         const packageJsonAfter = await readPkgJson(cwd);
+                        let packageJsonSnapshotBefore = null;
+                        let packageJsonSnapshotAfter = null;
+                        let packageJsonInstallBaselineSnapshot = null;
                         if (packageJsonBefore && packageJsonAfter) {
                             hasPackageChanged =
                                 JSON.stringify(packageJsonBefore, null, 2) !==
@@ -557,9 +567,45 @@ export async function dev(options) {
                         }
                         else if (packageJsonAfter) {
                             hasPackageChanged = true;
+                        }
+                        if (packageJsonBefore) {
+                            packageJsonSnapshotBefore =
+                                packageJsonSnapshot(packageJsonBefore);
+                        }
+                        if (packageJsonAfter) {
+                            packageJsonSnapshotAfter = packageJsonSnapshot(packageJsonAfter);
+                        }
+                        packageJsonInstallBaselineSnapshot =
+                            hasPackageJsonSnapshotBeforeRestore
+                                ? (options.packageJsonSnapshotBeforeRestore ?? null)
+                                : packageJsonSnapshotBefore;
+                        if (packageJsonAfter) {
+                            packageJsonRequiresInstall = didPackageJsonSnapshotChange(packageJsonInstallBaselineSnapshot, packageJsonSnapshotAfter);
+                        }
+                        if (!packageJsonBefore && packageJsonRequiresInstall) {
                             logger.info("package.json was created, installing packages…");
                         }
-                        if (hasPackageChanged || upgradePromises.length > 0) {
+                        const forcePackageInstallRequested = !!options.forcePackageInstall;
+                        let forcePackageInstall = forcePackageInstallRequested;
+                        if (forcePackageInstallRequested &&
+                            hasPackageJsonSnapshotBeforeRestore) {
+                            forcePackageInstall = packageJsonRequiresInstall;
+                        }
+                        logger.info("Package install decision", {
+                            packageJsonBeforePresent: !!packageJsonBefore,
+                            packageJsonAfterPresent: !!packageJsonAfter,
+                            hasPackageChanged,
+                            packageJsonRequiresInstall,
+                            forcePackageInstall,
+                            forcePackageInstallRequested,
+                            upgradePromiseCount: upgradePromises.length,
+                            packageJsonSnapshotBefore: packageJsonSnapshotDiagnostic(packageJsonSnapshotBefore),
+                            packageJsonInstallBaselineSnapshot: packageJsonSnapshotDiagnostic(packageJsonInstallBaselineSnapshot),
+                            packageJsonSnapshotAfter: packageJsonSnapshotDiagnostic(packageJsonSnapshotAfter),
+                        });
+                        if (packageJsonRequiresInstall ||
+                            upgradePromises.length > 0 ||
+                            forcePackageInstall) {
                             logger.info("Installing packages…");
                             await tracer.startActiveSpan("installPackages", async (span) => {
                                 try {
@@ -577,7 +623,8 @@ export async function dev(options) {
                         else {
                             logger.info("package.json has not changed, skipping package installation");
                         }
-                        if (hasPackageChanged || uploadFirst) {
+                        const shouldUploadPackageState = hasPackageChanged || forcePackageInstall;
+                        if (shouldUploadPackageState || uploadFirst) {
                             logger.info(`Uploading local files to branch '${activeDbfsBranchName}' on server before starting`);
                             await tracer.startActiveSpan("uploadFirstOrPackageChanged", async (span) => {
                                 await syncService.uploadDirectory("cli:sdk");