veryfront 0.1.47 → 0.1.49

package/src/src/html/styles-builder/css-hash-cache.ts

@@ -17,8 +17,11 @@ import { serverLogger } from "../../utils/index.js";
 import { withSpan } from "../../observability/tracing/otlp-setup.js";
 import { SpanNames } from "../../observability/tracing/span-names.js";
 import { hashCSS } from "./candidate-extractor.js";
-import { buildCSSCacheEntry, parseCSSCacheEntry } from "./tailwind-compiler-utils.js";
-import { resolveStylesheet } from "./tailwind-compiler-utils.js";
+import {
+  buildCSSCacheEntry,
+  parseCSSCacheEntry,
+  resolveStylesheet,
+} from "./tailwind-compiler-utils.js";
 
 const logger = serverLogger.component("tailwind");
 

package/src/src/html/styles-builder/plugin-loader.ts

@@ -52,6 +52,49 @@ try {
   __esModule: true,
 };
 
+function isRealDenoRuntime(): boolean {
+  return typeof dntShim.Deno !== "undefined" && typeof dntShim.Deno.version === "object";
+}
+
+function encodeToBase64(source: string): string {
+  const bufferCtor = (dntShim.dntGlobalThis as {
+    Buffer?: {
+      from: (input: string, encoding: string) => { toString: (encoding: string) => string };
+    };
+  }).Buffer;
+
+  if (bufferCtor?.from) {
+    return bufferCtor.from(source, "utf8").toString("base64");
+  }
+
+  const bytes = new TextEncoder().encode(source);
+  let binary = "";
+  for (const byte of bytes) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
+async function importBundledModule(code: string): Promise<unknown> {
+  if (!isRealDenoRuntime()) {
+    const dataUrl = `data:text/javascript;base64,${encodeToBase64(code)}`;
+    return await import(dataUrl);
+  }
+
+  const tempPath = await dntShim.Deno.makeTempFile({ prefix: "vf_tw_plugin_", suffix: ".mjs" });
+  await dntShim.Deno.writeTextFile(tempPath, code);
+  logger.debug("Wrote plugin to temp file", { path: tempPath });
+
+  try {
+    return await import(`file://${tempPath}`);
+  } finally {
+    await dntShim.Deno.remove(tempPath).catch((error) => {
+      logger.error("Failed to clean up temp plugin file", {
+        path: tempPath,
+        error: error instanceof Error ? error.message : String(error),
+      });
+    });
+  }
+}
+
 /**
  * Dynamically load a module from esm.sh in a compiled Deno binary.
  *
@@ -111,21 +154,7 @@ export async function loadModuleFromEsmSh(packageName: string): Promise<unknown>
     "(globalThis.__localStorageShim||(globalThis.__localStorageShim={getItem:()=>null,setItem:()=>{},length:0}))",
   );
 
-  // Step 5: Write to temp file and import
-  const tempPath = `/tmp/tw_plugin_${dntShim.crypto.randomUUID()}.mjs`;
-  await dntShim.Deno.writeTextFile(tempPath, code);
-  logger.debug("Wrote plugin to temp file", { path: tempPath });
-
-  try {
-    return await import(`file://${tempPath}`);
-  } finally {
-    await dntShim.Deno.remove(tempPath).catch((error) => {
-      logger.error("Failed to clean up temp plugin file", {
-        path: tempPath,
-        error: error instanceof Error ? error.message : String(error),
-      });
-    });
-  }
+  return await importBundledModule(code);
 }
 
 export async function loadPlugin(
@@ -151,12 +180,20 @@ export async function loadPlugin(
       logger.debug("Loading plugin from node_modules", { id });
       try {
         mod = await import(id);
-      } catch {
-        const errorMsg = `Failed to load plugin "${id}": plugin not installed`;
-        logger.warn("Plugin not installed", { id });
-        pluginErrors.set(id, errorMsg);
-        pluginCache.set(id, null);
-        throw new Error(errorMsg);
+      } catch (importError) {
+        logger.debug("Plugin not found in node_modules, falling back to esm.sh", { id });
+        try {
+          mod = await loadModuleFromEsmSh(id);
+        } catch {
+          const errorMsg = `Failed to load plugin "${id}": plugin not installed`;
+          logger.warn("Plugin not installed", {
+            id,
+            error: importError instanceof Error ? importError.message : String(importError),
+          });
+          pluginErrors.set(id, errorMsg);
+          pluginCache.set(id, null);
+          throw new Error(errorMsg);
+        }
       }
     }
 

package/src/src/html/styles-builder/tailwind-compiler-cache.ts

@@ -47,12 +47,19 @@ async function getTailwindBaseCSS(): Promise<string> {
   const url = getTailwindCSSUrl();
   logger.debug("Fetching base CSS", { url });
 
-  const response = await dntShim.fetch(url);
-  if (!response.ok) {
-    throw new Error(`Failed to fetch Tailwind CSS: ${response.status} ${response.statusText}`);
+  try {
+    const response = await dntShim.fetch(url);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch Tailwind CSS: ${response.status} ${response.statusText}`);
+    }
+    tailwindBaseCSS = await response.text();
+  } catch (error) {
+    logger.warn("Failed to fetch Tailwind base CSS, using empty fallback", {
+      error: error instanceof Error ? error.message : String(error),
+    });
+    tailwindBaseCSS = "";
   }
 
-  tailwindBaseCSS = await response.text();
   return tailwindBaseCSS;
 }
 

package/src/src/html/utils.ts

@@ -37,30 +37,6 @@ const DEFAULT_VERSIONS: DetectedVersions = {
   veryfront: VERYFRONT_VERSION,
 };
 
-export async function detectVersions(projectDir: string): Promise<DetectedVersions> {
-  try {
-    const { createFileSystem } = await import("../platform/compat/fs.js");
-    const fs = createFileSystem();
-    const content = await fs.readTextFile(`${projectDir}/package.json`);
-    const pkg = JSON.parse(content) as {
-      dependencies?: Record<string, string>;
-      devDependencies?: Record<string, string>;
-    };
-
-    const deps = { ...pkg.dependencies, ...pkg.devDependencies };
-
-    // Use shared resolver for React version (ensures consistency with module server)
-    const reactVersion = await resolveProjectReactVersion({ projectDir });
-
-    return {
-      react: reactVersion,
-      veryfront: deps.veryfront ? stripSemverRange(deps.veryfront) : DEFAULT_VERSIONS.veryfront,
-    };
-  } catch {
-    return DEFAULT_VERSIONS;
-  }
-}
-
 type CdnProvider = "esm.sh" | "unpkg" | "jsdelivr";
 
 // Platform utilities served from local module server to match SSR behavior.
@@ -220,10 +196,6 @@ function getCdnImportMap(
   return (CDN_IMPORT_MAP_FACTORIES[provider] ?? getEsmShImportMap)(versions);
 }
 
-function getDefaultHTMLImportMap(): Record<string, string> {
-  return getEsmShImportMap(DEFAULT_VERSIONS);
-}
-
 async function resolveVersions(
   projectDir: string,
   config?: VeryfrontConfig,
@@ -314,11 +286,6 @@ export async function buildImportMapJson(
   return JSON.stringify({ imports }, null, 2);
 }
 
-export function buildImportMapJsonSync(importMap?: Record<string, string>): string {
-  const imports = importMap ?? getDefaultHTMLImportMap();
-  return JSON.stringify({ imports }, null, 2);
-}
-
 export function shouldDisableLayout(frontmatter?: Record<string, unknown>): boolean {
   return frontmatter?.layout === false || frontmatter?.layout === "false";
 }

package/src/src/modules/component-registry/registry.ts

@@ -164,9 +164,6 @@ export class ComponentRegistry {
     return new Map(this.components);
   }
 
-  /**
-   * Loader accessor for compatibility with older tests; loader is not used in this registry.
-   */
   getLoader(): ComponentLoader | undefined {
     return undefined;
   }

package/src/src/modules/import-map/default-import-map.ts

@@ -28,7 +28,16 @@ function getVeryfrontSsrImportMap(): Record<string, string> {
   // the React hooks (useWorkflowStart, useWorkflowList, useWorkflow, useApproval).
   const workflowReact = `${base}/workflow/react/index.js${ssr}`;
 
+  // veryfront/react is a barrel that re-exports all browser-side modules.
+  const react = `${base}/react/public.js${ssr}`;
+
+  // Map veryfront/embedding to the React hooks submodule for SSR.
+  // The full embedding/index.ts imports heavy server-side code (vectorStore, uploadStore,
+  // AI SDK) that fails to transform. SSR only needs the React hook (useUploads).
+  const embedding = `${base}/embedding/react/index.js${ssr}`;
+
   return {
+    "veryfront/react": react,
     "veryfront/head": head,
     "veryfront/router": router,
     "veryfront/context": context,
@@ -36,6 +45,7 @@ function getVeryfrontSsrImportMap(): Record<string, string> {
     "veryfront/markdown": markdown,
     "veryfront/chat": chat,
     "veryfront/mdx": mdx,
+    "veryfront/embedding": embedding,
     "veryfront/workflow": workflowReact,
     "veryfront/react/head": head,
     "veryfront/react/router": router,

package/src/src/modules/react-loader/component-loader.ts

@@ -35,6 +35,7 @@ export function loadComponentFromSource(
           dev,
           contentSourceId: options?.contentSourceId,
           reactVersion: options?.reactVersion,
+          mode: options?.mode,
         });
 
         return loader.loadModule(filePath, source);

package/src/src/modules/react-loader/ssr-module-loader/loader.ts

@@ -53,6 +53,7 @@ import { SSRDependencyValidator } from "./ssr-dependency-validator.js";
 import { preflightLocalImports } from "./preflight-imports.js";
 import { resolveVfModuleImports } from "./vf-module-resolver.js";
 import { registerCSSImport } from "../css-import-collector.js";
+import { injectNodePositions } from "../../../transforms/plugins/babel-node-positions.js";
 
 const logger = rendererLogger.component("ssr-module-loader");
 
@@ -344,7 +345,17 @@ export class SSRModuleLoader {
       );
     }
 
-    const code = source ?? (await this.options.adapter.fs.readFile(filePath));
+    let code = source ?? (await this.options.adapter.fs.readFile(filePath));
+
+    // Inject node positions for JSX files in dev or preview mode
+    const shouldInjectPositions = this.options.dev || this.options.mode === "preview";
+    if (shouldInjectPositions && /\.(tsx|jsx)$/i.test(filePath)) {
+      const relativeFilePath = filePath.startsWith(this.options.projectDir)
+        ? filePath.slice(this.options.projectDir.length).replace(/^\/+/, "")
+        : filePath;
+      code = injectNodePositions(code, { filePath: relativeFilePath });
+    }
+
     const contentHash = await this.cache.hashContentAsync(code);
     const contentCacheKey = this.cache.getCacheKey(`${filePath}:${contentHash}`);
     const filePathCacheKey = this.cache.getCacheKey(filePath);

package/src/src/modules/react-loader/ssr-module-loader/types.ts

@@ -20,6 +20,8 @@ export interface SSRModuleLoaderOptions {
   contentSourceId?: string;
   /** React version for transforms (defaults to DEFAULT_REACT_VERSION) */
   reactVersion?: string;
+  /** Request mode ("preview" | "production") for studio features */
+  mode?: string;
 }
 
 export interface ModuleCacheEntry {

package/src/src/modules/react-loader/types.ts

@@ -13,6 +13,8 @@ export interface LoadComponentOptions {
   contentSourceId?: string;
   /** React version for transforms (from project config) */
   reactVersion?: string;
+  /** Request mode ("preview" | "production") for studio features */
+  mode?: string;
 }
 
 export interface ComponentSource {

package/src/src/modules/server/module-server.ts

@@ -146,6 +146,8 @@ export interface ModuleServerOptions {
   allowedImportDirs?: string[];
   /** React version for transforms (from project config) */
   reactVersion?: string;
+  /** Request mode ("preview" | "production") for studio features like node positions */
+  mode?: string;
 }
 
 /** Serve transformed module at /_vf_modules/* path */
@@ -399,8 +401,9 @@ export function serveModule(req: dntShim.Request, options: ModuleServerOptions):
           const isSSR = url.searchParams.get("ssr") === "true" || userAgent.startsWith("Deno/");
 
           const studioEmbed = url.searchParams.get("studio_embed") === "true";
+          const shouldInjectPositions = dev || options.mode === "preview";
           const isJsxFile = /\.(tsx|jsx)$/i.test(sourceFile);
-          if (studioEmbed && !isFrameworkFile && isJsxFile) {
+          if (shouldInjectPositions && !isFrameworkFile && isJsxFile) {
             const relativeFilePath = sourceFile.startsWith(projectDir)
               ? sourceFile.slice(projectDir.length).replace(/^\/+/, "")
               : sourceFile;

package/src/src/modules/server/websocket-handler.ts

@@ -65,7 +65,7 @@ export function setupWebSocketHandlers(
         return;
       }
 
-      let message: any;
+      let message: { type?: string };
       try {
         message = JSON.parse(event.data);
       } catch (parseError) {

package/src/src/oauth/handlers/callback-handler.ts

@@ -14,7 +14,7 @@ import {
 } from "../../config/environment-config.js";
 import { type EnvReader, OAuthService } from "../providers/base.js";
 import { memoryTokenStore } from "../token-store/memory.js";
-import type { OAuthServiceConfig, TokenStore } from "../types.js";
+import type { OAuthServiceConfig, OAuthState, TokenStore } from "../types.js";
 
 const logger = baseLogger.component("o-auth");
 
@@ -37,6 +37,9 @@ export interface OAuthCallbackHandlerOptions {
   /** Custom error callback */
   onError?: (serviceId: string, error: string) => void | Promise<void>;
 
+  /** Skip state validation for providers that don't return state */
+  skipStateValidation?: boolean;
+
   /** EnvironmentConfig for test isolation (defaults to getEnvironmentConfig()) */
   env?: EnvironmentConfig;
 
@@ -55,6 +58,7 @@ export function createOAuthCallbackHandler(
     errorRedirect = "/",
     onSuccess,
     onError,
+    skipStateValidation = false,
     env = getEnvironmentConfig(),
     envReader = getEnv,
   } = options;
@@ -106,12 +110,20 @@ export function createOAuthCallbackHandler(
 
     if (!code) return handleError(appUrl, "no_code");
 
-    let oauthState: Awaited<ReturnType<TokenStore["getState"]>> | null = null;
+    let oauthState: OAuthState | null = null;
+
+    if (!skipStateValidation && !state) {
+      return handleError(appUrl, "invalid_state", "Missing state parameter", {
+        serviceId: config.serviceId,
+      });
+    }
+
     if (state) {
       oauthState = await tokenStore.getState(state);
-      if (!oauthState) {
-        logger.warn("Invalid or expired state", { serviceId: config.serviceId });
-        // Continue anyway - some providers don't properly return state
+      if (!skipStateValidation && !oauthState) {
+        return handleError(appUrl, "invalid_state", "Invalid or expired state", {
+          serviceId: config.serviceId,
+        });
       }
     }
 

package/src/src/oauth/providers/base.ts

@@ -141,7 +141,7 @@ export class OAuthProvider {
     body: URLSearchParams,
     clientId: string,
     clientSecret: string,
-  ): Promise<{ response: dntShim.Response; data: any }> {
+  ): Promise<{ response: dntShim.Response; data: Record<string, unknown> }> {
     const response = await dntShim.fetch(this.config.tokenUrl, {
       method: "POST",
       headers: this.buildTokenHeaders(clientId, clientSecret),
@@ -174,8 +174,8 @@ export class OAuthProvider {
       if (!response.ok) {
         return {
           success: false,
-          error: data.error || errorFallback,
-          errorDescription: data.error_description ||
+          error: (data.error as string) || errorFallback,
+          errorDescription: (data.error_description as string) ||
             (errorDescriptionFallback ? errorDescriptionFallback(response.status) : undefined),
         };
       }

package/src/src/oauth/providers/common.ts

@@ -10,7 +10,6 @@ export const githubConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "GITHUB_CLIENT_SECRET",
   apiBaseUrl: "https://api.github.com",
   defaultScopes: ["repo", "user"],
-  additionalAuthParams: {},
 };
 
 export const slackConfig: OAuthServiceConfig = {
@@ -23,7 +22,6 @@ export const slackConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "SLACK_CLIENT_SECRET",
   apiBaseUrl: "https://slack.com/api",
   defaultScopes: ["channels:read", "chat:write", "users:read"],
-  additionalAuthParams: {},
 };
 
 export const notionConfig: OAuthServiceConfig = {
@@ -52,7 +50,6 @@ export const figmaConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "FIGMA_CLIENT_SECRET",
   apiBaseUrl: "https://api.figma.com/v1",
   defaultScopes: ["file_read"],
-  additionalAuthParams: {},
 };
 
 export const discordConfig: OAuthServiceConfig = {
@@ -65,7 +62,6 @@ export const discordConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "DISCORD_CLIENT_SECRET",
   apiBaseUrl: "https://discord.com/api/v10",
   defaultScopes: ["identify", "guilds"],
-  additionalAuthParams: {},
 };
 
 export const linearConfig: OAuthServiceConfig = {
@@ -78,7 +74,6 @@ export const linearConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "LINEAR_CLIENT_SECRET",
   apiBaseUrl: "https://api.linear.app",
   defaultScopes: ["read", "write"],
-  additionalAuthParams: {},
 };
 
 export const gitlabConfig: OAuthServiceConfig = {
@@ -91,7 +86,6 @@ export const gitlabConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "GITLAB_CLIENT_SECRET",
   apiBaseUrl: "https://gitlab.com/api/v4",
   defaultScopes: ["read_user", "api"],
-  additionalAuthParams: {},
 };
 
 export const airtableConfig: OAuthServiceConfig = {
@@ -105,7 +99,6 @@ export const airtableConfig: OAuthServiceConfig = {
   apiBaseUrl: "https://api.airtable.com/v0",
   defaultScopes: ["data.records:read", "data.records:write", "schema.bases:read"],
   useBasicAuth: true,
-  additionalAuthParams: {},
 };
 
 export const dropboxConfig: OAuthServiceConfig = {
@@ -133,7 +126,6 @@ export const hubspotConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "HUBSPOT_CLIENT_SECRET",
   apiBaseUrl: "https://api.hubapi.com",
   defaultScopes: ["crm.objects.contacts.read", "crm.objects.contacts.write"],
-  additionalAuthParams: {},
 };
 
 export const salesforceConfig: OAuthServiceConfig = {
@@ -146,7 +138,6 @@ export const salesforceConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "SALESFORCE_CLIENT_SECRET",
   apiBaseUrl: "https://login.salesforce.com/services/data/v59.0",
   defaultScopes: ["api", "refresh_token"],
-  additionalAuthParams: {},
 };
 
 export const twitterConfig: OAuthServiceConfig = {
@@ -160,7 +151,6 @@ export const twitterConfig: OAuthServiceConfig = {
   apiBaseUrl: "https://api.twitter.com/2",
   defaultScopes: ["tweet.read", "users.read", "offline.access"],
   useBasicAuth: true,
-  additionalAuthParams: {},
 };
 
 export const asanaConfig: OAuthServiceConfig = {
@@ -173,7 +163,6 @@ export const asanaConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "ASANA_CLIENT_SECRET",
   apiBaseUrl: "https://app.asana.com/api/1.0",
   defaultScopes: ["default"],
-  additionalAuthParams: {},
 };
 
 export const mondayConfig: OAuthServiceConfig = {
@@ -186,7 +175,6 @@ export const mondayConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "MONDAY_CLIENT_SECRET",
   apiBaseUrl: "https://api.monday.com/v2",
   defaultScopes: ["me:read", "boards:read", "boards:write"],
-  additionalAuthParams: {},
 };
 
 export const zoomConfig: OAuthServiceConfig = {
@@ -200,7 +188,6 @@ export const zoomConfig: OAuthServiceConfig = {
   apiBaseUrl: "https://api.zoom.us/v2",
   defaultScopes: ["meeting:read", "meeting:write", "user:read"],
   useBasicAuth: true,
-  additionalAuthParams: {},
 };
 
 export const intercomConfig: OAuthServiceConfig = {
@@ -213,7 +200,6 @@ export const intercomConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "INTERCOM_CLIENT_SECRET",
   apiBaseUrl: "https://api.intercom.io",
   defaultScopes: [],
-  additionalAuthParams: {},
 };
 
 export const freshdeskConfig: OAuthServiceConfig = {
@@ -226,7 +212,6 @@ export const freshdeskConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "FRESHDESK_CLIENT_SECRET",
   apiBaseUrl: "https://domain.freshdesk.com/api/v2",
   defaultScopes: ["freshdesk"],
-  additionalAuthParams: {},
 };
 
 export const mailchimpConfig: OAuthServiceConfig = {
@@ -239,7 +224,6 @@ export const mailchimpConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "MAILCHIMP_CLIENT_SECRET",
   apiBaseUrl: "https://server.api.mailchimp.com/3.0",
   defaultScopes: [],
-  additionalAuthParams: {},
 };
 
 export const shopifyConfig: OAuthServiceConfig = {
@@ -252,7 +236,6 @@ export const shopifyConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "SHOPIFY_CLIENT_SECRET",
   apiBaseUrl: "https://shop.myshopify.com/admin/api/2024-01",
   defaultScopes: ["read_products", "write_products", "read_orders"],
-  additionalAuthParams: {},
 };
 
 export const quickbooksConfig: OAuthServiceConfig = {
@@ -265,7 +248,6 @@ export const quickbooksConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "QUICKBOOKS_CLIENT_SECRET",
   apiBaseUrl: "https://quickbooks.api.intuit.com/v3",
   defaultScopes: ["com.intuit.quickbooks.accounting"],
-  additionalAuthParams: {},
 };
 
 export const xeroConfig: OAuthServiceConfig = {
@@ -284,7 +266,6 @@ export const xeroConfig: OAuthServiceConfig = {
     "accounting.transactions",
     "offline_access",
   ],
-  additionalAuthParams: {},
 };
 
 export const boxConfig: OAuthServiceConfig = {
@@ -297,7 +278,6 @@ export const boxConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "BOX_CLIENT_SECRET",
   apiBaseUrl: "https://api.box.com/2.0",
   defaultScopes: [],
-  additionalAuthParams: {},
 };
 
 export const webexConfig: OAuthServiceConfig = {
@@ -310,7 +290,6 @@ export const webexConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "WEBEX_CLIENT_SECRET",
   apiBaseUrl: "https://webexapis.com/v1",
   defaultScopes: ["spark:all", "spark:kms"],
-  additionalAuthParams: {},
 };
 
 export const trelloConfig: OAuthServiceConfig = {
@@ -338,7 +317,6 @@ export const clickupConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "CLICKUP_CLIENT_SECRET",
   apiBaseUrl: "https://api.clickup.com/api/v2",
   defaultScopes: [],
-  additionalAuthParams: {},
 };
 
 export const pipedriveConfig: OAuthServiceConfig = {
@@ -351,7 +329,6 @@ export const pipedriveConfig: OAuthServiceConfig = {
   clientSecretEnvVar: "PIPEDRIVE_CLIENT_SECRET",
   apiBaseUrl: "https://api.pipedrive.com/v1",
   defaultScopes: [],
-  additionalAuthParams: {},
 };
 
 export const commonServices = {

package/src/src/observability/auto-instrument/react-instrumentation.ts

@@ -1,5 +1,5 @@
 import * as dntShim from "../../../_dnt.shims.js";
-import type { Span } from "@opentelemetry/api";
+import { type Span, SpanStatusCode } from "@opentelemetry/api";
 import { endSpan, setSpanAttributes, SpanNames, startSpan, withSpan } from "../tracing/index.js";
 import { recordRenderError } from "../metrics/index.js";
 
@@ -48,7 +48,7 @@ function handleRenderError(span: Span | null, error: unknown, componentName: str
   if (!span) return;
 
   span.recordException(error as Error);
-  span.setStatus({ code: 2, message: String(error) }); // 2 = ERROR
+  span.setStatus({ code: SpanStatusCode.ERROR, message: String(error) });
 }
 
 function recordRenderDuration(span: Span | null, startTime: number): void {

package/src/src/observability/instruments/instruments-factory.ts

@@ -16,8 +16,8 @@ export function initializeInstruments(
   meter: Meter,
   config: MetricsConfig,
   runtimeState: RuntimeState,
-): Promise<MetricsInstruments> {
-  const instruments: MetricsInstruments = {
+): MetricsInstruments {
+  const emptyInstruments: MetricsInstruments = {
     httpRequestCounter: null,
     httpRequestDuration: null,
     httpActiveRequests: null,
@@ -53,7 +53,8 @@ export function initializeInstruments(
   };
 
   try {
-    Object.assign(instruments, {
+    return {
+      ...emptyInstruments,
       ...createHttpInstruments(meter, config),
       ...createCacheInstruments(meter, config, runtimeState),
       ...createRenderInstruments(meter, config),
@@ -62,10 +63,9 @@ export function initializeInstruments(
       ...createDataInstruments(meter, config),
       ...createMemoryInstruments(meter, config),
       ...createErrorInstruments(meter, config),
-    });
+    };
   } catch (error) {
     logger.warn("Failed to initialize metric instruments", error);
+    return emptyInstruments;
   }
-
-  return Promise.resolve(instruments);
 }

package/src/src/observability/metrics/config.ts

@@ -14,14 +14,14 @@ export const DEFAULT_CONFIG: MetricsConfig = {
 };
 
 function getEnvVar(env: unknown, key: string): string | undefined {
-  const envObj = env as Record<string, unknown> | null | undefined;
+  if (env == null || typeof env !== "object") return undefined;
 
-  const getter = envObj?.get;
-  if (typeof getter === "function") {
-    return getter.call(envObj, key) as string | undefined;
+  const envObj = env as Record<string, unknown>;
+  if (typeof envObj.get === "function") {
+    return envObj.get(key) as string | undefined;
   }
 
-  const value = envObj?.[key];
+  const value = envObj[key];
   return typeof value === "string" ? value : undefined;
 }
 

package/src/src/observability/metrics/manager.ts

@@ -82,7 +82,7 @@ export class MetricsManager {
       this.api = await import("@opentelemetry/api");
       this.meter = this.api.metrics.getMeter(finalConfig.prefix, VERSION);
 
-      this.instruments = await initializeInstruments(this.meter, finalConfig, this.runtimeState);
+      this.instruments = initializeInstruments(this.meter, finalConfig, this.runtimeState);
       this.recorder.instruments = this.instruments;
 
       logger.info("OpenTelemetry metrics initialized", {