@superblocksteam/sdk 2.0.118-next.0 → 2.0.118

package/src/index.ts

@@ -7,18 +7,13 @@ export {
   type CodeModeApplicationWrapper,
   type CreateApplicationResult,
   type CurrentBranch,
-  type BillingUsageLimitsResponse,
   type DailyUsageRow,
   type GetCommitsResponseBody,
   type IntegrationFilters,
   type IntegrationSummary,
   type MultiPageApplicationWrapper,
   type MultiPageApplicationWrapperWithComponents,
-  type OrgCreditLimit,
   type PlanSummary,
-  type UpdateOrgBillingUsageLimitRequest,
-  type UpdateUserBillingUsageLimitRequest,
-  type UserCreditLimit,
   type UsageRecordRow,
 } from "./client.js";
 
@@ -70,12 +65,6 @@ export { AUTO_UPGRADE_EXIT_CODE } from "./cli-replacement/automatic-upgrades.js"
 export { RESTART_EXIT_CODE } from "./dev-utils/dev-server.mjs";
 
 export { createDevServer, preWarmViteCache } from "./dev-utils/dev-server.mjs";
-export {
-  devServerMetrics,
-  type DevServerEndpoint,
-  type DevServerFailureType,
-  type WarmActivationOutcome,
-} from "./dev-utils/dev-server-metrics.mjs";
 
 export { TokenManager } from "./dev-utils/token-manager.js";
 
@@ -112,12 +101,7 @@ export {
   type PackageJsonSnapshotReadResult,
 } from "./cli-replacement/package-json-snapshot.mjs";
 
