Resolve TSGo diagnostics in relay stack

Co-authored-by: codex <codex@users.noreply.github.com>

Author: juliusmarminge

apps/desktop/src/app/DesktopCloudAuth.test.ts

@@ -96,6 +96,7 @@ function makeHarness(input: { readonly isDevelopment: boolean }): CloudAuthHarne
   const environment = DesktopEnvironment.DesktopEnvironment.of({
     isDevelopment: input.isDevelopment,
   } as DesktopEnvironment.DesktopEnvironmentShape);
+  const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, environment);
 
   return {
     app,
@@ -105,8 +106,10 @@ function makeHarness(input: { readonly isDevelopment: boolean }): CloudAuthHarne
     sends,
     reveals,
     layer: Layer.mergeAll(
-      DesktopCloudAuth.layer.pipe(Layer.provide(NodeServices.layer)),
-      Layer.succeed(DesktopEnvironment.DesktopEnvironment, environment),
+      DesktopCloudAuth.layer.pipe(
+        Layer.provideMerge(environmentLayer),
+        Layer.provide(NodeServices.layer),
+      ),
       Layer.succeed(ElectronApp.ElectronApp, app),
       Layer.succeed(ElectronWindow.ElectronWindow, window),
     ),

apps/desktop/src/app/DesktopCloudAuth.ts

@@ -39,23 +39,16 @@ interface PendingCloudAuthRequest {
 }
 
 export interface DesktopCloudAuthShape {
-  readonly createRequest: Effect.Effect<
-    string,
-    DesktopCloudAuthCallbackServerError,
-    DesktopEnvironment.DesktopEnvironment
-  >;
+  readonly createRequest: Effect.Effect<string, DesktopCloudAuthCallbackServerError>;
   readonly configure: Effect.Effect<
     void,
     never,
-    | DesktopEnvironment.DesktopEnvironment
-    | ElectronApp.ElectronApp
-    | ElectronWindow.ElectronWindow
-    | Scope.Scope
+    ElectronApp.ElectronApp | ElectronWindow.ElectronWindow | Scope.Scope
   >;
 }
 
 export class DesktopCloudAuth extends Context.Service<DesktopCloudAuth, DesktopCloudAuthShape>()(
-  "t3/desktop/CloudAuth",
+  "@t3tools/desktop/app/DesktopCloudAuth",
 ) {}
 
 export function resolveCloudAuthCallbackScheme(input: { readonly isDevelopment: boolean }): string {
@@ -196,6 +189,7 @@ function startProtocolCallbackForwardServer(
 
 const make = Effect.gen(function* () {
   const crypto = yield* Crypto.Crypto;
+  const environment = yield* DesktopEnvironment.DesktopEnvironment;
   let pendingAuthRequest: PendingCloudAuthRequest | null = null;
   let dispatchCloudAuthCallback: (rawUrl: string) => void = ignoreCloudAuthCallback;
   const makeCloudAuthRequestState = Effect.gen(function* () {
@@ -205,7 +199,6 @@ const make = Effect.gen(function* () {
 
   return DesktopCloudAuth.of({
     createRequest: Effect.gen(function* () {
-      const environment = yield* DesktopEnvironment.DesktopEnvironment;
       const scheme = resolveCloudAuthCallbackScheme({
         isDevelopment: environment.isDevelopment,
       });
@@ -227,7 +220,6 @@ const make = Effect.gen(function* () {
       return redirectUrl;
     }),
     configure: Effect.gen(function* () {
-      const environment = yield* DesktopEnvironment.DesktopEnvironment;
       const electronApp = yield* ElectronApp.ElectronApp;
       const electronWindow = yield* ElectronWindow.ElectronWindow;
       const scope = yield* Scope.Scope;

apps/desktop/src/app/DesktopCloudAuthTokenStore.ts

@@ -69,7 +69,7 @@ export interface DesktopCloudAuthTokenStoreShape {
 export class DesktopCloudAuthTokenStore extends Context.Service<
   DesktopCloudAuthTokenStore,
   DesktopCloudAuthTokenStoreShape
->()("t3/desktop/CloudAuthTokenStore") {}
+>()("@t3tools/desktop/app/DesktopCloudAuthTokenStore") {}
 
 function decodeSecretBytes(
   encoded: string,

apps/mobile/src/state/use-remote-environment-registry.ts

@@ -264,7 +264,7 @@ export function connectSavedEnvironment(
                 httpBaseUrl: connection.httpBaseUrl,
                 bearerToken: connection.bearerToken ?? "",
               }),
-      ),
+        ),
       {
         onAttempt: () => {
           if (!isCurrentAttempt()) {

apps/server/src/auth/Layers/SessionCredentialService.ts

@@ -96,7 +96,6 @@ export const makeSessionCredentialService = Effect.gen(function* () {
   const serverConfig = yield* ServerConfig;
   const secretStore = yield* ServerSecretStore;
   const authSessions = yield* AuthSessionRepository;
-  const crypto = yield* Crypto.Crypto;
   const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32);
   const connectedSessionsRef = yield* Ref.make(new Map<string, number>());
   const changesPubSub = yield* PubSub.unbounded<SessionCredentialChange>();

apps/server/src/cloud/ManagedEndpointRuntime.ts

@@ -33,7 +33,7 @@ export interface CloudManagedEndpointRuntimeShape {
 export class CloudManagedEndpointRuntime extends Context.Service<
   CloudManagedEndpointRuntime,
   CloudManagedEndpointRuntimeShape
->()("t3/cloud/ManagedEndpointRuntime") {}
+>()("t3/cloud/ManagedEndpointRuntime/CloudManagedEndpointRuntime") {}
 
 export type CloudManagedEndpointRuntimeStatus =
   | {

packages/client-runtime/src/managedRelay.ts

@@ -56,7 +56,7 @@ export interface ManagedRelayDpopSignerShape {
 export class ManagedRelayDpopSigner extends Context.Service<
   ManagedRelayDpopSigner,
   ManagedRelayDpopSignerShape
->()("t3/client-runtime/ManagedRelayDpopSigner") {}
+>()("@t3tools/client-runtime/managedRelay/ManagedRelayDpopSigner") {}
 
 export class ManagedRelayClientError extends Data.TaggedError("ManagedRelayClientError")<{
   readonly message: string;
@@ -130,7 +130,7 @@ export interface ManagedRelayClientShape {
 export class ManagedRelayClient extends Context.Service<
   ManagedRelayClient,
   ManagedRelayClientShape
->()("t3/client-runtime/ManagedRelayClient") {}
+>()("@t3tools/client-runtime/managedRelay/ManagedRelayClient") {}
 
 function relayClientError(message: string, cause?: unknown): ManagedRelayClientError {
   return new ManagedRelayClientError({ message, ...(cause === undefined ? {} : { cause }) });

packages/contracts/src/relay.ts

@@ -458,7 +458,7 @@ export interface RelayClientPrincipalShape {
 export class RelayClientPrincipal extends Context.Service<
   RelayClientPrincipal,
   RelayClientPrincipalShape
->()("RelayClientPrincipal") {}
+>()("@t3tools/contracts/relay/RelayClientPrincipal") {}
 
 export interface RelayEnvironmentPrincipalShape {
   readonly environmentId: string;
@@ -468,7 +468,7 @@ export interface RelayEnvironmentPrincipalShape {
 export class RelayEnvironmentPrincipal extends Context.Service<
   RelayEnvironmentPrincipal,
   RelayEnvironmentPrincipalShape
->()("RelayEnvironmentPrincipal") {}
+>()("@t3tools/contracts/relay/RelayEnvironmentPrincipal") {}
 
 export class RelayClientAuth extends HttpApiMiddleware.Service<
   RelayClientAuth,