@superblocksteam/sdk 2.0.64 → 2.0.65-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "2.0.64",
+  "version": "2.0.65-next.1",
   "type": "module",
   "description": "Superblocks JS SDK",
   "homepage": "https://www.superblocks.com",
@@ -33,11 +33,6 @@
     "@opentelemetry/sdk-node": "^0.55.0",
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "@superblocksteam/bucketeer-sdk": "0.5.0",
-    "@superblocksteam/library": "2.0.64",
-    "@superblocksteam/library-shared": "2.0.64",
-    "@superblocksteam/shared": "v0.9548.4",
-    "@superblocksteam/util": "2.0.64",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.64",
     "@vitejs/plugin-react": "4.3.4",
     "axios": "^1.4.0",
     "chokidar": "^4.0.3",
@@ -54,7 +49,7 @@
     "jwt-decode": "^4.0.0",
     "lodash-es": "^4.17.21",
     "package-manager-detector": "^1.3.0",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
     "read-pkg": "^9.0.1",
     "semver": "^7.5.4",
     "simple-git": "^3.20.0",
@@ -63,7 +58,12 @@
     "vite-tsconfig-paths": "^5.1.4",
     "winston": "^3.17.0",
     "ws": "^8.17.0",
-    "yaml": "^2.7.1"
+    "yaml": "^2.7.1",
+    "@superblocksteam/library": "2.0.65-next.1",
+    "@superblocksteam/library-shared": "2.0.65-next.1",
+    "@superblocksteam/shared": "v0.9550.0",
+    "@superblocksteam/util": "2.0.65-next.1",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.65-next.1"
   },
   "optionalDependencies": {
     "@rollup/rollup-darwin-arm64": "^4.34.9",
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "@babel/types": "7.28.2",
-    "@eslint/js": "^9.16.0",
+    "@eslint/js": "^9.39.1",
     "@types/babel__core": "^7.20.5",
     "@types/babel__traverse": "^7.20.6",
     "@types/chai": "^4",
@@ -90,23 +90,21 @@
     "@types/node": "^20",
     "@types/semver": "^7.5.8",
     "@types/ws": "^8.5.13",
-    "@typescript-eslint/eslint-plugin": "^5.60.1",
-    "@typescript-eslint/parser": "^5.60.1",
     "chai": "^4",
     "chai-as-promised": "^8.0.1",
-    "eslint": "^9.34.0",
+    "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-config-turbo": "^2.5.5",
+    "eslint-config-turbo": "^2.6.1",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-mocha": "^10.5.0",
+    "eslint-plugin-mocha": "^11.2.0",
     "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-unicorn": "^47.0.0",
-    "globals": "^15.9.0",
+    "eslint-plugin-unicorn": "^62.0.0",
+    "globals": "^16.5.0",
     "mocha": "^11.1.0",
     "tslib": "^2.8.0",
     "tsx": "^4.19.2",
-    "typescript": "^5.7.0",
-    "typescript-eslint": "^8.41.0"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.47.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -118,6 +116,7 @@
     "dev": "tsc --build --watch --preserveWatchOutput",
     "lint": "eslint --concurrency=auto",
     "lint:fix": "eslint --fix --concurrency=auto",
+    "publish-package": "pnpm publish",
     "test": "mocha \"test/**/*.test.mts\"",
     "typecheck": "tsc --noEmit"
   }

package/src/cli-replacement/automatic-upgrades.ts

@@ -87,7 +87,7 @@ export async function getCurrentCliVersion(): Promise<
       `${superblocksPath} version --json`,
     );
     const json = JSON.parse(versionOutput) as Record<string, string>;