-export {
-  getErrorMeta,
-  getLogger,
-  type ErrorMeta,
-  type Logger,
-} from "./telemetry/logging.js";
+export { getLogger } from "./telemetry/logging.js";
 
 export {
   AuthHotReloadServer,
@@ -127,7 +111,5 @@ export {
 export {
   configureTelemetry,
   deploymentType,
-  getMeter,
-  getTracer,
   isCloudPrem,
 } from "./telemetry/index.js";

package/src/sdk.test.ts

@@ -7,23 +7,12 @@ import {
   type GetPublicOrganizationSummaryResponseBody,
 } from "@superblocksteam/shared";
 
-import type { PlanSummary } from "./index.js";
-
-const {
-  fetchApplicationCommits,
-  fetchAuditEvents,
-  fetchBillingUsageLimits,
-  fetchOrganizationSummary,
-  updateOrgBillingUsageLimit,
-  updateUserBillingUsageLimit,
-} = vi.hoisted(() => ({
-  fetchApplicationCommits: vi.fn(),
-  fetchAuditEvents: vi.fn(),
-  fetchBillingUsageLimits: vi.fn(),
-  fetchOrganizationSummary: vi.fn(),
-  updateOrgBillingUsageLimit: vi.fn(),
-  updateUserBillingUsageLimit: vi.fn(),
-}));
+const { fetchApplicationCommits, fetchAuditEvents, fetchOrganizationSummary } =
+  vi.hoisted(() => ({
+    fetchApplicationCommits: vi.fn(),
+    fetchAuditEvents: vi.fn(),
+    fetchOrganizationSummary: vi.fn(),
+  }));
 
 vi.mock("./client.js", async () => {
   const actual = await vi.importActual("./client.js");
@@ -32,55 +21,12 @@ vi.mock("./client.js", async () => {
     ...actual,
     fetchApplicationCommits,
     fetchAuditEvents,
-    fetchBillingUsageLimits,
     fetchOrganizationSummary,
-    updateOrgBillingUsageLimit,
-    updateUserBillingUsageLimit,
   };
 });
 
 import { SuperblocksSdk } from "./sdk.js";
 
-describe("PlanSummary", () => {
-  it("types enterprise contract limits and usage fields", () => {
-    const plan: PlanSummary = {
-      billingInterval: "annual",
-      builderSeatsAssigned: 12,
-      builderSeatsTotal: 20,
-      contractEnd: "2027-05-01",
-      contractStart: "2026-05-01",
-      contractType: "dollar_commit",
-      creditsPerSeat: null,
-      currentPlanCredits: 0,
-      currentUsageCredits: 0,
-      cycleEnd: "2026-05-31",
-      cycleStart: "2026-05-01",
-      deployedAppCostCents: 2500,
-      deployedAppPriceAnnual: null,
-      deployedAppPriceMonthly: null,
-      deployedAppsAdditional: 0,
-      deployedAppsIncluded: 0,
-      deployedAppsLimit: 0,
-      deployedAppsUsed: 4,
-      dollarCommitAmountCents: 1000000,
-      dollarCommitUsedCents: 250000,
-      overageAppsEnabled: true,
-      overageCreditsEnabled: true,
-      overageSeatsEnabled: false,
-      pricePerSeatAnnual: null,
-      pricePerSeatMonthly: null,
-      seatsUnlimited: false,
-      subscriptionStatus: "active",
-      topupCreditsPurchased: 0,
-      topupCreditsUsed: 0,
-      usageResetPeriodLimit: 0,
-      usageResetPeriodType: "monthly",
-    };
-
-    expect(plan.dollarCommitUsedCents).toBe(250000);
-  });
-});
-
 describe("SuperblocksSdk.fetchOrganizationSummary", () => {
   beforeEach(() => {
     fetchApplicationCommits.mockReset();
@@ -120,91 +66,6 @@ describe("SuperblocksSdk.fetchOrganizationSummary", () => {
   });
 });
 
-describe("SuperblocksSdk billing usage limit methods", () => {
-  beforeEach(() => {
-    fetchBillingUsageLimits.mockReset();
-    updateOrgBillingUsageLimit.mockReset();
-    updateUserBillingUsageLimit.mockReset();
-  });
-
-  it("delegates listing usage limits with the SDK context", async () => {
-    const expectedResponse = {
-      limits: [
-        {
-          id: "limit-1",
-          orgId: "org-1",
-          userId: null,
-          amountLimitCents: null,
-          creditLimit: 5000,
-          updatedAt: "2026-05-01T00:00:00.000Z",
-          updatedBy: "admin-1",
-        },
-      ],
-      orgLimit: null,
-    };
-    fetchBillingUsageLimits.mockResolvedValue(expectedResponse);
-
-    const sdk = new SuperblocksSdk(
-      "test-token",
-      "https://staging.superblocks.com",
-      "1.2.3",
-    );
-
-    await expect(sdk.fetchBillingUsageLimits()).resolves.toEqual(
-      expectedResponse,
-    );
-    expect(fetchBillingUsageLimits).toHaveBeenCalledWith({
-      cliVersion: "1.2.3",
-      token: "test-token",
-      superblocksBaseUrl: "https://staging.superblocks.com",
-    });
-  });
-
-  it("delegates user usage limit updates with the SDK context", async () => {
-    updateUserBillingUsageLimit.mockResolvedValue({ success: true });
-
-    const sdk = new SuperblocksSdk(
-      "test-token",
-      "https://staging.superblocks.com",
-      "1.2.3",
-    );
-
-    await expect(
-      sdk.updateUserBillingUsageLimit({
-        amountLimitCents: 2500,
-        userId: "user-1",
-      }),
-    ).resolves.toEqual({ success: true });
-    expect(updateUserBillingUsageLimit).toHaveBeenCalledWith({
-      cliVersion: "1.2.3",
-      token: "test-token",
-      superblocksBaseUrl: "https://staging.superblocks.com",
-      amountLimitCents: 2500,
-      userId: "user-1",
-    });
-  });
-
-  it("delegates organization usage limit updates with the SDK context", async () => {
-    updateOrgBillingUsageLimit.mockResolvedValue({ success: true });
-
-    const sdk = new SuperblocksSdk(
-      "test-token",
-      "https://staging.superblocks.com",
-      "1.2.3",
-    );
-
-    await expect(
-      sdk.updateOrgBillingUsageLimit({ creditLimit: 5000 }),
-    ).resolves.toEqual({ success: true });
-    expect(updateOrgBillingUsageLimit).toHaveBeenCalledWith({
-      cliVersion: "1.2.3",
-      token: "test-token",
-      superblocksBaseUrl: "https://staging.superblocks.com",
-      creditLimit: 5000,
-    });
-  });
-});
-
 describe("SuperblocksSdk.fetchApplicationCommits", () => {
   beforeEach(() => {
     fetchApplicationCommits.mockReset();

package/src/sdk.ts

@@ -39,7 +39,6 @@ import {
   fetchChatHistory,
   fetchBillingPlanSummary,
   fetchBillingUsageDaily,
-  fetchBillingUsageLimits,
   fetchBillingUsageRecords,
   fetchCurrentUser,
   fetchFact,
@@ -65,8 +64,6 @@ import {
   deployApi,
   fetchApplicationDeployments,
   undeployApplication,
-  updateOrgBillingUsageLimit,
-  updateUserBillingUsageLimit,
 } from "./client.js";
 import type {
   ApplicationGitConfig,
@@ -75,7 +72,6 @@ import type {
   AuditEventsAggregateResponse,
   CreateApplicationResult,
   CreateRbacAssignmentsRequest,
-  BillingUsageLimitsResponse,
   DailyUsageRow,
   FolderMutationPayload,
   FolderSummary,
@@ -88,9 +84,7 @@ import type {
   PushMultiPageApplicationWithCommitConfig,
   SyncRequest,
   SyncResponse,
-  UpdateOrgBillingUsageLimitRequest,
   UpdateRbacAssignmentRequest,
-  UpdateUserBillingUsageLimitRequest,
   UsageRecordRow,
 } from "./client.js";
 import {
@@ -899,36 +893,6 @@ export class SuperblocksSdk {
     });
   }
 
-  async fetchBillingUsageLimits(): Promise<BillingUsageLimitsResponse> {
-    return fetchBillingUsageLimits({
-      cliVersion: this.cliVersion,
-      token: this.token,
-      superblocksBaseUrl: this.superblocksBaseUrl,
-    });
-  }
-
-  async updateUserBillingUsageLimit(
-    input: UpdateUserBillingUsageLimitRequest,
-  ): Promise<{ success: boolean }> {
-    return updateUserBillingUsageLimit({
-      cliVersion: this.cliVersion,
-      token: this.token,
-      superblocksBaseUrl: this.superblocksBaseUrl,
-      ...input,
-    });
-  }
-
-  async updateOrgBillingUsageLimit(
-    input: UpdateOrgBillingUsageLimitRequest,
-  ): Promise<{ success: boolean }> {
-    return updateOrgBillingUsageLimit({
-      cliVersion: this.cliVersion,
-      token: this.token,
-      superblocksBaseUrl: this.superblocksBaseUrl,
-      ...input,
-    });
-  }
-
   async sync({
     applicationId,
     payload,

package/src/telemetry/index.ts

@@ -1,6 +1,6 @@
 import os from "node:os";
 
-import { metrics, type Meter, trace, type Tracer } from "@opentelemetry/api";
+import { trace, type Tracer } from "@opentelemetry/api";
 import { logs, type Logger } from "@opentelemetry/api-logs";
 import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
 import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
@@ -230,11 +230,3 @@ export function getTracer(): Tracer {
   // Fallback to global API if telemetry not initialized
   return trace.getTracer(SERVICE_NAME, packageJson.version);
 }
-
-export function getMeter(): Meter {
-  if (isTelemetryInitialized()) {
-    return getTelemetryInstance().getMeter(SERVICE_NAME);
-  }
-  // Fallback to global API if telemetry not initialized
-  return metrics.getMeter(SERVICE_NAME, packageJson.version);
-}

package/src/telemetry/logging.ts

@@ -59,7 +59,7 @@ const winstonLogger = createLogger({
   transports: activeTransports,
 });
 
-export interface ErrorMeta {
+interface ErrorMeta {
   error: {
     kind: string;
     message: string;
@@ -156,7 +156,7 @@ export function getErrorMeta(error: unknown): ErrorMeta {
   return {
     error: {
       kind: "Unknown Error",
-      message: safeStringify(error) ?? String(error),
+      message: JSON.stringify(error),
     },
   };
 }

package/src/types/common.ts

@@ -12,12 +12,12 @@ export interface UserMeDto {
 export interface FlagBootstrap {
   "ui.enable-resource-signing"?: boolean;
   "superblocks.git.split.large.steps.enabled"?: boolean;
+  "superblocks.git.split.large.steps.new.enabled"?: boolean;
   "superblocks.git.split.large.step.lines"?: number;
   "ui.code-mode.enable-session-recording"?: boolean;
   "superblocks.dev-server.inactivity-timeout.cloud"?: number;
   "superblocks.dev-server.inactivity-timeout.local"?: number;
   "superblocks.dev-server.llmobs.enabled"?: boolean;
-  "superblocks.dev-server.memory-metrics.enabled"?: boolean;
   "superblocks.deploy.include-dot-superblocks"?: boolean;
 }
 

package/src/version-control.mts

@@ -1,11 +1,11 @@
-import * as https from "node:https";
+import * as https from "https";
 import path from "node:path";
 import { dirname } from "path";
 
 import { bold } from "colorette";
 import fs from "fs-extra";
 import { isEmpty, isArray, isObject, get } from "lodash-es";
-import semver from "semver";
+import * as semver from "semver";
 import { simpleGit } from "simple-git";
 import type { SimpleGit, StatusResult } from "simple-git";
 import slugify from "slugify";
@@ -419,7 +419,10 @@ export async function writeResourceToDisk(
         configType: "APPLICATION",
         defaultPageId: resource.page?.id,
         id: resource.application.id,
-        metadata: getResourceConfigMetadata(existingApplicationConfig),
+        metadata: getResourceConfigMetadata(
+          featureFlags,
+          existingApplicationConfig,
+        ),
       };
 
       const apiRepresentation =
@@ -503,7 +506,10 @@ export async function writeResourceToDisk(
       const backendConfig: SuperblocksBackendConfig = {
         id: resourceId,
         configType: "BACKEND",
-        metadata: getResourceConfigMetadata(existingBackendConfig),
+        metadata: getResourceConfigMetadata(
+          featureFlags,
+          existingBackendConfig,
+        ),
       };
 
       const apiRepresentation =
@@ -588,6 +594,7 @@ export async function writeApplicationToDisk({
       appDirName,
       directoryContentsHash,
       branch,
+      featureFlags,
     );
     return {
       location: relativeLocation,
@@ -629,7 +636,10 @@ async function writeV1ApplicationToDisk(
   const newApplicationConfig: SuperblocksApplicationConfig = {
     configType: "APPLICATION",
     id: resource.application.id,
-    metadata: getResourceConfigMetadata(existingApplicationConfig),
+    metadata: getResourceConfigMetadata(
+      featureFlags,
+      existingApplicationConfig,
+    ),
   };
 
   const apiRepresentation =
@@ -775,6 +785,7 @@ async function writeCodeModeApplicationToDisk(
   appDirName: string,
   directoryContentsHash: string | undefined,
   branch: string | undefined,
+  featureFlags: FeatureFlags,
 ): Promise<void> {
   // Find the existing application config and existing file paths
   const existingApplicationConfig =
@@ -783,7 +794,10 @@ async function writeCodeModeApplicationToDisk(
   const newApplicationConfig: SuperblocksApplicationV2Config = {
     configType: "APPLICATION_V2",
     id: resource.application.id,
-    metadata: getResourceConfigMetadata(existingApplicationConfig),
+    metadata: getResourceConfigMetadata(
+      featureFlags,
+      existingApplicationConfig,
+    ),
   };
 
   await fs.ensureDir(`${appDirName}/${SUPERBLOCKS_HOME_FOLDER_NAME}`);
@@ -916,15 +930,20 @@ export function addExistingFilePathsForApi(
 }
 
 function getResourceConfigMetadata(
+  featureFlags: FeatureFlags,
   existingResourceConfig: SuperblocksResourceConfig | undefined,
 ): SuperblocksResourceConfigMetadata | undefined {
   if (!existingResourceConfig) {
-    // This is a new application; tag the application config with the latest file version.
-    return {
-      fileVersion: LATEST_FILE_VERSION,
-    };
+    // This is a new application, and we may need to add a metadata field to the application config
+    if (featureFlags.splitLargeApiStepsInNewEnabled()) {
+      return {
+        fileVersion: LATEST_FILE_VERSION,
+      };
+    }
+  } else if (existingResourceConfig.metadata) {
+    return existingResourceConfig.metadata;
   }
-  return existingResourceConfig.metadata;
+  return undefined;
 }
 
 export async function removeResourceFromDisk(

package/test/version-control.test.mts

@@ -662,6 +662,7 @@ describe("version-control", () => {
   describe("writeResourcesToDisk", () => {
     const mockFeatureFlags = new FeatureFlags({
       "superblocks.git.split.large.steps.enabled": true,
+      "superblocks.git.split.large.steps.new.enabled": true,
       "superblocks.git.split.large.step.lines": 10,
     });
 
@@ -930,6 +931,7 @@ describe("version-control", () => {
   describe("writeApplicationToDIsk", () => {
     const mockFeatureFlags = new FeatureFlags({
       "superblocks.git.split.large.steps.enabled": true,
+      "superblocks.git.split.large.steps.new.enabled": false,
       "superblocks.git.split.large.step.lines": 10,
     });