From 17bf1f3e84562e7be74aa5ee3276011005792879 Mon Sep 17 00:00:00 2001
From: adudek-bw <adudek@bitwarden.com>
Date: Tue, 6 Jan 2026 14:56:50 -0500
Subject: [PATCH] fix build

---
 apps/browser/src/background/main.background.ts              | 1 +
 apps/cli/src/service-container/service-container.ts         | 1 +
 libs/common/src/tools/providers.ts                          | 6 ++++--
 .../generator/components/src/generator-services.module.ts   | 6 ++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 7b509380f6d..4fda51fc401 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -1101,6 +1101,7 @@ export default class MainBackground {
         this.logService,
         this.platformUtilsService,
         this.configService,
+        this.sdkService,
       ),
     );
 
diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index 2d4ea7d00b5..2af0c2e0164 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -894,6 +894,7 @@ export class ServiceContainer {
         this.logService,
         this.platformUtilsService,
         this.configService,
+        this.sdkService,
       ),
     );
 
diff --git a/libs/common/src/tools/providers.ts b/libs/common/src/tools/providers.ts
index ac42c556042..b1621f19c21 100644
--- a/libs/common/src/tools/providers.ts
+++ b/libs/common/src/tools/providers.ts
@@ -1,10 +1,10 @@
 import { LogService } from "@bitwarden/logging";
-import { BitwardenClient } from "@bitwarden/sdk-internal";
 import { StateProvider } from "@bitwarden/state";
 
 import { PolicyService } from "../admin-console/abstractions/policy/policy.service.abstraction";
 import { ConfigService } from "../platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "../platform/abstractions/platform-utils.service";
+import { SdkService } from "../platform/abstractions/sdk/sdk.service";
 
 import { LegacyEncryptorProvider } from "./cryptography/legacy-encryptor-provider";
 import { ExtensionRegistry } from "./extension/extension-registry.abstraction";
@@ -29,7 +29,7 @@ export type SystemServiceProvider = {
   readonly environment: PlatformUtilsService;
 
   /** SDK Service */
-  readonly sdk?: BitwardenClient;
+  readonly sdk: SdkService;
 };
 
 /** Constructs a system service provider. */
@@ -41,6 +41,7 @@ export function createSystemServiceProvider(
   logger: LogService,
   environment: PlatformUtilsService,
   configService: ConfigService,
+  sdk: SdkService,
 ): SystemServiceProvider {
   let log: LogProvider;
   if (environment.isDev()) {
@@ -62,5 +63,6 @@ export function createSystemServiceProvider(
     log,
     configService,
     environment,
+    sdk,
   };
 }
diff --git a/libs/tools/generator/components/src/generator-services.module.ts b/libs/tools/generator/components/src/generator-services.module.ts
index 3e84a524178..9bc5692f610 100644
--- a/libs/tools/generator/components/src/generator-services.module.ts
+++ b/libs/tools/generator/components/src/generator-services.module.ts
@@ -1,4 +1,5 @@
 import { NgModule } from "@angular/core";
+import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
@@ -36,6 +37,7 @@ import {
   DefaultCredentialGeneratorService,
 } from "@bitwarden/generator-core";
 import { KeyService } from "@bitwarden/key-management";
+import { BitwardenClient } from "@bitwarden/sdk-internal";
 
 export const RANDOMIZER = new SafeInjectionToken<Randomizer>("Randomizer");
 const GENERATOR_SERVICE_PROVIDER = new SafeInjectionToken<providers.CredentialGeneratorProviders>(
@@ -124,7 +126,7 @@ export const SYSTEM_SERVICE_PROVIDER = new SafeInjectionToken<SystemServiceProvi
     }),
     safeProvider({
       provide: GENERATOR_SERVICE_PROVIDER,
-      useFactory: (
+      useFactory: async (
         system: SystemServiceProvider,
         random: Randomizer,
         encryptor: LegacyEncryptorProvider,
@@ -145,7 +147,7 @@ export const SYSTEM_SERVICE_PROVIDER = new SafeInjectionToken<SystemServiceProvi
           Object.values(BuiltIn),
         );
 
-        const sdkService = system.sdk;
+        const sdkService: BitwardenClient = await firstValueFrom(system.sdk.client$);
         const profile = new providers.GeneratorProfileProvider(userStateDeps, system.policy);
 
         const generator: providers.GeneratorDependencyProvider = {