Merge upstream T3 Code v0.0.27

apps/mobile/package.json

@@ -94,7 +94,7 @@
     "react-native-image-viewing": "^0.2.2",
     "react-native-keyboard-controller": "1.21.6",
     "react-native-nitro-markdown": "^0.5.0",
-    "react-native-nitro-modules": "^0.35.4",
+    "react-native-nitro-modules": "0.35.9",
     "react-native-reanimated": "4.3.1",
     "react-native-safe-area-context": "~5.7.0",
     "react-native-screens": "4.25.2",

apps/mobile/src/app/settings/waitlist.tsx

@@ -6,6 +6,7 @@ import { ScrollView } from "react-native";
 import { CloudWaitlistEnrollment } from "../../features/cloud/CloudWaitlistEnrollment";
 import { useClerkSettingsSheetDetent } from "../../features/cloud/ClerkSettingsSheetDetent";
 import { hasCloudPublicConfig } from "../../features/cloud/publicConfig";
+import { useNativeClerkAuthModal } from "../../features/cloud/useNativeClerkAuthModal";
 
 export default function SettingsWaitlistRouteScreen() {
   return hasCloudPublicConfig() ? (
@@ -18,6 +19,7 @@ export default function SettingsWaitlistRouteScreen() {
 function ConfiguredSettingsWaitlistRouteScreen() {
   const { isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
   const { expand } = useClerkSettingsSheetDetent();
+  const { isAvailable: isNativeAuthAvailable, presentAuth } = useNativeClerkAuthModal();
   const router = useRouter();
 
   useFocusEffect(
@@ -45,6 +47,13 @@ function ConfiguredSettingsWaitlistRouteScreen() {
       >
         <CloudWaitlistEnrollment
           onSignIn={() => {
+            if (isNativeAuthAvailable) {
+              void presentAuth().catch(() => {
+                expand();
+                router.push("/settings/auth");
+              });
+              return;
+            }
             expand();
             router.push("/settings/auth");
           }}

apps/mobile/src/features/cloud/useNativeClerkAuthModal.ts

@@ -0,0 +1,150 @@
+import { getClerkInstance } from "@clerk/expo";
+import { tokenCache } from "@clerk/expo/token-cache";
+import * as Data from "effect/Data";
+import { useCallback, useRef } from "react";
+import type { TurboModule } from "react-native";
+import { TurboModuleRegistry } from "react-native";
+
+const CLERK_CLIENT_JWT_KEY = "__clerk_client_jwt";
+
+interface NativeClerkModule extends TurboModule {
+  readonly getClientToken?: () => Promise<string | null>;
+  readonly presentAuth?: (options: {
+    readonly dismissable: boolean;
+    readonly mode: "signInOrUp";
+  }) => Promise<NativeAuthResult | null>;
+}
+
+interface NativeAuthResult {
+  readonly cancelled?: boolean;
+  readonly session?: {
+    readonly id?: string;
+  };
+  readonly sessionId?: string;
+}
+
+interface ClerkWithNativeSync {
+  readonly __internal_reloadInitialResources?: () => Promise<void>;
+  readonly setActive?: (params: { readonly session: string }) => Promise<void>;
+}
+
+interface TokenCacheWithClear {
+  readonly deleteToken?: (key: string) => Promise<void>;
+  readonly saveToken?: (key: string, token: string) => Promise<void>;
+}
+
+const NativeClerk = TurboModuleRegistry.get<NativeClerkModule>("ClerkExpo");
+
+class NativeClerkAuthError extends Data.TaggedError("NativeClerkAuthError")<{
+  readonly message: string;
+  readonly cause?: unknown;
+}> {}
+
+async function syncNativeSession(sessionId: string): Promise<void> {
+  const getClientToken = NativeClerk?.getClientToken;
+  let nativeClientToken: string | null = null;
+  if (getClientToken) {
+    try {
+      nativeClientToken = await getClientToken();
+    } catch (cause) {
+      throw new NativeClerkAuthError({
+        message: "Could not read native Clerk client token.",
+        cause,
+      });
+    }
+  }
+  const cache = tokenCache as TokenCacheWithClear | null | undefined;
+  if (nativeClientToken) {
+    const saveToken = cache?.saveToken;
+    if (saveToken) {
+      try {
+        await saveToken(CLERK_CLIENT_JWT_KEY, nativeClientToken);
+      } catch (cause) {
+        throw new NativeClerkAuthError({
+          message: "Could not save native Clerk client token.",
+          cause,
+        });
+      }
+    }
+  } else if (cache?.deleteToken) {
+    try {
+      await cache.deleteToken(CLERK_CLIENT_JWT_KEY);
+    } catch (cause) {
+      throw new NativeClerkAuthError({
+        message: "Could not clear native Clerk client token.",
+        cause,
+      });
+    }
+  }
+
+  const clerk = getClerkInstance();
+  const clerkWithNativeSync = clerk as ClerkWithNativeSync;
+  const reloadInitialResources = clerkWithNativeSync.__internal_reloadInitialResources;
+  if (reloadInitialResources) {
+    try {
+      await reloadInitialResources();
+    } catch (cause) {
+      throw new NativeClerkAuthError({
+        message: "Could not reload Clerk resources after native auth.",
+        cause,
+      });
+    }
+  }
+  const setActive = clerkWithNativeSync.setActive;
+  if (setActive) {
+    try {
+      await setActive({ session: sessionId });
+    } catch (cause) {
+      throw new NativeClerkAuthError({
+        message: "Could not activate native Clerk session.",
+        cause,
+      });
+    }
+  }
+}
+
+export function useNativeClerkAuthModal() {
+  const presentingRef = useRef(false);
+
+  const presentAuth = useCallback(async (): Promise<void> => {
+    if (presentingRef.current || !NativeClerk?.presentAuth) {
+      return;
+    }
+
+    presentingRef.current = true;
+    const presentNativeAuth = NativeClerk.presentAuth;
+    try {
+      // Clerk's iOS AuthView is not inline. It presents this same native modal
+      // internally; call the presenter directly so Expo Router does not render
+      // an empty formSheet behind it.
+      let result: NativeAuthResult | null;
+      try {
+        result = await presentNativeAuth({
+          dismissable: true,
+          mode: "signInOrUp",
+        });
+      } catch (cause) {
+        throw new NativeClerkAuthError({
+          message: "Native Clerk auth presentation failed.",
+          cause,
+        });
+      }
+      const sessionId = result?.sessionId ?? result?.session?.id ?? null;
+      if (sessionId && !result?.cancelled) {
+        await syncNativeSession(sessionId);
+      }
+    } catch (error) {
+      if (__DEV__) {
+        console.error("[useNativeClerkAuthModal] presentAuth failed:", error);
+      }
+      throw error;
+    } finally {
+      presentingRef.current = false;
+    }
+  }, []);
+
+  return {
+    isAvailable: !!NativeClerk?.presentAuth,
+    presentAuth,
+  };
+}

apps/server/src/provider/Layers/ProviderRegistry.test.ts

@@ -1428,6 +1428,11 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
             assert.strictEqual(initialCodex?.installed, false);
             assert.deepStrictEqual(spawnedCommands, [firstMissing]);
 
+            // The rebuilt instance may re-probe synchronously during the
+            // settings update. Advance the TestClock first so `checkedAt`
+            // can safely act as the fresh-probe marker this assertion uses.
+            yield* TestClock.adjust("1 second");
+
             // Drive a settings change. The Hydration layer's
             // `SettingsWatcherLive` consumes this via `streamChanges`,
             // calls `reconcile`, which rebuilds the codex instance (the