@superblocksteam/sdk 2.0.119-next.0 → 2.0.119

package/src/cli-replacement/dev.mts

@@ -26,7 +26,6 @@ import {
   AiServiceFeatureFlags,
   SnapshotManager,
   isSdkApiTemplate,
-  stripResolvedFromLockfile,
 } from "@superblocksteam/vite-plugin-file-sync/ai-service";
 import type { DraftInterface } from "@superblocksteam/vite-plugin-file-sync/draft-interface";
 import { createGitService } from "@superblocksteam/vite-plugin-file-sync/git-service";
@@ -296,7 +295,7 @@ async function installPackages(cwd: string, logger: Logger) {
     logger.info("Package installation completed successfully");
     logger.info(stdout);
   } catch (error) {
-    logger.error("Error during package installation", getErrorMeta(error));
+    logger.error(`Error during package installation: ${error}`);
     throw error;
   }
 }
@@ -352,13 +351,6 @@ export async function dev(options: {
   /** Pre-existing HTTP server from warm standby mode (avoids port gap on transition). */
   existingServer?: HttpServer;
 
-  /**
-   * Wall-clock timestamp (Date.now()) when the warm-standby /_sb_activate
-   * POST was accepted. Forwarded to createDevServer so the warm-activation
-   * handoff histogram can be recorded.
-   */
-  warmActivationStart?: number;
-
   /** Force package installation when the caller has detected dependency drift. */
   forcePackageInstall?: boolean;
 
@@ -391,26 +383,8 @@ export async function dev(options: {
   let snapshotManager: SnapshotManager | undefined;
   let gitUserName: string | undefined;
   let gitUserEmail: string | undefined;
-  // In-flight install handle. We launch the install while the upload/restart
-  // decisions are still being evaluated and join at every gate that depends
-  // on post-install state. See the install block and `joinPackageInstall`.
-  let packageInstallPromise: Promise<void> | undefined;
   const tracer = getTracer();
   const logger = getLogger(options.logger);
-  // Joins the in-flight install at any step that depends on a settled
-  // node_modules / lockfile state. Clears the handle so later joins are
-  // no-ops. The rejection (if any) propagates so the caller's step can
-  // abort cleanly. Defined at outer scope so the post-sync `createDevServer`
-  // gate and the abort handler can call it too.
-  const joinPackageInstall = async (reason: string): Promise<void> => {
-    if (!packageInstallPromise) {
-      return;
-    }
-    logger.info(`Waiting for background package install (${reason})…`);
-    const promise = packageInstallPromise;
-    packageInstallPromise = undefined;
-    await promise;
-  };
   const skipAutoUpgrade = autoUpgradeMode === DevServerAutoUpgradeMode.SKIP;
   const skipCliUpgrade =
     skipAutoUpgrade ||
@@ -830,16 +804,6 @@ export async function dev(options: {
               logger.info("[dev-startup] Skipping download, already in sync");
             }
 
-            // Unconditional lockfile sanitation: strip cross-registry
-            // `resolved` URLs from any lockfile on disk regardless of whether
-            // install runs next. The lockfile here is whatever survived the
-            // DBFS path (downloadFirst overwrite, prior boot, brownfield
-            // import); npm honors `resolved` verbatim and would bypass the
-            // active registry. `integrity` is preserved, so genuine
-            // cross-registry tarball drift surfaces as EINTEGRITY. No-op when
-            // there's no lockfile or no `resolved` entries.
-            await stripResolvedFromLockfile(cwd);
-
             let hasCliUpdated = false;
             let upgradePromises: Promise<void>[] = [];
             const forceUpgrade =
@@ -953,42 +917,17 @@ export async function dev(options: {
               upgradePromises.length > 0 ||
               forcePackageInstall
             ) {
-              // Launch the install while the upload/restart decisions below
-              // are still being evaluated. The synchronous joins at upload,
-              // CLI restart, and pre-Vite-startup all observe and surface
-              // any rejection; the `.catch` backstop only fires if every
-              // join was skipped (rare — would mean no upload, no restart,
-              // and a re-throw before reaching createDevServer).
-              logger.info("Starting package install in background…");
-              packageInstallPromise = tracer.startActiveSpan(
-                "installPackages",
-                async (span) => {
-                  try {
-                    // Upgrade global CLI and local packages in parallel - improves performance
-                    await Promise.all([
-                      ...upgradePromises,
-                      installPackages(cwd, logger),
-                    ]);
-                  } finally {
-                    span.end();
-                  }
-                },
-              );
-              // Backstop: assigning `.catch` to a separate (discarded) promise
-              // keeps `packageInstallPromise` itself rejecting, so the joins
-              // can still observe and abort. Without this, an install that
-              // fails before any join fires becomes an unhandled rejection.
-              const installApplicationId = applicationConfig.id;
-              const installUpgradeCount = upgradePromises.length;
-              packageInstallPromise.catch((err) => {
-                logger.error(
-                  // errorId is encoded into the message body because the
-                  // logger.error contract limits structured attributes to
-                  // `{ error: { kind, message, stack } }`. The id stays
-                  // grep-able for Datadog/Sentry alert rules.
-                  `Background package install failed [errorId=DEV_SERVER_BG_INSTALL_FAILED applicationId=${installApplicationId} cwd=${cwd} upgradePromiseCount=${installUpgradeCount}]`,
-                  getErrorMeta(err),
-                );
+              logger.info("Installing packages…");
+              await tracer.startActiveSpan("installPackages", async (span) => {
+                try {
+                  // Upgrade global CLI and local packages in parallel - improves performance
+                  await Promise.all([
+                    ...upgradePromises,
+                    installPackages(cwd, logger),
+                  ]);
+                } finally {
+                  span.end();
+                }
               });
             } else {
               logger.info(
@@ -999,9 +938,6 @@ export async function dev(options: {
             const shouldUploadPackageState =
               hasPackageChanged || forcePackageInstall;
             if (shouldUploadPackageState || uploadFirst) {
-              // Upload serializes the post-install lockfile + node_modules
-              // tree to DBFS, so it must observe a quiesced install.
-              await joinPackageInstall("before upload");
               logger.info(
                 `Uploading local files to branch '${activeDbfsBranchName}' on server before starting`,
               );
@@ -1016,9 +952,6 @@ export async function dev(options: {
             }
 
             if (hasCliUpdated) {
-              // Exiting mid-install would leave a half-written lockfile that
-              // the next boot would have to recover from.
-              await joinPackageInstall("before CLI restart");
               try {
                 logger.info("Releasing lock before restarting the dev server");
                 await aiService?.removeIntegrationCache();
@@ -1034,9 +967,9 @@ export async function dev(options: {
             }
           });
         } catch (error: any) {
+          const msg = error instanceof Error ? error.message : String(error);
           logger.error(
-            "[dev-server] Startup failed during sync/lock/setup (exiting with code 1)",
-            getErrorMeta(error),
+            `[dev-server] Startup failed during sync/lock/setup (exiting with code 1): ${msg}`,
           );
           try {
             await aiService?.removeIntegrationCache();
@@ -1050,15 +983,6 @@ export async function dev(options: {
         logger.info("Skipping directory sync");
       }
 
-      // Drain the install before Vite starts. Vite's createServer eagerly
-      // scans `node_modules` for `optimizeDeps` pre-bundling; if that scan
-      // observes a mid-install state (npm moves per-package directories via
-      // rename, so a reader can race the rename), the resulting `.vite/deps`
-      // cache embeds partial state that survives across reloads. Awaiting
-      // here costs at most the install's remaining wall time — the upload
-      // and CLI-restart joins above usually drain it first.
-      await joinPackageInstall("before Vite startup");
-
       const activateRuntimeGitService = async (): Promise<
         GitService | undefined
       > => {
@@ -1174,7 +1098,6 @@ export async function dev(options: {
             sdk,
             superblocksBaseUrl: tokenConfig.superblocksBaseUrl,
             existingServer: options.existingServer,
-            warmActivationStart: options.warmActivationStart,
             // TODO: Remove this cast — build the options object to match
             // CreateDevServerOptions directly so new required fields cause a
             // compile error instead of silently passing undefined.
@@ -1194,19 +1117,6 @@ export async function dev(options: {
             logger.warn(`Error stopping auth hot-reload server: ${error}`);
           });
         }
-        // Drain any straggler install before tear-down. By this point the
-        // pre-Vite join has already run on the success path, so usually
-        // `packageInstallPromise` is undefined and this is a no-op; if abort
-        // races createDevServer (or fires during the inner sync block on
-        // some error path), draining here keeps the spawned npm child from
-        // being SIGKILL'd mid-rename. Errors only get logged — we are tearing
-        // down anyway.
-        joinPackageInstall("during abort").catch((error: unknown) => {
-          logger.warn(
-            "Error draining background install during abort",
-            getErrorMeta(error),
-          );
-        });
         // Clean up AI service cache (must happen before app switches directories)
         aiService?.removeIntegrationCache().catch((error: any) => {
           logger.warn(`Error removing integration cache: ${error}`);

package/src/client.ts

@@ -2796,71 +2796,21 @@ export interface UsageRecordRow {
   source: string;
 }
 
-export interface UserCreditLimit {
-  amountLimitCents: number | null;
-  creditLimit: number | null;
-  id: string;
-  orgId: string;
-  updatedAt: string;
-  updatedBy: string | null;
-  userId: string | null;
-}
-
-export type OrgCreditLimit = Omit<UserCreditLimit, "userId">;
-
-export interface BillingUsageLimitsResponse {
-  limits: UserCreditLimit[];
-  orgLimit: OrgCreditLimit | null;
-}
-
-type BillingUsageLimitValue =
-  | {
-      amountLimitCents: number;
-      creditLimit?: never;
-    }
-  | {
-      amountLimitCents?: never;
-      creditLimit: number;
-    };
-
-export type UpdateUserBillingUsageLimitRequest = BillingUsageLimitValue & {
-  userId: string | null;
-};
-
-export type UpdateOrgBillingUsageLimitRequest = BillingUsageLimitValue;
-
 export interface PlanSummary {
   billingInterval: "annual" | "monthly";
-  builderSeatsAssigned?: number;
-  builderSeatsTotal?: number;
-  contractEnd?: string | null;
-  contractStart?: string | null;
-  contractType?: string | null;
   currentPlanCredits: number;
   currentUsageCredits: number;
   cycleStart: string | null;
   cycleEnd: string | null;
   creditsPerSeat: number | null;
-  deployedAppsAdditional: number;
-  deployedAppPriceAnnual: number | null;
-  deployedAppPriceMonthly: number | null;
-  deployedAppsIncluded: number;
-  deployedAppsLimit: number;
-  deployedAppsUsed: number;
-  deployedAppCostCents?: number | null;
-  dollarCommitAmountCents?: number | null;
-  dollarCommitUsedCents?: number | null;
-  overageAppsEnabled?: boolean;
-  overageCreditsEnabled?: boolean;
-  overageSeatsEnabled?: boolean;
   pricePerSeatAnnual: number | null;
   pricePerSeatMonthly: number | null;
-  seatsUnlimited?: boolean;
-  subscriptionStatus: string | null;
-  topupCreditsPurchased: number;
-  topupCreditsUsed: number;
-  usageResetPeriodLimit: number;
-  usageResetPeriodType: "annual" | "contract_term" | "monthly";
+  deployedAppsUsed: number;
+  deployedAppsLimit: number;
+  deployedAppsIncluded: number;
+  deployedAppsAdditional: number;
+  deployedAppPriceMonthly: number | null;
+  deployedAppPriceAnnual: number | null;
 }
 
 export async function fetchBillingUsageDaily({
@@ -2995,139 +2945,6 @@ export async function fetchBillingPlanSummary({
   }
 }
 
-export async function fetchBillingUsageLimits({
-  cliVersion,
-  token,
-  superblocksBaseUrl,
-}: {
-  cliVersion: string;
-  token: string;
-  superblocksBaseUrl: string;
-}): Promise<BillingUsageLimitsResponse> {
-  try {
-    const url = new URL(
-      `${BASE_SERVER_API_URL_V1}/billing/user-credit-limits`,
-      superblocksBaseUrl,
-    );
-
-    const config: AxiosRequestConfig = {
-      method: "get",
-      url: url.toString(),
-      headers: {
-        Authorization: "Bearer " + token,
-        [CLI_VERSION_HEADER]: cliVersion,
-      },
-    };
-    const response = await axios(config);
-    return response.data.data as BillingUsageLimitsResponse;
-  } catch (e: any) {
-    let message: string;
-    if (e instanceof AxiosError) {
-      message =
-        (e.response?.data?.responseMeta?.message as string) ??
-        JSON.stringify(e.response?.data) ??
-        e.response?.statusText ??
-        e?.message;
-    } else {
-      message = `${e?.message ? e?.message : e}`;
-    }
-    throw new Error(`Could not fetch billing usage limits: ${message}`);
-  }
-}
-
-export async function updateUserBillingUsageLimit({
-  amountLimitCents,
-  cliVersion,
-  creditLimit,
-  token,
-  superblocksBaseUrl,
-  userId,
-}: UpdateUserBillingUsageLimitRequest & {
-  cliVersion: string;
-  token: string;
-  superblocksBaseUrl: string;
-}): Promise<{ success: boolean }> {
-  try {
-    const url = new URL(
-      `${BASE_SERVER_API_URL_V1}/billing/user-credit-limits`,
-      superblocksBaseUrl,
-    );
-
-    const config: AxiosRequestConfig = {
-      method: "put",
-      url: url.toString(),
-      headers: {
-        Authorization: "Bearer " + token,
-        [CLI_VERSION_HEADER]: cliVersion,
-      },
-      data: {
-        userId,
-        ...(amountLimitCents !== undefined
-          ? { amountLimitCents }
-          : { creditLimit }),
-      },
-    };
-    const response = await axios(config);
-    return response.data.data as { success: boolean };
-  } catch (e: any) {
-    let message: string;
-    if (e instanceof AxiosError) {
-      message =
-        (e.response?.data?.responseMeta?.message as string) ??
-        JSON.stringify(e.response?.data) ??
-        e.response?.statusText ??
-        e?.message;
-    } else {
-      message = `${e?.message ? e?.message : e}`;
-    }
-    throw new Error(`Could not update user billing usage limit: ${message}`);
-  }
-}
-
-export async function updateOrgBillingUsageLimit({
-  amountLimitCents,
-  cliVersion,
-  creditLimit,
-  token,
-  superblocksBaseUrl,
-}: UpdateOrgBillingUsageLimitRequest & {
-  cliVersion: string;
-  token: string;
-  superblocksBaseUrl: string;
-}): Promise<{ success: boolean }> {
-  try {
-    const url = new URL(
-      `${BASE_SERVER_API_URL_V1}/billing/user-credit-limits/org`,
-      superblocksBaseUrl,
-    );
-
-    const config: AxiosRequestConfig = {
-      method: "put",
-      url: url.toString(),
-      headers: {
-        Authorization: "Bearer " + token,
-        [CLI_VERSION_HEADER]: cliVersion,
-      },
-      data:
-        amountLimitCents !== undefined ? { amountLimitCents } : { creditLimit },
-    };
-    const response = await axios(config);
-    return response.data.data as { success: boolean };
-  } catch (e: any) {
-    let message: string;
-    if (e instanceof AxiosError) {
-      message =
-        (e.response?.data?.responseMeta?.message as string) ??
-        JSON.stringify(e.response?.data) ??
-        e.response?.statusText ??
-        e?.message;
-    } else {
-      message = `${e?.message ? e?.message : e}`;
-    }
-    throw new Error(`Could not update org billing usage limit: ${message}`);
-  }
-}
-
 // ---------------------------------------------------------------------------
 // Knowledge (Facts)
 // ---------------------------------------------------------------------------

package/src/dev-utils/dev-server-persist.test.mts

@@ -1,11 +1,8 @@
 import type * as NodeChildProcess from "node:child_process";
 import { EventEmitter } from "node:events";
-import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
 import { PassThrough } from "node:stream";
 
-import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
 const { spawnMock } = vi.hoisted(() => ({
   spawnMock: vi.fn(),
@@ -25,14 +22,6 @@ vi.mock("node:child_process", async () => {
   };
 });
 
-// Use a static import so the slow `dev-server.mjs` module graph (vite, react
-// plugin, workspace deps) loads during file evaluation rather than inside each
-// test, where the cold-import cost easily exceeds the default 5s test timeout.
-import {
-  createWorkspacePersistArchive,
-  getSuperblocksTarExcludes,
-} from "./dev-server.mjs";
-
 function createMockProcess() {
   return Object.assign(new EventEmitter(), {
     stdin: new PassThrough(),
@@ -41,53 +30,8 @@ function createMockProcess() {
   });
 }
 
-describe("getSuperblocksTarExcludes", () => {
-  let tempRoot: string;
-
-  beforeAll(() => {
-    tempRoot = mkdtempSync(join(tmpdir(), "persist-test-"));
-  });
-
-  afterAll(() => {
-    rmSync(tempRoot, { recursive: true, force: true });
-  });
-
-  it("excludes .superblocks entirely when the directory does not exist", () => {
-    const result = getSuperblocksTarExcludes(tempRoot);
-    expect(result).toEqual(["--exclude", ".superblocks"]);
-  });
-
-  it("excludes subdirs not in the safelist and keeps context/drafts", () => {
-    const sb = join(tempRoot, ".superblocks");
-    mkdirSync(sb);
-    mkdirSync(join(sb, "context"));
-    mkdirSync(join(sb, "drafts"));
-    mkdirSync(join(sb, "recordings"));
-    mkdirSync(join(sb, "scratch"));
-    mkdirSync(join(sb, "system-skills"));
-
-    const result = getSuperblocksTarExcludes(tempRoot);
-
-    // Safelisted dirs must NOT appear
-    expect(result).not.toContain(".superblocks/context");
-    expect(result).not.toContain(".superblocks/drafts");
-
-    // Non-safelisted dirs must be excluded
-    expect(result).toContain(".superblocks/recordings");
-    expect(result).toContain(".superblocks/scratch");
-    expect(result).toContain(".superblocks/system-skills");
-
-    // Each excluded dir has a preceding --exclude flag
-    for (const name of ["recordings", "scratch", "system-skills"]) {
-      const idx = result.indexOf(`.superblocks/${name}`);
-      expect(idx).toBeGreaterThan(0);
-      expect(result[idx - 1]).toBe("--exclude");
-    }
-  });
-});
-
 describe("createWorkspacePersistArchive", () => {
-  it("archive respects excludes", async () => {
+  it("excludes node_modules from the tar archive", async () => {
     const tarProc = createMockProcess();
     const zstdProc = createMockProcess();
     spawnMock.mockImplementation((command: string) => {
@@ -103,17 +47,27 @@ describe("createWorkspacePersistArchive", () => {
       return zstdProc;
     });
 
+    const { createWorkspacePersistArchive } = await import("./dev-server.mjs");
+
     await expect(createWorkspacePersistArchive("/workspace")).resolves.toEqual(
       Buffer.from("archive"),
     );
 
     const tarCall = spawnMock.mock.calls.find(([command]) => command === "tar");
     expect(tarCall).toBeDefined();
-    const args: string[] = tarCall?.[1];
-
-    // Standard excludes are always present
-    expect(args).toContain(".git");
-    expect(args).toContain("node_modules");
+    expect(tarCall?.[1]).toEqual([
+      "cf",
+      "-",
+      "--exclude",
+      ".git",
+      "--exclude",
+      "node_modules",
+      "--exclude",
+      ".superblocks",
+      "-C",
+      "/workspace",
+      ".",
+    ]);
   });
 
   it("rejects if tar fails after zstd closes successfully", async () => {
@@ -133,115 +87,10 @@ describe("createWorkspacePersistArchive", () => {
       return zstdProc;
     });
 
+    const { createWorkspacePersistArchive } = await import("./dev-server.mjs");
+
     await expect(
       createWorkspacePersistArchive("/workspace"),
     ).rejects.toThrowError(/^tar archival failed \(code 2\): tar failed$/);
   });
 });
-
-describe("createWorkspacePersistUploadHeaders", () => {
-  it("forwards presigned upload headers and adds the archive content length", async () => {
-    const { createWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    expect(
-      createWorkspacePersistUploadHeaders(123, {
-        "Content-Type": "application/custom-zstd",
-        "x-amz-server-side-encryption": "AES256",
-      }),
-    ).toEqual({
-      "content-length": "123",
-      "content-type": "application/custom-zstd",
-      "x-amz-server-side-encryption": "AES256",
-    });
-  });
-
-  it("normalizes presigned upload header names case-insensitively", async () => {
-    const { createWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    expect(
-      createWorkspacePersistUploadHeaders(789, {
-        "content-type": "application/custom-zstd",
-        "content-length": "1",
-        "x-amz-server-side-encryption": "AES256",
-      }),
-    ).toEqual({
-      "content-length": "789",
-      "content-type": "application/custom-zstd",
-      "x-amz-server-side-encryption": "AES256",
-    });
-  });
-
-  it("keeps the legacy content headers when SABS sends only a URL", async () => {
-    const { createWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    expect(createWorkspacePersistUploadHeaders(456)).toEqual({
-      "content-length": "456",
-      "content-type": "application/zstd",
-    });
-  });
-});
-
-describe("isWorkspacePersistUploadHeaders", () => {
-  it("accepts undefined (legacy SABS payloads with no uploadHeaders)", async () => {
-    const { isWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    expect(isWorkspacePersistUploadHeaders(undefined)).toBe(true);
-  });
-
-  it("accepts a valid string map", async () => {
-    const { isWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    expect(
-      isWorkspacePersistUploadHeaders({
-        "content-type": "application/zstd",
-        "x-amz-server-side-encryption": "AES256",
-      }),
-    ).toBe(true);
-  });
-
-  it("rejects null, arrays, and non-string values", async () => {
-    const { isWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    expect(isWorkspacePersistUploadHeaders(null)).toBe(false);
-    expect(isWorkspacePersistUploadHeaders([])).toBe(false);
-    expect(isWorkspacePersistUploadHeaders({ "x-foo": 1 })).toBe(false);
-  });
-
-  it("rejects case-insensitive duplicate keys", async () => {
-    const { isWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    expect(
-      isWorkspacePersistUploadHeaders({
-        "Content-Type": "application/zstd",
-        "content-type": "application/custom-zstd",
-      }),
-    ).toBe(false);
-  });
-
-  it("rejects header names with illegal characters", async () => {
-    const { isWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    // Spaces are not allowed in HTTP token names.
-    expect(isWorkspacePersistUploadHeaders({ "bad header": "value" })).toBe(
-      false,
-    );
-  });
-
-  it("rejects header values with illegal characters", async () => {
-    const { isWorkspacePersistUploadHeaders } =
-      await import("./dev-server.mjs");
-
-    // CR/LF in header values is not allowed (header injection guard).
-    expect(isWorkspacePersistUploadHeaders({ "x-foo": "bad\r\nvalue" })).toBe(
-      false,
-    );
-  });
-});