-    // Extract version from string like "@superblocksteam/cli/2.0.0-next.1" or "@superblocksteam/cli-ephemeral/2.0.0-SNAPSHOT.1749077365"
+    // Extract version from string like "@superblocksteam/cli/2.0.0-next.1" or "@superblocksteam/cli-ephemeral/2.0.0-SNAPSHOT.ebd2b86d643331f5"
     const version = json.cliVersion?.replace(
       /@superblocksteam\/cli(-ephemeral)?\//,
       "",
@@ -269,7 +269,9 @@ export async function checkVersionsAndWritePackageJson(
               currentCliInfo.version.startsWith("link:")
             ) &&
             targetVersions.cli &&
-            gt(targetVersions.cli, currentCliInfo.version),
+            (currentCliInfo.version.toLowerCase().includes("snapshot")
+              ? targetVersions.cli !== currentCliInfo.version
+              : gt(targetVersions.cli, currentCliInfo.version)),
         );
       } catch (error) {
         logger.error(

package/src/cli-replacement/dev.mts

@@ -467,6 +467,7 @@ export async function dev(options: {
                     userId: currentUser.user.id,
                     userEmail: currentUser.user.email,
                     organizationId: currentUser.user.currentOrganizationId,
+                    featureFlags: sdk.getFeatureFlagsForUser(currentUser),
                   };
 
                 const result = await checkVersionsAndWritePackageJson(

package/src/dbfs/local.ts

@@ -84,7 +84,9 @@ export async function hashLocalDirectory(localDirectoryPath: string): Promise<{
     let entry: any;
     switch (localDirEntry.type) {
       case "-": {
-        const hash = await hashFileContents(localDirEntry.contents);
+        const hash = await hashFileContents(
+          new Uint8Array(localDirEntry.contents),
+        );
         entry = {
           type: "-",
           executable: localDirEntry.executable,

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

@@ -43,22 +43,46 @@ const tracer = getTracer();
 export const RESTART_EXIT_CODE = 98;
 
 function getJwksUriWithBaseUrl(superblocksBaseUrl?: string): string {
-  let isProd: boolean;
-  try {
-    const url = new URL(
-      superblocksBaseUrl || process.env.SUPERBLOCKS_BASE_URL || "",
+  if (process.env.SUPERBLOCKS_JWKS_URI) {
+    console.debug(
+      `[JWKS] Using override SUPERBLOCKS_JWKS_URI=${process.env.SUPERBLOCKS_JWKS_URI}`,
     );
-    isProd = [
-      "app.superblocks.com",
-      "app.superblockshq.com",
-      "eu.superblocks.com",
-    ].includes(url.hostname);
+    return process.env.SUPERBLOCKS_JWKS_URI;
+  }
+
+  const baseUrl = superblocksBaseUrl || process.env.SUPERBLOCKS_BASE_URL || "";
+
+  const PROD_CLOUD_HOSTS = [
+    "app.superblocks.com",
+    "app.superblockshq.com",
+    "eu.superblocks.com",
+  ];
+  const STAGING_CLOUD_HOSTS = ["app.staging.superblocks.com"];
+
+  let jwksUri: string;
+
+  try {
+    const url = new URL(baseUrl);
+    const hostname = url.hostname;
+
+    if (PROD_CLOUD_HOSTS.includes(hostname)) {
+      jwksUri = "https://prod-cdn.superblocks.com/.well-known/jwks.json";
+    } else if (
+      STAGING_CLOUD_HOSTS.includes(hostname) ||
+      hostname === "localhost" ||
+      hostname === "127.0.0.1"
+    ) {
+      jwksUri = "https://staging-cdn.superblocks.com/.well-known/jwks.json";
+    } else {
+      // For cloud-prem if env var is not set use the base URL
+      jwksUri = `${url.origin}/.well-known/jwks.json`;
+    }
   } catch {
-    isProd = false;
+    jwksUri = "https://staging-cdn.superblocks.com/.well-known/jwks.json";
   }
-  return isProd
-    ? "https://prod-cdn.superblocks.com/.well-known/jwks.json"
-    : "https://staging-cdn.superblocks.com/.well-known/jwks.json";
+
+  console.debug(`[JWKS] Derived jwksUri=${jwksUri} from baseUrl=${baseUrl}`);
+  return jwksUri;
 }
 
 interface CreateDevServerOptions {

package/src/flag.ts

@@ -38,4 +38,8 @@ export class FeatureFlags {
   devServerLocalInactivityTimeoutMinutes(): number {
     return this.flags["superblocks.dev-server.inactivity-timeout.local"] ?? 1;
   }
+
+  devServerLlmobsEnabled(): boolean {
+    return this.flags["superblocks.dev-server.llmobs.enabled"] ?? false;
+  }
 }

package/src/telemetry/index.ts

@@ -28,6 +28,7 @@ import {
   ATTR_SUPERBLOCKS_USER_ID,
   getEnvironmentFromHostname,
 } from "./attributes.js";
+import { getLogger as getStandardLogger } from "./logging.js";
 import { getConfiguration, SERVICE_NAME } from "./util.js";
 import type { ApplicationConfigWithTokenConfigAndUserInfo } from "../types/index.js";
 import type { Tracer } from "@opentelemetry/api";
@@ -48,6 +49,7 @@ async function shutdownTelemetry(): Promise<void> {
 export async function configureTelemetry(
   applicationConfig?: ApplicationConfigWithTokenConfigAndUserInfo,
 ) {
+  const logger = getStandardLogger();
   if (configured) {
     await shutdownTelemetry();
   }
@@ -61,6 +63,18 @@ export async function configureTelemetry(
     configured = false;
     return;
   }
+
+  logger.info(
+    `[INIT] Initializing telemetry for service ${config.serviceName} at Superblocks instance ${config.superblocksHostname}`,
+  );
+
+  const llmobsEnabled =
+    applicationConfig?.featureFlags.devServerLlmobsEnabled() ?? false;
+
+  logger.debug(
+    `[INIT] superblocks.dev-server.llmobs.enabled=${llmobsEnabled} for service ${config.serviceName}`,
+  );
+
   // First, configure dd-trace for LLM tracing
   process.env.DD_SITE = "datadoghq.com";
   // stop ddTrace from trying to get remote configuration
@@ -83,12 +97,20 @@ export async function configureTelemetry(
       [OBS_TAG_APPLICATION_ID]: applicationConfig?.id,
       [OBS_TAG_BRANCH]: applicationConfig?.branchName,
     },
-    llmobs: {
-      mlApp: SERVICE_NAME_LLM,
-      agentlessEnabled: true,
-    },
+    llmobs: llmobsEnabled
+      ? {
+          mlApp: SERVICE_NAME_LLM,
+          agentlessEnabled: true,
+        }
+      : undefined,
   });
 
+  logger.info(
+    `[INIT] Datadog LLM tracing is ${
+      ddTrace.llmobs.enabled ? "enabled" : "disabled"
+    } for service ${config.serviceName}`,
+  );
+
   // Next, configure the OpenTelemetry traces, metrics, and logs
   sdkInstance = new NodeSDK({
     resource: Resource.default().merge(

package/src/types/common.ts

@@ -1,3 +1,4 @@
+import type { FeatureFlags } from "../flag.js";
 import type { Api } from "@superblocksteam/util";
 
 export interface UserMeDto {
@@ -15,6 +16,7 @@ export interface FlagBootstrap {
   "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;
 }
 
 export interface TokenConfig {
@@ -26,6 +28,7 @@ export interface UserInfo {
   userId: string;
   userEmail: string;
   organizationId: string;
+  featureFlags: FeatureFlags;
 }
 
 export interface ApplicationConfig {

package/test/clients.test.mts

@@ -19,6 +19,7 @@ const currentGitBranch = await getCurrentGitBranch();
 describe("get current branch info", () => {
   let createdSuperblocksFolder = false;
 
+  // eslint-disable-next-line mocha/no-top-level-hooks
   before(async function () {
     // Make the .superblocks folder in the test directory, if it is missing. It should be git-ignored.
     if (!fs.existsSync(superblocksTestFolder)) {
@@ -39,6 +40,7 @@ describe("get current branch info", () => {
     );
   });
 
+  // eslint-disable-next-line mocha/no-top-level-hooks
   after(async function () {
     // Delete the .superblocks folder in the test directory.
     if (createdSuperblocksFolder && fs.existsSync(superblocksTestFolder)) {

package/test/version-control.test.mts

@@ -45,17 +45,17 @@ const NO_EXTRACT_SOURCE_CODE: ApiRepresentation = {
 
 describe("version-control", function () {
   const testDir = USE_TEMP_TEST_DIR
-    ? // eslint-disable-next-line mocha/no-setup-in-describe
-      fs.mkdtempSync(path.join(os.tmpdir(), "test-output"))
-    : // eslint-disable-next-line mocha/no-setup-in-describe
-      new URL("../../test-output", import.meta.url).pathname;
+    ? fs.mkdtempSync(path.join(os.tmpdir(), "test-output"))
+    : new URL("../../test-output", import.meta.url).pathname;
 
+  // eslint-disable-next-line mocha/no-top-level-hooks
   beforeEach(async function () {
     // Clean up the temporary directory before each test, then create it
     await fs.rm(testDir, { recursive: true, force: true });
     await fs.ensureDir(testDir);
   });
 
+  // eslint-disable-next-line mocha/no-top-level-hooks
   afterEach(async function () {
     // Clean up the temporary directory after each test
     await fs.rm(testDir, { recursive: true, force: true });

package/tsconfig.json

@@ -13,7 +13,8 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "incremental": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "isolatedModules": true
   },
   "include": ["src/**/*.ts", "src/**/*.mts"],
   "exclude": ["node_modules", "dist"]