lael-labs/t3code

.github/workflows/mobile-eas-preview.yml+2−0

 on:
   pull_request:
+    types: [opened, reopened, synchronize, labeled, unlabeled]
 jobs:
   preview:
     name: EAS Preview
+    if: contains(github.event.pull_request.labels.*.name, '🚀 Mobile Continuous Deployment')
     runs-on: blacksmith-8vcpu-ubuntu-2404
     permissions:
       contents: read

apps/desktop/src/app/DesktopAppIdentity.test.ts+2−2

@@ -63,7 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) => · 62 unmodified lines
63	}),	63	}),
64	appendCommandLineSwitch: () => Effect.void,	64	appendCommandLineSwitch: () => Effect.void,
65	on: () => Effect.void,	65	on: () => Effect.void,
66	} satisfies ElectronApp.ElectronAppShape);	66	} satisfies ElectronApp.ElectronApp["Service"]);
67		67
68	const makeAssetsLayer = (png: Option.Option<string>) =>	68	const makeAssetsLayer = (png: Option.Option<string>) =>
69	Layer.succeed(DesktopAssets.DesktopAssets, {	69	Layer.succeed(DesktopAssets.DesktopAssets, {
@@ -73,7 +73,7 @@ const makeAssetsLayer = (png: Option.Option<string>) => · 3 unmodified lines
73	png,	73	png,
74	}),	74	}),
75	resolveResourcePath: () => Effect.succeed(Option.none()),	75	resolveResourcePath: () => Effect.succeed(Option.none()),
76	} satisfies DesktopAssets.DesktopAssetsShape);	76	} satisfies DesktopAssets.DesktopAssets["Service"]);
77		77
78	const makeEnvironmentLayer = (overrides: TestEnvironmentInput = {}) => {	78	const makeEnvironmentLayer = (overrides: TestEnvironmentInput = {}) => {
79	const { env, ...environmentOverrides } = overrides;	79	const { env, ...environmentOverrides } = overrides;

apps/desktop/src/app/DesktopAppIdentity.ts+4−6

 });
 const decodeAppPackageMetadata = Schema.decodeEffect(Schema.fromJsonString(AppPackageMetadata));
-export interface DesktopAppIdentityShape {
-  readonly resolveUserDataPath: Effect.Effect<string>;
-  readonly configure: Effect.Effect<void>;
-}
 export class DesktopAppIdentity extends Context.Service<
   DesktopAppIdentity,
-  DesktopAppIdentityShape
+  {
+    readonly resolveUserDataPath: Effect.Effect<string>;
+    readonly configure: Effect.Effect<void>;
+  }
 >()("@t3tools/desktop/app/DesktopAppIdentity") {}
 const normalizeCommitHash = (value: string): Option.Option<string> => {

apps/desktop/src/app/DesktopAssets.ts+7−8

@@ -12,14 +12,13 @@ export interface DesktopIconPaths { · 11 unmodified lines
12	readonly png: Option.Option<string>;	12	readonly png: Option.Option<string>;
13	}	13	}
14		14
15	export interface DesktopAssetsShape {	15	export class DesktopAssets extends Context.Service<
16	readonly iconPaths: Effect.Effect<DesktopIconPaths>;	16	DesktopAssets,
17	readonly resolveResourcePath: (fileName: string) => Effect.Effect<Option.Option<string>>;	17	{
18	}	18	readonly iconPaths: Effect.Effect<DesktopIconPaths>;
19		19	readonly resolveResourcePath: (fileName: string) => Effect.Effect<Option.Option<string>>;
20	export class DesktopAssets extends Context.Service<DesktopAssets, DesktopAssetsShape>()(	20	}
21	"@t3tools/desktop/app/DesktopAssets",	21	>()("@t3tools/desktop/app/DesktopAssets") {}
22	) {}
23		22
24	const resolveResourcePath = Effect.fn("desktop.assets.resolveResourcePath")(function* (	23	const resolveResourcePath = Effect.fn("desktop.assets.resolveResourcePath")(function* (
25	fileName: string,	24	fileName: string,

apps/desktop/src/app/DesktopClerk.test.ts+8−9

   storage: storageMock,
 }));
-import {
-  createDesktopClerkBridge,
-  resolveDesktopClerkFrontendApiHostname,
-} from "./DesktopClerk.ts";
 import * as DesktopClerk from "./DesktopClerk.ts";
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
   it("derives the Clerk Frontend API hostname used by the desktop CSP", () => {
     const publishableKey = `pk_test_${btoa("clerk.t3.codes$")}`;
-    assert.equal(resolveDesktopClerkFrontendApiHostname(publishableKey), "clerk.t3.codes");
+    assert.equal(
-    assert.equal(resolveDesktopClerkFrontendApiHostname(""), undefined);
+      DesktopClerk.resolveDesktopClerkFrontendApiHostname(publishableKey),
-    assert.equal(resolveDesktopClerkFrontendApiHostname("invalid"), undefined);
+      "clerk.t3.codes",
+    );
+    assert.equal(DesktopClerk.resolveDesktopClerkFrontendApiHostname(""), undefined);
+    assert.equal(DesktopClerk.resolveDesktopClerkFrontendApiHostname("invalid"), undefined);
   });
   it.effect("acquires and releases the SDK bridge with the layer", () => {
     const environment = DesktopEnvironment.DesktopEnvironment.of({
       stateDir: "/tmp/t3-state",
       isDevelopment: true,
-    } as unknown as DesktopEnvironment.DesktopEnvironmentShape);
+    } as unknown as DesktopEnvironment.DesktopEnvironment["Service"]);
     return Effect.gen(function* () {
       yield* Effect.scoped(
     storageMock.mockReturnValue(storageAdapter);
     createClerkBridgeMock.mockReturnValue(bridge);
-    assert.equal(createDesktopClerkBridge("/tmp/t3-state", isDevelopment), bridge);
+    assert.equal(DesktopClerk.createDesktopClerkBridge("/tmp/t3-state", isDevelopment), bridge);
     assert.deepEqual(storageMock.mock.calls, [[{ path: "/tmp/t3-state" }]]);
     assert.deepEqual(createClerkBridgeMock.mock.calls, [
       [

apps/desktop/src/app/DesktopClerk.ts+10−11

@@ -14,17 +14,16 @@ import * as DesktopEnvironment from "./DesktopEnvironment.ts"; · 13 unmodified lines
14		14
15	declare const __T3CODE_BUILD_CLERK_PUBLISHABLE_KEY__: string \| undefined;	15	declare const __T3CODE_BUILD_CLERK_PUBLISHABLE_KEY__: string \| undefined;
16		16
17	export interface DesktopClerkShape {	17	export class DesktopClerk extends Context.Service<
18	readonly configure: Effect.Effect<	18	DesktopClerk,
19	void,	19	{
20	never,	20	readonly configure: Effect.Effect<
21	ElectronApp.ElectronApp \| ElectronWindow.ElectronWindow \| Scope.Scope	21	void,
22	>;	22	never,
23	}	23	ElectronApp.ElectronApp \| ElectronWindow.ElectronWindow \| Scope.Scope
24		24	>;
25	export class DesktopClerk extends Context.Service<DesktopClerk, DesktopClerkShape>()(	25	}
26	"@t3tools/desktop/app/DesktopClerk",	26	>()("@t3tools/desktop/app/DesktopClerk") {}
27	) {}
28		27
29	export function resolveDesktopClerkFrontendApiHostname(	28	export function resolveDesktopClerkFrontendApiHostname(
30	publishableKey: string \| undefined,	29	publishableKey: string \| undefined,

apps/desktop/src/app/DesktopEnvironment.ts+50−55

 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
-import {
+import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
-  type DesktopSettings,
-  resolveDefaultDesktopSettings,
-} from "../settings/DesktopAppSettings.ts";
 import * as DesktopConfig from "./DesktopConfig.ts";
 import { isNightlyDesktopVersion } from "../updates/updateChannels.ts";
   readonly runningUnderArm64Translation: boolean;
 }
-export interface DesktopEnvironmentShape {
-  readonly path: Path.Path;
-  readonly dirname: string;
-  readonly platform: NodeJS.Platform;
-  readonly processArch: string;
-  readonly isPackaged: boolean;
-  readonly isDevelopment: boolean;
-  readonly appVersion: string;
-  readonly appPath: string;
-  readonly resourcesPath: string;
-  readonly homeDirectory: string;
-  readonly appDataDirectory: string;
-  readonly baseDir: string;
-  readonly stateDir: string;
-  readonly desktopSettingsPath: string;
-  readonly clientSettingsPath: string;
-  readonly savedEnvironmentRegistryPath: string;
-  readonly serverSettingsPath: string;
-  readonly logDir: string;
-  readonly browserArtifactsDir: string;
-  readonly rootDir: string;
-  readonly appRoot: string;
-  readonly backendEntryPath: string;
-  readonly backendCwd: string;
-  readonly preloadPath: string;
-  readonly appUpdateYmlPath: string;
-  readonly devServerUrl: Option.Option<URL>;
-  readonly devRemoteT3ServerEntryPath: Option.Option<string>;
-  readonly configuredBackendPort: Option.Option<number>;
-  readonly commitHashOverride: Option.Option<string>;
-  readonly otlpTracesUrl: Option.Option<string>;
-  readonly otlpExportIntervalMs: number;
-  readonly branding: DesktopAppBranding;
-  readonly displayName: string;
-  readonly appUserModelId: string;
-  readonly linuxDesktopEntryName: string;
-  readonly linuxWmClass: string;
-  readonly userDataDirName: string;
-  readonly legacyUserDataDirName: string;
-  readonly defaultDesktopSettings: DesktopSettings;
-  readonly runtimeInfo: DesktopRuntimeInfo;
-  readonly resolvePickFolderDefaultPath: (rawOptions: unknown) => Option.Option<string>;
-  readonly resolveResourcePathCandidates: (fileName: string) => readonly string[];
-  readonly developmentDockIconPath: string;
-}
 export class DesktopEnvironment extends Context.Service<
   DesktopEnvironment,
-  DesktopEnvironmentShape
+  {
+    readonly path: Path.Path;
+    readonly dirname: string;
+    readonly platform: NodeJS.Platform;
+    readonly processArch: string;
+    readonly isPackaged: boolean;
+    readonly isDevelopment: boolean;
+    readonly appVersion: string;
+    readonly appPath: string;
+    readonly resourcesPath: string;
+    readonly homeDirectory: string;
+    readonly appDataDirectory: string;
+    readonly baseDir: string;
+    readonly stateDir: string;
+    readonly desktopSettingsPath: string;
+    readonly clientSettingsPath: string;
+    readonly savedEnvironmentRegistryPath: string;
+    readonly serverSettingsPath: string;
+    readonly logDir: string;
+    readonly browserArtifactsDir: string;
+    readonly rootDir: string;
+    readonly appRoot: string;
+    readonly backendEntryPath: string;
+    readonly backendCwd: string;
+    readonly preloadPath: string;
+    readonly appUpdateYmlPath: string;
+    readonly devServerUrl: Option.Option<URL>;
+    readonly devRemoteT3ServerEntryPath: Option.Option<string>;
+    readonly configuredBackendPort: Option.Option<number>;
+    readonly commitHashOverride: Option.Option<string>;
+    readonly otlpTracesUrl: Option.Option<string>;
+    readonly otlpExportIntervalMs: number;
+    readonly branding: DesktopAppBranding;
+    readonly displayName: string;
+    readonly appUserModelId: string;
+    readonly linuxDesktopEntryName: string;
+    readonly linuxWmClass: string;
+    readonly userDataDirName: string;
+    readonly legacyUserDataDirName: string;
+    readonly defaultDesktopSettings: DesktopAppSettings.DesktopSettings;
+    readonly runtimeInfo: DesktopRuntimeInfo;
+    readonly resolvePickFolderDefaultPath: (rawOptions: unknown) => Option.Option<string>;
+    readonly resolveResourcePathCandidates: (fileName: string) => readonly string[];
+    readonly developmentDockIconPath: string;
+  }
 >()("@t3tools/desktop/app/DesktopEnvironment") {}
 const APP_BASE_NAME = "T3 Code";
   };
 }
-const makeDesktopEnvironment = Effect.fn("desktop.environment.make")(function* (
+const make = Effect.fn("desktop.environment.make")(function* (
   input: MakeDesktopEnvironmentInput,
-): Effect.fn.Return<DesktopEnvironmentShape, Config.ConfigError, Path.Path> {
+): Effect.fn.Return<DesktopEnvironment["Service"], Config.ConfigError, Path.Path> {
   const path = yield* Path.Path;
   const config = yield* DesktopConfig.DesktopConfig;
   const homeDirectory = input.homeDirectory;
     linuxWmClass: isDevelopment ? "t3code-dev" : "t3code",
     userDataDirName,
     legacyUserDataDirName,
-    defaultDesktopSettings: resolveDefaultDesktopSettings(input.appVersion),
+    defaultDesktopSettings: DesktopAppSettings.resolveDefaultDesktopSettings(input.appVersion),
     runtimeInfo: resolveDesktopRuntimeInfo({
       platform: input.platform,
       processArch: input.processArch,
 });
 export const layer = (input: MakeDesktopEnvironmentInput) =>
-  Layer.effect(DesktopEnvironment, makeDesktopEnvironment(input));
+  Layer.effect(DesktopEnvironment, make(input));

apps/desktop/src/app/DesktopLifecycle.ts+89−120

 import * as Cause from "effect/Cause";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
-import * as Deferred from "effect/Deferred";
 import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
 import * as Scope from "effect/Scope";
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
 import * as DesktopObservability from "./DesktopObservability.ts";
+import * as DesktopShutdownModule from "./DesktopShutdown.ts";
 import * as ElectronApp from "../electron/ElectronApp.ts";
 import * as ElectronTheme from "../electron/ElectronTheme.ts";
 import * as DesktopState from "./DesktopState.ts";
 import * as DesktopWindow from "../window/DesktopWindow.ts";
-export interface DesktopShutdownShape {
+export { DesktopShutdown, layer as layerShutdown } from "./DesktopShutdown.ts";
-  readonly request: Effect.Effect<void>;
-  readonly awaitRequest: Effect.Effect<void>;
-  readonly markComplete: Effect.Effect<void>;
-  readonly awaitComplete: Effect.Effect<void>;
-  readonly isComplete: Effect.Effect<boolean>;
-}
-export class DesktopShutdown extends Context.Service<DesktopShutdown, DesktopShutdownShape>()(
-  "@t3tools/desktop/app/DesktopLifecycle/DesktopShutdown",
-) {}
-const makeShutdown = Effect.gen(function* () {
-  const requested = yield* Deferred.make<void>();
-  const completed = yield* Deferred.make<void>();
-  const completedRef = yield* Ref.make(false);
-  return DesktopShutdown.of({
-    request: Deferred.succeed(requested, undefined).pipe(Effect.asVoid),
-    awaitRequest: Deferred.await(requested),
-    markComplete: Ref.set(completedRef, true).pipe(
-      Effect.andThen(Deferred.succeed(completed, undefined)),
-      Effect.asVoid,
-    ),
-    awaitComplete: Deferred.await(completed),
-    isComplete: Ref.get(completedRef),
-  });
-});
-export const layerShutdown = Layer.effect(DesktopShutdown, makeShutdown);
 export type DesktopLifecycleRuntimeServices =
   | DesktopEnvironment.DesktopEnvironment
-  | DesktopShutdown
+  | DesktopShutdownModule.DesktopShutdown
   | DesktopState.DesktopState
   | DesktopWindow.DesktopWindow
   | ElectronApp.ElectronApp
   | ElectronTheme.ElectronTheme;
-export interface DesktopLifecycleShape {
-  readonly relaunch: (
-    reason: string,
-  ) => Effect.Effect<void, never, DesktopLifecycleRuntimeServices>;
-  readonly register: Effect.Effect<void, never, Scope.Scope | DesktopLifecycleRuntimeServices>;
-}
 /**
  * @effect-expect-leaking DesktopEnvironment | DesktopShutdown | DesktopState | DesktopWindow | ElectronApp | ElectronTheme
  */
-export class DesktopLifecycle extends Context.Service<DesktopLifecycle, DesktopLifecycleShape>()(
+export class DesktopLifecycle extends Context.Service<
-  "@t3tools/desktop/app/DesktopLifecycle",
+  DesktopLifecycle,
-) {}
+  {
+    readonly relaunch: (
+      reason: string,
+    ) => Effect.Effect<void, never, DesktopLifecycleRuntimeServices>;
+    readonly register: Effect.Effect<void, never, Scope.Scope | DesktopLifecycleRuntimeServices>;
+  }
+>()("@t3tools/desktop/app/DesktopLifecycle") {}
 const { logInfo: logLifecycleInfo, logError: logLifecycleError } =
   DesktopObservability.makeComponentLogger("desktop-lifecycle");
 }
 const requestDesktopShutdownAndWait = Effect.fn("desktop.lifecycle.requestShutdownAndWait")(
-  function* (): Effect.fn.Return<void, never, DesktopShutdown> {
+  function* (): Effect.fn.Return<void, never, DesktopShutdownModule.DesktopShutdown> {
-    const shutdown = yield* DesktopShutdown;
+    const shutdown = yield* DesktopShutdownModule.DesktopShutdown;
     yield* shutdown.request;
     yield* shutdown.awaitComplete;
   },
   );
 }
-export const layer = Layer.succeed(
+const make = DesktopLifecycle.of({
-  DesktopLifecycle,
+  relaunch: Effect.fn("desktop.lifecycle.relaunch")(function* (reason) {
-  DesktopLifecycle.of({
+    const electronApp = yield* ElectronApp.ElectronApp;
-    relaunch: Effect.fn("desktop.lifecycle.relaunch")(function* (reason) {
+    const environment = yield* DesktopEnvironment.DesktopEnvironment;
-      const electronApp = yield* ElectronApp.ElectronApp;
+    const state = yield* DesktopState.DesktopState;
-      const environment = yield* DesktopEnvironment.DesktopEnvironment;
+    yield* logLifecycleInfo("desktop relaunch requested", { reason });
-      const state = yield* DesktopState.DesktopState;
+    yield* Effect.gen(function* () {
-      yield* logLifecycleInfo("desktop relaunch requested", { reason });
+      yield* Effect.yieldNow;
-      yield* Effect.gen(function* () {
+      yield* Ref.set(state.quitting, true);
-        yield* Effect.yieldNow;
+      yield* requestDesktopShutdownAndWait();
-        yield* Ref.set(state.quitting, true);
+      if (environment.isDevelopment) {
-        yield* requestDesktopShutdownAndWait();
+        yield* electronApp.exit(75);
-        if (environment.isDevelopment) {
+        return;
-          yield* electronApp.exit(75);
+      }
-          return;
+      yield* electronApp.relaunch({
-        }
+        execPath: process.execPath,
-        yield* electronApp.relaunch({
+        args: process.argv.slice(1),
-          execPath: process.execPath,
-          args: process.argv.slice(1),
-        });
-        yield* electronApp.exit(0);
-      }).pipe(
-        Effect.catchCause((cause) =>
-          logLifecycleError("desktop relaunch failed", {
-            cause: Cause.pretty(cause),
-          }),
-        ),
-        Effect.forkDetach,
-        Effect.asVoid,
-      );
-    }),
-    register: Effect.gen(function* () {
-      const desktopWindow = yield* DesktopWindow.DesktopWindow;
-      const electronApp = yield* ElectronApp.ElectronApp;
-      const electronTheme = yield* ElectronTheme.ElectronTheme;
-      const environment = yield* DesktopEnvironment.DesktopEnvironment;
-      const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
-      const runEffect = Effect.runPromiseWith(context);
-      let quitAllowed = false;
-      yield* electronTheme.onUpdated(() => {
-        void runEffect(
-          desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
-        );
-      });
-      yield* electronApp.on("before-quit", (event: Electron.Event) => {
-        handleBeforeQuit(
-          event,
-          runEffect,
-          () => quitAllowed,
-          () => {
-            quitAllowed = true;
-          },
-        );
       });
-      yield* electronApp.on("activate", () => {
+      yield* electronApp.exit(0);
-        void runEffect(desktopWindow.activate.pipe(Effect.withSpan("desktop.lifecycle.activate")));
+    }).pipe(
+      Effect.catchCause((cause) =>
+        logLifecycleError("desktop relaunch failed", {
+          cause: Cause.pretty(cause),
+        }),
+      ),
+      Effect.forkDetach,
+      Effect.asVoid,
+    );
+  }),
+  register: Effect.gen(function* () {
+    const desktopWindow = yield* DesktopWindow.DesktopWindow;
+    const electronApp = yield* ElectronApp.ElectronApp;
+    const electronTheme = yield* ElectronTheme.ElectronTheme;
+    const environment = yield* DesktopEnvironment.DesktopEnvironment;
+    const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
+    const runEffect = Effect.runPromiseWith(context);
+    let quitAllowed = false;
+    yield* electronTheme.onUpdated(() => {
+      void runEffect(
+        desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
+      );
+    });
+    yield* electronApp.on("before-quit", (event: Electron.Event) => {
+      handleBeforeQuit(
+        event,
+        runEffect,
+        () => quitAllowed,
+        () => {
+          quitAllowed = true;
+        },
+      );
+    });
+    yield* electronApp.on("activate", () => {
+      void runEffect(desktopWindow.activate.pipe(Effect.withSpan("desktop.lifecycle.activate")));
+    });
+    yield* electronApp.on("window-all-closed", () => {
+      void runEffect(
+        Effect.gen(function* () {
+          const app = yield* ElectronApp.ElectronApp;
+          const state = yield* DesktopState.DesktopState;
+          if (environment.platform !== "darwin" && !(yield* Ref.get(state.quitting))) {
+            yield* app.quit;
+          }
+        }).pipe(Effect.withSpan("desktop.lifecycle.windowAllClosed")),
+      );
+    });
+    if (environment.platform !== "win32") {
+      yield* addScopedListener(process, "SIGINT", () => {
+        quitFromSignal("SIGINT", runEffect);
       });
-      yield* electronApp.on("window-all-closed", () => {
+      yield* addScopedListener(process, "SIGTERM", () => {
-        void runEffect(
+        quitFromSignal("SIGTERM", runEffect);
-          Effect.gen(function* () {
-            const app = yield* ElectronApp.ElectronApp;
-            const state = yield* DesktopState.DesktopState;
-            if (environment.platform !== "darwin" && !(yield* Ref.get(state.quitting))) {
-              yield* app.quit;
-            }
-          }).pipe(Effect.withSpan("desktop.lifecycle.windowAllClosed")),
-        );
       });
+    }
+  }).pipe(Effect.withSpan("desktop.lifecycle.register")),
+});
-      if (environment.platform !== "win32") {
+export const layer = Layer.succeed(DesktopLifecycle, make);
-        yield* addScopedListener(process, "SIGINT", () => {
-          quitFromSignal("SIGINT", runEffect);
-        });
-        yield* addScopedListener(process, "SIGTERM", () => {
-          quitFromSignal("SIGTERM", runEffect);
-        });
-      }
-    }).pipe(Effect.withSpan("desktop.lifecycle.register")),
-  }),
-);

apps/desktop/src/app/DesktopObservability.ts+3−3

@@ -314,7 +314,7 @@ const PRIMARY_BACKEND_LOG_INSTANCE_ID = PRIMARY_LOCAL_ENVIRONMENT_ID; · 313 unmodified lines
314	const sanitizeInstanceIdForFileName = (id: string): string => id.replace(/[^a-zA-Z0-9._-]+/g, "_");	314	const sanitizeInstanceIdForFileName = (id: string): string => id.replace(/[^a-zA-Z0-9._-]+/g, "_");
315		315
316	const backendLogFilePathForInstance = (	316	const backendLogFilePathForInstance = (
317	environment: DesktopEnvironment.DesktopEnvironmentShape,	317	environment: DesktopEnvironment.DesktopEnvironment["Service"],
318	id: string,	318	id: string,
319	): string => {	319	): string => {
320	// Primary keeps the historical "server-child.log" path so ops scripts	320	// Primary keeps the historical "server-child.log" path so ops scripts
@@ -332,7 +332,7 @@ const backendLogFilePathForInstance = ( · 11 unmodified lines
332	// per-call shape lets the shape annotate writes with the caller's	332	// per-call shape lets the shape annotate writes with the caller's
333	// id rather than whatever id created the cached writer first.	333	// id rather than whatever id created the cached writer first.
334	const makeBackendOutputSinkForInstance = (	334	const makeBackendOutputSinkForInstance = (
335	environment: DesktopEnvironment.DesktopEnvironmentShape,	335	environment: DesktopEnvironment.DesktopEnvironment["Service"],
336	id: string,	336	id: string,
337	): Effect.Effect<	337	): Effect.Effect<
338	Option.Option<RotatingLogFileWriter>,	338	Option.Option<RotatingLogFileWriter>,
@@ -344,7 +344,7 @@ const makeBackendOutputSinkForInstance = ( · 5 unmodified lines
344	}).pipe(Effect.option);	344	}).pipe(Effect.option);
345		345
346	const makeBackendOutputLogShape = (	346	const makeBackendOutputLogShape = (
347	environment: DesktopEnvironment.DesktopEnvironmentShape,	347	environment: DesktopEnvironment.DesktopEnvironment["Service"],
348	id: string,	348	id: string,
349	sink: Option.Option<RotatingLogFileWriter>,	349	sink: Option.Option<RotatingLogFileWriter>,
350	): DesktopBackendOutputLogShape =>	350	): DesktopBackendOutputLogShape =>

apps/desktop/src/app/DesktopShutdown.ts+35−0

@@ -0,0 +1,35 @@
	1	import * as Context from "effect/Context";
	2	import * as Deferred from "effect/Deferred";
	3	import * as Effect from "effect/Effect";
	4	import * as Layer from "effect/Layer";
	5	import * as Ref from "effect/Ref";
	6
	7	export class DesktopShutdown extends Context.Service<
	8	DesktopShutdown,
	9	{
	10	readonly request: Effect.Effect<void>;
	11	readonly awaitRequest: Effect.Effect<void>;
	12	readonly markComplete: Effect.Effect<void>;
	13	readonly awaitComplete: Effect.Effect<void>;
	14	readonly isComplete: Effect.Effect<boolean>;
	15	}
	16	>()("@t3tools/desktop/app/DesktopShutdown") {}
	17
	18	const make = Effect.gen(function* () {
	19	const requested = yield* Deferred.make<void>();
	20	const completed = yield* Deferred.make<void>();
	21	const completedRef = yield* Ref.make(false);
	22
	23	return DesktopShutdown.of({
	24	request: Deferred.succeed(requested, undefined).pipe(Effect.asVoid),
	25	awaitRequest: Deferred.await(requested),
	26	markComplete: Ref.set(completedRef, true).pipe(
	27	Effect.andThen(Deferred.succeed(completed, undefined)),
	28	Effect.asVoid,
	29	),
	30	awaitComplete: Deferred.await(completed),
	31	isComplete: Ref.get(completedRef),
	32	});
	33	});
	34
	35	export const layer = Layer.effect(DesktopShutdown, make);

apps/desktop/src/app/DesktopState.ts+12−12

 import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
-export interface DesktopStateShape {
+export class DesktopState extends Context.Service<
-  readonly quitting: Ref.Ref<boolean>;
+  DesktopState,
-}
+  {
+    readonly backendReady: Ref.Ref<boolean>;
+    readonly quitting: Ref.Ref<boolean>;
+  }
+>()("@t3tools/desktop/app/DesktopState") {}
-export class DesktopState extends Context.Service<DesktopState, DesktopStateShape>()(
+const make = Effect.all({
-  "@t3tools/desktop/app/DesktopState",
+  backendReady: Ref.make(false),
-) {}
+  quitting: Ref.make(false),
+});
-export const layer = Layer.effect(
+export const layer = Layer.effect(DesktopState, make);
-  DesktopState,
-  Effect.all({
-    quitting: Ref.make(false),
-  }),
-);

apps/desktop/src/ipc/DesktopIpc.ts+16−14

@@ -1,5 +1,6 @@
1	import * as Context from "effect/Context";	1	import * as Context from "effect/Context";
2	import * as Effect from "effect/Effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import * as Schema from "effect/Schema";	4	import * as Schema from "effect/Schema";
4	import * as Scope from "effect/Scope";	5	import * as Scope from "effect/Scope";
5		6
@@ -33,20 +34,19 @@ export interface DesktopSyncIpcMethod<E, R> { · 27 unmodified lines
33	readonly handler: () => Effect.Effect<unknown, E, R>;	34	readonly handler: () => Effect.Effect<unknown, E, R>;
34	}	35	}
35		36
36	export interface DesktopIpcShape {	37	export class DesktopIpc extends Context.Service<
37	readonly handle: <E, R>(	38	DesktopIpc,
38	input: DesktopIpcMethod<E, R>,	39	{
39	) => Effect.Effect<void, never, R \| Scope.Scope>;	40	readonly handle: <E, R>(
40	readonly handleSync: <E, R>(	41	input: DesktopIpcMethod<E, R>,
41	input: DesktopSyncIpcMethod<E, R>,	42	) => Effect.Effect<void, never, R \| Scope.Scope>;
42	) => Effect.Effect<void, never, R \| Scope.Scope>;	43	readonly handleSync: <E, R>(
43	}	44	input: DesktopSyncIpcMethod<E, R>,
44		45	) => Effect.Effect<void, never, R \| Scope.Scope>;
45	export class DesktopIpc extends Context.Service<DesktopIpc, DesktopIpcShape>()(	46	}
46	"@t3tools/desktop/ipc/DesktopIpc",	47	>()("@t3tools/desktop/ipc/DesktopIpc") {}
47	) {}	48
48		49	export const make = (ipcMain: DesktopIpcMain): DesktopIpc["Service"] =>
49	export const make = (ipcMain: DesktopIpcMain): DesktopIpcShape =>
50	DesktopIpc.of({	50	DesktopIpc.of({
51	handle: Effect.fn("desktop.ipc.registerInvoke")(function* <E, R>({	51	handle: Effect.fn("desktop.ipc.registerInvoke")(function* <E, R>({
52	channel,	52	channel,
@@ -97,6 +97,8 @@ export const make = (ipcMain: DesktopIpcMain): DesktopIpcShape => · 44 unmodified lines
97	}),	97	}),
98	});	98	});
99		99
		100	export const layer = (ipcMain: DesktopIpcMain) => Layer.succeed(DesktopIpc, make(ipcMain));
		101
100	/**	102	/**
101	* Convenience helpers for creating IPC methods	103	* Convenience helpers for creating IPC methods
102	*/	104	*/

apps/desktop/src/ipc/methods/clientSettings.ts+3−3

@@ -5,9 +5,9 @@ import * as Schema from "effect/Schema"; · 4 unmodified lines
5		5
6	import * as DesktopClientSettings from "../../settings/DesktopClientSettings.ts";	6	import * as DesktopClientSettings from "../../settings/DesktopClientSettings.ts";
7	import * as IpcChannels from "../channels.ts";	7	import * as IpcChannels from "../channels.ts";
8	import { makeIpcMethod } from "../DesktopIpc.ts";	8	import * as DesktopIpc from "../DesktopIpc.ts";
9		9
10	export const getClientSettings = makeIpcMethod({	10	export const getClientSettings = DesktopIpc.makeIpcMethod({
11	channel: IpcChannels.GET_CLIENT_SETTINGS_CHANNEL,	11	channel: IpcChannels.GET_CLIENT_SETTINGS_CHANNEL,
12	payload: Schema.Void,	12	payload: Schema.Void,
13	result: Schema.NullOr(ClientSettingsSchema),	13	result: Schema.NullOr(ClientSettingsSchema),
@@ -17,7 +17,7 @@ export const getClientSettings = makeIpcMethod({ · 3 unmodified lines
17	}),	17	}),
18	});	18	});
19		19
20	export const setClientSettings = makeIpcMethod({	20	export const setClientSettings = DesktopIpc.makeIpcMethod({
21	channel: IpcChannels.SET_CLIENT_SETTINGS_CHANNEL,	21	channel: IpcChannels.SET_CLIENT_SETTINGS_CHANNEL,
22	payload: ClientSettingsSchema,	22	payload: ClientSettingsSchema,
23	result: Schema.Void,	23	result: Schema.Void,

apps/desktop/src/ipc/methods/connectionCatalog.ts+4−4

@@ -4,9 +4,9 @@ import * as Schema from "effect/Schema"; · 3 unmodified lines
4		4
5	import * as DesktopConnectionCatalogStore from "../../app/DesktopConnectionCatalogStore.ts";	5	import * as DesktopConnectionCatalogStore from "../../app/DesktopConnectionCatalogStore.ts";
6	import * as IpcChannels from "../channels.ts";	6	import * as IpcChannels from "../channels.ts";
7	import { makeIpcMethod } from "../DesktopIpc.ts";	7	import * as DesktopIpc from "../DesktopIpc.ts";
8		8
9	export const getConnectionCatalog = makeIpcMethod({	9	export const getConnectionCatalog = DesktopIpc.makeIpcMethod({
10	channel: IpcChannels.GET_CONNECTION_CATALOG_CHANNEL,	10	channel: IpcChannels.GET_CONNECTION_CATALOG_CHANNEL,
11	payload: Schema.Void,	11	payload: Schema.Void,
12	result: Schema.NullOr(Schema.String),	12	result: Schema.NullOr(Schema.String),
@@ -16,7 +16,7 @@ export const getConnectionCatalog = makeIpcMethod({ · 3 unmodified lines
16	}),	16	}),
17	});	17	});
18		18
19	export const setConnectionCatalog = makeIpcMethod({	19	export const setConnectionCatalog = DesktopIpc.makeIpcMethod({
20	channel: IpcChannels.SET_CONNECTION_CATALOG_CHANNEL,	20	channel: IpcChannels.SET_CONNECTION_CATALOG_CHANNEL,
21	payload: Schema.String,	21	payload: Schema.String,
22	result: Schema.Boolean,	22	result: Schema.Boolean,
@@ -26,7 +26,7 @@ export const setConnectionCatalog = makeIpcMethod({ · 3 unmodified lines
26	}),	26	}),
27	});	27	});
28		28
29	export const clearConnectionCatalog = makeIpcMethod({	29	export const clearConnectionCatalog = DesktopIpc.makeIpcMethod({
30	channel: IpcChannels.CLEAR_CONNECTION_CATALOG_CHANNEL,	30	channel: IpcChannels.CLEAR_CONNECTION_CATALOG_CHANNEL,
31	payload: Schema.Void,	31	payload: Schema.Void,
32	result: Schema.Void,	32	result: Schema.Void,

apps/desktop/src/ipc/methods/preview.ts+23−23

@@ -27,7 +27,7 @@ import { pathToFileURL } from "node:url"; · 26 unmodified lines
27	import * as PreviewManager from "../../preview/Manager.ts";	27	import * as PreviewManager from "../../preview/Manager.ts";
28	import { PREVIEW_WEBVIEW_PREFERENCES } from "../../preview/WebviewPreferences.ts";	28	import { PREVIEW_WEBVIEW_PREFERENCES } from "../../preview/WebviewPreferences.ts";
29	import * as IpcChannels from "../channels.ts";	29	import * as IpcChannels from "../channels.ts";
30	import { makeIpcMethod } from "../DesktopIpc.ts";	30	import * as DesktopIpc from "../DesktopIpc.ts";
31		31
32	const broadcast = (channel: string, ...args: ReadonlyArray<unknown>): void => {	32	const broadcast = (channel: string, ...args: ReadonlyArray<unknown>): void => {
33	for (const window of BrowserWindow.getAllWindows()) {	33	for (const window of BrowserWindow.getAllWindows()) {
@@ -52,7 +52,7 @@ export const installPreviewEventForwarding = Effect.fn( · 18 unmodified lines
52	});	52	});
53	});	53	});
54		54
55	export const createTab = makeIpcMethod({	55	export const createTab = DesktopIpc.makeIpcMethod({
56	channel: IpcChannels.PREVIEW_CREATE_TAB_CHANNEL,	56	channel: IpcChannels.PREVIEW_CREATE_TAB_CHANNEL,
57	payload: DesktopPreviewTabInputSchema,	57	payload: DesktopPreviewTabInputSchema,
58	result: Schema.Void,	58	result: Schema.Void,
@@ -62,7 +62,7 @@ export const createTab = makeIpcMethod({ · 3 unmodified lines
62	}),	62	}),
63	});	63	});
64		64
65	export const closeTab = makeIpcMethod({	65	export const closeTab = DesktopIpc.makeIpcMethod({
66	channel: IpcChannels.PREVIEW_CLOSE_TAB_CHANNEL,	66	channel: IpcChannels.PREVIEW_CLOSE_TAB_CHANNEL,
67	payload: DesktopPreviewTabInputSchema,	67	payload: DesktopPreviewTabInputSchema,
68	result: Schema.Void,	68	result: Schema.Void,
@@ -72,7 +72,7 @@ export const closeTab = makeIpcMethod({ · 3 unmodified lines
72	}),	72	}),
73	});	73	});
74		74
75	export const registerWebview = makeIpcMethod({	75	export const registerWebview = DesktopIpc.makeIpcMethod({
76	channel: IpcChannels.PREVIEW_REGISTER_WEBVIEW_CHANNEL,	76	channel: IpcChannels.PREVIEW_REGISTER_WEBVIEW_CHANNEL,
77	payload: DesktopPreviewRegisterWebviewInputSchema,	77	payload: DesktopPreviewRegisterWebviewInputSchema,
78	result: Schema.Void,	78	result: Schema.Void,
@@ -82,7 +82,7 @@ export const registerWebview = makeIpcMethod({ · 3 unmodified lines
82	}),	82	}),
83	});	83	});
84		84
85	export const navigate = makeIpcMethod({	85	export const navigate = DesktopIpc.makeIpcMethod({
86	channel: IpcChannels.PREVIEW_NAVIGATE_CHANNEL,	86	channel: IpcChannels.PREVIEW_NAVIGATE_CHANNEL,
87	payload: DesktopPreviewNavigateInputSchema,	87	payload: DesktopPreviewNavigateInputSchema,
88	result: Schema.Void,	88	result: Schema.Void,
@@ -100,7 +100,7 @@ const tabMethod = ( · 11 unmodified lines
100	tabId: string,	100	tabId: string,
101	) => Effect.Effect<void, PreviewManager.PreviewManagerError>,	101	) => Effect.Effect<void, PreviewManager.PreviewManagerError>,
102	) =>	102	) =>
103	makeIpcMethod({	103	DesktopIpc.makeIpcMethod({
104	channel,	104	channel,
105	payload: DesktopPreviewTabInputSchema,	105	payload: DesktopPreviewTabInputSchema,
106	result: Schema.Void,	106	result: Schema.Void,
@@ -166,7 +166,7 @@ export const stopRecording = tabMethod( · 59 unmodified lines
166	(manager, tabId) => manager.stopRecording(tabId),	166	(manager, tabId) => manager.stopRecording(tabId),
167	);	167	);
168		168
169	export const clearCookies = makeIpcMethod({	169	export const clearCookies = DesktopIpc.makeIpcMethod({
170	channel: IpcChannels.PREVIEW_CLEAR_COOKIES_CHANNEL,	170	channel: IpcChannels.PREVIEW_CLEAR_COOKIES_CHANNEL,
171	payload: Schema.Void,	171	payload: Schema.Void,
172	result: Schema.Void,	172	result: Schema.Void,
@@ -176,7 +176,7 @@ export const clearCookies = makeIpcMethod({ · 3 unmodified lines
176	}),	176	}),
177	});	177	});
178		178
179	export const clearCache = makeIpcMethod({	179	export const clearCache = DesktopIpc.makeIpcMethod({
180	channel: IpcChannels.PREVIEW_CLEAR_CACHE_CHANNEL,	180	channel: IpcChannels.PREVIEW_CLEAR_CACHE_CHANNEL,
181	payload: Schema.Void,	181	payload: Schema.Void,
182	result: Schema.Void,	182	result: Schema.Void,
@@ -186,7 +186,7 @@ export const clearCache = makeIpcMethod({ · 3 unmodified lines
186	}),	186	}),
187	});	187	});
188		188
189	export const getPreviewConfig = makeIpcMethod({	189	export const getPreviewConfig = DesktopIpc.makeIpcMethod({
190	channel: IpcChannels.PREVIEW_GET_CONFIG_CHANNEL,	190	channel: IpcChannels.PREVIEW_GET_CONFIG_CHANNEL,
191	payload: DesktopPreviewConfigInputSchema,	191	payload: DesktopPreviewConfigInputSchema,
192	result: DesktopPreviewWebviewConfigSchema,	192	result: DesktopPreviewWebviewConfigSchema,
@@ -201,7 +201,7 @@ export const getPreviewConfig = makeIpcMethod({ · 8 unmodified lines
201	}),	201	}),
202	});	202	});
203		203
204	export const setAnnotationTheme = makeIpcMethod({	204	export const setAnnotationTheme = DesktopIpc.makeIpcMethod({
205	channel: IpcChannels.PREVIEW_SET_ANNOTATION_THEME_CHANNEL,	205	channel: IpcChannels.PREVIEW_SET_ANNOTATION_THEME_CHANNEL,
206	payload: DesktopPreviewAnnotationThemeInputSchema,	206	payload: DesktopPreviewAnnotationThemeInputSchema,
207	result: Schema.Void,	207	result: Schema.Void,
@@ -211,7 +211,7 @@ export const setAnnotationTheme = makeIpcMethod({ · 3 unmodified lines
211	}),	211	}),
212	});	212	});
213		213
214	export const pickElement = makeIpcMethod({	214	export const pickElement = DesktopIpc.makeIpcMethod({
215	channel: IpcChannels.PREVIEW_PICK_ELEMENT_CHANNEL,	215	channel: IpcChannels.PREVIEW_PICK_ELEMENT_CHANNEL,
216	payload: DesktopPreviewTabInputSchema,	216	payload: DesktopPreviewTabInputSchema,
217	result: Schema.NullOr(PreviewAnnotationPayloadSchema),	217	result: Schema.NullOr(PreviewAnnotationPayloadSchema),
@@ -221,7 +221,7 @@ export const pickElement = makeIpcMethod({ · 3 unmodified lines
221	}),	221	}),
222	});	222	});
223		223
224	export const captureScreenshot = makeIpcMethod({	224	export const captureScreenshot = DesktopIpc.makeIpcMethod({
225	channel: IpcChannels.PREVIEW_CAPTURE_SCREENSHOT_CHANNEL,	225	channel: IpcChannels.PREVIEW_CAPTURE_SCREENSHOT_CHANNEL,
226	payload: DesktopPreviewTabInputSchema,	226	payload: DesktopPreviewTabInputSchema,
227	result: DesktopPreviewScreenshotArtifactSchema,	227	result: DesktopPreviewScreenshotArtifactSchema,
@@ -231,7 +231,7 @@ export const captureScreenshot = makeIpcMethod({ · 3 unmodified lines
231	}),	231	}),
232	});	232	});
233		233
234	export const revealArtifact = makeIpcMethod({	234	export const revealArtifact = DesktopIpc.makeIpcMethod({
235	channel: IpcChannels.PREVIEW_REVEAL_ARTIFACT_CHANNEL,	235	channel: IpcChannels.PREVIEW_REVEAL_ARTIFACT_CHANNEL,
236	payload: DesktopPreviewArtifactInputSchema,	236	payload: DesktopPreviewArtifactInputSchema,
237	result: Schema.Void,	237	result: Schema.Void,
@@ -241,7 +241,7 @@ export const revealArtifact = makeIpcMethod({ · 3 unmodified lines
241	}),	241	}),
242	});	242	});
243		243
244	export const copyArtifactToClipboard = makeIpcMethod({	244	export const copyArtifactToClipboard = DesktopIpc.makeIpcMethod({
245	channel: IpcChannels.PREVIEW_COPY_ARTIFACT_CHANNEL,	245	channel: IpcChannels.PREVIEW_COPY_ARTIFACT_CHANNEL,
246	payload: DesktopPreviewArtifactInputSchema,	246	payload: DesktopPreviewArtifactInputSchema,
247	result: Schema.Void,	247	result: Schema.Void,
@@ -251,7 +251,7 @@ export const copyArtifactToClipboard = makeIpcMethod({ · 3 unmodified lines
251	}),	251	}),
252	});	252	});
253		253
254	export const automationStatus = makeIpcMethod({	254	export const automationStatus = DesktopIpc.makeIpcMethod({
255	channel: IpcChannels.PREVIEW_AUTOMATION_STATUS_CHANNEL,	255	channel: IpcChannels.PREVIEW_AUTOMATION_STATUS_CHANNEL,
256	payload: DesktopPreviewTabInputSchema,	256	payload: DesktopPreviewTabInputSchema,
257	result: PreviewAutomationStatus,	257	result: PreviewAutomationStatus,
@@ -261,7 +261,7 @@ export const automationStatus = makeIpcMethod({ · 3 unmodified lines
261	}),	261	}),
262	});	262	});
263		263
264	export const automationSnapshot = makeIpcMethod({	264	export const automationSnapshot = DesktopIpc.makeIpcMethod({
265	channel: IpcChannels.PREVIEW_AUTOMATION_SNAPSHOT_CHANNEL,	265	channel: IpcChannels.PREVIEW_AUTOMATION_SNAPSHOT_CHANNEL,
266	payload: DesktopPreviewTabInputSchema,	266	payload: DesktopPreviewTabInputSchema,
267	result: PreviewAutomationSnapshot,	267	result: PreviewAutomationSnapshot,
@@ -271,7 +271,7 @@ export const automationSnapshot = makeIpcMethod({ · 3 unmodified lines
271	}),	271	}),
272	});	272	});
273		273
274	export const automationClick = makeIpcMethod({	274	export const automationClick = DesktopIpc.makeIpcMethod({
275	channel: IpcChannels.PREVIEW_AUTOMATION_CLICK_CHANNEL,	275	channel: IpcChannels.PREVIEW_AUTOMATION_CLICK_CHANNEL,
276	payload: DesktopPreviewAutomationClickInputSchema,	276	payload: DesktopPreviewAutomationClickInputSchema,
277	result: Schema.Void,	277	result: Schema.Void,
@@ -281,7 +281,7 @@ export const automationClick = makeIpcMethod({ · 3 unmodified lines
281	}),	281	}),
282	});	282	});
283		283
284	export const automationType = makeIpcMethod({	284	export const automationType = DesktopIpc.makeIpcMethod({
285	channel: IpcChannels.PREVIEW_AUTOMATION_TYPE_CHANNEL,	285	channel: IpcChannels.PREVIEW_AUTOMATION_TYPE_CHANNEL,
286	payload: DesktopPreviewAutomationTypeInputSchema,	286	payload: DesktopPreviewAutomationTypeInputSchema,
287	result: Schema.Void,	287	result: Schema.Void,
@@ -291,7 +291,7 @@ export const automationType = makeIpcMethod({ · 3 unmodified lines
291	}),	291	}),
292	});	292	});
293		293
294	export const automationPress = makeIpcMethod({	294	export const automationPress = DesktopIpc.makeIpcMethod({
295	channel: IpcChannels.PREVIEW_AUTOMATION_PRESS_CHANNEL,	295	channel: IpcChannels.PREVIEW_AUTOMATION_PRESS_CHANNEL,
296	payload: DesktopPreviewAutomationPressInputSchema,	296	payload: DesktopPreviewAutomationPressInputSchema,
297	result: Schema.Void,	297	result: Schema.Void,
@@ -301,7 +301,7 @@ export const automationPress = makeIpcMethod({ · 3 unmodified lines
301	}),	301	}),
302	});	302	});
303		303
304	export const automationScroll = makeIpcMethod({	304	export const automationScroll = DesktopIpc.makeIpcMethod({
305	channel: IpcChannels.PREVIEW_AUTOMATION_SCROLL_CHANNEL,	305	channel: IpcChannels.PREVIEW_AUTOMATION_SCROLL_CHANNEL,
306	payload: DesktopPreviewAutomationScrollInputSchema,	306	payload: DesktopPreviewAutomationScrollInputSchema,
307	result: Schema.Void,	307	result: Schema.Void,
@@ -311,7 +311,7 @@ export const automationScroll = makeIpcMethod({ · 3 unmodified lines
311	}),	311	}),
312	});	312	});
313		313
314	export const automationEvaluate = makeIpcMethod({	314	export const automationEvaluate = DesktopIpc.makeIpcMethod({
315	channel: IpcChannels.PREVIEW_AUTOMATION_EVALUATE_CHANNEL,	315	channel: IpcChannels.PREVIEW_AUTOMATION_EVALUATE_CHANNEL,
316	payload: DesktopPreviewAutomationEvaluateInputSchema,	316	payload: DesktopPreviewAutomationEvaluateInputSchema,
317	result: Schema.Unknown,	317	result: Schema.Unknown,
@@ -321,7 +321,7 @@ export const automationEvaluate = makeIpcMethod({ · 3 unmodified lines
321	}),	321	}),
322	});	322	});
323		323
324	export const automationWaitFor = makeIpcMethod({	324	export const automationWaitFor = DesktopIpc.makeIpcMethod({
325	channel: IpcChannels.PREVIEW_AUTOMATION_WAIT_FOR_CHANNEL,	325	channel: IpcChannels.PREVIEW_AUTOMATION_WAIT_FOR_CHANNEL,
326	payload: DesktopPreviewAutomationWaitForInputSchema,	326	payload: DesktopPreviewAutomationWaitForInputSchema,
327	result: Schema.Void,	327	result: Schema.Void,
@@ -331,7 +331,7 @@ export const automationWaitFor = makeIpcMethod({ · 3 unmodified lines
331	}),	331	}),
332	});	332	});
333		333
334	export const saveRecording = makeIpcMethod({	334	export const saveRecording = DesktopIpc.makeIpcMethod({
335	channel: IpcChannels.PREVIEW_RECORDING_SAVE_CHANNEL,	335	channel: IpcChannels.PREVIEW_RECORDING_SAVE_CHANNEL,
336	payload: DesktopPreviewRecordingSaveInputSchema,	336	payload: DesktopPreviewRecordingSaveInputSchema,
337	result: DesktopPreviewRecordingArtifactSchema,	337	result: DesktopPreviewRecordingArtifactSchema,

apps/desktop/src/ipc/methods/serverExposure.ts+5−5

@@ -9,14 +9,14 @@ import * as Schema from "effect/Schema"; · 8 unmodified lines
9	import * as DesktopLifecycle from "../../app/DesktopLifecycle.ts";	9	import * as DesktopLifecycle from "../../app/DesktopLifecycle.ts";
10	import * as DesktopServerExposure from "../../backend/DesktopServerExposure.ts";	10	import * as DesktopServerExposure from "../../backend/DesktopServerExposure.ts";
11	import * as IpcChannels from "../channels.ts";	11	import * as IpcChannels from "../channels.ts";
12	import { makeIpcMethod } from "../DesktopIpc.ts";	12	import * as DesktopIpc from "../DesktopIpc.ts";
13		13
14	const SetTailscaleServeEnabledInput = Schema.Struct({	14	const SetTailscaleServeEnabledInput = Schema.Struct({
15	enabled: Schema.Boolean,	15	enabled: Schema.Boolean,
16	port: Schema.optionalKey(Schema.Number),	16	port: Schema.optionalKey(Schema.Number),
17	});	17	});
18		18
19	export const getServerExposureState = makeIpcMethod({	19	export const getServerExposureState = DesktopIpc.makeIpcMethod({
20	channel: IpcChannels.GET_SERVER_EXPOSURE_STATE_CHANNEL,	20	channel: IpcChannels.GET_SERVER_EXPOSURE_STATE_CHANNEL,
21	payload: Schema.Void,	21	payload: Schema.Void,
22	result: DesktopServerExposureStateSchema,	22	result: DesktopServerExposureStateSchema,
@@ -26,7 +26,7 @@ export const getServerExposureState = makeIpcMethod({ · 3 unmodified lines
26	}),	26	}),
27	});	27	});
28		28
29	export const setServerExposureMode = makeIpcMethod({	29	export const setServerExposureMode = DesktopIpc.makeIpcMethod({
30	channel: IpcChannels.SET_SERVER_EXPOSURE_MODE_CHANNEL,	30	channel: IpcChannels.SET_SERVER_EXPOSURE_MODE_CHANNEL,
31	payload: DesktopServerExposureModeSchema,	31	payload: DesktopServerExposureModeSchema,
32	result: DesktopServerExposureStateSchema,	32	result: DesktopServerExposureStateSchema,
@@ -41,7 +41,7 @@ export const setServerExposureMode = makeIpcMethod({ · 8 unmodified lines
41	}),	41	}),
42	});	42	});
43		43
44	export const setTailscaleServeEnabled = makeIpcMethod({	44	export const setTailscaleServeEnabled = DesktopIpc.makeIpcMethod({
45	channel: IpcChannels.SET_TAILSCALE_SERVE_ENABLED_CHANNEL,	45	channel: IpcChannels.SET_TAILSCALE_SERVE_ENABLED_CHANNEL,
46	payload: SetTailscaleServeEnabledInput,	46	payload: SetTailscaleServeEnabledInput,
47	result: DesktopServerExposureStateSchema,	47	result: DesktopServerExposureStateSchema,
@@ -58,7 +58,7 @@ export const setTailscaleServeEnabled = makeIpcMethod({ · 10 unmodified lines
58	}),	58	}),
59	});	59	});
60		60
61	export const getAdvertisedEndpoints = makeIpcMethod({	61	export const getAdvertisedEndpoints = DesktopIpc.makeIpcMethod({
62	channel: IpcChannels.GET_ADVERTISED_ENDPOINTS_CHANNEL,	62	channel: IpcChannels.GET_ADVERTISED_ENDPOINTS_CHANNEL,
63	payload: Schema.Void,	63	payload: Schema.Void,
64	result: Schema.Array(AdvertisedEndpoint),	64	result: Schema.Array(AdvertisedEndpoint),

apps/desktop/src/ipc/methods/sshEnvironment.ts+9−9

apps/desktop/src/ipc/methods/updates.ts+6−6

@@ -9,9 +9,9 @@ import * as Schema from "effect/Schema"; · 8 unmodified lines
9		9
10	import * as DesktopUpdates from "../../updates/DesktopUpdates.ts";	10	import * as DesktopUpdates from "../../updates/DesktopUpdates.ts";
11	import * as IpcChannels from "../channels.ts";	11	import * as IpcChannels from "../channels.ts";
12	import { makeIpcMethod } from "../DesktopIpc.ts";	12	import * as DesktopIpc from "../DesktopIpc.ts";
13		13
14	export const getUpdateState = makeIpcMethod({	14	export const getUpdateState = DesktopIpc.makeIpcMethod({
15	channel: IpcChannels.UPDATE_GET_STATE_CHANNEL,	15	channel: IpcChannels.UPDATE_GET_STATE_CHANNEL,
16	payload: Schema.Void,	16	payload: Schema.Void,
17	result: DesktopUpdateStateSchema,	17	result: DesktopUpdateStateSchema,
@@ -21,7 +21,7 @@ export const getUpdateState = makeIpcMethod({ · 3 unmodified lines
21	}),	21	}),
22	});	22	});
23		23
24	export const setUpdateChannel = makeIpcMethod({	24	export const setUpdateChannel = DesktopIpc.makeIpcMethod({
25	channel: IpcChannels.UPDATE_SET_CHANNEL_CHANNEL,	25	channel: IpcChannels.UPDATE_SET_CHANNEL_CHANNEL,
26	payload: DesktopUpdateChannelSchema,	26	payload: DesktopUpdateChannelSchema,
27	result: DesktopUpdateStateSchema,	27	result: DesktopUpdateStateSchema,
@@ -31,7 +31,7 @@ export const setUpdateChannel = makeIpcMethod({ · 3 unmodified lines
31	}),	31	}),
32	});	32	});
33		33
34	export const downloadUpdate = makeIpcMethod({	34	export const downloadUpdate = DesktopIpc.makeIpcMethod({
35	channel: IpcChannels.UPDATE_DOWNLOAD_CHANNEL,	35	channel: IpcChannels.UPDATE_DOWNLOAD_CHANNEL,
36	payload: Schema.Void,	36	payload: Schema.Void,
37	result: DesktopUpdateActionResultSchema,	37	result: DesktopUpdateActionResultSchema,
@@ -41,7 +41,7 @@ export const downloadUpdate = makeIpcMethod({ · 3 unmodified lines
41	}),	41	}),
42	});	42	});
43		43
44	export const installUpdate = makeIpcMethod({	44	export const installUpdate = DesktopIpc.makeIpcMethod({
45	channel: IpcChannels.UPDATE_INSTALL_CHANNEL,	45	channel: IpcChannels.UPDATE_INSTALL_CHANNEL,
46	payload: Schema.Void,	46	payload: Schema.Void,
47	result: DesktopUpdateActionResultSchema,	47	result: DesktopUpdateActionResultSchema,
@@ -51,7 +51,7 @@ export const installUpdate = makeIpcMethod({ · 3 unmodified lines
51	}),	51	}),
52	});	52	});
53		53
54	export const checkForUpdate = makeIpcMethod({	54	export const checkForUpdate = DesktopIpc.makeIpcMethod({
55	channel: IpcChannels.UPDATE_CHECK_CHANNEL,	55	channel: IpcChannels.UPDATE_CHECK_CHANNEL,
56	payload: Schema.Void,	56	payload: Schema.Void,
57	result: DesktopUpdateCheckResultSchema,	57	result: DesktopUpdateCheckResultSchema,

apps/desktop/src/ipc/methods/window.ts+9−9

@@ -23,7 +23,7 @@ import * as ElectronShell from "../../electron/ElectronShell.ts"; · 22 unmodified lines
23	import * as ElectronTheme from "../../electron/ElectronTheme.ts";	23	import * as ElectronTheme from "../../electron/ElectronTheme.ts";
24	import * as ElectronWindow from "../../electron/ElectronWindow.ts";	24	import * as ElectronWindow from "../../electron/ElectronWindow.ts";
25	import * as IpcChannels from "../channels.ts";	25	import * as IpcChannels from "../channels.ts";
26	import { makeIpcMethod, makeSyncIpcMethod } from "../DesktopIpc.ts";	26	import * as DesktopIpc from "../DesktopIpc.ts";
27	import {	27	import {
28	extractDistroFromUncPath,	28	extractDistroFromUncPath,
29	resolveWslPickFolderDefaultPath,	29	resolveWslPickFolderDefaultPath,
@@ -46,7 +46,7 @@ function toWebSocketBaseUrl(httpBaseUrl: URL): string { · 16 unmodified lines
46	return url.href;	46	return url.href;
47	}	47	}
48		48
49	export const getAppBranding = makeSyncIpcMethod({	49	export const getAppBranding = DesktopIpc.makeSyncIpcMethod({
50	channel: IpcChannels.GET_APP_BRANDING_CHANNEL,	50	channel: IpcChannels.GET_APP_BRANDING_CHANNEL,
51	result: Schema.NullOr(DesktopAppBrandingSchema),	51	result: Schema.NullOr(DesktopAppBrandingSchema),
52	handler: Effect.fn("desktop.ipc.window.getAppBranding")(function* () {	52	handler: Effect.fn("desktop.ipc.window.getAppBranding")(function* () {
@@ -55,7 +55,7 @@ export const getAppBranding = makeSyncIpcMethod({ · 2 unmodified lines
55	}),	55	}),
56	});	56	});
57		57
58	export const getLocalEnvironmentBootstraps = makeSyncIpcMethod({	58	export const getLocalEnvironmentBootstraps = DesktopIpc.makeSyncIpcMethod({
59	channel: IpcChannels.GET_LOCAL_ENVIRONMENT_BOOTSTRAPS_CHANNEL,	59	channel: IpcChannels.GET_LOCAL_ENVIRONMENT_BOOTSTRAPS_CHANNEL,
60	result: Schema.Array(DesktopEnvironmentBootstrapSchema),	60	result: Schema.Array(DesktopEnvironmentBootstrapSchema),
61	handler: Effect.fn("desktop.ipc.window.getLocalEnvironmentBootstraps")(function* () {	61	handler: Effect.fn("desktop.ipc.window.getLocalEnvironmentBootstraps")(function* () {
@@ -102,7 +102,7 @@ function extractWslDistroFromEnvironmentId(envId: string): string \| null { · 40 unmodified lines
102	return suffix === "default" \|\| suffix.length === 0 ? null : suffix;	102	return suffix === "default" \|\| suffix.length === 0 ? null : suffix;
103	}	103	}
104		104
105	export const getLocalEnvironmentBearerToken = makeIpcMethod({	105	export const getLocalEnvironmentBearerToken = DesktopIpc.makeIpcMethod({
106	channel: IpcChannels.GET_LOCAL_ENVIRONMENT_BEARER_TOKEN_CHANNEL,	106	channel: IpcChannels.GET_LOCAL_ENVIRONMENT_BEARER_TOKEN_CHANNEL,
107	payload: Schema.Void,	107	payload: Schema.Void,
108	result: Schema.String,	108	result: Schema.String,
@@ -112,7 +112,7 @@ export const getLocalEnvironmentBearerToken = makeIpcMethod({ · 3 unmodified lines
112	}),	112	}),
113	});	113	});
114		114
115	export const pickFolder = makeIpcMethod({	115	export const pickFolder = DesktopIpc.makeIpcMethod({
116	channel: IpcChannels.PICK_FOLDER_CHANNEL,	116	channel: IpcChannels.PICK_FOLDER_CHANNEL,
117	payload: Schema.UndefinedOr(PickFolderOptionsSchema),	117	payload: Schema.UndefinedOr(PickFolderOptionsSchema),
118	result: Schema.NullOr(Schema.String),	118	result: Schema.NullOr(Schema.String),
@@ -179,7 +179,7 @@ export const pickFolder = makeIpcMethod({ · 60 unmodified lines
179	}),	179	}),
180	});	180	});
181		181
182	export const confirm = makeIpcMethod({	182	export const confirm = DesktopIpc.makeIpcMethod({
183	channel: IpcChannels.CONFIRM_CHANNEL,	183	channel: IpcChannels.CONFIRM_CHANNEL,
184	payload: Schema.String,	184	payload: Schema.String,
185	result: Schema.Boolean,	185	result: Schema.Boolean,
@@ -192,7 +192,7 @@ export const confirm = makeIpcMethod({ · 6 unmodified lines
192	}),	192	}),
193	});	193	});
194		194
195	export const setTheme = makeIpcMethod({	195	export const setTheme = DesktopIpc.makeIpcMethod({
196	channel: IpcChannels.SET_THEME_CHANNEL,	196	channel: IpcChannels.SET_THEME_CHANNEL,
197	payload: DesktopThemeSchema,	197	payload: DesktopThemeSchema,
198	result: Schema.Void,	198	result: Schema.Void,
@@ -202,7 +202,7 @@ export const setTheme = makeIpcMethod({ · 3 unmodified lines
202	}),	202	}),
203	});	203	});
204		204
205	export const showContextMenu = makeIpcMethod({	205	export const showContextMenu = DesktopIpc.makeIpcMethod({
206	channel: IpcChannels.CONTEXT_MENU_CHANNEL,	206	channel: IpcChannels.CONTEXT_MENU_CHANNEL,
207	payload: ContextMenuInput,	207	payload: ContextMenuInput,
208	result: Schema.NullOr(Schema.String),	208	result: Schema.NullOr(Schema.String),
@@ -223,7 +223,7 @@ export const showContextMenu = makeIpcMethod({ · 14 unmodified lines
223	}),	223	}),
224	});	224	});
225		225
226	export const openExternal = makeIpcMethod({	226	export const openExternal = DesktopIpc.makeIpcMethod({
227	channel: IpcChannels.OPEN_EXTERNAL_CHANNEL,	227	channel: IpcChannels.OPEN_EXTERNAL_CHANNEL,
228	payload: Schema.String,	228	payload: Schema.String,
229	result: Schema.Boolean,	229	result: Schema.Boolean,

apps/desktop/src/ipc/methods/wsl.test.ts+1−1

@@ -49,7 +49,7 @@ const unusedLifecycleRuntimeLayer = Layer.mergeAll( · 48 unmodified lines
49	DesktopState.layer,	49	DesktopState.layer,
50	Layer.succeed(	50	Layer.succeed(
51	DesktopEnvironment.DesktopEnvironment,	51	DesktopEnvironment.DesktopEnvironment,
52	DesktopEnvironment.DesktopEnvironment.of({} as DesktopEnvironment.DesktopEnvironmentShape),	52	DesktopEnvironment.DesktopEnvironment.of({} as DesktopEnvironment.DesktopEnvironment["Service"]),
53	),	53	),
54	Layer.succeed(	54	Layer.succeed(
55	DesktopWindow.DesktopWindow,	55	DesktopWindow.DesktopWindow,

apps/desktop/src/main.ts+3−4

 import type { RemoteT3RunnerOptions } from "@t3tools/ssh/tunnel";
 import serverPackageJson from "../../server/package.json" with { type: "json" };
-import type { DesktopSettings as DesktopSettingsValue } from "./settings/DesktopAppSettings.ts";
 import * as DesktopIpc from "./ipc/DesktopIpc.ts";
 import * as ElectronApp from "./electron/ElectronApp.ts";
 import * as ElectronDialog from "./electron/ElectronDialog.ts";
 );
 const resolveDesktopSshCliRunner = (
-  environment: DesktopEnvironment.DesktopEnvironmentShape,
+  environment: DesktopEnvironment.DesktopEnvironment["Service"],
-  settings: DesktopSettingsValue,
+  settings: DesktopAppSettings.DesktopSettings,
 ): RemoteT3RunnerOptions => {
   const devRemoteEntryPath = Option.getOrUndefined(environment.devRemoteT3ServerEntryPath);
   if (environment.isDevelopment && devRemoteEntryPath !== undefined) {
   ElectronTheme.layer,
   ElectronUpdater.layer,
   ElectronWindow.layer,
-  Layer.succeed(DesktopIpc.DesktopIpc, DesktopIpc.make(Electron.ipcMain)),
+  DesktopIpc.layer(Electron.ipcMain),
 );
 const desktopFoundationLayer = Layer.mergeAll(

apps/desktop/src/preview/Manager.test.ts+2−2

@@ -59,7 +59,7 @@ const environmentLayer = Layer.succeed( · 58 unmodified lines
59	DesktopEnvironment.DesktopEnvironment,	59	DesktopEnvironment.DesktopEnvironment,
60	DesktopEnvironment.DesktopEnvironment.of({	60	DesktopEnvironment.DesktopEnvironment.of({
61	browserArtifactsDir: "/tmp/t3/dev/browser-artifacts",	61	browserArtifactsDir: "/tmp/t3/dev/browser-artifacts",
62	} as DesktopEnvironment.DesktopEnvironmentShape),	62	} as DesktopEnvironment.DesktopEnvironment["Service"]),
63	);	63	);
64		64
65	const fileSystemLayer = FileSystem.layerNoop({	65	const fileSystemLayer = FileSystem.layerNoop({
@@ -82,7 +82,7 @@ const layer = PreviewManager.layer.pipe( · 16 unmodified lines
82		82
83	const withManager = <A>(	83	const withManager = <A>(
84	use: (	84	use: (
85	manager: PreviewManager.PreviewManagerShape,	85	manager: PreviewManager.PreviewManager["Service"],
86	) => Effect.Effect<A, PreviewManager.PreviewManagerError, Scope.Scope>,	86	) => Effect.Effect<A, PreviewManager.PreviewManagerError, Scope.Scope>,
87	) =>	87	) =>
88	Effect.gen(function* () {	88	Effect.gen(function* () {

apps/desktop/src/shell/DesktopShellEnvironment.test.ts+1−1

@@ -64,7 +64,7 @@ function runShellEnvironment(input: { · 63 unmodified lines
64	DesktopEnvironment.DesktopEnvironment,	64	DesktopEnvironment.DesktopEnvironment,
65	DesktopEnvironment.DesktopEnvironment.of({	65	DesktopEnvironment.DesktopEnvironment.of({
66	platform: input.platform,	66	platform: input.platform,
67	} as DesktopEnvironment.DesktopEnvironmentShape),	67	} as DesktopEnvironment.DesktopEnvironment["Service"]),
68	);	68	);
69	const spawnerLayer = Layer.succeed(	69	const spawnerLayer = Layer.succeed(
70	ChildProcessSpawner.ChildProcessSpawner,	70	ChildProcessSpawner.ChildProcessSpawner,

apps/desktop/src/updates/DesktopUpdates.ts+1−1

@@ -127,7 +127,7 @@ function parseAppUpdateYml(raw: string): Effect.Effect<Option.Option<AppUpdateYm · 126 unmodified lines
127	function createBaseUpdateState(	127	function createBaseUpdateState(
128	channel: DesktopUpdateChannel,	128	channel: DesktopUpdateChannel,
129	enabled: boolean,	129	enabled: boolean,
130	environment: DesktopEnvironment.DesktopEnvironmentShape,	130	environment: DesktopEnvironment.DesktopEnvironment["Service"],
131	): DesktopUpdateState {	131	): DesktopUpdateState {
132	return {	132	return {
133	...createInitialDesktopUpdateState(environment.appVersion, environment.runtimeInfo, channel),	133	...createInitialDesktopUpdateState(environment.appVersion, environment.runtimeInfo, channel),

apps/desktop/src/window/DesktopWindow.test.ts+6−6

@@ -91,7 +91,7 @@ const desktopAssetsLayer = Layer.succeed(DesktopAssets.DesktopAssets, { · 90 unmodified lines
91	png: Option.none<string>(),	91	png: Option.none<string>(),
92	}),	92	}),
93	resolveResourcePath: () => Effect.succeed(Option.none<string>()),	93	resolveResourcePath: () => Effect.succeed(Option.none<string>()),
94	} satisfies DesktopAssets.DesktopAssetsShape);	94	} satisfies DesktopAssets.DesktopAssets["Service"]);
95		95
96	const desktopServerExposureLayer = Layer.succeed(DesktopServerExposure.DesktopServerExposure, {	96	const desktopServerExposureLayer = Layer.succeed(DesktopServerExposure.DesktopServerExposure, {
97	getState: Effect.die("unexpected getState"),	97	getState: Effect.die("unexpected getState"),
@@ -106,19 +106,19 @@ const desktopServerExposureLayer = Layer.succeed(DesktopServerExposure.DesktopSe · 8 unmodified lines
106	setMode: () => Effect.die("unexpected setMode"),	106	setMode: () => Effect.die("unexpected setMode"),
107	setTailscaleServeEnabled: () => Effect.die("unexpected setTailscaleServeEnabled"),	107	setTailscaleServeEnabled: () => Effect.die("unexpected setTailscaleServeEnabled"),
108	getAdvertisedEndpoints: Effect.die("unexpected getAdvertisedEndpoints"),	108	getAdvertisedEndpoints: Effect.die("unexpected getAdvertisedEndpoints"),
109	} satisfies DesktopServerExposure.DesktopServerExposureShape);	109	} satisfies DesktopServerExposure.DesktopServerExposure["Service"]);
110		110
111	const electronMenuLayer = Layer.succeed(ElectronMenu.ElectronMenu, {	111	const electronMenuLayer = Layer.succeed(ElectronMenu.ElectronMenu, {
112	setApplicationMenu: () => Effect.void,	112	setApplicationMenu: () => Effect.void,
113	popupTemplate: () => Effect.void,	113	popupTemplate: () => Effect.void,
114	showContextMenu: () => Effect.succeed(Option.none()),	114	showContextMenu: () => Effect.succeed(Option.none()),
115	} satisfies ElectronMenu.ElectronMenuShape);	115	} satisfies ElectronMenu.ElectronMenu["Service"]);
116		116
117	const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {	117	const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
118	shouldUseDarkColors: Effect.succeed(false),	118	shouldUseDarkColors: Effect.succeed(false),
119	setSource: () => Effect.void,	119	setSource: () => Effect.void,
120	onUpdated: () => Effect.void,	120	onUpdated: () => Effect.void,
121	} satisfies ElectronTheme.ElectronThemeShape);	121	} satisfies ElectronTheme.ElectronTheme["Service"]);
122		122
123	const desktopEnvironmentLayer = DesktopEnvironment.layer(environmentInput).pipe(	123	const desktopEnvironmentLayer = DesktopEnvironment.layer(environmentInput).pipe(
124	Layer.provide(	124	Layer.provide(
@@ -156,7 +156,7 @@ function makeTestLayer(input: { · 31 unmodified lines
156	sendAll: () => Effect.void,	156	sendAll: () => Effect.void,
157	destroyAll: Effect.void,	157	destroyAll: Effect.void,
158	syncAllAppearance: (sync) => sync(input.window),	158	syncAllAppearance: (sync) => sync(input.window),
159	} satisfies ElectronWindow.ElectronWindowShape);	159	} satisfies ElectronWindow.ElectronWindow["Service"]);
160		160
161	return DesktopWindow.layer.pipe(	161	return DesktopWindow.layer.pipe(
162	Layer.provide(	162	Layer.provide(
@@ -172,7 +172,7 @@ function makeTestLayer(input: { · 9 unmodified lines
172	return true;	172	return true;
173	}),	173	}),
174	copyText: () => Effect.void,	174	copyText: () => Effect.void,
175	} satisfies ElectronShell.ElectronShellShape),	175	} satisfies ElectronShell.ElectronShell["Service"]),
176	electronThemeLayer,	176	electronThemeLayer,
177	electronWindowLayer,	177	electronWindowLayer,
178	Layer.mock(PreviewManager.PreviewManager)({	178	Layer.mock(PreviewManager.PreviewManager)({

apps/mobile/.swiftlint.yml+1−0

@@ -1,5 +1,6 @@
1	included:	1	included:
2	- ios/T3Code	2	- ios/T3Code
		3	- modules/t3-composer-editor/ios
3	- modules/t3-terminal/ios	4	- modules/t3-terminal/ios
4	- modules/t3-review-diff/ios	5	- modules/t3-review-diff/ios
5		6

apps/mobile/global.css+21−1

@@ -192,11 +192,31 @@ · 191 unmodified lines
192	}	192	}
193	}	193	}
194		194
195	/* ─── Font family ───────────────────────────────────────────────────── */	195	/* ─── Typography ────────────────────────────────────────────────────── */
196	@theme {	196	@theme {
197	--font-sans: "DMSans_400Regular";	197	--font-sans: "DMSans_400Regular";
198	--font-medium: "DMSans_500Medium";	198	--font-medium: "DMSans_500Medium";
199	--font-bold: "DMSans_700Bold";	199	--font-bold: "DMSans_700Bold";
		200
		201	/* Keep this scale aligned with src/lib/typography.ts for native style props. */
		202	--text-3xs: 10px;
		203	--text-3xs--line-height: 13px;
		204	--text-2xs: 11px;
		205	--text-2xs--line-height: 15px;
		206	--text-xs: 12px;
		207	--text-xs--line-height: 16px;
		208	--text-sm: 13px;
		209	--text-sm--line-height: 18px;
		210	--text-base: 15px;
		211	--text-base--line-height: 22px;
		212	--text-lg: 17px;
		213	--text-lg--line-height: 22px;
		214	--text-xl: 20px;
		215	--text-xl--line-height: 26px;
		216	--text-2xl: 24px;
		217	--text-2xl--line-height: 30px;
		218	--text-3xl: 28px;
		219	--text-3xl--line-height: 34px;
200	}	220	}
201		221
202	/* ─── Custom utilities ──────────────────────────────────────────────── */	222	/* ─── Custom utilities ──────────────────────────────────────────────── */

apps/mobile/modules/t3-composer-editor/ios/T3ComposerEditorView.swift+27−4

     fileTint: "#737373"
   )
   private var fontFamily = "DMSans_400Regular"
-  private var fontSize: CGFloat = 15
+  private var fontSize: CGFloat = 14
-  private var lineHeight: CGFloat = 22
+  private var lineHeight: CGFloat = 20
   private var contentInsetVertical: CGFloat = 0
   private var shouldAutoFocus = false
   private var didAutoFocus = false
     guard !isApplyingControlledValue else {
       return
     }
+    restoreBaseTypingAttributes()
     emitSelection()
   }
+  public func textView(
+    _ textView: UITextView,
+    shouldChangeTextIn range: NSRange,
+    replacementText text: String
+  ) -> Bool {
+    restoreBaseTypingAttributes()
+    return true
+  }
   public func textViewDidBeginEditing(_ textView: UITextView) {
     onComposerFocus()
   }
     let targetSelection = requestedSelection ?? previousSelection
     requestedSelection = nil
     textView.selectedRange = displayRange(for: targetSelection)
+    restoreBaseTypingAttributes()
     isApplyingControlledValue = false
     updatePlaceholderVisibility()
     emitContentSizeIfNeeded()
       size: image.size,
       baselineOffset: baselineOffset
     )
-    return NSAttributedString(attachment: attachment)
+    let attributedAttachment = NSMutableAttributedString(attachment: attachment)
+    attributedAttachment.addAttributes(
+      baseAttributes(),
+      range: NSRange(location: 0, length: attributedAttachment.length)
+    )
+    return attributedAttachment
   }
   private func renderChip(
     let font = UIFont(name: fontFamily, size: fontSize)
       ?? UIFont.systemFont(ofSize: fontSize)
     textView.font = font
-    textView.typingAttributes = baseAttributes()
+    restoreBaseTypingAttributes()
     placeholderLabel.font = font
     setNeedsLayout()
   }
+  private func restoreBaseTypingAttributes() {
+    guard textView.markedTextRange == nil else {
+      return
+    }
+    textView.typingAttributes = baseAttributes()
+  }
   private func applyTheme() {
     textView.textColor = UIColor(composerHex: theme.text) ?? .label
     placeholderLabel.textColor = UIColor(composerHex: theme.placeholder) ?? .placeholderText

apps/mobile/src/app/+not-found.tsx+2−2

@@ -21,7 +21,7 @@ export default function NotFoundRoute() { · 20 unmodified lines
21	}}	21	}}
22	style={[{ flex: 1 }, screenBgStyle]}	22	style={[{ flex: 1 }, screenBgStyle]}
23	>	23	>
24	<Text className="text-[28px] font-t3-bold text-foreground" selectable>	24	<Text className="text-3xl font-t3-bold text-foreground" selectable>
25	Route not found	25	Route not found
26	</Text>	26	</Text>
27	<Link href="/" asChild>	27	<Link href="/" asChild>
@@ -35,7 +35,7 @@ export default function NotFoundRoute() { · 7 unmodified lines
35	primaryBgStyle,	35	primaryBgStyle,
36	]}	36	]}
37	>	37	>
38	<Text className="text-[16px] font-t3-bold text-primary-foreground">Return home</Text>	38	<Text className="text-base font-t3-bold text-primary-foreground">Return home</Text>
39	</Pressable>	39	</Pressable>
40	</Link>	40	</Link>
41	</ScrollView>	41	</ScrollView>

apps/mobile/src/app/connections/index.tsx+1−1

@@ -85,7 +85,7 @@ export default function ConnectionsRouteScreen() { · 84 unmodified lines
85	type="monochrome"	85	type="monochrome"
86	/>	86	/>
87	</View>	87	</View>
88	<Text className="text-center text-[14px] leading-[20px] text-foreground-muted">	88	<Text className="text-center text-sm leading-[20px] text-foreground-muted">
89	No environments connected yet.{"\n"}Tap{" "}	89	No environments connected yet.{"\n"}Tap{" "}
90	<Text className="font-t3-bold text-foreground">+</Text> to add one.	90	<Text className="font-t3-bold text-foreground">+</Text> to add one.
91	</Text>	91	</Text>

apps/mobile/src/app/connections/new.tsx+5−5

@@ -171,7 +171,7 @@ export default function ConnectionsNewRouteScreen() { · 170 unmodified lines
171	className="items-center gap-3 rounded-[24px] bg-card px-5 py-8"	171	className="items-center gap-3 rounded-[24px] bg-card px-5 py-8"
172	style={{ borderCurve: "continuous" }}	172	style={{ borderCurve: "continuous" }}
173	>	173	>
174	<Text className="text-center text-[14px] leading-[20px] text-foreground-muted">	174	<Text className="text-center text-sm leading-[20px] text-foreground-muted">
175	Camera permission is required to scan a QR code.	175	Camera permission is required to scan a QR code.
176	</Text>	176	</Text>
177	<ConnectionSheetButton	177	<ConnectionSheetButton
@@ -189,7 +189,7 @@ export default function ConnectionsNewRouteScreen() { · 11 unmodified lines
189	<View collapsable={false} className="gap-4 rounded-[24px] bg-card p-4">	189	<View collapsable={false} className="gap-4 rounded-[24px] bg-card p-4">
190	<View collapsable={false} className="gap-1.5">	190	<View collapsable={false} className="gap-1.5">
191	<Text	191	<Text
192	className="text-[11px] font-t3-bold uppercase text-foreground-muted"	192	className="text-2xs font-t3-bold uppercase text-foreground-muted"
193	style={{ letterSpacing: 0.8 }}	193	style={{ letterSpacing: 0.8 }}
194	>	194	>
195	Host	195	Host
@@ -202,13 +202,13 @@ export default function ConnectionsNewRouteScreen() { · 6 unmodified lines
202	placeholderTextColor={placeholderColor}	202	placeholderTextColor={placeholderColor}
203	value={hostInput}	203	value={hostInput}
204	onChangeText={handleHostChange}	204	onChangeText={handleHostChange}
205	className="rounded-[14px] border border-input-border bg-input px-4 py-3.5 text-[15px] text-foreground"	205	className="rounded-[14px] border border-input-border bg-input px-4 py-3.5 text-base text-foreground"
206	/>	206	/>
207	</View>	207	</View>
208		208
209	<View collapsable={false} className="gap-1.5">	209	<View collapsable={false} className="gap-1.5">
210	<Text	210	<Text
211	className="text-[11px] font-t3-bold uppercase text-foreground-muted"	211	className="text-2xs font-t3-bold uppercase text-foreground-muted"
212	style={{ letterSpacing: 0.8 }}	212	style={{ letterSpacing: 0.8 }}
213	>	213	>
214	Pairing code	214	Pairing code
@@ -220,7 +220,7 @@ export default function ConnectionsNewRouteScreen() { · 5 unmodified lines
220	placeholderTextColor={placeholderColor}	220	placeholderTextColor={placeholderColor}
221	value={codeInput}	221	value={codeInput}
222	onChangeText={handleCodeChange}	222	onChangeText={handleCodeChange}
223	className="rounded-[14px] border border-input-border bg-input px-4 py-3.5 text-[15px] text-foreground"	223	className="rounded-[14px] border border-input-border bg-input px-4 py-3.5 text-base text-foreground"
224	/>	224	/>
225	</View>	225	</View>
226		226

apps/mobile/src/app/new/index.tsx+5−7

         {items.length === 0 ? (
           <View collapsable={false} className="items-center gap-3 rounded-[24px] bg-card px-6 py-8">
             {projectEmptyState.loading ? <ActivityIndicator color={accentColor} /> : null}
-            <Text className="text-center text-[17px] font-t3-bold text-foreground">
+            <Text className="text-center text-lg font-t3-bold text-foreground">
               {projectEmptyState.title}
             </Text>
-            <Text className="text-center text-[14px] leading-[20px] text-foreground-muted">
+            <Text className="text-center text-sm leading-[20px] text-foreground-muted">
               {projectEmptyState.detail}
             </Text>
             {!catalogState.hasReadyEnvironment ? (
                 className="mt-1 rounded-full bg-primary px-4 py-2.5 active:opacity-70"
                 onPress={() => router.push("/connections/new")}
               >
-                <Text className="text-[13px] font-t3-bold text-primary-foreground">
+                <Text className="text-sm font-t3-bold text-primary-foreground">
                   Add environment
                 </Text>
               </Pressable>
                 className="mt-1 rounded-full bg-primary px-4 py-2.5 active:opacity-70"
                 onPress={() => router.push("/new/add-project")}
               >
-                <Text className="text-[13px] font-t3-bold text-primary-foreground">
+                <Text className="text-sm font-t3-bold text-primary-foreground">
                   Add new project
                 </Text>
               </Pressable>
                         />
                       </View>
                       <View className="flex-1">
-                        <Text className="text-[16px] leading-[21px] font-t3-bold">
+                        <Text className="text-base leading-[21px] font-t3-bold">{item.title}</Text>
-                          {item.title}
-                        </Text>
                       </View>
                       <SymbolView
                         name="chevron.right"

apps/mobile/src/app/settings/environments.tsx+11−11

@@ -111,7 +111,7 @@ export default function SettingsEnvironmentsRouteScreen() { · 110 unmodified lines
111	type="monochrome"	111	type="monochrome"
112	/>	112	/>
113	</View>	113	</View>
114	<Text className="text-center text-[14px] leading-[20px] text-foreground-muted">	114	<Text className="text-center text-sm leading-[20px] text-foreground-muted">
115	No environments connected yet.{"\n"}Tap{" "}	115	No environments connected yet.{"\n"}Tap{" "}
116	<Text className="font-t3-bold text-foreground">+</Text> to add one.	116	<Text className="font-t3-bold text-foreground">+</Text> to add one.
117	</Text>	117	</Text>
@@ -160,7 +160,7 @@ function ConfiguredCloudEnvironmentRows(props: { · 42 unmodified lines
160	return (	160	return (
161	<View collapsable={false} className="mt-5 gap-3">	161	<View collapsable={false} className="mt-5 gap-3">
162	<View className="flex-row items-center justify-between px-1">	162	<View className="flex-row items-center justify-between px-1">
163	<Text className="text-[13px] font-t3-bold uppercase text-foreground-muted">T3 Cloud</Text>	163	<Text className="text-sm font-t3-bold uppercase text-foreground-muted">T3 Cloud</Text>
164	<Pressable	164	<Pressable
165	accessibilityRole="button"	165	accessibilityRole="button"
166	disabled={controller.relayDiscovery.isRefreshing}	166	disabled={controller.relayDiscovery.isRefreshing}
@@ -204,16 +204,16 @@ function ConfiguredCloudEnvironmentRows(props: { · 37 unmodified lines
204	) : controller.relayDiscovery.isRefreshing ? (	204	) : controller.relayDiscovery.isRefreshing ? (
205	<View collapsable={false} className="items-center gap-3 rounded-[24px] bg-card p-6">	205	<View collapsable={false} className="items-center gap-3 rounded-[24px] bg-card p-6">
206	<ActivityIndicator color={iconColor} />	206	<ActivityIndicator color={iconColor} />
207	<Text className="text-center text-[14px] leading-[20px] text-foreground-muted">	207	<Text className="text-center text-sm leading-[20px] text-foreground-muted">
208	Loading linked cloud environments.	208	Loading linked cloud environments.
209	</Text>	209	</Text>
210	</View>	210	</View>
211	) : controller.relayDiscovery.error ? (	211	) : controller.relayDiscovery.error ? (
212	<View collapsable={false} className="gap-3 rounded-[24px] bg-card p-5">	212	<View collapsable={false} className="gap-3 rounded-[24px] bg-card p-5">
213	<Text className="text-[15px] font-t3-bold text-foreground">	213	<Text className="text-base font-t3-bold text-foreground">
214	Could not load T3 Cloud environments	214	Could not load T3 Cloud environments
215	</Text>	215	</Text>
216	<Text className="text-[13px] leading-[18px] text-foreground-muted">	216	<Text className="text-sm leading-[18px] text-foreground-muted">
217	{controller.relayDiscovery.error}	217	{controller.relayDiscovery.error}
218	</Text>	218	</Text>
219	{controller.relayDiscovery.errorTraceId ? (	219	{controller.relayDiscovery.errorTraceId ? (
@@ -222,7 +222,7 @@ function ConfiguredCloudEnvironmentRows(props: { · 2 unmodified lines
222	</View>	222	</View>
223	) : (	223	) : (
224	<View collapsable={false} className="rounded-[24px] bg-card p-5">	224	<View collapsable={false} className="rounded-[24px] bg-card p-5">
225	<Text className="text-[14px] leading-[20px] text-foreground-muted">	225	<Text className="text-sm leading-[20px] text-foreground-muted">
226	No additional linked cloud environments.	226	No additional linked cloud environments.
227	</Text>	227	</Text>
228	</View>	228	</View>
@@ -361,7 +361,7 @@ function CloudEnvironmentRowShell(props: { · 132 unmodified lines
361	<View className="min-w-0 flex-row items-center gap-2">	361	<View className="min-w-0 flex-row items-center gap-2">
362	<ConnectionStatusDot state={props.connectionState} pulse={shouldPulse} size={7} />	362	<ConnectionStatusDot state={props.connectionState} pulse={shouldPulse} size={7} />
363	<Text	363	<Text
364	className="min-w-0 flex-shrink text-[16px] font-t3-bold leading-[21px] text-foreground"	364	className="min-w-0 flex-shrink text-base font-t3-bold leading-[21px] text-foreground"
365	numberOfLines={1}	365	numberOfLines={1}
366	>	366	>
367	{props.label}	367	{props.label}
@@ -370,7 +370,7 @@ function CloudEnvironmentRowShell(props: { · 2 unmodified lines
370	{props.connectionError ? (	370	{props.connectionError ? (
371	<Text	371	<Text
372	aria-hidden	372	aria-hidden
373	className={cn("absolute left-0 right-0 text-[12px] leading-[16px]", statusClassName)}	373	className={cn("absolute left-0 right-0 text-xs leading-[16px]", statusClassName)}
374	onTextLayout={onMeasuredErrorTextLayout}	374	onTextLayout={onMeasuredErrorTextLayout}
375	style={{ opacity: 0, zIndex: -1 }}	375	style={{ opacity: 0, zIndex: -1 }}
376	>	376	>
@@ -384,7 +384,7 @@ function CloudEnvironmentRowShell(props: { · 7 unmodified lines
384	className="min-w-0 flex-row items-start gap-1"	384	className="min-w-0 flex-row items-start gap-1"
385	>	385	>
386	<Text	386	<Text
387	className={cn("min-w-0 flex-1 text-[12px] leading-[16px]", statusClassName)}	387	className={cn("min-w-0 flex-1 text-xs leading-[16px]", statusClassName)}
388	numberOfLines={isErrorExpanded ? undefined : 1}	388	numberOfLines={isErrorExpanded ? undefined : 1}
389	>	389	>
390	{statusText}	390	{statusText}
@@ -394,7 +394,7 @@ function CloudEnvironmentRowShell(props: { · 3 unmodified lines
394	<Text	394	<Text
395	accessibilityHint="Copies the trace ID"	395	accessibilityHint="Copies the trace ID"
396	accessibilityRole="button"	396	accessibilityRole="button"
397	className={cn("text-[12px] leading-[16px] underline", statusClassName)}	397	className={cn("text-xs leading-[16px] underline", statusClassName)}
398	onLongPress={(event) => {	398	onLongPress={(event) => {
399	event.stopPropagation();	399	event.stopPropagation();
400	copyTextWithHaptic(errorTraceId);	400	copyTextWithHaptic(errorTraceId);
@@ -446,7 +446,7 @@ function CopyTraceIdButton(props: { readonly traceId: string }) { · 45 unmodified lines
446	className="self-start flex-row items-center gap-1.5 rounded-full bg-subtle px-3 py-2 active:opacity-70"	446	className="self-start flex-row items-center gap-1.5 rounded-full bg-subtle px-3 py-2 active:opacity-70"
447	>	447	>
448	<SymbolView name="doc.on.doc" size={12} tintColor={iconColor} type="monochrome" />	448	<SymbolView name="doc.on.doc" size={12} tintColor={iconColor} type="monochrome" />
449	<Text className="text-[12px] font-t3-bold text-foreground">Copy trace ID</Text>	449	<Text className="text-xs font-t3-bold text-foreground">Copy trace ID</Text>
450	</Pressable>	450	</Pressable>
451	);	451	);
452	}	452	}

apps/mobile/src/app/settings/index.tsx+7−7

@@ -346,7 +346,7 @@ function ConfiguredSettingsRouteScreen() { · 345 unmodified lines
346	onPress={openAccount}	346	onPress={openAccount}
347	/>	347	/>
348	</SettingsSection>	348	</SettingsSection>
349	<Text className="px-2 text-[13px] leading-[18px] text-foreground-muted">	349	<Text className="px-2 text-sm leading-[18px] text-foreground-muted">
350	T3 Code works locally without signing in. Cloud features are optional.	350	T3 Code works locally without signing in. Cloud features are optional.
351	</Text>	351	</Text>
352	</View>	352	</View>
@@ -389,7 +389,7 @@ type SymbolName = ComponentProps<typeof SymbolView>["name"]; · 36 unmodified lines
389	function SettingsSection(props: { readonly title: string; readonly children: ReactNode }) {	389	function SettingsSection(props: { readonly title: string; readonly children: ReactNode }) {
390	return (	390	return (
391	<View className="gap-2">	391	<View className="gap-2">
392	<Text className="px-2 text-[13px] font-t3-medium text-foreground-muted">{props.title}</Text>	392	<Text className="px-2 text-sm font-t3-medium text-foreground-muted">{props.title}</Text>
393	<View	393	<View
394	className="overflow-hidden rounded-[28px] bg-card"	394	className="overflow-hidden rounded-[28px] bg-card"
395	style={{ borderCurve: "continuous" }}	395	style={{ borderCurve: "continuous" }}
@@ -413,8 +413,8 @@ function AppSettingsSection() { · 17 unmodified lines
413	type="monochrome"	413	type="monochrome"
414	weight="regular"	414	weight="regular"
415	/>	415	/>
416	<Text className="flex-1 text-[17px] text-foreground">Version</Text>	416	<Text className="flex-1 text-lg text-foreground">Version</Text>
417	<Text className="text-[17px] text-foreground-muted">Alpha</Text>	417	<Text className="text-lg text-foreground-muted">Alpha</Text>
418	</View>	418	</View>
419	</SettingsSection>	419	</SettingsSection>
420	);	420	);
@@ -444,13 +444,13 @@ function SettingsRow(props: { · 23 unmodified lines
444	style={{ opacity: props.disabled ? 0.45 : 1 }}	444	style={{ opacity: props.disabled ? 0.45 : 1 }}
445	>	445	>
446	<SymbolView name={props.icon} size={22} tintColor={icon} type="monochrome" weight="regular" />	446	<SymbolView name={props.icon} size={22} tintColor={icon} type="monochrome" weight="regular" />
447	<Text className="shrink-0 text-[17px] text-foreground" numberOfLines={1}>	447	<Text className="shrink-0 text-lg text-foreground" numberOfLines={1}>
448	{props.label}	448	{props.label}
449	</Text>	449	</Text>
450	<View className="min-w-0 flex-1 items-end">	450	<View className="min-w-0 flex-1 items-end">
451	{props.value ? (	451	{props.value ? (
452	<Text	452	<Text
453	className="max-w-[180px] text-right text-[16px] text-foreground-muted"	453	className="max-w-[180px] text-right text-base text-foreground-muted"
454	ellipsizeMode="middle"	454	ellipsizeMode="middle"
455	numberOfLines={1}	455	numberOfLines={1}
456	>	456	>
@@ -502,7 +502,7 @@ function SettingsSwitchRow(props: { · 45 unmodified lines
502	style={{ opacity: props.disabled ? 0.45 : 1 }}	502	style={{ opacity: props.disabled ? 0.45 : 1 }}
503	>	503	>
504	<SymbolView name={props.icon} size={22} tintColor={icon} type="monochrome" weight="regular" />	504	<SymbolView name={props.icon} size={22} tintColor={icon} type="monochrome" weight="regular" />
505	<Text className="flex-1 text-[17px] text-foreground">{props.label}</Text>	505	<Text className="flex-1 text-lg text-foreground">{props.label}</Text>
506	<Switch	506	<Switch
507	disabled={props.disabled}	507	disabled={props.disabled}
508	ios_backgroundColor={track}	508	ios_backgroundColor={track}

apps/mobile/src/components/AppText.tsx+1−1

@@ -40,7 +40,7 @@ export function AppTextInput({ · 39 unmodified lines
40	<RNTextInput	40	<RNTextInput
41	ref={ref}	41	ref={ref}
42	className={cn(	42	className={cn(
43	"min-h-[54px] rounded-2xl border border-input-border bg-input px-3.5 py-3 font-sans text-[15px] text-foreground",	43	"min-h-[54px] rounded-2xl border border-input-border bg-input px-3.5 py-3 font-sans text-base text-foreground",
44	className,	44	className,
45	)}	45	)}
46	placeholderTextColor={placeholderTextColor ?? placeholderColor}	46	placeholderTextColor={placeholderTextColor ?? placeholderColor}

apps/mobile/src/components/BrandMark.tsx+3−6

       />
       <View className="gap-1">
         <View className="flex-row items-center gap-2">
-          <Text
+          <Text className="text-lg font-t3-bold text-foreground" style={{ letterSpacing: -0.4 }}>
-            className="text-[17px] font-t3-bold text-foreground"
-            style={{ letterSpacing: -0.4 }}
-          >
             T3 Code
           </Text>
           <View className="rounded-full bg-subtle px-2 py-1">
             <Text
-              className="text-[10px] font-t3-bold uppercase text-foreground-muted"
+              className="text-3xs font-t3-bold uppercase text-foreground-muted"
               style={{ letterSpacing: 1.1 }}
             >
               {stageLabel}
           </View>
         </View>
         {!compact ? (
-          <Text className="text-[12px] font-medium text-foreground-muted">
+          <Text className="text-xs font-medium text-foreground-muted">
             Mobile control surface for your live coding environments
           </Text>
         ) : null}

apps/mobile/src/components/ComposerToolbarTrigger.tsx+1−1

@@ -223,7 +223,7 @@ export function ComposerToolbarButton(props: { · 222 unmodified lines
223	{props.label ? (	223	{props.label ? (
224	<Text	224	<Text
225	className={cn(	225	className={cn(
226	"shrink text-center text-[13px] font-t3-bold",	226	"shrink text-center text-sm font-t3-bold",
227	variant === "primary"	227	variant === "primary"
228	? props.disabled	228	? props.disabled
229	? "text-foreground-muted"	229	? "text-foreground-muted"

apps/mobile/src/components/ControlPill.tsx+1−1

@@ -48,7 +48,7 @@ export function ControlPill(props: { · 47 unmodified lines
48	: "bg-subtle",	48	: "bg-subtle",
49	);	49	);
50	const labelClassName = cn(	50	const labelClassName = cn(
51	"text-center text-[12px] font-t3-bold",	51	"text-center text-xs font-t3-bold",
52	variant === "primary"	52	variant === "primary"
53	? props.disabled	53	? props.disabled
54	? "text-foreground-muted"	54	? "text-foreground-muted"

apps/mobile/src/components/EmptyState.tsx+1−3

           className="mt-4 self-start rounded-full bg-primary px-4 py-2.5 active:opacity-70"
           onPress={props.onAction}
         >
-          <Text className="text-[13px] font-t3-bold text-primary-foreground">
+          <Text className="text-sm font-t3-bold text-primary-foreground">{props.actionLabel}</Text>
-            {props.actionLabel}
-          </Text>
         </Pressable>
       ) : null}
     </View>

apps/mobile/src/components/ErrorBanner.tsx+1−1

@@ -4,7 +4,7 @@ import { AppText as Text } from "./AppText"; · 3 unmodified lines
4	export function ErrorBanner(props: { readonly message: string }) {	4	export function ErrorBanner(props: { readonly message: string }) {
5	return (	5	return (
6	<View className="rounded-2xl border border-rose-300/70 bg-rose-100/80 px-3.5 py-3 dark:border-rose-400/28 dark:bg-rose-500/12">	6	<View className="rounded-2xl border border-rose-300/70 bg-rose-100/80 px-3.5 py-3 dark:border-rose-400/28 dark:bg-rose-500/12">
7	<Text className="font-t3-medium text-[13px] leading-[18px] text-rose-700 dark:text-rose-300">	7	<Text className="font-t3-medium text-sm leading-[18px] text-rose-700 dark:text-rose-300">
8	{props.message}	8	{props.message}
9	</Text>	9	</Text>
10	</View>	10	</View>

apps/mobile/src/components/StatusPill.tsx+1−1

@@ -26,7 +26,7 @@ export function StatusPill( · 25 unmodified lines
26	<Text	26	<Text
27	className={cn(	27	className={cn(
28	"font-t3-bold",	28	"font-t3-bold",
29	size === "compact" ? "text-[11px]" : "text-xs",	29	size === "compact" ? "text-2xs" : "text-xs",
30	props.textClassName,	30	props.textClassName,
31	)}	31	)}
32	>	32	>

apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx+11−9

         workspaceRoot={props.project.workspaceRoot}
       />
       <Text
-        className="flex-1 text-[12px] font-t3-medium uppercase text-foreground-muted"
+        className="flex-1 text-xs font-t3-medium uppercase text-foreground-muted"
         numberOfLines={1}
         style={{ letterSpacing: 0.5 }}
       >
         {props.project.title}
       </Text>
       {props.environmentLabel ? (
-        <Text className="max-w-[42%] text-[11px] text-foreground-tertiary" numberOfLines={1}>
+        <Text className="max-w-[42%] text-2xs text-foreground-tertiary" numberOfLines={1}>
           {props.environmentLabel}
         </Text>
       ) : null}
         <View className="min-w-0 flex-1 gap-1">
           <View className="flex-row items-center gap-2">
             <Text
-              className="min-w-0 flex-1 text-[15px] font-t3-bold leading-[20px] text-foreground"
+              className="min-w-0 flex-1 text-base font-t3-bold leading-[20px] text-foreground"
               numberOfLines={1}
             >
               {props.thread.title}
             </Text>
             <Text
-              className="text-[12px] text-foreground-tertiary"
+              className="text-xs text-foreground-tertiary"
               style={{ fontVariant: ["tabular-nums"] }}
             >
               {timestamp}
                 type="monochrome"
               />
               <Text
-                className="min-w-0 flex-1 text-[11px] text-foreground-tertiary"
+                className="min-w-0 flex-1 text-2xs text-foreground-tertiary"
                 numberOfLines={1}
                 style={{ fontFamily: "monospace" }}
               >
 function ArchiveError(props: { readonly message: string; readonly onRetry: () => void }) {
   return (
     <View className="rounded-[20px] border border-danger-border bg-danger p-4">
-      <Text className="font-t3-bold text-danger-foreground">Could not load every archive</Text>
+      <Text className="text-base font-t3-bold text-danger-foreground">
-      <Text className="mt-1 text-[13px] leading-[18px] text-foreground-muted">{props.message}</Text>
+        Could not load every archive
+      </Text>
+      <Text className="mt-1 text-sm leading-[18px] text-foreground-muted">{props.message}</Text>
       <Pressable className="mt-3 self-start active:opacity-60" onPress={props.onRetry}>
-        <Text className="text-[13px] font-t3-bold text-danger-foreground">Try again</Text>
+        <Text className="text-sm font-t3-bold text-danger-foreground">Try again</Text>
       </Pressable>
     </View>
   );
         {isInitialLoad ? (
           <View className="items-center py-16">
             <ActivityIndicator color={refreshTint} />
-            <Text className="mt-3 text-[13px] text-foreground-muted">Loading archive…</Text>
+            <Text className="mt-3 text-sm text-foreground-muted">Loading archive…</Text>
           </View>
         ) : props.groups.length === 0 ? (
           <EmptyState

apps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsx+8−12

 import { ActivityIndicator, Pressable, StyleSheet, Text, TextInput, View } from "react-native";
 import { useState } from "react";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import { useThemeColor } from "../../lib/useThemeColor";
 export function CloudWaitlistEnrollment(props: { readonly onSignIn: () => void }) {
 const styles = StyleSheet.create({
   body: {
     fontFamily: "DMSans_400Regular",
-    fontSize: 15,
+    ...MOBILE_TYPOGRAPHY.body,
-    lineHeight: 21,
   },
   buttonText: {
     fontFamily: "DMSans_700Bold",
-    fontSize: 16,
+    fontSize: MOBILE_TYPOGRAPHY.body.fontSize,
   },
   content: {
     gap: 18,
   },
   error: {
     fontFamily: "DMSans_400Regular",
-    fontSize: 13,
+    ...MOBILE_TYPOGRAPHY.footnote,
-    lineHeight: 18,
   },
   field: {
     gap: 8,
     borderRadius: 16,
     borderWidth: 1,
     fontFamily: "DMSans_400Regular",
-    fontSize: 17,
+    fontSize: MOBILE_TYPOGRAPHY.headline.fontSize,
     minHeight: 54,
     paddingHorizontal: 16,
     paddingVertical: 14,
   },
   label: {
     fontFamily: "DMSans_700Bold",
-    fontSize: 13,
+    ...MOBILE_TYPOGRAPHY.footnote,
-    lineHeight: 18,
   },
   primaryButton: {
     alignItems: "center",
   },
   signInText: {
     fontFamily: "DMSans_700Bold",
-    fontSize: 15,
+    ...MOBILE_TYPOGRAPHY.body,
-    lineHeight: 21,
   },
   title: {
     fontFamily: "DMSans_700Bold",
-    fontSize: 20,
+    ...MOBILE_TYPOGRAPHY.title,
-    lineHeight: 26,
     textAlign: "center",
   },
 });

apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx+9−12

         />
         <View className="flex-1 gap-0.5">
-          <Text
+          <Text className="text-base font-t3-bold leading-[21px] text-foreground" numberOfLines={1}>
-            className="text-[16px] font-t3-bold leading-[21px] text-foreground"
-            numberOfLines={1}
-          >
             {props.environment.environmentLabel}
           </Text>
-          <Text className="text-[12px] leading-[16px] text-foreground-muted" numberOfLines={1}>
+          <Text className="text-xs leading-[16px] text-foreground-muted" numberOfLines={1}>
             {props.environment.displayUrl}
           </Text>
           {statusLabel ? (
             <Text
               className={cn(
-                "text-[12px] leading-[16px]",
+                "text-xs leading-[16px]",
                 hasConnectionFailure ? "text-rose-500 dark:text-rose-400" : "text-foreground-muted",
               )}
               numberOfLines={props.expanded ? undefined : 1}
           className="gap-3 px-4 pb-4"
         >
           {props.environment.isRelayManaged ? (
-            <Text className="text-[13px] leading-[18px] text-foreground-muted">
+            <Text className="text-sm leading-[18px] text-foreground-muted">
               Managed by T3 Cloud. Tunnel details update automatically.
             </Text>
           ) : (
             <>
               <View className="gap-1.5">
                 <Text
-                  className="text-[11px] font-t3-bold uppercase text-foreground-muted"
+                  className="text-2xs font-t3-bold uppercase text-foreground-muted"
                   style={{ letterSpacing: 0.8 }}
                 >
                   Label
                   placeholderTextColor={placeholderColor}
                   value={label}
                   onChangeText={setLabel}
-                  className="rounded-[14px] border border-input-border bg-input px-4 py-3 text-[15px] text-foreground"
+                  className="rounded-[14px] border border-input-border bg-input px-4 py-3 text-base text-foreground"
                 />
               </View>
               <View className="gap-1.5">
                 <Text
-                  className="text-[11px] font-t3-bold uppercase text-foreground-muted"
+                  className="text-2xs font-t3-bold uppercase text-foreground-muted"
                   style={{ letterSpacing: 0.8 }}
                 >
                   URL
                   placeholderTextColor={placeholderColor}
                   value={url}
                   onChangeText={setUrl}
-                  className="rounded-[14px] border border-input-border bg-input px-4 py-3 text-[15px] text-foreground"
+                  className="rounded-[14px] border border-input-border bg-input px-4 py-3 text-base text-foreground"
                 />
               </View>
             </>
               >
                 <SymbolView name="checkmark" size={13} tintColor={primaryFg} type="monochrome" />
                 <Text
-                  className="text-[12px] font-t3-bold uppercase text-primary-foreground"
+                  className="text-xs font-t3-bold uppercase text-primary-foreground"
                   style={{ letterSpacing: 0.8 }}
                 >
                   Save

apps/mobile/src/features/connection/ConnectionSheetButton.tsx+1−1

@@ -104,7 +104,7 @@ export function ConnectionSheetButton(props: { · 103 unmodified lines
104	type="monochrome"	104	type="monochrome"
105	/>	105	/>
106	<Text	106	<Text
107	className="text-[12px] font-t3-bold uppercase"	107	className="text-xs font-t3-bold uppercase"
108	style={{ color: colors.textColor, letterSpacing: 0.8 }}	108	style={{ color: colors.textColor, letterSpacing: 0.8 }}
109	>	109	>
110	{props.label}	110	{props.label}

apps/mobile/src/features/connection/EnvironmentConnectionNotice.tsx+3−3

@@ -73,10 +73,10 @@ export function EnvironmentConnectionNotice(props: { · 72 unmodified lines
73	/>	73	/>
74	)}	74	)}
75		75
76	<Text className="text-center text-[17px] font-t3-bold leading-[22px] text-foreground">	76	<Text className="text-center text-lg font-t3-bold leading-[22px] text-foreground">
77	{noticeTitle(props.connection.phase, props.environmentLabel)}	77	{noticeTitle(props.connection.phase, props.environmentLabel)}
78	</Text>	78	</Text>
79	<Text className="text-center text-[14px] leading-[20px] text-foreground-muted">	79	<Text className="text-center text-sm leading-[20px] text-foreground-muted">
80	{noticeDetail(props.connection.phase, props.resourceName, props.connection.error)}	80	{noticeDetail(props.connection.phase, props.resourceName, props.connection.error)}
81	{props.connection.traceId ? (	81	{props.connection.traceId ? (
82	<>	82	<>
@@ -99,7 +99,7 @@ export function EnvironmentConnectionNotice(props: { · 16 unmodified lines
99	className="mt-1 rounded-full bg-subtle px-4 py-2.5 active:opacity-70"	99	className="mt-1 rounded-full bg-subtle px-4 py-2.5 active:opacity-70"
100	onPress={props.onRetry}	100	onPress={props.onRetry}
101	>	101	>
102	<Text className="text-[13px] font-t3-bold text-foreground">Retry now</Text>	102	<Text className="text-sm font-t3-bold text-foreground">Retry now</Text>
103	</Pressable>	103	</Pressable>
104	) : null}	104	) : null}
105	</View>	105	</View>

apps/mobile/src/features/files/FileMarkdownPreview.tsx+3−4

 } from "react-native-nitro-markdown";
 import { Linking, ScrollView, Text as NativeText, View } from "react-native";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import { useThemeColor } from "../../lib/useThemeColor";
 import {
   hasNativeSelectableMarkdownText,
         text: {
           color: body,
           fontFamily: "DMSans_400Regular",
-          fontSize: 15,
+          ...MOBILE_TYPOGRAPHY.body,
-          lineHeight: 22,
         },
         heading: {
           color: strong,
         skillTextColor: codeText,
         quoteMarkerColor: blockquoteBorder,
         dividerColor: horizontalRule,
-        fontSize: 15,
+        ...MOBILE_TYPOGRAPHY.body,
-        lineHeight: 22,
         fontFamily: "DMSans_400Regular",
         headingFontFamily: "DMSans_700Bold",
         boldFontFamily: "DMSans_700Bold",

apps/mobile/src/features/files/FileTreeBrowser.tsx+6−8

       <PierreEntryIcon path={node.path} kind={node.kind} size={17} />
       <Text
         className={cn(
-          "min-w-0 flex-1 text-[14px] leading-[19px]",
+          "min-w-0 flex-1 text-sm leading-[19px]",
           selected ? "font-t3-bold text-foreground" : "font-t3-medium text-foreground-secondary",
         )}
         numberOfLines={1}
         {node.name}
       </Text>
       {node.kind === "directory" ? (
-        <Text className="text-[11px] font-t3-medium text-foreground-tertiary">
+        <Text className="text-2xs font-t3-medium text-foreground-tertiary">
           {node.children.length}
         </Text>
       ) : null}
     <View className="flex-1 bg-sheet">
       {props.error && props.entries.length === 0 ? (
         <View className="px-4 py-5">
-          <Text className="text-[13px] font-t3-bold text-foreground">Files unavailable</Text>
+          <Text className="text-sm font-t3-bold text-foreground">Files unavailable</Text>
-          <Text className="mt-1 text-[12px] leading-[18px] text-foreground-muted">
+          <Text className="mt-1 text-xs leading-[18px] text-foreground-muted">{props.error}</Text>
-            {props.error}
-          </Text>
         </View>
       ) : (
         <FlatList
                 <ActivityIndicator size="small" />
               ) : (
                 <>
-                  <Text className="text-[13px] font-t3-bold text-foreground">No files found</Text>
+                  <Text className="text-sm font-t3-bold text-foreground">No files found</Text>
-                  <Text className="mt-1 text-[12px] leading-[18px] text-foreground-muted">
+                  <Text className="mt-1 text-xs leading-[18px] text-foreground-muted">
                     {props.searchQuery.trim().length > 0
                       ? "Try a different search."
                       : "The workspace file index is empty."}

apps/mobile/src/features/files/SourceFileSurface.tsx+15−9

 } from "../review/reviewDiffRendering";
 import type { ReviewHighlightedToken } from "../review/shikiReviewHighlighter";
 import { cn } from "../../lib/cn";
+import { MOBILE_CODE_SURFACE } from "../../lib/typography";
 import {
   buildNativeSourceRows,
   buildNativeSourceTokens,
 } from "./nativeSourceFileAdapter";
 import { sourceHighlightAtom } from "./sourceHighlightingState";
-const SOURCE_LINE_HEIGHT = 24;
+const SOURCE_LINE_HEIGHT = MOBILE_CODE_SURFACE.rowHeight;
-const SOURCE_LINE_NUMBER_WIDTH = 58;
+const SOURCE_LINE_NUMBER_WIDTH = MOBILE_CODE_SURFACE.gutterWidth;
 const NATIVE_SOURCE_STYLE_JSON = JSON.stringify(NATIVE_SOURCE_STYLE);
 interface SourceFileSurfaceProps {
       style={{ minHeight: SOURCE_LINE_HEIGHT }}
     >
       <NativeText
-        className="select-none pr-3 text-right text-[11px] leading-[24px] text-foreground-tertiary"
+        className="select-none pr-3 text-right text-foreground-tertiary"
         style={{
           width: SOURCE_LINE_NUMBER_WIDTH,
           fontFamily: REVIEW_MONO_FONT_FAMILY,
+          fontSize: MOBILE_CODE_SURFACE.lineNumberFontSize,
+          lineHeight: MOBILE_CODE_SURFACE.rowHeight,
         }}
       >
         {props.index + 1}
       <NativeText
         selectable
         numberOfLines={1}
-        className="text-[13px] font-medium leading-[24px] text-foreground"
+        className="font-normal text-foreground"
-        style={{ fontFamily: REVIEW_MONO_FONT_FAMILY, minWidth: 320 }}
+        style={{
+          fontFamily: REVIEW_MONO_FONT_FAMILY,
+          fontSize: MOBILE_CODE_SURFACE.fontSize,
+          lineHeight: MOBILE_CODE_SURFACE.rowHeight,
+          minWidth: 320,
+        }}
       >
         {props.tokens && props.tokens.length > 0
           ? (() => {
                 const fontWeight =
                   token.fontStyle !== null && (token.fontStyle & 2) === 2
                     ? ("700" as const)
-                    : ("500" as const);
+                    : ("400" as const);
                 const fontStyle =
                   token.fontStyle !== null && (token.fontStyle & 1) === 1
                     ? ("italic" as const)
   if (props.status === "error") {
     return (
       <View className="border-b border-border bg-card px-4 py-2">
-        <Text className="text-[11px] font-t3-medium uppercase text-foreground-muted">
+        <Text className="text-2xs font-t3-medium uppercase text-foreground-muted">Plain text</Text>
-          Plain text
-        </Text>
       </View>
     );
   }

apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx+8−7

 import { LoadingScreen } from "../../components/LoadingScreen";
 import { cn } from "../../lib/cn";
 import { buildThreadFilesNavigation } from "../../lib/routes";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import { useThemeColor } from "../../lib/useThemeColor";
 import { useThreadSelection } from "../../state/use-thread-selection";
 import { useSelectedThreadWorktree } from "../../state/use-selected-thread-worktree";
       <SymbolView name={props.icon} size={13} tintColor={iconColor} type="monochrome" />
       <Text
         className={cn(
-          "text-[12px] font-t3-bold",
+          "text-xs font-t3-bold",
           props.active ? "text-primary-foreground" : "text-foreground-muted",
         )}
       >
               ) : null}
               <Text
                 className={cn(
-                  "max-w-[180px] px-1 text-[12px]",
+                  "max-w-[180px] px-1 text-xs",
                   crumb.kind === "file"
                     ? "font-t3-bold text-foreground"
                     : "font-t3-medium text-foreground-muted",
     return (
       <View className="flex-1 items-center justify-center gap-3 bg-card px-6">
         <ActivityIndicator />
-        <Text className="text-center text-[13px] text-foreground-muted">Loading file...</Text>
+        <Text className="text-center text-sm text-foreground-muted">Loading file...</Text>
       </View>
     );
   }
     <View className="flex-1 bg-card">
       {props.truncated ? (
         <View className="border-b border-amber-200 bg-amber-50 px-4 py-2 dark:border-amber-900/60 dark:bg-amber-950/40">
-          <Text className="text-[11px] font-t3-bold uppercase text-amber-700 dark:text-amber-300">
+          <Text className="text-2xs font-t3-bold uppercase text-amber-700 dark:text-amber-300">
             Partial file
           </Text>
-          <Text className="text-[12px] leading-[17px] text-amber-800 dark:text-amber-200">
+          <Text className="text-xs leading-[17px] text-amber-800 dark:text-amber-200">
             Preview limited to the first 1 MB of a truncated file.
           </Text>
         </View>
         style={{
           color: foregroundColor,
           fontFamily: "DMSans_700Bold",
-          fontSize: 18,
+          fontSize: MOBILE_TYPOGRAPHY.headline.fontSize,
           fontWeight: "900",
           letterSpacing: -0.4,
         }}
         style={{
           color: secondaryForegroundColor,
           fontFamily: "DMSans_500Medium",
-          fontSize: 12,
+          fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
           fontWeight: "500",
           letterSpacing: 0.2,
         }}

apps/mobile/src/features/files/WorkspaceFileImagePreview.tsx+2−2

@@ -81,7 +81,7 @@ function CachedWorkspaceFileImagePreview(props: { · 80 unmodified lines
81	return (	81	return (
82	<View className="flex-1 items-center justify-center gap-3 bg-card px-6">	82	<View className="flex-1 items-center justify-center gap-3 bg-card px-6">
83	<ActivityIndicator />	83	<ActivityIndicator />
84	<Text className="text-center text-[13px] text-foreground-muted">Loading image...</Text>	84	<Text className="text-center text-sm text-foreground-muted">Loading image...</Text>
85	</View>	85	</View>
86	);	86	);
87	}	87	}
@@ -102,7 +102,7 @@ export function WorkspaceFileImagePreview(props: { · 14 unmodified lines
102	return (	102	return (
103	<View className="flex-1 items-center justify-center gap-3 bg-card px-6">	103	<View className="flex-1 items-center justify-center gap-3 bg-card px-6">
104	<ActivityIndicator />	104	<ActivityIndicator />
105	<Text className="text-center text-[13px] text-foreground-muted">	105	<Text className="text-center text-sm text-foreground-muted">
106	Preparing image preview...	106	Preparing image preview...
107	</Text>	107	</Text>
108	</View>	108	</View>

apps/mobile/src/features/files/WorkspaceFileWebPreview.tsx+3−5

     return (
       <View className="flex-1 items-center justify-center gap-3 bg-card px-6">
         <ActivityIndicator />
-        <Text className="text-center text-[13px] text-foreground-muted">Preparing preview...</Text>
+        <Text className="text-center text-sm text-foreground-muted">Preparing preview...</Text>
       </View>
     );
   }
       {loadProgress > 0 && loadProgress < 1 ? <LoadingStrip progress={loadProgress} /> : null}
       {loadError ? (
         <View className="border-b border-border bg-card px-4 py-2">
-          <Text className="text-[12px] font-t3-bold text-foreground">Preview failed</Text>
+          <Text className="text-xs font-t3-bold text-foreground">Preview failed</Text>
-          <Text className="mt-0.5 text-[12px] leading-[17px] text-foreground-muted">
+          <Text className="mt-0.5 text-xs leading-[17px] text-foreground-muted">{loadError}</Text>
-            {loadError}
-          </Text>
         </View>
       ) : null}
       <WebView

apps/mobile/src/features/files/nativeSourceFileAdapter.test.ts+20−0

@@ -3,10 +3,30 @@ import { describe, expect, it } from "vite-plus/test"; · 2 unmodified lines
3	import {	3	import {
4	buildNativeSourceRows,	4	buildNativeSourceRows,
5	buildNativeSourceTokens,	5	buildNativeSourceTokens,
		6	NATIVE_SOURCE_ROW_HEIGHT,
		7	NATIVE_SOURCE_STYLE,
6	nativeSourceRowId,	8	nativeSourceRowId,
7	} from "./nativeSourceFileAdapter";	9	} from "./nativeSourceFileAdapter";
		10	import {
		11	NATIVE_REVIEW_DIFF_ROW_HEIGHT,
		12	NATIVE_REVIEW_DIFF_STYLE,
		13	} from "../review/nativeReviewDiffAdapter";
8		14
9	describe("nativeSourceFileAdapter", () => {	15	describe("nativeSourceFileAdapter", () => {
		16	it("uses the same compact code typography as the diff viewer", () => {
		17	expect(NATIVE_SOURCE_ROW_HEIGHT).toBe(NATIVE_REVIEW_DIFF_ROW_HEIGHT);
		18	expect(NATIVE_SOURCE_STYLE).toMatchObject({
		19	rowHeight: NATIVE_REVIEW_DIFF_STYLE.rowHeight,
		20	gutterWidth: NATIVE_REVIEW_DIFF_STYLE.gutterWidth,
		21	codePadding: NATIVE_REVIEW_DIFF_STYLE.codePadding,
		22	textVerticalInset: NATIVE_REVIEW_DIFF_STYLE.textVerticalInset,
		23	codeFontSize: NATIVE_REVIEW_DIFF_STYLE.codeFontSize,
		24	codeFontWeight: NATIVE_REVIEW_DIFF_STYLE.codeFontWeight,
		25	lineNumberFontSize: NATIVE_REVIEW_DIFF_STYLE.lineNumberFontSize,
		26	lineNumberFontWeight: NATIVE_REVIEW_DIFF_STYLE.lineNumberFontWeight,
		27	});
		28	});
		29
10	it("maps plain source lines onto context rows with stable line numbers", () => {	30	it("maps plain source lines onto context rows with stable line numbers", () => {
11	expect(buildNativeSourceRows(["const value = 1;", "\treturn value;"])).toEqual([	31	expect(buildNativeSourceRows(["const value = 1;", "\treturn value;"])).toEqual([
12	{	32	{

apps/mobile/src/features/files/nativeSourceFileAdapter.ts+10−8

   NativeReviewDiffStyle,
   NativeReviewDiffToken,
 } from "../diffs/nativeReviewDiffSurface";
+import { MOBILE_CODE_SURFACE, MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import type { SourceHighlightTokens } from "./sourceHighlightingState";
-export const NATIVE_SOURCE_ROW_HEIGHT = 24;
+export const NATIVE_SOURCE_ROW_HEIGHT = MOBILE_CODE_SURFACE.rowHeight;
 export const NATIVE_SOURCE_CONTENT_WIDTH = 32_000;
 export const NATIVE_SOURCE_STYLE: NativeReviewDiffStyle = {
   rowHeight: NATIVE_SOURCE_ROW_HEIGHT,
   contentWidth: NATIVE_SOURCE_CONTENT_WIDTH,
   changeBarWidth: 0,
-  gutterWidth: 58,
+  gutterWidth: MOBILE_CODE_SURFACE.gutterWidth,
-  codePadding: 8,
+  codePadding: MOBILE_CODE_SURFACE.codePadding,
-  codeFontSize: 13,
+  textVerticalInset: MOBILE_CODE_SURFACE.textVerticalInset,
-  codeFontWeight: "medium",
+  codeFontSize: MOBILE_CODE_SURFACE.fontSize,
-  lineNumberFontSize: 11,
+  codeFontWeight: "regular",
-  lineNumberFontWeight: "medium",
+  lineNumberFontSize: MOBILE_CODE_SURFACE.lineNumberFontSize,
-  emptyStateFontSize: 12,
+  lineNumberFontWeight: "regular",
+  emptyStateFontSize: MOBILE_TYPOGRAPHY.label.fontSize,
   emptyStateFontWeight: "medium",
 };

apps/mobile/src/features/home/HomeHeader.tsx+3−2

 import { Text as RNText, View } from "react-native";
 import { useThemeColor } from "../../lib/useThemeColor";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import type { HomeProjectSortOrder } from "./homeThreadList";
 export interface HomeHeaderEnvironment {
             <RNText
               style={{
                 fontFamily: "DMSans_700Bold",
-                fontSize: 17,
+                fontSize: MOBILE_TYPOGRAPHY.headline.fontSize,
                 color: iconColor,
                 letterSpacing: -0.4,
               }}
               <RNText
                 style={{
                   fontFamily: "DMSans_700Bold",
-                  fontSize: 10,
+                  fontSize: MOBILE_TYPOGRAPHY.micro.fontSize,
                   color: mutedColor,
                   letterSpacing: 1.1,
                   textTransform: "uppercase",

apps/mobile/src/features/home/HomeScreen.tsx+7−7

@@ -186,7 +186,7 @@ function ProjectGroupLabel(props: { · 185 unmodified lines
186	workspaceRoot={props.project.workspaceRoot}	186	workspaceRoot={props.project.workspaceRoot}
187	/>	187	/>
188	<Text	188	<Text
189	className="flex-1 text-[12px] font-t3-medium uppercase text-foreground-muted"	189	className="flex-1 text-xs font-t3-medium uppercase text-foreground-muted"
190	style={{ letterSpacing: 0.5 }}	190	style={{ letterSpacing: 0.5 }}
191	numberOfLines={1}	191	numberOfLines={1}
192	>	192	>
@@ -196,7 +196,7 @@ function ProjectGroupLabel(props: { · 3 unmodified lines
196	{hiddenCount > 0 ? (	196	{hiddenCount > 0 ? (
197	<Pressable onPress={props.onToggleExpand} hitSlop={8}>	197	<Pressable onPress={props.onToggleExpand} hitSlop={8}>
198	<Text	198	<Text
199	className="text-[12px] font-t3-medium text-foreground-muted"	199	className="text-xs font-t3-medium text-foreground-muted"
200	style={{ letterSpacing: 0.4 }}	200	style={{ letterSpacing: 0.4 }}
201	>	201	>
202	{props.isExpanded ? "Show less" : `${hiddenCount} more`}	202	{props.isExpanded ? "Show less" : `${hiddenCount} more`}
@@ -335,7 +335,7 @@ function ThreadRow(props: { · 132 unmodified lines
335	<View style={{ flex: 1, gap: 3 }}>	335	<View style={{ flex: 1, gap: 3 }}>
336	<View className="flex-row items-center justify-between gap-2">	336	<View className="flex-row items-center justify-between gap-2">
337	<Text	337	<Text
338	className="flex-1 text-[15px] font-t3-bold leading-[20px] text-foreground"	338	className="flex-1 text-base font-t3-bold leading-[20px] text-foreground"
339	numberOfLines={1}	339	numberOfLines={1}
340	>	340	>
341	{props.thread.title}	341	{props.thread.title}
@@ -345,12 +345,12 @@ function ThreadRow(props: { · 3 unmodified lines
345	className={tone.pillClassName}	345	className={tone.pillClassName}
346	style={{ borderRadius: 99, paddingHorizontal: 6, paddingVertical: 2 }}	346	style={{ borderRadius: 99, paddingHorizontal: 6, paddingVertical: 2 }}
347	>	347	>
348	<Text className={`text-[10px] font-t3-bold ${tone.textClassName}`}>	348	<Text className={`text-3xs font-t3-bold ${tone.textClassName}`}>
349	{tone.label}	349	{tone.label}
350	</Text>	350	</Text>
351	</View>	351	</View>
352	<Text	352	<Text
353	className="text-[12px] text-foreground-tertiary"	353	className="text-xs text-foreground-tertiary"
354	style={{ fontVariant: ["tabular-nums"] }}	354	style={{ fontVariant: ["tabular-nums"] }}
355	>	355	>
356	{timestamp}	356	{timestamp}
@@ -367,7 +367,7 @@ function ThreadRow(props: { · 10 unmodified lines
367	type="monochrome"	367	type="monochrome"
368	/>	368	/>
369	<Text	369	<Text
370	className="text-[11px] text-foreground-tertiary"	370	className="text-2xs text-foreground-tertiary"
371	numberOfLines={1}	371	numberOfLines={1}
372	style={{ fontFamily: "monospace" }}	372	style={{ fontFamily: "monospace" }}
373	>	373	>
@@ -429,7 +429,7 @@ function StaleCatalogStatusPill(props: { · 55 unmodified lines
429	weight="semibold"	429	weight="semibold"
430	/>	430	/>
431	)}	431	)}
432	<Text className="max-w-[260px] text-[13px] font-t3-bold text-foreground" numberOfLines={1}>	432	<Text className="max-w-[260px] text-sm font-t3-bold text-foreground" numberOfLines={1}>
433	{label}	433	{label}
434	</Text>	434	</Text>
435	</Pressable>	435	</Pressable>

apps/mobile/src/features/home/thread-swipe-actions.tsx+1−1

@@ -167,7 +167,7 @@ function SwipeActionButton(props: { · 166 unmodified lines
167	</Animated.View>	167	</Animated.View>
168	</View>	168	</View>
169	<Animated.View style={[{ paddingTop: 2 }, labelStyle]}>	169	<Animated.View style={[{ paddingTop: 2 }, labelStyle]}>
170	<Text className="text-[10px] font-t3-medium text-foreground-muted">{props.label}</Text>	170	<Text className="text-3xs font-t3-medium text-foreground-muted">{props.label}</Text>
171	</Animated.View>	171	</Animated.View>
172	</Pressable>	172	</Pressable>
173	</Animated.View>	173	</Animated.View>

apps/mobile/src/features/projects/AddProjectScreen.tsx+11−11

@@ -100,7 +100,7 @@ function sourceFromParam(value: string \| string[] \| undefined): AddProjectRemote · 99 unmodified lines
100	function SectionTitle(props: { readonly children: string }) {	100	function SectionTitle(props: { readonly children: string }) {
101	return (	101	return (
102	<Text	102	<Text
103	className="px-1 text-[11px] font-t3-bold uppercase text-foreground-muted"	103	className="px-1 text-2xs font-t3-bold uppercase text-foreground-muted"
104	style={{ letterSpacing: 0.7 }}	104	style={{ letterSpacing: 0.7 }}
105	>	105	>
106	{props.children}	106	{props.children}
@@ -168,9 +168,9 @@ function ListRow(props: { · 61 unmodified lines
168	{props.icon}	168	{props.icon}
169	</View>	169	</View>
170	<View className="flex-1 gap-0.5">	170	<View className="flex-1 gap-0.5">
171	<Text className="text-[16px] leading-[21px] font-t3-bold">{props.title}</Text>	171	<Text className="text-base leading-[21px] font-t3-bold">{props.title}</Text>
172	{props.subtitle ? (	172	{props.subtitle ? (
173	<Text className="text-[13px] leading-[17px] text-foreground-muted" numberOfLines={2}>	173	<Text className="text-sm leading-[17px] text-foreground-muted" numberOfLines={2}>
174	{props.subtitle}	174	{props.subtitle}
175	</Text>	175	</Text>
176	) : null}	176	) : null}
@@ -202,7 +202,7 @@ function PrimaryActionButton(props: { · 25 unmodified lines
202	{props.loading ? (	202	{props.loading ? (
203	<ActivityIndicator color={String(primaryForeground)} />	203	<ActivityIndicator color={String(primaryForeground)} />
204	) : (	204	) : (
205	<Text className="text-[14px] font-t3-bold text-primary-foreground">{props.label}</Text>	205	<Text className="text-base font-t3-bold text-primary-foreground">{props.label}</Text>
206	)}	206	)}
207	</Pressable>	207	</Pressable>
208	);	208	);
@@ -215,7 +215,7 @@ function ProjectPathInput(props: { · 6 unmodified lines
215	}) {	215	}) {
216	return (	216	return (
217	<TextInput	217	<TextInput
218	className="h-12 min-h-12 rounded-[24px] px-4 py-0 text-[15px] leading-[20px]"	218	className="h-12 min-h-12 rounded-[24px] px-4 py-0 text-base leading-[20px]"
219	value={props.value}	219	value={props.value}
220	onChangeText={props.onChangeText}	220	onChangeText={props.onChangeText}
221	autoCapitalize="none"	221	autoCapitalize="none"
@@ -273,15 +273,15 @@ function EmptyEnvironmentState() { · 51 unmodified lines
273		273
274	return (	274	return (
275	<View className="items-center gap-3 rounded-2xl bg-card px-5 py-8">	275	<View className="items-center gap-3 rounded-2xl bg-card px-5 py-8">
276	<Text className="text-center text-[17px] font-t3-bold">No environments connected</Text>	276	<Text className="text-center text-lg font-t3-bold">No environments connected</Text>
277	<Text className="text-center text-[14px] leading-[20px] text-foreground-muted">	277	<Text className="text-center text-sm leading-[20px] text-foreground-muted">
278	Add an environment before adding a project.	278	Add an environment before adding a project.
279	</Text>	279	</Text>
280	<Pressable	280	<Pressable
281	onPress={() => router.replace("/connections/new")}	281	onPress={() => router.replace("/connections/new")}
282	className="mt-1 rounded-full bg-primary px-4 py-2.5 active:opacity-70"	282	className="mt-1 rounded-full bg-primary px-4 py-2.5 active:opacity-70"
283	>	283	>
284	<Text className="text-[13px] font-t3-bold text-primary-foreground">Add environment</Text>	284	<Text className="text-sm font-t3-bold text-primary-foreground">Add environment</Text>
285	</Pressable>	285	</Pressable>
286	</View>	286	</View>
287	);	287	);
@@ -565,7 +565,7 @@ export function AddProjectRepositoryScreen() { · 277 unmodified lines
565	<AddProjectShell>	565	<AddProjectShell>
566	{error ? <ErrorBanner message={error} /> : null}	566	{error ? <ErrorBanner message={error} /> : null}
567	<TextInput	567	<TextInput
568	className="h-12 min-h-12 rounded-[24px] px-4 py-0 text-[15px] leading-[20px]"	568	className="h-12 min-h-12 rounded-[24px] px-4 py-0 text-base leading-[20px]"
569	value={repositoryInput}	569	value={repositoryInput}
570	onChangeText={setRepositoryInput}	570	onChangeText={setRepositoryInput}
571	autoCapitalize="none"	571	autoCapitalize="none"
@@ -806,8 +806,8 @@ export function AddProjectDestinationScreen() { · 234 unmodified lines
806	{error ? <ErrorBanner message={error} /> : null}	806	{error ? <ErrorBanner message={error} /> : null}
807	{repositoryTitle ? (	807	{repositoryTitle ? (
808	<View className="rounded-[24px] bg-card px-4 py-3">	808	<View className="rounded-[24px] bg-card px-4 py-3">
809	<Text className="text-[14px] font-t3-bold">{repositoryTitle}</Text>	809	<Text className="text-base font-t3-bold">{repositoryTitle}</Text>
810	<Text className="mt-0.5 text-[12px] text-foreground-muted" numberOfLines={2}>	810	<Text className="mt-0.5 text-xs text-foreground-muted" numberOfLines={2}>
811	{remoteUrl}	811	{remoteUrl}
812	</Text>	812	</Text>
813	</View>	813	</View>

apps/mobile/src/features/review/ReviewCommentComposerSheet.tsx+8−8

@@ -159,26 +159,26 @@ export function ReviewCommentComposerSheet() { · 158 unmodified lines
159	<SymbolView name="xmark" size={18} tintColor={iconTint} type="monochrome" />	159	<SymbolView name="xmark" size={18} tintColor={iconTint} type="monochrome" />
160	</Pressable>	160	</Pressable>
161		161
162	<Text className="text-[18px] font-t3-bold text-foreground">Add Comment</Text>	162	<Text className="text-lg font-t3-bold text-foreground">Add Comment</Text>
163		163
164	<View className="h-12 w-12" />	164	<View className="h-12 w-12" />
165	</View>	165	</View>
166		166
167	{!target ? (	167	{!target ? (
168	<View className="rounded-[22px] border border-border bg-card px-4 py-5">	168	<View className="rounded-[22px] border border-border bg-card px-4 py-5">
169	<Text className="text-[15px] font-t3-bold text-foreground">No selection</Text>	169	<Text className="text-base font-t3-bold text-foreground">No selection</Text>
170	<Text className="mt-1 text-[13px] leading-[19px] text-foreground-muted">	170	<Text className="mt-1 text-sm leading-[19px] text-foreground-muted">
171	Select a diff line or range first.	171	Select a diff line or range first.
172	</Text>	172	</Text>
173	</View>	173	</View>
174	) : (	174	) : (
175	<View className="min-h-0 flex-1 gap-4">	175	<View className="min-h-0 flex-1 gap-4">
176	<View className="gap-1 px-1">	176	<View className="gap-1 px-1">
177	<Text className="text-[11px] font-t3-bold uppercase text-foreground-muted">	177	<Text className="text-2xs font-t3-bold uppercase text-foreground-muted">
178	{selectionLabel}	178	{selectionLabel}
179	</Text>	179	</Text>
180	<Text	180	<Text
181	className="font-mono text-[12px] leading-[17px] text-foreground-muted"	181	className="font-mono text-xs leading-[17px] text-foreground-muted"
182	ellipsizeMode="middle"	182	ellipsizeMode="middle"
183	numberOfLines={2}	183	numberOfLines={2}
184	>	184	>
@@ -215,7 +215,7 @@ export function ReviewCommentComposerSheet() { · 30 unmodified lines
215	>	215	>
216	<ReviewChangeBar change={line.change} />	216	<ReviewChangeBar change={line.change} />
217	<Text	217	<Text
218	className="w-9 py-1 pr-1 text-right text-[11px] font-t3-medium text-foreground-muted"	218	className="w-9 py-1 pr-1 text-right text-2xs font-t3-medium text-foreground-muted"
219	style={{ fontFamily: REVIEW_MONO_FONT_FAMILY }}	219	style={{ fontFamily: REVIEW_MONO_FONT_FAMILY }}
220	>	220	>
221	{lineNumber ?? ""}	221	{lineNumber ?? ""}
@@ -236,7 +236,7 @@ export function ReviewCommentComposerSheet() { · 14 unmodified lines
236	</View>	236	</View>
237		237
238	<View className="min-h-0 flex-1 gap-2">	238	<View className="min-h-0 flex-1 gap-2">
239	<Text className="text-[13px] font-t3-bold text-foreground">Comment</Text>	239	<Text className="text-sm font-t3-bold text-foreground">Comment</Text>
240	<View className="min-h-[132px] flex-1 overflow-hidden rounded-[20px] border border-border bg-card">	240	<View className="min-h-[132px] flex-1 overflow-hidden rounded-[20px] border border-border bg-card">
241	<View className="min-h-0 flex-1 px-4 pt-3.5">	241	<View className="min-h-0 flex-1 px-4 pt-3.5">
242	<TextInputWrapper onPaste={handleNativePaste} style={{ flex: 1, minHeight: 0 }}>	242	<TextInputWrapper onPaste={handleNativePaste} style={{ flex: 1, minHeight: 0 }}>
@@ -248,7 +248,7 @@ export function ReviewCommentComposerSheet() { · 5 unmodified lines
248	textAlignVertical="top"	248	textAlignVertical="top"
249	value={commentText}	249	value={commentText}
250	onChangeText={setCommentText}	250	onChangeText={setCommentText}
251	className="h-full flex-1 border-0 bg-transparent px-0 py-0 font-sans text-[15px]"	251	className="h-full flex-1 border-0 bg-transparent px-0 py-0 font-sans text-base"
252	style={{ flex: 1, minHeight: 0 }}	252	style={{ flex: 1, minHeight: 0 }}
253	/>	253	/>
254	</TextInputWrapper>	254	</TextInputWrapper>

apps/mobile/src/features/review/ReviewSheet.tsx+19−18

 import { useEnvironmentPresentation } from "../../state/presentation";
 import { useAtomCommand } from "../../state/use-atom-command";
 import { useThemeColor } from "../../lib/useThemeColor";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import { useThreadDraftForThread } from "../../state/use-thread-composer-state";
 import { EnvironmentConnectionNotice } from "../connection/EnvironmentConnectionNotice";
 import { useReviewCacheForThread } from "./reviewState";
 const ReviewNotice = memo(function ReviewNotice(props: { readonly notice: string }) {
   return (
     <View className="border-b border-amber-200 bg-amber-50 px-4 py-3 dark:border-amber-900/60 dark:bg-amber-950/40">
-      <Text className="text-[12px] font-t3-bold uppercase text-amber-700 dark:text-amber-300">
+      <Text className="text-xs font-t3-bold uppercase text-amber-700 dark:text-amber-300">
         Partial diff
       </Text>
-      <Text className="text-[12px] leading-[18px] text-amber-800 dark:text-amber-200">
+      <Text className="text-xs leading-[18px] text-amber-800 dark:text-amber-200">
         {props.notice}
       </Text>
     </View>
         tintColor="#ffffff"
         type="monochrome"
       />
-      <Text className="text-[15px] font-t3-bold text-white">{props.title}</Text>
+      <Text className="text-base font-t3-bold text-white">{props.title}</Text>
     </>
   );
     if (error) {
       children.push(
         <View key="review-error" className="border-b border-border bg-card px-4 py-3">
-          <Text className="text-[13px] font-t3-bold text-foreground">Review unavailable</Text>
+          <Text className="text-sm font-t3-bold text-foreground">Review unavailable</Text>
-          <Text className="text-[12px] leading-[18px] text-foreground-muted">{error}</Text>
+          <Text className="text-xs leading-[18px] text-foreground-muted">{error}</Text>
         </View>,
       );
     }
                 numberOfLines={1}
                 style={{
                   fontFamily: "DMSans_700Bold",
-                  fontSize: 18,
+                  fontSize: MOBILE_TYPOGRAPHY.headline.fontSize,
                   fontWeight: "900",
                   color: headerForeground,
                   letterSpacing: -0.4,
                     <NativeText
                       style={{
                         fontFamily: "DMSans_700Bold",
-                        fontSize: 12,
+                        fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
                         fontWeight: "700",
                         color: "#16a34a",
                       }}
                     <NativeText
                       style={{
                         fontFamily: "DMSans_700Bold",
-                        fontSize: 12,
+                        fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
                         fontWeight: "700",
                         color: "#e11d48",
                       }}
                       <NativeText
                         style={{
                           fontFamily: "DMSans_700Bold",
-                          fontSize: 12,
+                          fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
                           fontWeight: "700",
                           color: "#b45309",
                         }}
                       numberOfLines={1}
                       style={{
                         fontFamily: "DMSans_700Bold",
-                        fontSize: 12,
+                        fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
                         fontWeight: "700",
                         color: headerMuted,
                       }}
                       <NativeText
                         style={{
                           fontFamily: "DMSans_700Bold",
-                          fontSize: 12,
+                          fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
                           fontWeight: "700",
                           color: "#b45309",
                         }}
             {listHeader}
             {!selectedSection ? (
               <View className="border-b border-border bg-card px-4 py-5">
-                <Text className="text-[14px] font-t3-bold text-foreground">No review diffs</Text>
+                <Text className="text-sm font-t3-bold text-foreground">No review diffs</Text>
-                <Text className="text-[12px] leading-[18px] text-foreground-muted">
+                <Text className="text-xs leading-[18px] text-foreground-muted">
                   This thread has no ready turn diffs and the worktree diff is empty.
                 </Text>
               </View>
             ) : selectedSection.isLoading && selectedSection.diff === null ? (
               <View className="items-center gap-3 border-b border-border bg-card px-4 py-6">
                 <ActivityIndicator size="small" />
-                <Text className="text-[12px] text-foreground-muted">Loading diff…</Text>
+                <Text className="text-xs text-foreground-muted">Loading diff…</Text>
               </View>
             ) : parsedDiff.kind === "empty" ? (
               <View className="border-b border-border bg-card px-4 py-5">
-                <Text className="text-[14px] font-t3-bold text-foreground">No changes</Text>
+                <Text className="text-sm font-t3-bold text-foreground">No changes</Text>
-                <Text className="text-[12px] leading-[18px] text-foreground-muted">
+                <Text className="text-xs leading-[18px] text-foreground-muted">
                   {selectedSection.subtitle ?? "This diff is empty."}
                 </Text>
               </View>
             ) : parsedDiff.kind === "raw" ? (
               <View className="gap-3 border-b border-border bg-card px-4 py-4">
-                <Text className="text-[12px] leading-[18px] text-foreground-muted">
+                <Text className="text-xs leading-[18px] text-foreground-muted">
                   {parsedDiff.reason}
                 </Text>
                 <ScrollView horizontal showsHorizontalScrollIndicator={false} bounces={false}>
-                  <Text selectable className="font-mono text-[12px] leading-[19px] text-foreground">
+                  <Text selectable className="font-mono text-xs leading-[19px] text-foreground">
                     {parsedDiff.text}
                   </Text>
                 </ScrollView>

apps/mobile/src/features/review/nativeReviewDiffAdapter.ts+7−6

 } from "../diffs/nativeReviewDiffTypes";
 import * as Arr from "effect/Array";
 import { pipe } from "effect/Function";
+import { MOBILE_CODE_SURFACE } from "../../lib/typography";
 import { getPierreTerminalTheme, type TerminalAppearanceScheme } from "../terminal/terminalTheme";
 import { computeWordAltDiffRanges } from "./reviewWordDiffs";
 import {
 const NATIVE_REVIEW_MAX_WORD_DIFF_RANGE_COUNT = 4;
 const NATIVE_REVIEW_MAX_WORD_DIFF_COVERAGE = 0.45;
-export const NATIVE_REVIEW_DIFF_ROW_HEIGHT = 20;
+export const NATIVE_REVIEW_DIFF_ROW_HEIGHT = MOBILE_CODE_SURFACE.rowHeight;
 export const NATIVE_REVIEW_DIFF_CONTENT_WIDTH = 2_800;
 export const NATIVE_REVIEW_DIFF_STYLE = {
   rowHeight: NATIVE_REVIEW_DIFF_ROW_HEIGHT,
   contentWidth: NATIVE_REVIEW_DIFF_CONTENT_WIDTH,
   changeBarWidth: 4,
-  gutterWidth: 46,
+  gutterWidth: MOBILE_CODE_SURFACE.gutterWidth,
-  codePadding: 7,
+  codePadding: MOBILE_CODE_SURFACE.codePadding,
-  textVerticalInset: 2,
+  textVerticalInset: MOBILE_CODE_SURFACE.textVerticalInset,
   fileHeaderHeight: 56,
   fileHeaderHorizontalMargin: 8,
   fileHeaderVerticalMargin: 6,
   fileHeaderPathRightPadding: 118,
   fileHeaderCountColumnWidth: 38,
   fileHeaderCountGap: 5,
-  codeFontSize: 11,
+  codeFontSize: MOBILE_CODE_SURFACE.fontSize,
   codeFontWeight: "regular",
-  lineNumberFontSize: 10,
+  lineNumberFontSize: MOBILE_CODE_SURFACE.lineNumberFontSize,
   lineNumberFontWeight: "regular",
   hunkFontSize: 11,
   hunkFontWeight: "medium",

apps/mobile/src/features/review/reviewDiffRendering.tsx+14−5

 import { Platform, Text as NativeText, View } from "react-native";
 import { cn } from "../../lib/cn";
+import { MOBILE_CODE_SURFACE } from "../../lib/typography";
 import type { ReviewRenderableLineRow } from "./reviewModel";
 import type { ReviewHighlightedToken } from "./shikiReviewHighlighter";
   default: "monospace",
 });
-export const REVIEW_DIFF_LINE_HEIGHT = 26;
+export const REVIEW_DIFF_LINE_HEIGHT = MOBILE_CODE_SURFACE.rowHeight;
 const REVIEW_DELETE_STRIPE_COUNT = REVIEW_DIFF_LINE_HEIGHT / 2;
 export function renderVisibleWhitespace(value: string): string {
       <NativeText
         numberOfLines={1}
         selectable
-        className={cn("text-[13px] leading-[17px] font-medium text-foreground", props.className)}
+        className={cn("font-normal text-foreground", props.className)}
-        style={{ fontFamily: REVIEW_MONO_FONT_FAMILY }}
+        style={{
+          fontFamily: REVIEW_MONO_FONT_FAMILY,
+          fontSize: MOBILE_CODE_SURFACE.fontSize,
+          lineHeight: MOBILE_CODE_SURFACE.rowHeight,
+        }}
       >
         {renderVisibleWhitespace(props.fallback || " ")}
       </NativeText>
     <NativeText
       numberOfLines={1}
       selectable
-      className={cn("text-[13px] leading-[17px] font-medium text-foreground", props.className)}
+      className={cn("font-normal text-foreground", props.className)}
-      style={{ fontFamily: REVIEW_MONO_FONT_FAMILY }}
+      style={{
+        fontFamily: REVIEW_MONO_FONT_FAMILY,
+        fontSize: MOBILE_CODE_SURFACE.fontSize,
+        lineHeight: MOBILE_CODE_SURFACE.rowHeight,
+      }}
     >
       {(() => {
         let offset = 0;

apps/mobile/src/features/terminal/NativeTerminalSurface.tsx+6−5

 } from "react-native";
 import { AppText as Text } from "../../components/AppText";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import { resolveNativeTerminalSurfaceView } from "./nativeTerminalModule";
 import {
   buildGhosttyThemeConfig,
 }
 const FallbackTerminalSurface = memo(function FallbackTerminalSurface(props: TerminalSurfaceProps) {
-  const fontSize = props.fontSize ?? 12;
+  const fontSize = props.fontSize ?? MOBILE_TYPOGRAPHY.label.fontSize;
   const inputRef = useRef<TextInput>(null);
   const appearanceScheme = useColorScheme() === "light" ? "light" : "dark";
   const theme = props.theme ?? getPierreTerminalTheme(appearanceScheme);
         <Text
           style={{
             color: theme.mutedForeground,
-            fontSize: 11,
+            fontSize: MOBILE_TYPOGRAPHY.caption.fontSize,
             paddingBottom: 8,
           }}
         >
             color: theme.foreground,
             flex: 1,
             fontFamily: "Menlo",
-            fontSize: 13,
+            fontSize: MOBILE_TYPOGRAPHY.footnote.fontSize,
             padding: 0,
           }}
           onSubmitEditing={(event) => {
             style={{
               color: theme.foreground,
               fontFamily: "DMSans_700Bold",
-              fontSize: 11,
+              fontSize: MOBILE_TYPOGRAPHY.caption.fontSize,
             }}
           >
             Ctrl-C
 });
 export const TerminalSurface = memo(function TerminalSurface(props: TerminalSurfaceProps) {
-  const fontSize = props.fontSize ?? 12;
+  const fontSize = props.fontSize ?? MOBILE_TYPOGRAPHY.label.fontSize;
   const keyboardInputRef = useRef<TextInput>(null);
   const appearanceScheme = useColorScheme() === "light" ? "light" : "dark";
   const theme = props.theme ?? getPierreTerminalTheme(appearanceScheme);

apps/mobile/src/features/terminal/ThreadTerminalPanel.tsx+3−3

@@ -127,16 +127,16 @@ export const ThreadTerminalPanel = memo(function ThreadTerminalPanel( · 126 unmodified lines
127	<View className="absolute inset-x-3 bottom-28 top-28 overflow-hidden rounded-[8px] border border-white/10 bg-neutral-950 shadow-2xl">	127	<View className="absolute inset-x-3 bottom-28 top-28 overflow-hidden rounded-[8px] border border-white/10 bg-neutral-950 shadow-2xl">
128	<View className="flex-row items-center justify-between border-b border-white/10 px-3 py-2">	128	<View className="flex-row items-center justify-between border-b border-white/10 px-3 py-2">
129	<View className="min-w-0 flex-1">	129	<View className="min-w-0 flex-1">
130	<Text className="font-t3-bold text-[13px] text-neutral-100" numberOfLines={1}>	130	<Text className="font-t3-bold text-sm text-neutral-100" numberOfLines={1}>
131	Terminal	131	Terminal
132	</Text>	132	</Text>
133	<Text className="text-[11px] text-neutral-500" numberOfLines={1}>	133	<Text className="text-2xs text-neutral-500" numberOfLines={1}>
134	{nativeTerminalAvailable ? "Native Ghostty surface" : "Text fallback active"}	134	{nativeTerminalAvailable ? "Native Ghostty surface" : "Text fallback active"}
135	</Text>	135	</Text>
136	</View>	136	</View>
137	<View className="flex-row items-center gap-2">	137	<View className="flex-row items-center gap-2">
138	{terminal.error ? (	138	{terminal.error ? (
139	<Text className="max-w-44 text-right text-[11px] text-red-300" numberOfLines={1}>	139	<Text className="max-w-44 text-right text-2xs text-red-300" numberOfLines={1}>
140	{terminal.error}	140	{terminal.error}
141	</Text>	141	</Text>
142	) : null}	142	) : null}

apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx+3−2

 import { useAtomCommand } from "../../state/use-atom-command";
 import { useWorkspaceState } from "../../state/workspace";
 import { buildThreadTerminalNavigation } from "../../lib/routes";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import {
   useAttachedTerminalSession,
   useKnownTerminalSessions,
                 style={{
                   color: terminalTheme.foreground,
                   fontFamily: "DMSans_700Bold",
-                  fontSize: 13,
+                  fontSize: MOBILE_TYPOGRAPHY.footnote.fontSize,
                   lineHeight: 16,
                 }}
               >
                 style={{
                   color: terminalTheme.mutedForeground,
                   fontFamily: "Menlo",
-                  fontSize: 11,
+                  fontSize: MOBILE_TYPOGRAPHY.caption.fontSize,
                   lineHeight: 14,
                 }}
               >

apps/mobile/src/features/threads/ComposerCommandPopover.tsx+13−4

 import { AppText as Text } from "../../components/AppText";
 import { PierreEntryIcon } from "../../components/PierreEntryIcon";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 export type ComposerCommandItem =
   | {
         <SymbolView name={iconName} size={14} tintColor={iconColor} type="monochrome" />
       ) : null}
       <Text
-        className="text-[14px] font-t3-medium text-foreground"
+        className="text-base font-t3-medium text-foreground"
         numberOfLines={1}
         style={{ flexShrink: 0 }}
       >
         {props.item.label}
       </Text>
       {props.item.description ? (
-        <Text numberOfLines={1} style={{ flex: 1, minWidth: 0, fontSize: 12, color: "#a1a1aa" }}>
+        <Text
+          numberOfLines={1}
+          style={{
+            flex: 1,
+            minWidth: 0,
+            fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
+            color: "#a1a1aa",
+          }}
+        >
           {props.item.description}
         </Text>
       ) : null}
       {label ? (
         <View style={{ paddingHorizontal: 14, paddingTop: 10, paddingBottom: 4 }}>
           <Text
-            className="text-[10px] font-t3-bold text-foreground-muted"
+            className="text-3xs font-t3-bold text-foreground-muted"
             style={{ letterSpacing: 0.8, textTransform: "uppercase" }}
           >
             {label}
         </ScrollView>
       ) : (
         <View style={{ paddingHorizontal: 14, paddingVertical: 10 }}>
-          <Text className="text-[12px] text-foreground-tertiary">
+          <Text className="text-xs text-foreground-tertiary">
             {emptyText(props.triggerKind, props.isLoading)}
           </Text>
         </View>

apps/mobile/src/features/threads/GitActionProgressOverlay.tsx+2−2

@@ -73,12 +73,12 @@ function OverlayContent(props: { readonly progress: GitActionProgress }) { · 72 unmodified lines
73		73
74	<View className="flex-1 gap-0.5">	74	<View className="flex-1 gap-0.5">
75	{progress.label ? (	75	{progress.label ? (
76	<Text className="text-[13px] font-t3-bold text-foreground" numberOfLines={1}>	76	<Text className="text-sm font-t3-bold text-foreground" numberOfLines={1}>
77	{progress.label}	77	{progress.label}
78	</Text>	78	</Text>
79	) : null}	79	) : null}
80	{progress.description ? (	80	{progress.description ? (
81	<Text className="text-[11px] text-foreground-muted" numberOfLines={1}>	81	<Text className="text-2xs text-foreground-muted" numberOfLines={1}>
82	{progress.description}	82	{progress.description}
83	</Text>	83	</Text>
84	) : null}	84	) : null}

apps/mobile/src/features/threads/NewTaskDraftScreen.tsx+2−1

   resolveProviderOptionDescriptors,
 } from "../../lib/providerOptions";
 import { buildThreadRoutePath } from "../../lib/routes";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import { useProjects } from "../../state/entities";
 import { branchBadgeLabel, useNewTaskFlow } from "./new-task-flow-provider";
 import { useCreateProjectThread } from "./use-project-actions";
             onPasteImages={(uris) => void handleNativePasteImages(uris)}
             placeholder={`Describe a coding task in ${selectedProject.title}`}
             style={{ flex: 1, minHeight: 0 }}
-            textStyle={{ fontSize: 18, lineHeight: 28 }}
+            textStyle={MOBILE_TYPOGRAPHY.composer}
           />
         </View>

apps/mobile/src/features/threads/PendingApprovalCard.tsx+1−1

@@ -16,7 +16,7 @@ export interface PendingApprovalCardProps { · 15 unmodified lines
16	export function PendingApprovalCard(props: PendingApprovalCardProps) {	16	export function PendingApprovalCard(props: PendingApprovalCardProps) {
17	return (	17	return (
18	<View className="gap-2.5 rounded-[20px] border border-neutral-200 bg-neutral-100/80 p-4 dark:border-white/6 dark:bg-neutral-900/80">	18	<View className="gap-2.5 rounded-[20px] border border-neutral-200 bg-neutral-100/80 p-4 dark:border-white/6 dark:bg-neutral-900/80">
19	<Text className="font-t3-bold text-[11px] uppercase tracking-[1.1px] text-sky-700 dark:text-sky-300">	19	<Text className="font-t3-bold text-2xs uppercase tracking-[1.1px] text-sky-700 dark:text-sky-300">
20	Approval needed	20	Approval needed
21	</Text>	21	</Text>
22	<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">	22	<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">

apps/mobile/src/features/threads/PendingUserInputCard.tsx+4−4

@@ -26,7 +26,7 @@ export interface PendingUserInputCardProps { · 25 unmodified lines
26	export function PendingUserInputCard(props: PendingUserInputCardProps) {	26	export function PendingUserInputCard(props: PendingUserInputCardProps) {
27	return (	27	return (
28	<View className="gap-2.5 rounded-[20px] border border-neutral-200 bg-neutral-100/80 p-4 dark:border-white/6 dark:bg-neutral-900/80">	28	<View className="gap-2.5 rounded-[20px] border border-neutral-200 bg-neutral-100/80 p-4 dark:border-white/6 dark:bg-neutral-900/80">
29	<Text className="font-t3-bold text-[11px] uppercase tracking-[1.1px] text-sky-700 dark:text-sky-300">	29	<Text className="font-t3-bold text-2xs uppercase tracking-[1.1px] text-sky-700 dark:text-sky-300">
30	User input needed	30	User input needed
31	</Text>	31	</Text>
32	<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">	32	<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
@@ -39,7 +39,7 @@ export function PendingUserInputCard(props: PendingUserInputCardProps) { · 6 unmodified lines
39	<Text className="font-t3-bold text-xs uppercase tracking-[1px] text-neutral-500 dark:text-neutral-500">	39	<Text className="font-t3-bold text-xs uppercase tracking-[1px] text-neutral-500 dark:text-neutral-500">
40	{question.header}	40	{question.header}
41	</Text>	41	</Text>
42	<Text className="font-sans text-[15px] leading-[21px] text-neutral-950 dark:text-neutral-50">	42	<Text className="font-sans text-base leading-[21px] text-neutral-950 dark:text-neutral-50">
43	{question.question}	43	{question.question}
44	</Text>	44	</Text>
45	<View className="flex-row flex-wrap gap-2.5">	45	<View className="flex-row flex-wrap gap-2.5">
@@ -65,7 +65,7 @@ export function PendingUserInputCard(props: PendingUserInputCardProps) { · 19 unmodified lines
65	>	65	>
66	<Text	66	<Text
67	className={cn(	67	className={cn(
68	"font-t3-bold text-[13px]",	68	"font-t3-bold text-sm",
69	selected	69	selected
70	? "text-sky-700 dark:text-sky-300"	70	? "text-sky-700 dark:text-sky-300"
71	: "text-neutral-600 dark:text-neutral-300",	71	: "text-neutral-600 dark:text-neutral-300",
@@ -83,7 +83,7 @@ export function PendingUserInputCard(props: PendingUserInputCardProps) { · 11 unmodified lines
83	props.onChangeCustomAnswer(props.pendingUserInput.requestId, question.id, value)	83	props.onChangeCustomAnswer(props.pendingUserInput.requestId, question.id, value)
84	}	84	}
85	placeholder="Or type a custom answer"	85	placeholder="Or type a custom answer"
86	className="min-h-[54px] rounded-2xl border border-neutral-200 bg-white px-3.5 py-3 font-sans text-[15px] text-neutral-950 dark:border-white/8 dark:bg-neutral-950/70 dark:text-neutral-50"	86	className="min-h-[54px] rounded-2xl border border-neutral-200 bg-white px-3.5 py-3 font-sans text-base text-neutral-950 dark:border-white/8 dark:bg-neutral-950/70 dark:text-neutral-50"
87	/>	87	/>
88	</View>	88	</View>
89	);	89	);

apps/mobile/src/features/threads/ThreadComposer.tsx+5−6

 import { ProviderIcon } from "../../components/ProviderIcon";
 import type { DraftComposerImageAttachment } from "../../lib/composerImages";
 import { buildModelOptions, groupByProvider } from "../../lib/modelOptions";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import type { RemoteClientConnectionState } from "../../lib/connection";
 import {
   insertRankedSearchResult,
           <View className="h-2 w-2 rounded-full bg-red-500" />
         )}
         <Text
-          className="max-w-[260px] text-[13px] font-t3-bold leading-[17px] text-foreground"
+          className="max-w-[260px] text-sm font-t3-bold leading-[17px] text-foreground"
           numberOfLines={1}
         >
           {props.status.label}
                     }
               }
               textStyle={{
-                fontSize: 15,
+                ...MOBILE_TYPOGRAPHY.composer,
-                lineHeight: isExpanded ? 22 : 20,
                 color: foregroundColor,
                 fontFamily: "DMSans_400Regular",
               }}
                     justifyContent: "center",
                   }}
                 >
-                  <Text className="text-foreground-muted text-[11px] font-t3-bold">
+                  <Text className="text-foreground-muted text-2xs font-t3-bold">
                     +{props.draftAttachments.length - 3}
                   </Text>
                 </View>
           <Text
             className="text-foreground-muted"
             style={{
-              fontSize: 12,
+              ...MOBILE_TYPOGRAPHY.label,
-              lineHeight: 18,
               paddingTop: 8,
             }}
           >

apps/mobile/src/features/threads/ThreadFeed.tsx+12−14

 import { cn } from "../../lib/cn";
 import type { LayoutVariant } from "../../lib/layout";
 import { buildThreadFilesNavigation } from "../../lib/routes";
+import { MOBILE_CODE_SURFACE, MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import { markdownFileIconSource } from "@t3tools/mobile-markdown-text/file-icons";
 import { resolveMarkdownLinkPresentation } from "@t3tools/mobile-markdown-text/links";
 import {
                     marginRight: 5,
                     color: inlineTextColor,
                     fontFamily: "DMSans_400Regular",
-                    fontSize: 15,
+                    ...MOBILE_TYPOGRAPHY.body,
-                    lineHeight: 22,
                     textAlign: ordered ? "right" : "center",
                   }}
                 >
             style={{
               color: inlineCodeTextColor,
               fontFamily: "ui-monospace",
-              fontSize: 12,
+              fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
               lineHeight: 22,
             }}
           >
                 style={{
                   color: markdownBodyColor,
                   fontFamily: "ui-monospace",
-                  fontSize: 12,
+                  fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
                   opacity: 0.7,
                   textTransform: "uppercase",
                 }}
               style={{
                 color: blockTextColor,
                 fontFamily: "ui-monospace",
-                fontSize: 12,
+                fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
                 lineHeight: 18,
               }}
             >
           skillTextColor: "#f0abfc",
           quoteMarkerColor: markdownUserBodyColor,
           dividerColor: markdownUserBodyColor,
-          fontSize: 15,
+          ...MOBILE_TYPOGRAPHY.body,
-          lineHeight: 22,
           fontFamily: "DMSans_400Regular",
           headingFontFamily: "DMSans_700Bold",
           boldFontFamily: "DMSans_700Bold",
           skillTextColor: inlineSkillForeground,
           quoteMarkerColor: markdownBlockquoteBorder,
           dividerColor: markdownHrColor,
-          fontSize: 15,
+          ...MOBILE_TYPOGRAPHY.body,
-          lineHeight: 22,
           fontFamily: "DMSans_400Regular",
           headingFontFamily: "DMSans_700Bold",
           boldFontFamily: "DMSans_700Bold",
           className="max-w-[85%] gap-2 rounded-[22px] rounded-br-[6px] px-3.5 py-2.5 opacity-60"
           style={{ backgroundColor: userBubbleColor }}
         >
-          <Text className="font-sans text-[15px] leading-[22px] text-white">
+          <Text className="font-sans text-base leading-[22px] text-white">
             {entry.queuedMessage.text}
           </Text>
           {entry.queuedMessage.attachments.length > 0 ? (
         </View>
         <View className="min-w-0 flex-1">
           <Text
-            className="font-mono text-[12px] leading-[16px]"
+            className="font-mono text-xs leading-[16px]"
             numberOfLines={1}
             style={{ color: props.colors.text }}
           >
             style={{
               color: props.colors.text,
               fontFamily: "ui-monospace",
-              fontSize: 12,
+              fontSize: MOBILE_CODE_SURFACE.fontSize,
-              lineHeight: 18,
+              lineHeight: MOBILE_CODE_SURFACE.rowHeight,
             }}
           >
             {props.comment.diff.trim()}
         <View className="border-t px-3 py-3" style={{ borderColor: props.colors.border }}>
           <Text
             selectable
-            className="text-[15px] leading-[21px]"
+            className="text-base leading-[21px]"
             style={{ color: props.colors.text }}
           >
             {props.comment.text}

apps/mobile/src/features/threads/ThreadNavigationDrawer.tsx+5−7

             ]}
           >
             <View className="flex-row items-center justify-between px-4 pb-5">
-              <Text className="text-[26px] font-t3-bold">Threads</Text>
+              <Text className="text-2xl font-t3-bold">Threads</Text>
               <Pressable
                 onPress={() => {
                   props.onClose();
       {groupedThreads.map((group) => (
         <View key={group.key} className="gap-3">
           <Text
-            className="px-1 text-[15px] font-t3-bold text-foreground-muted"
+            className="px-1 text-base font-t3-bold text-foreground-muted"
             style={{ letterSpacing: -0.2 }}
           >
             {group.title}
           <View className="overflow-hidden rounded-[22px] bg-card">
             {group.threads.length === 0 ? (
               <View className="px-4 py-4">
-                <Text className="text-[14px] font-medium text-foreground-tertiary">
+                <Text className="text-sm font-medium text-foreground-tertiary">No threads yet</Text>
-                  No threads yet
-                </Text>
               </View>
             ) : (
               group.threads.map((thread, index) => {
                   >
                     <View className="flex-row items-start justify-between gap-3">
                       <View className="flex-1 gap-1">
-                        <Text className="text-[16px] font-t3-bold" numberOfLines={1}>
+                        <Text className="text-base font-t3-bold" numberOfLines={1}>
                           {thread.title}
                         </Text>
                         <Text
-                          className="text-[13px] font-medium text-foreground-muted"
+                          className="text-sm font-medium text-foreground-muted"
                           numberOfLines={1}
                         >
                           {relativeTime(thread.updatedAt ?? thread.createdAt)}

apps/mobile/src/features/threads/ThreadRouteScreen.tsx+3−2

 import { LoadingScreen } from "../../components/LoadingScreen";
 import { buildThreadRoutePath, buildThreadTerminalNavigation } from "../../lib/routes";
 import { scopedThreadKey } from "../../lib/scopedEntities";
+import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
 import { connectionTone } from "../connection/connectionTone";
 import {
                 numberOfLines={1}
                 style={{
                   fontFamily: "DMSans_700Bold",
-                  fontSize: 18,
+                  fontSize: MOBILE_TYPOGRAPHY.headline.fontSize,
                   fontWeight: "900",
                   color: foregroundColor,
                   letterSpacing: -0.4,
                 numberOfLines={1}
                 style={{
                   fontFamily: "DMSans_700Bold",
-                  fontSize: 12,
+                  fontSize: MOBILE_TYPOGRAPHY.label.fontSize,
                   fontWeight: "700",
                   color: secondaryFg,
                   letterSpacing: 0.3,

apps/mobile/src/features/threads/git/GitBranchesSheet.tsx+10−12

     >
       <View className="gap-2 rounded-[18px] border border-border bg-card px-4 py-4">
         <Text
-          className="text-foreground-secondary text-[11px] font-t3-bold uppercase"
+          className="text-foreground-secondary text-2xs font-t3-bold uppercase"
           style={{ letterSpacing: 1 }}
         >
           New branch
           value={newBranchName}
           onChangeText={setNewBranchName}
           placeholder="feature/mobile-polish"
-          className="rounded-[18px] px-3.5 py-3 font-sans text-[15px]"
+          className="rounded-[18px] px-3.5 py-3 font-sans text-base"
           style={{
             borderWidth: 1,
             borderColor: inputBorderColor,
       <View className="gap-2 rounded-[18px] border border-border bg-card px-4 py-4">
         <Text
-          className="text-foreground-secondary text-[11px] font-t3-bold uppercase"
+          className="text-foreground-secondary text-2xs font-t3-bold uppercase"
           style={{ letterSpacing: 1 }}
         >
           New worktree
           value={worktreeBaseBranch}
           onChangeText={setWorktreeBaseBranch}
           placeholder="main"
-          className="rounded-[18px] px-3.5 py-3 font-sans text-[15px]"
+          className="rounded-[18px] px-3.5 py-3 font-sans text-base"
           style={{
             borderWidth: 1,
             borderColor: inputBorderColor,
           value={worktreeBranchName}
           onChangeText={setWorktreeBranchName}
           placeholder="feature/mobile-thread"
-          className="rounded-[18px] px-3.5 py-3 font-sans text-[15px]"
+          className="rounded-[18px] px-3.5 py-3 font-sans text-base"
           style={{
             borderWidth: 1,
             borderColor: inputBorderColor,
       <View className="gap-2">
         <Text
-          className="text-foreground-secondary text-[11px] font-t3-bold uppercase"
+          className="text-foreground-secondary text-2xs font-t3-bold uppercase"
           style={{ letterSpacing: 1 }}
         >
           Existing branches
         </Text>
         {branchesLoading ? (
-          <Text className="text-foreground-secondary text-[13px] font-medium">
+          <Text className="text-foreground-secondary text-sm font-medium">Loading branches...</Text>
-            Loading branches...
-          </Text>
         ) : null}
         {!branchesLoading && availableBranches.length === 0 ? (
-          <Text className="text-foreground-secondary text-[13px] font-medium">
+          <Text className="text-foreground-secondary text-sm font-medium">
             No local branches found.
           </Text>
         ) : null}
               }}
             >
               <View className="absolute inset-0 rounded-[18px] bg-card" />
-              <Text className="text-foreground text-[15px] font-t3-bold">{branch.name}</Text>
+              <Text className="text-foreground text-base font-t3-bold">{branch.name}</Text>
-              <Text className="text-foreground-secondary text-[12px] font-medium">{subtitle}</Text>
+              <Text className="text-foreground-secondary text-xs font-medium">{subtitle}</Text>
             </Pressable>
           );
         })}

apps/mobile/src/features/threads/git/GitCommitSheet.tsx+18−18

@@ -79,14 +79,14 @@ export function GitCommitSheet() { · 78 unmodified lines
79	>	79	>
80	<View className="gap-3 rounded-[22px] border border-border bg-card px-4 py-4">	80	<View className="gap-3 rounded-[22px] border border-border bg-card px-4 py-4">
81	<View className="flex-row items-center justify-between gap-3">	81	<View className="flex-row items-center justify-between gap-3">
82	<Text className="text-foreground-muted text-[13px] font-medium">Branch</Text>	82	<Text className="text-foreground-muted text-sm font-medium">Branch</Text>
83	<Text className="text-foreground text-[15px] font-t3-bold">	83	<Text className="text-foreground text-base font-t3-bold">
84	{gitStatus.data?.refName ?? "(detached HEAD)"}	84	{gitStatus.data?.refName ?? "(detached HEAD)"}
85	</Text>	85	</Text>
86	</View>	86	</View>
87	{isDefaultRef ? (	87	{isDefaultRef ? (
88	<Text	88	<Text
89	className="text-[12px] leading-[18px]"	89	className="text-xs leading-[18px]"
90	style={{ color: isDarkMode ? "#fbbf24" : "#b45309" }}	90	style={{ color: isDarkMode ? "#fbbf24" : "#b45309" }}
91	>	91	>
92	Warning: this is the default branch.	92	Warning: this is the default branch.
@@ -97,8 +97,8 @@ export function GitCommitSheet() { · 4 unmodified lines
97	<View className="gap-3 rounded-[22px] border border-border bg-card px-4 py-4">	97	<View className="gap-3 rounded-[22px] border border-border bg-card px-4 py-4">
98	<View className="flex-row items-center justify-between gap-3">	98	<View className="flex-row items-center justify-between gap-3">
99	<View className="gap-1">	99	<View className="gap-1">
100	<Text className="text-foreground text-[16px] font-t3-bold">Files</Text>	100	<Text className="text-foreground text-base font-t3-bold">Files</Text>
101	<Text className="text-foreground-muted text-[12px] leading-[18px]">	101	<Text className="text-foreground-muted text-xs leading-[18px]">
102	{selectedFiles.length} selected · +{selectedInsertions} / -{selectedDeletions}	102	{selectedFiles.length} selected · +{selectedInsertions} / -{selectedDeletions}
103	</Text>	103	</Text>
104	</View>	104	</View>
@@ -108,14 +108,14 @@ export function GitCommitSheet() { · 3 unmodified lines
108	className="bg-subtle rounded-full px-3 py-2"	108	className="bg-subtle rounded-full px-3 py-2"
109	onPress={() => setExcludedFiles(new Set())}	109	onPress={() => setExcludedFiles(new Set())}
110	>	110	>
111	<Text className="text-foreground text-[11px] font-t3-bold uppercase">Reset</Text>	111	<Text className="text-foreground text-2xs font-t3-bold uppercase">Reset</Text>
112	</Pressable>	112	</Pressable>
113	) : null}	113	) : null}
114	<Pressable	114	<Pressable
115	className="bg-subtle rounded-full px-3 py-2"	115	className="bg-subtle rounded-full px-3 py-2"
116	onPress={() => setIsEditingFiles((current) => !current)}	116	onPress={() => setIsEditingFiles((current) => !current)}
117	>	117	>
118	<Text className="text-foreground text-[11px] font-t3-bold uppercase">	118	<Text className="text-foreground text-2xs font-t3-bold uppercase">
119	{isEditingFiles ? "Done" : "Edit"}	119	{isEditingFiles ? "Done" : "Edit"}
120	</Text>	120	</Text>
121	</Pressable>	121	</Pressable>
@@ -123,26 +123,26 @@ export function GitCommitSheet() { · 1 unmodified line
123	</View>	123	</View>
124		124
125	{allFiles.length === 0 ? (	125	{allFiles.length === 0 ? (
126	<Text className="text-foreground-secondary text-[13px] leading-[19px]">	126	<Text className="text-foreground-secondary text-sm leading-[19px]">
127	No changed files are available to commit.	127	No changed files are available to commit.
128	</Text>	128	</Text>
129	) : !isEditingFiles ? (	129	) : !isEditingFiles ? (
130	<View className="gap-2">	130	<View className="gap-2">
131	{selectedFilePreview.map((file) => (	131	{selectedFilePreview.map((file) => (
132	<View key={file.path} className="flex-row items-center justify-between gap-3">	132	<View key={file.path} className="flex-row items-center justify-between gap-3">
133	<Text className="text-foreground flex-1 text-[13px] font-medium" numberOfLines={1}>	133	<Text className="text-foreground flex-1 text-sm font-medium" numberOfLines={1}>
134	{file.path}	134	{file.path}
135	</Text>	135	</Text>
136	<Text className="text-[12px] font-t3-bold" style={{ color: "#10b981" }}>	136	<Text className="text-xs font-t3-bold" style={{ color: "#10b981" }}>
137	+{file.insertions}	137	+{file.insertions}
138	</Text>	138	</Text>
139	<Text className="text-[12px] font-t3-bold" style={{ color: "#f43f5e" }}>	139	<Text className="text-xs font-t3-bold" style={{ color: "#f43f5e" }}>
140	-{file.deletions}	140	-{file.deletions}
141	</Text>	141	</Text>
142	</View>	142	</View>
143	))}	143	))}
144	{selectedFiles.length > selectedFilePreview.length ? (	144	{selectedFiles.length > selectedFilePreview.length ? (
145	<Text className="text-foreground-muted text-[12px] leading-[17px]">	145	<Text className="text-foreground-muted text-xs leading-[17px]">
146	+{selectedFiles.length - selectedFilePreview.length} more files	146	+{selectedFiles.length - selectedFilePreview.length} more files
147	</Text>	147	</Text>
148	) : null}	148	) : null}
@@ -177,21 +177,21 @@ export function GitCommitSheet() { · 28 unmodified lines
177	<View className="flex-1 gap-1">	177	<View className="flex-1 gap-1">
178	<Text	178	<Text
179	selectable	179	selectable
180	className={`text-[13px] font-t3-bold ${included ? "text-foreground" : "text-foreground-muted"}`}	180	className={`text-sm font-t3-bold ${included ? "text-foreground" : "text-foreground-muted"}`}
181	>	181	>
182	{file.path}	182	{file.path}
183	</Text>	183	</Text>
184	{!included ? (	184	{!included ? (
185	<Text className="text-foreground-muted text-[11px] leading-[16px]">	185	<Text className="text-foreground-muted text-2xs leading-[16px]">
186	Excluded from this commit	186	Excluded from this commit
187	</Text>	187	</Text>
188	) : null}	188	) : null}
189	</View>	189	</View>
190	<View className="items-end gap-1">	190	<View className="items-end gap-1">
191	<Text className="text-[12px] font-t3-bold" style={{ color: "#10b981" }}>	191	<Text className="text-xs font-t3-bold" style={{ color: "#10b981" }}>
192	+{file.insertions}	192	+{file.insertions}
193	</Text>	193	</Text>
194	<Text className="text-[12px] font-t3-bold" style={{ color: "#f43f5e" }}>	194	<Text className="text-xs font-t3-bold" style={{ color: "#f43f5e" }}>
195	-{file.deletions}	195	-{file.deletions}
196	</Text>	196	</Text>
197	</View>	197	</View>
@@ -204,14 +204,14 @@ export function GitCommitSheet() { · 6 unmodified lines
204	</View>	204	</View>
205		205
206	<View className="gap-2">	206	<View className="gap-2">
207	<Text className="text-foreground text-[13px] font-t3-bold">Commit message</Text>	207	<Text className="text-foreground text-sm font-t3-bold">Commit message</Text>
208	<TextInput	208	<TextInput
209	multiline	209	multiline
210	value={dialogCommitMessage}	210	value={dialogCommitMessage}
211	onChangeText={setDialogCommitMessage}	211	onChangeText={setDialogCommitMessage}
212	placeholder="Leave empty to auto-generate"	212	placeholder="Leave empty to auto-generate"
213	textAlignVertical="top"	213	textAlignVertical="top"
214	className="min-h-[128px] rounded-[20px] px-4 py-3.5 font-sans text-[15px]"	214	className="min-h-[128px] rounded-[20px] px-4 py-3.5 font-sans text-base"
215	style={{	215	style={{
216	minHeight: 128,	216	minHeight: 128,
217	borderWidth: 1,	217	borderWidth: 1,

apps/mobile/src/features/threads/git/GitConfirmSheet.tsx+3−3

@@ -90,15 +90,15 @@ export function GitConfirmSheet() { · 89 unmodified lines
90		90
91	<View className="items-center gap-1 px-5 pb-3 pt-4">	91	<View className="items-center gap-1 px-5 pb-3 pt-4">
92	<Text	92	<Text
93	className="text-[12px] font-t3-bold uppercase text-foreground-muted"	93	className="text-xs font-t3-bold uppercase text-foreground-muted"
94	style={{ letterSpacing: 1 }}	94	style={{ letterSpacing: 1 }}
95	>	95	>
96	Confirm	96	Confirm
97	</Text>	97	</Text>
98	<Text className="text-center text-[28px] font-t3-bold">	98	<Text className="text-center text-3xl font-t3-bold">
99	{copy?.title ?? "Run action on default branch?"}	99	{copy?.title ?? "Run action on default branch?"}
100	</Text>	100	</Text>
101	<Text className="text-center text-foreground-secondary text-[13px] font-medium leading-[19px]">	101	<Text className="text-center text-foreground-secondary text-sm font-medium leading-[19px]">
102	{copy?.description ?? "Choose how to continue."}	102	{copy?.description ?? "Choose how to continue."}
103	</Text>	103	</Text>
104	</View>	104	</View>

apps/mobile/src/features/threads/git/GitOverviewSheet.tsx+3−3

@@ -175,13 +175,13 @@ export function GitOverviewSheet() { · 174 unmodified lines
175	/>	175	/>
176	</Pressable>	176	</Pressable>
177	<Text	177	<Text
178	className="text-[12px] font-t3-bold uppercase text-foreground-muted"	178	className="text-xs font-t3-bold uppercase text-foreground-muted"
179	style={{ letterSpacing: 1 }}	179	style={{ letterSpacing: 1 }}
180	>	180	>
181	Branch	181	Branch
182	</Text>	182	</Text>
183	<Text className="text-[28px] font-t3-bold">{currentBranchLabel}</Text>	183	<Text className="text-3xl font-t3-bold">{currentBranchLabel}</Text>
184	<Text className="text-foreground-secondary text-[13px] font-medium leading-[19px]">	184	<Text className="text-foreground-secondary text-sm font-medium leading-[19px]">
185	{statusSummary(gitStatus.data)}	185	{statusSummary(gitStatus.data)}
186	</Text>	186	</Text>
187	</View>	187	</View>

apps/mobile/src/features/threads/git/gitSheetComponents.tsx+5−5

@@ -56,7 +56,7 @@ export function SheetActionButton(props: { · 55 unmodified lines
56	>	56	>
57	<SymbolView name={props.icon} size={16} tintColor={colors.textColor} type="monochrome" />	57	<SymbolView name={props.icon} size={16} tintColor={colors.textColor} type="monochrome" />
58	<Text	58	<Text
59	className="text-[12px] font-t3-bold uppercase"	59	className="text-xs font-t3-bold uppercase"
60	style={{ color: colors.textColor, letterSpacing: 0.9 }}	60	style={{ color: colors.textColor, letterSpacing: 0.9 }}
61	>	61	>
62	{props.label}	62	{props.label}
@@ -69,12 +69,12 @@ export function MetaCard(props: { readonly label: string; readonly value: string · 6 unmodified lines
69	return (	69	return (
70	<View className="rounded-[18px] border border-border bg-card px-4 py-3">	70	<View className="rounded-[18px] border border-border bg-card px-4 py-3">
71	<Text	71	<Text
72	className="text-foreground-muted text-[11px] font-t3-bold uppercase"	72	className="text-foreground-muted text-2xs font-t3-bold uppercase"
73	style={{ letterSpacing: 0.9 }}	73	style={{ letterSpacing: 0.9 }}
74	>	74	>
75	{props.label}	75	{props.label}
76	</Text>	76	</Text>
77	<Text selectable className="text-foreground text-[13px] font-medium" numberOfLines={1}>	77	<Text selectable className="text-foreground text-sm font-medium" numberOfLines={1}>
78	{props.value}	78	{props.value}
79	</Text>	79	</Text>
80	</View>	80	</View>
@@ -102,9 +102,9 @@ export function SheetListRow(props: { · 21 unmodified lines
102	<SymbolView name={props.icon} size={16} tintColor={iconColor} type="monochrome" />	102	<SymbolView name={props.icon} size={16} tintColor={iconColor} type="monochrome" />
103	</View>	103	</View>
104	<View className="flex-1 gap-0.5">	104	<View className="flex-1 gap-0.5">
105	<Text className="text-foreground text-[16px] font-t3-bold">{props.title}</Text>	105	<Text className="text-foreground text-base font-t3-bold">{props.title}</Text>
106	{props.subtitle ? (	106	{props.subtitle ? (
107	<Text className="text-foreground-muted text-[12px] leading-[17px]">{props.subtitle}</Text>	107	<Text className="text-foreground-muted text-xs leading-[17px]">{props.subtitle}</Text>
108	) : null}	108	) : null}
109	</View>	109	</View>
110	<SymbolView name="chevron.right" size={13} tintColor={iconSubtleColor} type="monochrome" />	110	<SymbolView name="chevron.right" size={13} tintColor={iconSubtleColor} type="monochrome" />

apps/mobile/src/features/threads/thread-work-log.tsx+3−3

@@ -98,7 +98,7 @@ export function ThreadWorkLog(props: { · 97 unmodified lines
98	return (	98	return (
99	<View className="-mx-1 mb-3 px-1 py-0.5">	99	<View className="-mx-1 mb-3 px-1 py-0.5">
100	{!onlyToolRows ? (	100	{!onlyToolRows ? (
101	<Text className="px-0.5 pb-0.5 font-t3-medium text-[11px] text-foreground-muted opacity-60">	101	<Text className="px-0.5 pb-0.5 font-t3-medium text-2xs text-foreground-muted opacity-60">
102	work log	102	work log
103	</Text>	103	</Text>
104	) : null}	104	) : null}
@@ -164,7 +164,7 @@ export function ThreadWorkLog(props: { · 59 unmodified lines
164		164
165	<View className="shrink-0 flex-row items-center gap-px">	165	<View className="shrink-0 flex-row items-center gap-px">
166	{props.copiedRowId === row.id ? (	166	{props.copiedRowId === row.id ? (
167	<Text className="pr-1 font-t3-medium text-[10px] text-emerald-600 dark:text-emerald-400">	167	<Text className="pr-1 font-t3-medium text-3xs text-emerald-600 dark:text-emerald-400">
168	Copied	168	Copied
169	</Text>	169	</Text>
170	) : null}	170	) : null}
@@ -209,7 +209,7 @@ export function ThreadWorkLog(props: { · 38 unmodified lines
209	>	209	>
210	<Text	210	<Text
211	selectable	211	selectable
212	className="text-[11px] leading-[17px] text-foreground-muted"	212	className="text-2xs leading-[17px] text-foreground-muted"
213	style={{ fontFamily: "ui-monospace" }}	213	style={{ fontFamily: "ui-monospace" }}
214	>	214	>
215	{row.fullDetail}	215	{row.fullDetail}

apps/mobile/src/lib/typography.test.ts+23−0

@@ -0,0 +1,23 @@
	1	import { describe, expect, it } from "vite-plus/test";
	2
	3	import { MOBILE_CODE_SURFACE, MOBILE_TYPOGRAPHY } from "./typography";
	4
	5	describe("mobile typography", () => {
	6	it("uses the intentional compact mobile font scale", () => {
	7	expect(Object.values(MOBILE_TYPOGRAPHY).map(({ fontSize }) => fontSize)).toEqual([
	8	10, 11, 12, 13, 14, 15, 17, 20, 24, 28,
	9	]);
	10	});
	11
	12	it("uses a compact shared style for editable composer text", () => {
	13	expect(MOBILE_TYPOGRAPHY.composer).toEqual({ fontSize: 14, lineHeight: 20 });
	14	});
	15
	16	it("uses caption-sized code with a compact readable row height", () => {
	17	expect(MOBILE_CODE_SURFACE).toMatchObject({
	18	fontSize: MOBILE_TYPOGRAPHY.caption.fontSize,
	19	lineNumberFontSize: MOBILE_TYPOGRAPHY.micro.fontSize,
	20	rowHeight: 20,
	21	});
	22	});
	23	});

apps/mobile/src/lib/typography.ts+22−0

@@ -0,0 +1,22 @@
	1	export const MOBILE_TYPOGRAPHY = {
	2	micro: { fontSize: 10, lineHeight: 13 },
	3	caption: { fontSize: 11, lineHeight: 15 },
	4	label: { fontSize: 12, lineHeight: 16 },
	5	footnote: { fontSize: 13, lineHeight: 18 },
	6	composer: { fontSize: 14, lineHeight: 20 },
	7	body: { fontSize: 15, lineHeight: 22 },
	8	headline: { fontSize: 17, lineHeight: 22 },
	9	title: { fontSize: 20, lineHeight: 26 },
	10	largeTitle: { fontSize: 24, lineHeight: 30 },
	11	display: { fontSize: 28, lineHeight: 34 },
	12	} as const;
	13
	14	/** Shared geometry for dense, horizontally scrolling code surfaces. */
	15	export const MOBILE_CODE_SURFACE = {
	16	rowHeight: 20,
	17	gutterWidth: 46,
	18	codePadding: 7,
	19	textVerticalInset: 2,
	20	fontSize: MOBILE_TYPOGRAPHY.caption.fontSize,
	21	lineNumberFontSize: MOBILE_TYPOGRAPHY.micro.fontSize,
	22	} as const;

apps/mobile/src/native/T3ComposerEditor.ios.tsx+9−2

 import { markdownFileIconSource } from "@t3tools/mobile-markdown-text/file-icons";
 import { resolveMarkdownFileIcon } from "@t3tools/mobile-markdown-text/links";
+import { MOBILE_TYPOGRAPHY } from "../lib/typography";
 import { useThemeColor } from "../lib/useThemeColor";
 import type { ComposerEditorProps, ComposerEditorSelection } from "./T3ComposerEditor.types";
           ? resolvedTextStyle.fontFamily
           : "DMSans_400Regular"
       }
-      fontSize={typeof resolvedTextStyle.fontSize === "number" ? resolvedTextStyle.fontSize : 15}
+      fontSize={
+        typeof resolvedTextStyle.fontSize === "number"
+          ? resolvedTextStyle.fontSize
+          : MOBILE_TYPOGRAPHY.composer.fontSize
+      }
       lineHeight={
-        typeof resolvedTextStyle.lineHeight === "number" ? resolvedTextStyle.lineHeight : 22
+        typeof resolvedTextStyle.lineHeight === "number"
+          ? resolvedTextStyle.lineHeight
+          : MOBILE_TYPOGRAPHY.composer.lineHeight
       }
       contentInsetVertical={contentInsetVertical}
       editable={props.editable ?? true}

apps/mobile/src/native/T3ComposerEditor.tsx+2−2

 import { useImperativeHandle, useRef } from "react";
 import { TextInput, type TextInput as RNTextInput } from "react-native";
+import { MOBILE_TYPOGRAPHY } from "../lib/typography";
 import { useThemeColor } from "../lib/useThemeColor";
 import { useNativePaste } from "../lib/useNativePaste";
 import type { ComposerEditorProps } from "./T3ComposerEditor.types";
             minHeight: 0,
             color: foregroundColor,
             fontFamily: "DMSans_400Regular",
-            fontSize: 15,
+            ...MOBILE_TYPOGRAPHY.composer,
-            lineHeight: 22,
             paddingVertical: contentInsetVertical,
           },
           textStyle,

apps/server/src/auth/EnvironmentAuth.test.ts+10−9

 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import type { ServerConfigShape } from "../config.ts";
+import * as ServerConfig from "../config.ts";
-import { ServerConfig } from "../config.ts";
 import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
 import * as PairingGrantStore from "./PairingGrantStore.ts";
 import * as EnvironmentAuth from "./EnvironmentAuth.ts";
 import * as ServerSecretStore from "./ServerSecretStore.ts";
-const makeServerConfigLayer = (overrides?: Partial<ServerConfigShape>) =>
+const makeServerConfigLayer = (overrides?: Partial<ServerConfig.ServerConfig["Service"]>) =>
   Layer.effect(
-    ServerConfig,
+    ServerConfig.ServerConfig,
     Effect.gen(function* () {
-      const config = yield* ServerConfig;
+      const config = yield* ServerConfig.ServerConfig;
       return {
         ...config,
         ...overrides,
-      } satisfies ServerConfigShape;
+      } satisfies ServerConfig.ServerConfig["Service"];
     }),
   ).pipe(Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-auth-server-test-" })));
-const makeEnvironmentAuthLayer = (overrides?: Partial<ServerConfigShape>) =>
+const makeEnvironmentAuthLayer = (overrides?: Partial<ServerConfig.ServerConfig["Service"]>) =>
   EnvironmentAuth.layer.pipe(
     Layer.provide(SqlitePersistenceMemory),
     Layer.provide(ServerSecretStore.layer),
 const makeCookieRequest = (
   sessionToken: string,
-): Parameters<EnvironmentAuth.EnvironmentAuthShape["authenticateHttpRequest"]>[0] =>
+): Parameters<EnvironmentAuth.EnvironmentAuth["Service"]["authenticateHttpRequest"]>[0] =>
   ({
     cookies: {
       t3_session: sessionToken,
     },
     headers: {},
-  }) as unknown as Parameters<EnvironmentAuth.EnvironmentAuthShape["authenticateHttpRequest"]>[0];
+  }) as unknown as Parameters<
+    EnvironmentAuth.EnvironmentAuth["Service"]["authenticateHttpRequest"]
+  >[0];
 const requestMetadata = {
   deviceType: "desktop" as const,

apps/server/src/auth/EnvironmentAuthAdmin.test.ts+6−7

 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import type { ServerConfigShape } from "../config.ts";
+import * as ServerConfig from "../config.ts";
-import { ServerConfig } from "../config.ts";
 import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
 import * as EnvironmentAuth from "./EnvironmentAuth.ts";
 import * as ServerSecretStore from "./ServerSecretStore.ts";
 import * as SessionStore from "./SessionStore.ts";
 const makeServerConfigLayer = (
-  overrides?: Partial<Pick<ServerConfigShape, "desktopBootstrapToken">>,
+  overrides?: Partial<Pick<ServerConfig.ServerConfig["Service"], "desktopBootstrapToken">>,
 ) =>
   Layer.effect(
-    ServerConfig,
+    ServerConfig.ServerConfig,
     Effect.gen(function* () {
-      const config = yield* ServerConfig;
+      const config = yield* ServerConfig.ServerConfig;
       return {
         ...config,
         ...overrides,
-      } satisfies ServerConfigShape;
+      } satisfies ServerConfig.ServerConfig["Service"];
     }),
   ).pipe(
     Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-auth-control-plane-test-" })),
   );
 const makeEnvironmentAuthLayer = (
-  overrides?: Partial<Pick<ServerConfigShape, "desktopBootstrapToken">>,
+  overrides?: Partial<Pick<ServerConfig.ServerConfig["Service"], "desktopBootstrapToken">>,
 ) =>
   EnvironmentAuth.layer.pipe(
     Layer.provideMerge(ServerSecretStore.layer),

apps/server/src/auth/EnvironmentAuthPolicy.test.ts+7−6

 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import type { ServerConfigShape } from "../config.ts";
+import * as ServerConfig from "../config.ts";
-import { ServerConfig } from "../config.ts";
 import * as EnvironmentAuthPolicy from "./EnvironmentAuthPolicy.ts";
-const makeEnvironmentAuthPolicyLayer = (overrides?: Partial<ServerConfigShape>) =>
+const makeEnvironmentAuthPolicyLayer = (
+  overrides?: Partial<ServerConfig.ServerConfig["Service"]>,
+) =>
   EnvironmentAuthPolicy.layer.pipe(
     Layer.provide(
       Layer.effect(
-        ServerConfig,
+        ServerConfig.ServerConfig,
         Effect.gen(function* () {
-          const config = yield* ServerConfig;
+          const config = yield* ServerConfig.ServerConfig;
           return {
             ...config,
             ...overrides,
-          } satisfies ServerConfigShape;
+          } satisfies ServerConfig.ServerConfig["Service"];
         }),
       ).pipe(
         Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-auth-policy-test-" })),

apps/server/src/auth/PairingGrantStore.test.ts+6−7

 import * as Layer from "effect/Layer";
 import * as TestClock from "effect/testing/TestClock";
-import type { ServerConfigShape } from "../config.ts";
+import * as ServerConfig from "../config.ts";
-import { ServerConfig } from "../config.ts";
 import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
 import * as PairingGrantStore from "./PairingGrantStore.ts";
 const makeServerConfigLayer = (
-  overrides?: Partial<Pick<ServerConfigShape, "desktopBootstrapToken">>,
+  overrides?: Partial<Pick<ServerConfig.ServerConfig["Service"], "desktopBootstrapToken">>,
 ) =>
   Layer.effect(
-    ServerConfig,
+    ServerConfig.ServerConfig,
     Effect.gen(function* () {
-      const config = yield* ServerConfig;
+      const config = yield* ServerConfig.ServerConfig;
       return {
         ...config,
         ...overrides,
-      } satisfies ServerConfigShape;
+      } satisfies ServerConfig.ServerConfig["Service"];
     }),
   ).pipe(
     Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-auth-bootstrap-test-" })),
   );
 const makePairingGrantStoreLayer = (
-  overrides?: Partial<Pick<ServerConfigShape, "desktopBootstrapToken">>,
+  overrides?: Partial<Pick<ServerConfig.ServerConfig["Service"], "desktopBootstrapToken">>,
 ) =>
   PairingGrantStore.layer.pipe(
     Layer.provide(SqlitePersistenceMemory),

apps/server/src/auth/SessionStore.test.ts+8−9

 import * as Layer from "effect/Layer";
 import * as TestClock from "effect/testing/TestClock";
-import type { ServerConfigShape } from "../config.ts";
+import * as ServerConfig from "../config.ts";
-import { ServerConfig } from "../config.ts";
 import { PersistenceSqlError } from "../persistence/Errors.ts";
 import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
-import { AuthSessionRepository } from "../persistence/Services/AuthSessions.ts";
+import * as AuthSessions from "../persistence/Services/AuthSessions.ts";
 import * as SessionStore from "./SessionStore.ts";
 import * as ServerSecretStore from "./ServerSecretStore.ts";
 const makeServerConfigLayer = (
-  overrides?: Partial<Pick<ServerConfigShape, "desktopBootstrapToken">>,
+  overrides?: Partial<Pick<ServerConfig.ServerConfig["Service"], "desktopBootstrapToken">>,
 ) =>
   Layer.effect(
-    ServerConfig,
+    ServerConfig.ServerConfig,
     Effect.gen(function* () {
-      const config = yield* ServerConfig;
+      const config = yield* ServerConfig.ServerConfig;
       return {
         ...config,
         ...overrides,
-      } satisfies ServerConfigShape;
+      } satisfies ServerConfig.ServerConfig["Service"];
     }),
   ).pipe(Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-auth-session-test-" })));
 const makeSessionStoreLayer = (
-  overrides?: Partial<Pick<ServerConfigShape, "desktopBootstrapToken">>,
+  overrides?: Partial<Pick<ServerConfig.ServerConfig["Service"], "desktopBootstrapToken">>,
 ) =>
   SessionStore.layer.pipe(
     Layer.provide(SqlitePersistenceMemory),
   detail: "sqlite is unavailable",
 });
-const failingSessionLookupRepositoryLayer = Layer.succeed(AuthSessionRepository, {
+const failingSessionLookupRepositoryLayer = Layer.succeed(AuthSessions.AuthSessionRepository, {
   create: () => Effect.void,
   getById: () => Effect.fail(repositoryFailure),
   listActive: () => Effect.succeed([]),

apps/server/src/bin.test.ts+11−14

 import { Command } from "effect/unstable/cli";
 import { cli, makeCli } from "./bin.ts";
-import { deriveServerPaths, ServerConfig, type ServerConfigShape } from "./config.ts";
+import * as ServerConfig from "./config.ts";
-import { ProjectionSnapshotQuery } from "./orchestration/Services/ProjectionSnapshotQuery.ts";
+import * as ProjectionSnapshotQuery from "./orchestration/Services/ProjectionSnapshotQuery.ts";
 import { OrchestrationLayerLive } from "./orchestration/runtimeLayer.ts";
 import { orchestrationHttpApiLayer } from "./orchestration/http.ts";
 import { layerConfig as SqlitePersistenceLayerLive } from "./persistence/Layers/Sqlite.ts";
 const makeCliTestServerConfig = (baseDir: string) =>
   Effect.gen(function* () {
-    const derivedPaths = yield* deriveServerPaths(baseDir, undefined);
+    const derivedPaths = yield* ServerConfig.deriveServerPaths(baseDir, undefined);
     return {
       logLevel: "Info",
       traceMinLevel: "Info",
       logWebSocketEvents: false,
       tailscaleServeEnabled: false,
       tailscaleServePort: 443,
-    } satisfies ServerConfigShape;
+    } satisfies ServerConfig.ServerConfig["Service"];
   });
-const makeProjectPersistenceLayer = (config: ServerConfigShape) =>
+const makeProjectPersistenceLayer = (config: ServerConfig.ServerConfig["Service"]) =>
   Layer.mergeAll(
     OrchestrationLayerLive.pipe(
       Layer.provideMerge(RepositoryIdentityResolverLive),
       Layer.provideMerge(SqlitePersistenceLayerLive),
     ),
     WorkspacePathsLive,
-  ).pipe(
+  ).pipe(Layer.provideMerge(NodeServices.layer), Layer.provide(ServerConfig.layer(config)));
-    Layer.provideMerge(NodeServices.layer),
-    Layer.provide(Layer.succeed(ServerConfig, config)),
-  );
 const readPersistedSnapshot = (baseDir: string) =>
   Effect.gen(function* () {
     const config = yield* makeCliTestServerConfig(baseDir);
     return yield* Effect.gen(function* () {
-      const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
+      const projectionSnapshotQuery = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
       return yield* projectionSnapshotQuery.getSnapshot();
     }).pipe(Effect.provide(makeProjectPersistenceLayer(config)));
   });
         }),
       ),
       Layer.provideMerge(NodeServices.layer),
-      Layer.provide(Layer.succeed(ServerConfig, config)),
+      Layer.provide(ServerConfig.layer(config)),
     );
     return yield* Effect.scoped(
   it.effect("logs in to headless connect without enabling access", () =>
     Effect.gen(function* () {
       const baseDir = mkdtempSync(join(tmpdir(), "t3-cli-cloud-login-test-"));
-      const { secretsDir } = yield* deriveServerPaths(baseDir, undefined);
+      const { secretsDir } = yield* ServerConfig.deriveServerPaths(baseDir, undefined);
       mkdirSync(secretsDir, { recursive: true });
       writeFileSync(
         join(secretsDir, "cloud-cli-oauth-token.bin"),
   it.effect("logs out of headless connect and removes the stored CLI authorization", () =>
     Effect.gen(function* () {
       const baseDir = mkdtempSync(join(tmpdir(), "t3-cli-cloud-logout-test-"));
-      const { secretsDir } = yield* deriveServerPaths(baseDir, undefined);
+      const { secretsDir } = yield* ServerConfig.deriveServerPaths(baseDir, undefined);
       const tokenPath = join(secretsDir, "cloud-cli-oauth-token.bin");
       mkdirSync(secretsDir, { recursive: true });
       writeFileSync(tokenPath, "invalid persisted token");
             "--base-dir",
             baseDir,
           ]);
-          const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
+          const projectionSnapshotQuery = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
           const readModel = yield* projectionSnapshotQuery.getSnapshot();
           const addedProject = readModel.projects.find(
             (project) => project.workspaceRoot === workspaceRoot && project.deletedAt === null,

apps/server/src/cli/auth.ts+3−3

@@ -18,7 +18,7 @@ import { · 17 unmodified lines
18	formatPairingCredentialList,	18	formatPairingCredentialList,
19	formatSessionList,	19	formatSessionList,
20	} from "../cliAuthFormat.ts";	20	} from "../cliAuthFormat.ts";
21	import { ServerConfig } from "../config.ts";	21	import * as ServerConfig from "../config.ts";
22	import {	22	import {
23	authLocationFlags,	23	authLocationFlags,
24	type CliAuthLocationFlags,	24	type CliAuthLocationFlags,
@@ -28,7 +28,7 @@ import { · 3 unmodified lines
28		28
29	const runWithEnvironmentAuth = <A, E>(	29	const runWithEnvironmentAuth = <A, E>(
30	flags: CliAuthLocationFlags,	30	flags: CliAuthLocationFlags,
31	run: (environmentAuth: EnvironmentAuth.EnvironmentAuthShape) => Effect.Effect<A, E>,	31	run: (environmentAuth: EnvironmentAuth.EnvironmentAuth["Service"]) => Effect.Effect<A, E>,
32	options?: {	32	options?: {
33	readonly quietLogs?: boolean;	33	readonly quietLogs?: boolean;
34	},	34	},
@@ -43,7 +43,7 @@ const runWithEnvironmentAuth = <A, E>( · 8 unmodified lines
43	}).pipe(	43	}).pipe(
44	Effect.provide(	44	Effect.provide(
45	Layer.mergeAll(EnvironmentAuth.runtimeLayer).pipe(	45	Layer.mergeAll(EnvironmentAuth.runtimeLayer).pipe(
46	Layer.provide(Layer.succeed(ServerConfig, config)),	46	Layer.provide(ServerConfig.layer(config)),
47	Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)),	47	Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)),
48	),	48	),
49	),	49	),

apps/server/src/cli/config.ts+12−20

 import { Argument, Flag } from "effect/unstable/cli";
 import { readBootstrapEnvelope } from "../bootstrap.ts";
-import {
+import * as ServerConfig from "../config.ts";
-  DEFAULT_PORT,
-  deriveServerPaths,
-  ensureServerDirectories,
-  resolveStaticDir,
-  RuntimeMode,
-  type ServerConfigShape,
-  type StartupPresentation,
-} from "../config.ts";
 import { expandHomePath, resolveBaseDir } from "../os-jank.ts";
-export const modeFlag = Flag.choice("mode", RuntimeMode.literals).pipe(
+export const modeFlag = Flag.choice("mode", ServerConfig.RuntimeMode.literals).pipe(
   Flag.withDescription("Runtime mode. `desktop` keeps loopback defaults unless overridden."),
   Flag.optional,
 );
     Config.withDefault(10_000),
   ),
   otlpServiceName: Config.string("T3CODE_OTLP_SERVICE_NAME").pipe(Config.withDefault("t3-server")),
-  mode: Config.schema(RuntimeMode, "T3CODE_MODE").pipe(
+  mode: Config.schema(ServerConfig.RuntimeMode, "T3CODE_MODE").pipe(
     Config.option,
     Config.map(Option.getOrUndefined),
   ),
 });
 export interface CliServerFlags {
-  readonly mode: Option.Option<RuntimeMode>;
+  readonly mode: Option.Option<ServerConfig.RuntimeMode>;
   readonly port: Option.Option<number>;
   readonly host: Option.Option<string>;
   readonly baseDir: Option.Option<string>;
   flags: CliServerFlags,
   cliLogLevel: Option.Option<LogLevel.LogLevel>,
   options?: {
-    readonly startupPresentation?: StartupPresentation;
+    readonly startupPresentation?: ServerConfig.StartupPresentation;
     readonly forceAutoBootstrapProjectFromCwd?: boolean;
   },
 ) =>
         : Option.none();
     const bootstrap = Option.getOrUndefined(bootstrapEnvelope);
-    const mode: RuntimeMode = Option.getOrElse(
+    const mode: ServerConfig.RuntimeMode = Option.getOrElse(
       resolveOptionPrecedence(
         normalizedFlags.mode,
         Option.fromUndefinedOr(env.mode),
         onSome: (value) => Effect.succeed(value),
         onNone: () => {
           if (mode === "desktop") {
-            return Effect.succeed(DEFAULT_PORT);
+            return Effect.succeed(ServerConfig.DEFAULT_PORT);
           }
-          return findAvailablePort(DEFAULT_PORT);
+          return findAvailablePort(ServerConfig.DEFAULT_PORT);
         },
       },
     );
     const rawCwd = Option.getOrElse(normalizedFlags.cwd, () => process.cwd());
     const cwd = path.resolve(yield* expandHomePath(rawCwd.trim()));
     yield* fs.makeDirectory(cwd, { recursive: true });
-    const derivedPaths = yield* deriveServerPaths(baseDir, devUrl);
+    const derivedPaths = yield* ServerConfig.deriveServerPaths(baseDir, devUrl);
-    yield* ensureServerDirectories(derivedPaths);
+    yield* ServerConfig.ensureServerDirectories(derivedPaths);
     const persistedObservabilitySettings = yield* loadPersistedObservabilitySettings(
       derivedPaths.settingsPath,
     );
       ),
       () => 443,
     );
-    const staticDir = devUrl ? undefined : yield* resolveStaticDir();
+    const staticDir = devUrl ? undefined : yield* ServerConfig.resolveStaticDir();
     const host = Option.getOrElse(
       resolveOptionPrecedence(
         normalizedFlags.host,
     );
     const logLevel = Option.getOrElse(cliLogLevel, () => env.logLevel);
-    const config: ServerConfigShape = {
+    const config: ServerConfig.ServerConfig["Service"] = {
       logLevel,
       traceMinLevel: env.traceMinLevel,
       traceTimingEnabled: env.traceTimingEnabled,

apps/server/src/cli/connect.ts+9−9

@@ -31,9 +31,9 @@ import * as CliTokenManager from "../cloud/CliTokenManager.ts"; · 30 unmodified lines
31	import { CLOUD_LINKED_USER_ID, RELAY_URL_SECRET } from "../cloud/config.ts";	31	import { CLOUD_LINKED_USER_ID, RELAY_URL_SECRET } from "../cloud/config.ts";
32	import { relayUrlConfig } from "../cloud/publicConfig.ts";	32	import { relayUrlConfig } from "../cloud/publicConfig.ts";
33	import { headlessRelayClientTracingLayer } from "../cloud/relayTracing.ts";	33	import { headlessRelayClientTracingLayer } from "../cloud/relayTracing.ts";
34	import { ServerConfig } from "../config.ts";	34	import * as ServerConfig from "../config.ts";
35	import { ServerEnvironmentLive } from "../environment/Layers/ServerEnvironment.ts";	35	import { ServerEnvironmentLive } from "../environment/Layers/ServerEnvironment.ts";
36	import { ServerEnvironment } from "../environment/Services/ServerEnvironment.ts";	36	import * as ServerEnvironment from "../environment/Services/ServerEnvironment.ts";
37	import { readPersistedServerRuntimeState } from "../serverRuntimeState.ts";	37	import { readPersistedServerRuntimeState } from "../serverRuntimeState.ts";
38	import { projectLocationFlags, resolveCliAuthConfig } from "./config.ts";	38	import { projectLocationFlags, resolveCliAuthConfig } from "./config.ts";
39		39
@@ -145,7 +145,7 @@ const reportRelayClientInstallProgress = (event: RelayClientInstallProgressEvent · 105 unmodified lines
145		145
146	export const acquireRelayClientForLink = Effect.fn("cloud.cli.acquire_relay_client_for_link")(	146	export const acquireRelayClientForLink = Effect.fn("cloud.cli.acquire_relay_client_for_link")(
147	function* <ConfirmError, ConfirmContext>(	147	function* <ConfirmError, ConfirmContext>(
148	relayClient: RelayClient.RelayClientShape,	148	relayClient: RelayClient.RelayClient["Service"],
149	confirmInstall: (version: string) => Effect.Effect<boolean, ConfirmError, ConfirmContext>,	149	confirmInstall: (version: string) => Effect.Effect<boolean, ConfirmError, ConfirmContext>,
150	reportProgress: (event: RelayClientInstallProgressEvent) => Effect.Effect<void>,	150	reportProgress: (event: RelayClientInstallProgressEvent) => Effect.Effect<void>,
151	) {	151	) {
@@ -164,7 +164,7 @@ export const acquireRelayClientForLink = Effect.fn("cloud.cli.acquire_relay_clie · 12 unmodified lines
164	);	164	);
165		165
166	const withCloudCliSessionToken = <A, E, R>(	166	const withCloudCliSessionToken = <A, E, R>(
167	environmentAuth: EnvironmentAuth.EnvironmentAuthShape,	167	environmentAuth: EnvironmentAuth.EnvironmentAuth["Service"],
168	run: (token: string) => Effect.Effect<A, E, R>,	168	run: (token: string) => Effect.Effect<A, E, R>,
169	) =>	169	) =>
170	Effect.acquireUseRelease(	170	Effect.acquireUseRelease(
@@ -183,7 +183,7 @@ type LiveCloudActionResult = · 12 unmodified lines
183	\| { readonly status: "failed"; readonly cause: unknown };	183	\| { readonly status: "failed"; readonly cause: unknown };
184		184
185	const runLiveCloudUnlink = Effect.fn("cloud.cli.run_live_unlink")(function* () {	185	const runLiveCloudUnlink = Effect.fn("cloud.cli.run_live_unlink")(function* () {
186	const config = yield* ServerConfig;	186	const config = yield* ServerConfig.ServerConfig;
187	const runtimeState = yield* readPersistedServerRuntimeState(config.serverRuntimeStatePath);	187	const runtimeState = yield* readPersistedServerRuntimeState(config.serverRuntimeStatePath);
188	if (Option.isNone(runtimeState)) {	188	if (Option.isNone(runtimeState)) {
189	return { status: "not-running" } satisfies LiveCloudActionResult;	189	return { status: "not-running" } satisfies LiveCloudActionResult;
@@ -219,7 +219,7 @@ const unlinkRelayEnvironment = Effect.fn("cloud.cli.unlink_relay_environment")(f · 29 unmodified lines
219	return { status: "not-authenticated" } satisfies RelayUnlinkResult;	219	return { status: "not-authenticated" } satisfies RelayUnlinkResult;
220	}	220	}
221		221
222	const environment = yield* ServerEnvironment;	222	const environment = yield* ServerEnvironment.ServerEnvironment;
223	const environmentId = yield* environment.getEnvironmentId;	223	const environmentId = yield* environment.getEnvironmentId;
224	const relayUrl = yield* relayUrlConfig;	224	const relayUrl = yield* relayUrlConfig;
225	const httpClient = yield* HttpClient.HttpClient;	225	const httpClient = yield* HttpClient.HttpClient;
@@ -285,8 +285,8 @@ const runCloudCommand = <A, E>( · 59 unmodified lines
285	\| FileSystem.FileSystem	285	\| FileSystem.FileSystem
286	\| HttpClient.HttpClient	286	\| HttpClient.HttpClient
287	\| Prompt.Environment	287	\| Prompt.Environment
288	\| ServerConfig	288	\| ServerConfig.ServerConfig
289	\| ServerEnvironment	289	\| ServerEnvironment.ServerEnvironment
290	>,	290	>,
291	options?: {	291	options?: {
292	readonly quietLogs?: boolean;	292	readonly quietLogs?: boolean;
@@ -305,7 +305,7 @@ const runCloudCommand = <A, E>( · 12 unmodified lines
305	headlessRelayClientTracingLayer,	305	headlessRelayClientTracingLayer,
306	).pipe(	306	).pipe(
307	Layer.provideMerge(FetchHttpClient.layer),	307	Layer.provideMerge(FetchHttpClient.layer),
308	Layer.provideMerge(Layer.succeed(ServerConfig, config)),	308	Layer.provideMerge(ServerConfig.layer(config)),
309	Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)),	309	Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)),
310	);	310	);
311	return yield* run.pipe(Effect.provide(runtimeLayer));	311	return yield* run.pipe(Effect.provide(runtimeLayer));

apps/server/src/cli/project.ts+21−14

 import * as EnvironmentAuth from "../auth/EnvironmentAuth.ts";
-import { ServerConfig, type ServerConfigShape } from "../config.ts";
+import * as ServerConfig from "../config.ts";
-import { OrchestrationEngineService } from "../orchestration/Services/OrchestrationEngine.ts";
+import * as OrchestrationEngine from "../orchestration/Services/OrchestrationEngine.ts";
-import { ProjectionSnapshotQuery } from "../orchestration/Services/ProjectionSnapshotQuery.ts";
+import * as ProjectionSnapshotQuery from "../orchestration/Services/ProjectionSnapshotQuery.ts";
 import { OrchestrationLayerLive } from "../orchestration/runtimeLayer.ts";
 import { layerConfig as SqlitePersistenceLayerLive } from "../persistence/Layers/Sqlite.ts";
 import { RepositoryIdentityResolverLive } from "../project/Layers/RepositoryIdentityResolver.ts";
-import { getAutoBootstrapDefaultModelSelection } from "../serverRuntimeStartup.ts";
+import * as ServerRuntimeStartup from "../serverRuntimeStartup.ts";
 import {
   clearPersistedServerRuntimeState,
   readPersistedServerRuntimeState,
 } from "../serverRuntimeState.ts";
 import { WorkspacePathsLive } from "../workspace/Layers/WorkspacePaths.ts";
-import { WorkspacePaths } from "../workspace/Services/WorkspacePaths.ts";
+import * as WorkspacePaths from "../workspace/Services/WorkspacePaths.ts";
 import { type CliAuthLocationFlags, projectLocationFlags, resolveCliAuthConfig } from "./config.ts";
 type ProjectMutationTarget = {
 const PROJECT_CLI_LIVE_SERVER_TIMEOUT = Duration.seconds(1);
 const isEnvironmentHttpCommonError = Schema.is(EnvironmentHttpCommonError);
 const withProjectCliSessionToken = <A, E, R>(
-  environmentAuth: EnvironmentAuth.EnvironmentAuthShape,
+  environmentAuth: EnvironmentAuth.EnvironmentAuth["Service"],
   run: (token: string) => Effect.Effect<A, E, R>,
 ) =>
   Effect.acquireUseRelease(
 const normalizeWorkspaceRootForProjectCommand = Effect.fn(
   "normalizeWorkspaceRootForProjectCommand",
 )(function* (workspaceRoot: string) {
-  const workspacePaths = yield* WorkspacePaths;
+  const workspacePaths = yield* WorkspacePaths.WorkspacePaths;
   return yield* workspacePaths.normalizeWorkspaceRoot(workspaceRoot);
 });
   }).pipe(withProjectCliLiveServerTimeout, Effect.catch(failLiveServerRequest));
 const getOfflineSnapshot = Effect.fn("getOfflineSnapshot")(function* () {
-  const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
+  const projectionSnapshotQuery = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
   return yield* projectionSnapshotQuery.getSnapshot();
 });
 const tryResolveLiveProjectExecutionMode = Effect.fn("tryResolveLiveProjectExecutionMode")(
-  function* (environmentAuth: EnvironmentAuth.EnvironmentAuthShape, config: ServerConfigShape) {
+  function* (
+    environmentAuth: EnvironmentAuth.EnvironmentAuth["Service"],
+    config: ServerConfig.ServerConfig["Service"],
+  ) {
     const runtimeState = yield* readPersistedServerRuntimeState(config.serverRuntimeStatePath);
     if (Option.isNone(runtimeState)) {
       return Option.none<{ readonly origin: string }>();
   }) => Effect.Effect<
     string,
     Error,
-    Crypto.Crypto | FileSystem.FileSystem | HttpClient.HttpClient | Path.Path | WorkspacePaths
+    | Crypto.Crypto
+    | FileSystem.FileSystem
+    | HttpClient.HttpClient
+    | Path.Path
+    | WorkspacePaths.WorkspacePaths
   >,
 ) {
   const logLevel = yield* GlobalFlag.LogLevel;
     }
     const offlineRuntimeLayer = ProjectCliRuntimeLive.pipe(
-      Layer.provide(Layer.succeed(ServerConfig, config)),
+      Layer.provide(ServerConfig.layer(config)),
       Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)),
     );
     return yield* Effect.gen(function* () {
       const snapshot = yield* getOfflineSnapshot();
-      const orchestrationEngine = yield* OrchestrationEngineService;
+      const orchestrationEngine = yield* OrchestrationEngine.OrchestrationEngineService;
       const output = yield* run({
         snapshot,
         dispatch: (command) => orchestrationEngine.dispatch(command),
     Effect.provide(
       Layer.mergeAll(EnvironmentAuth.runtimeLayer, WorkspacePathsLive).pipe(
         Layer.provideMerge(FetchHttpClient.layer),
-        Layer.provide(Layer.succeed(ServerConfig, config)),
+        Layer.provide(ServerConfig.layer(config)),
         Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)),
       ),
     ),
           projectId,
           title,
           workspaceRoot,
-          defaultModelSelection: getAutoBootstrapDefaultModelSelection(),
+          defaultModelSelection: ServerRuntimeStartup.getAutoBootstrapDefaultModelSelection(),
           createdAt: DateTime.formatIso(yield* DateTime.now),
         });
         return `Added project ${projectId} (${title}) at ${workspaceRoot}.`;

apps/server/src/config.ts+83−76

  *
  * @module ServerConfig
  */
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as LogLevel from "effect/LogLevel";
 import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
-import * as Context from "effect/Context";
 export const DEFAULT_PORT = 3773;
 }
 /**
- * ServerConfigShape - Process/runtime configuration required by the server.
+ * ServerConfig - Service tag for server runtime configuration.
  */
-export interface ServerConfigShape extends ServerDerivedPaths {
+export class ServerConfig extends Context.Service<
-  readonly logLevel: LogLevel.LogLevel;
+  ServerConfig,
-  readonly traceMinLevel: LogLevel.LogLevel;
+  ServerDerivedPaths & {
-  readonly traceTimingEnabled: boolean;
+    readonly logLevel: LogLevel.LogLevel;
-  readonly traceBatchWindowMs: number;
+    readonly traceMinLevel: LogLevel.LogLevel;
-  readonly traceMaxBytes: number;
+    readonly traceTimingEnabled: boolean;
-  readonly traceMaxFiles: number;
+    readonly traceBatchWindowMs: number;
-  readonly otlpTracesUrl: string | undefined;
+    readonly traceMaxBytes: number;
-  readonly otlpMetricsUrl: string | undefined;
+    readonly traceMaxFiles: number;
-  readonly otlpExportIntervalMs: number;
+    readonly otlpTracesUrl: string | undefined;
-  readonly otlpServiceName: string;
+    readonly otlpMetricsUrl: string | undefined;
-  readonly mode: RuntimeMode;
+    readonly otlpExportIntervalMs: number;
-  readonly port: number;
+    readonly otlpServiceName: string;
-  readonly host: string | undefined;
+    readonly mode: RuntimeMode;
-  readonly cwd: string;
+    readonly port: number;
-  readonly baseDir: string;
+    readonly host: string | undefined;
-  readonly staticDir: string | undefined;
+    readonly cwd: string;
-  readonly devUrl: URL | undefined;
+    readonly baseDir: string;
-  readonly noBrowser: boolean;
+    readonly staticDir: string | undefined;
-  readonly startupPresentation: StartupPresentation;
+    readonly devUrl: URL | undefined;
-  readonly desktopBootstrapToken: string | undefined;
+    readonly noBrowser: boolean;
-  readonly autoBootstrapProjectFromCwd: boolean;
+    readonly startupPresentation: StartupPresentation;
-  readonly logWebSocketEvents: boolean;
+    readonly desktopBootstrapToken: string | undefined;
-  readonly tailscaleServeEnabled: boolean;
+    readonly autoBootstrapProjectFromCwd: boolean;
-  readonly tailscaleServePort: number;
+    readonly logWebSocketEvents: boolean;
+    readonly tailscaleServeEnabled: boolean;
+    readonly tailscaleServePort: number;
+  }
+>()("t3/config/ServerConfig") {
+  /** @deprecated Import and use `layerTest` from this module. */
+  static readonly layerTest = (
+    cwd: string,
+    baseDirOrPrefix: string | { readonly prefix: string },
+  ) => layerTest(cwd, baseDirOrPrefix);
 }
+export const make = (config: ServerConfig["Service"]) => ServerConfig.of(config);
+export const layer = (config: ServerConfig["Service"]) => Layer.succeed(ServerConfig, make(config));
 export const deriveServerPaths = Effect.fn(function* (
-  baseDir: ServerConfigShape["baseDir"],
+  baseDir: ServerConfig["Service"]["baseDir"],
-  devUrl: ServerConfigShape["devUrl"],
+  devUrl: ServerConfig["Service"]["devUrl"],
 ): Effect.fn.Return<ServerDerivedPaths, never, Path.Path> {
   const { join } = yield* Path.Path;
   const stateDir = join(baseDir, devUrl !== undefined ? "dev" : "userdata");
   );
 });
-/**
+const makeTest = Effect.fn("ServerConfig.makeTest")(function* (
- * ServerConfig - Service tag for server runtime configuration.
+  cwd: string,
- */
+  baseDirOrPrefix: string | { readonly prefix: string },
-export class ServerConfig extends Context.Service<ServerConfig, ServerConfigShape>()(
-  "t3/config/ServerConfig",
 ) {
-  static readonly layerTest = (cwd: string, baseDirOrPrefix: string | { prefix: string }) =>
+  const devUrl = undefined;
-    Layer.effect(
+  const fs = yield* FileSystem.FileSystem;
-      ServerConfig,
+  const baseDir =
-      Effect.gen(function* () {
+    typeof baseDirOrPrefix === "string"
-        const devUrl = undefined;
+      ? baseDirOrPrefix
+      : yield* fs.makeTempDirectoryScoped({ prefix: baseDirOrPrefix.prefix });
+  const derivedPaths = yield* deriveServerPaths(baseDir, devUrl);
+  yield* ensureServerDirectories(derivedPaths);
-        const fs = yield* FileSystem.FileSystem;
+  return ServerConfig.of({
-        const baseDir =
+    logLevel: "Error",
-          typeof baseDirOrPrefix === "string"
+    traceMinLevel: "Info",
-            ? baseDirOrPrefix
+    traceTimingEnabled: true,
-            : yield* fs.makeTempDirectoryScoped({ prefix: baseDirOrPrefix.prefix });
+    traceBatchWindowMs: 200,
-        const derivedPaths = yield* deriveServerPaths(baseDir, devUrl);
+    traceMaxBytes: 10 * 1024 * 1024,
-        yield* ensureServerDirectories(derivedPaths);
+    traceMaxFiles: 10,
+    otlpTracesUrl: undefined,
+    otlpMetricsUrl: undefined,
+    otlpExportIntervalMs: 10_000,
+    otlpServiceName: "t3-server",
+    cwd,
+    baseDir,
+    ...derivedPaths,
+    mode: "web",
+    autoBootstrapProjectFromCwd: false,
+    logWebSocketEvents: false,
+    tailscaleServeEnabled: false,
+    tailscaleServePort: 443,
+    port: 0,
+    host: undefined,
+    desktopBootstrapToken: undefined,
+    staticDir: undefined,
+    devUrl,
+    noBrowser: false,
+    startupPresentation: "browser",
+  });
+});
-        return {
+export const layerTest = (cwd: string, baseDirOrPrefix: string | { readonly prefix: string }) =>
-          logLevel: "Error",
+  Layer.effect(ServerConfig, makeTest(cwd, baseDirOrPrefix));
-          traceMinLevel: "Info",
-          traceTimingEnabled: true,
-          traceBatchWindowMs: 200,
-          traceMaxBytes: 10 * 1024 * 1024,
-          traceMaxFiles: 10,
-          otlpTracesUrl: undefined,
-          otlpMetricsUrl: undefined,
-          otlpExportIntervalMs: 10_000,
-          otlpServiceName: "t3-server",
-          cwd,
-          baseDir,
-          ...derivedPaths,
-          mode: "web",
-          autoBootstrapProjectFromCwd: false,
-          logWebSocketEvents: false,
-          tailscaleServeEnabled: false,
-          tailscaleServePort: 443,
-          port: 0,
-          host: undefined,
-          desktopBootstrapToken: undefined,
-          staticDir: undefined,
-          devUrl,
-          noBrowser: false,
-          startupPresentation: "browser",
-        } satisfies ServerConfigShape;
-      }),
-    );
-}
 export const resolveStaticDir = Effect.fn(function* () {
   const { join, resolve } = yield* Path.Path;

apps/server/src/environment/Layers/ServerEnvironment.test.ts+8−10

 import * as Layer from "effect/Layer";
 import * as PlatformError from "effect/PlatformError";
-import { deriveServerPaths, ServerConfig, type ServerConfigShape } from "../../config.ts";
+import * as ServerConfig from "../../config.ts";
-import { ServerEnvironment } from "../Services/ServerEnvironment.ts";
+import * as ServerEnvironment from "../Services/ServerEnvironment.ts";
 import { ServerEnvironmentLive } from "./ServerEnvironment.ts";
 const makeServerEnvironmentLayer = (baseDir: string) =>
   ServerEnvironmentLive.pipe(Layer.provide(ServerConfig.layerTest(process.cwd(), baseDir)));
 const makeServerConfig = Effect.fn(function* (baseDir: string) {
-  const derivedPaths = yield* deriveServerPaths(baseDir, undefined);
+  const derivedPaths = yield* ServerConfig.deriveServerPaths(baseDir, undefined);
   return {
     ...derivedPaths,
     devUrl: undefined,
     noBrowser: false,
     startupPresentation: "browser",
-  } satisfies ServerConfigShape;
+  } satisfies ServerConfig.ServerConfig["Service"];
 });
 it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
       });
       const first = yield* Effect.gen(function* () {
-        const serverEnvironment = yield* ServerEnvironment;
+        const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;
         return yield* serverEnvironment.getDescriptor;
       }).pipe(Effect.provide(makeServerEnvironmentLayer(baseDir)));
       const second = yield* Effect.gen(function* () {
-        const serverEnvironment = yield* ServerEnvironment;
+        const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;
         return yield* serverEnvironment.getDescriptor;
       }).pipe(Effect.provide(makeServerEnvironmentLayer(baseDir)));
       });
       const exit = yield* Effect.gen(function* () {
-        const serverEnvironment = yield* ServerEnvironment;
+        const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;
         return yield* serverEnvironment.getDescriptor;
       }).pipe(
         Effect.provide(
           ServerEnvironmentLive.pipe(
-            Layer.provide(
+            Layer.provide(Layer.merge(ServerConfig.layer(serverConfig), failingFileSystemLayer)),
-              Layer.merge(Layer.succeed(ServerConfig, serverConfig), failingFileSystemLayer),
-            ),
           ),
         ),
         Effect.exit,

apps/server/src/keybindings.test.ts+48−55

@@ -9,28 +9,21 @@ import * as Layer from "effect/Layer"; · 8 unmodified lines
9	import * as Logger from "effect/Logger";	9	import * as Logger from "effect/Logger";
10	import * as Path from "effect/Path";	10	import * as Path from "effect/Path";
11	import * as Schema from "effect/Schema";	11	import * as Schema from "effect/Schema";
12	import { ServerConfig } from "./config.ts";	12	import * as ServerConfig from "./config.ts";
13		13	import * as Keybindings from "./keybindings.ts";
14	import {
15	DEFAULT_KEYBINDINGS,
16	Keybindings,
17	KeybindingsLive,
18	ResolvedKeybindingFromConfig,
19	compileResolvedKeybindingRule,
20	compileResolvedKeybindingsConfig,
21	parseKeybindingShortcut,
22	} from "./keybindings.ts";
23	import { KeybindingsConfigError } from "@t3tools/contracts";	14	import { KeybindingsConfigError } from "@t3tools/contracts";
24		15
25	const KeybindingsConfigJson = Schema.fromJsonString(KeybindingsConfig);	16	const KeybindingsConfigJson = Schema.fromJsonString(KeybindingsConfig);
26	const encodeKeybindingsConfigJson = Schema.encodeEffect(KeybindingsConfigJson);	17	const encodeKeybindingsConfigJson = Schema.encodeEffect(KeybindingsConfigJson);
27	const decodeKeybindingsConfigJson = Schema.decodeUnknownEffect(KeybindingsConfigJson);	18	const decodeKeybindingsConfigJson = Schema.decodeUnknownEffect(KeybindingsConfigJson);
28	const encodeResolvedKeybindingFromConfig = Schema.encodeEffect(ResolvedKeybindingFromConfig);	19	const encodeResolvedKeybindingFromConfig = Schema.encodeEffect(
		20	Keybindings.ResolvedKeybindingFromConfig,
		21	);
29	const decodeResolvedKeybindingFromConfigExit = Schema.decodeUnknownExit(	22	const decodeResolvedKeybindingFromConfigExit = Schema.decodeUnknownExit(
30	ResolvedKeybindingFromConfig,	23	Keybindings.ResolvedKeybindingFromConfig,
31	);	24	);
32	const makeKeybindingsLayer = () => {	25	const makeKeybindingsLayer = () => {
33	return KeybindingsLive.pipe(	26	return Keybindings.layer.pipe(
34	Layer.provideMerge(	27	Layer.provideMerge(
35	Layer.fresh(	28	Layer.fresh(
36	ServerConfig.layerTest(process.cwd(), {	29	ServerConfig.layerTest(process.cwd(), {
@@ -66,7 +59,7 @@ const readKeybindingsConfig = (configPath: string) => · 29 unmodified lines
66	it.layer(NodeServices.layer)("keybindings", (it) => {	59	it.layer(NodeServices.layer)("keybindings", (it) => {
67	it.effect("parses shortcuts including plus key", () =>	60	it.effect("parses shortcuts including plus key", () =>
68	Effect.sync(() => {	61	Effect.sync(() => {
69	assert.deepEqual(parseKeybindingShortcut("mod+j"), {	62	assert.deepEqual(Keybindings.parseKeybindingShortcut("mod+j"), {
70	key: "j",	63	key: "j",
71	metaKey: false,	64	metaKey: false,
72	ctrlKey: false,	65	ctrlKey: false,
@@ -74,7 +67,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 1 unmodified line
74	altKey: false,	67	altKey: false,
75	modKey: true,	68	modKey: true,
76	});	69	});
77	assert.deepEqual(parseKeybindingShortcut("mod++"), {	70	assert.deepEqual(Keybindings.parseKeybindingShortcut("mod++"), {
78	key: "+",	71	key: "+",
79	metaKey: false,	72	metaKey: false,
80	ctrlKey: false,	73	ctrlKey: false,
@@ -87,7 +80,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 6 unmodified lines
87		80
88	it.effect("compiles valid rule with parsed when AST", () =>	81	it.effect("compiles valid rule with parsed when AST", () =>
89	Effect.sync(() => {	82	Effect.sync(() => {
90	const compiled = compileResolvedKeybindingRule({	83	const compiled = Keybindings.compileResolvedKeybindingRule({
91	key: "mod+d",	84	key: "mod+d",
92	command: "terminal.split",	85	command: "terminal.split",
93	when: "terminalOpen && !terminalFocus",	86	when: "terminalOpen && !terminalFocus",
@@ -137,14 +130,14 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 43 unmodified lines
137	it.effect("rejects invalid rules", () =>	130	it.effect("rejects invalid rules", () =>
138	Effect.sync(() => {	131	Effect.sync(() => {
139	assert.isNull(	132	assert.isNull(
140	compileResolvedKeybindingRule({	133	Keybindings.compileResolvedKeybindingRule({
141	key: "mod+shift+d+o",	134	key: "mod+shift+d+o",
142	command: "terminal.new",	135	command: "terminal.new",
143	}),	136	}),
144	);	137	);
145		138
146	assert.isNull(	139	assert.isNull(
147	compileResolvedKeybindingRule({	140	Keybindings.compileResolvedKeybindingRule({
148	key: "mod+d",	141	key: "mod+d",
149	command: "terminal.split",	142	command: "terminal.split",
150	when: "terminalFocus && (",	143	when: "terminalFocus && (",
@@ -152,7 +145,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 1 unmodified line
152	);	145	);
153		146
154	assert.isNull(	147	assert.isNull(
155	compileResolvedKeybindingRule({	148	Keybindings.compileResolvedKeybindingRule({
156	key: "mod+d",	149	key: "mod+d",
157	command: "terminal.split",	150	command: "terminal.split",
158	when: `${"!".repeat(300)}terminalFocus`,	151	when: `${"!".repeat(300)}terminalFocus`,
@@ -181,23 +174,23 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 22 unmodified lines
181	it.effect("bootstraps default keybindings when config file is missing", () =>	174	it.effect("bootstraps default keybindings when config file is missing", () =>
182	Effect.gen(function* () {	175	Effect.gen(function* () {
183	const fs = yield* FileSystem.FileSystem;	176	const fs = yield* FileSystem.FileSystem;
184	const { keybindingsConfigPath } = yield* ServerConfig;	177	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
185	assert.isFalse(yield* fs.exists(keybindingsConfigPath));	178	assert.isFalse(yield* fs.exists(keybindingsConfigPath));
186		179
187	yield* Effect.gen(function* () {	180	yield* Effect.gen(function* () {
188	const keybindings = yield* Keybindings;	181	const keybindings = yield* Keybindings.Keybindings;
189	yield* keybindings.syncDefaultKeybindingsOnStartup;	182	yield* keybindings.syncDefaultKeybindingsOnStartup;
190	});	183	});
191		184
192	const persisted = yield* readKeybindingsConfig(keybindingsConfigPath);	185	const persisted = yield* readKeybindingsConfig(keybindingsConfigPath);
193	assert.deepEqual(persisted, DEFAULT_KEYBINDINGS);	186	assert.deepEqual(persisted, Keybindings.DEFAULT_KEYBINDINGS);
194	}).pipe(Effect.provide(makeKeybindingsLayer())),	187	}).pipe(Effect.provide(makeKeybindingsLayer())),
195	);	188	);
196		189
197	it.effect("ships configurable thread navigation defaults", () =>	190	it.effect("ships configurable thread navigation defaults", () =>
198	Effect.sync(() => {	191	Effect.sync(() => {
199	const defaultsByCommand = new Map(	192	const defaultsByCommand = new Map(
200	DEFAULT_KEYBINDINGS.map((binding) => [binding.command, binding.key] as const),	193	Keybindings.DEFAULT_KEYBINDINGS.map((binding) => [binding.command, binding.key] as const),
201	);	194	);
202		195
203	assert.equal(defaultsByCommand.get("thread.previous"), "mod+shift+[");	196	assert.equal(defaultsByCommand.get("thread.previous"), "mod+shift+[");
@@ -215,17 +208,17 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 11 unmodified lines
215	it.effect("uses defaults in runtime when config is malformed without overriding file", () =>	208	it.effect("uses defaults in runtime when config is malformed without overriding file", () =>
216	Effect.gen(function* () {	209	Effect.gen(function* () {
217	const fs = yield* FileSystem.FileSystem;	210	const fs = yield* FileSystem.FileSystem;
218	const { keybindingsConfigPath } = yield* ServerConfig;	211	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
219	yield* fs.writeFileString(keybindingsConfigPath, "{ not-json");	212	yield* fs.writeFileString(keybindingsConfigPath, "{ not-json");
220		213
221	const configState = yield* Effect.gen(function* () {	214	const configState = yield* Effect.gen(function* () {
222	const keybindings = yield* Keybindings;	215	const keybindings = yield* Keybindings.Keybindings;
223	return yield* keybindings.loadConfigState;	216	return yield* keybindings.loadConfigState;
224	});	217	});
225		218
226	assert.deepEqual(	219	assert.deepEqual(
227	configState.keybindings,	220	configState.keybindings,
228	compileResolvedKeybindingsConfig(DEFAULT_KEYBINDINGS),	221	Keybindings.compileResolvedKeybindingsConfig(Keybindings.DEFAULT_KEYBINDINGS),
229	);	222	);
230	assert.deepEqual(configState.issues, [	223	assert.deepEqual(configState.issues, [
231	{	224	{
@@ -240,7 +233,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 8 unmodified lines
240	it.effect("ignores invalid entries in runtime and reports them as issues", () =>	233	it.effect("ignores invalid entries in runtime and reports them as issues", () =>
241	Effect.gen(function* () {	234	Effect.gen(function* () {
242	const fs = yield* FileSystem.FileSystem;	235	const fs = yield* FileSystem.FileSystem;
243	const { keybindingsConfigPath } = yield* ServerConfig;	236	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
244	yield* fs.writeFileString(	237	yield* fs.writeFileString(
245	keybindingsConfigPath,	238	keybindingsConfigPath,
246	// @effect-diagnostics-next-line preferSchemaOverJson:off	239	// @effect-diagnostics-next-line preferSchemaOverJson:off
@@ -252,7 +245,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 5 unmodified lines
252	);	245	);
253		246
254	const configState = yield* Effect.gen(function* () {	247	const configState = yield* Effect.gen(function* () {
255	const keybindings = yield* Keybindings;	248	const keybindings = yield* Keybindings.Keybindings;
256	return yield* keybindings.loadConfigState;	249	return yield* keybindings.loadConfigState;
257	});	250	});
258		251
@@ -279,14 +272,14 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 20 unmodified lines
279	"upserts missing default keybindings on startup without overriding existing command rules",	272	"upserts missing default keybindings on startup without overriding existing command rules",
280	() =>	273	() =>
281	Effect.gen(function* () {	274	Effect.gen(function* () {
282	const { keybindingsConfigPath } = yield* ServerConfig;	275	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
283	yield* writeKeybindingsConfig(keybindingsConfigPath, [	276	yield* writeKeybindingsConfig(keybindingsConfigPath, [
284	{ key: "mod+shift+t", command: "terminal.toggle" },	277	{ key: "mod+shift+t", command: "terminal.toggle" },
285	{ key: "mod+shift+r", command: "script.run-tests.run" },	278	{ key: "mod+shift+r", command: "script.run-tests.run" },
286	]);	279	]);
287		280
288	yield* Effect.gen(function* () {	281	yield* Effect.gen(function* () {
289	const keybindings = yield* Keybindings;	282	const keybindings = yield* Keybindings.Keybindings;
290	yield* keybindings.syncDefaultKeybindingsOnStartup;	283	yield* keybindings.syncDefaultKeybindingsOnStartup;
291	});	284	});
292		285
@@ -300,7 +293,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 7 unmodified lines
300	persisted.some((entry) => entry.command === "terminal.toggle" && entry.key === "mod+j"),	293	persisted.some((entry) => entry.command === "terminal.toggle" && entry.key === "mod+j"),
301	);	294	);
302		295
303	for (const defaultRule of DEFAULT_KEYBINDINGS) {	296	for (const defaultRule of Keybindings.DEFAULT_KEYBINDINGS) {
304	assert.isTrue(byCommand.has(defaultRule.command), `expected ${defaultRule.command}`);	297	assert.isTrue(byCommand.has(defaultRule.command), `expected ${defaultRule.command}`);
305	}	298	}
306	assert.isTrue(byCommand.has("script.run-tests.run"));	299	assert.isTrue(byCommand.has("script.run-tests.run"));
@@ -314,13 +307,13 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 7 unmodified lines
314	});	307	});
315		308
316	return Effect.gen(function* () {	309	return Effect.gen(function* () {
317	const { keybindingsConfigPath } = yield* ServerConfig;	310	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
318	yield* writeKeybindingsConfig(keybindingsConfigPath, [	311	yield* writeKeybindingsConfig(keybindingsConfigPath, [
319	{ key: "mod+j", command: "script.custom-action.run" },	312	{ key: "mod+j", command: "script.custom-action.run" },
320	]);	313	]);
321		314
322	yield* Effect.gen(function* () {	315	yield* Effect.gen(function* () {
323	const keybindings = yield* Keybindings;	316	const keybindings = yield* Keybindings.Keybindings;
324	yield* keybindings.syncDefaultKeybindingsOnStartup;	317	yield* keybindings.syncDefaultKeybindingsOnStartup;
325	});	318	});
326		319
@@ -345,13 +338,13 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 18 unmodified lines
345		338
346	it.effect("upserts custom keybindings to configured path", () =>	339	it.effect("upserts custom keybindings to configured path", () =>
347	Effect.gen(function* () {	340	Effect.gen(function* () {
348	const { keybindingsConfigPath } = yield* ServerConfig;	341	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
349	yield* writeKeybindingsConfig(keybindingsConfigPath, [	342	yield* writeKeybindingsConfig(keybindingsConfigPath, [
350	{ key: "mod+j", command: "terminal.toggle" },	343	{ key: "mod+j", command: "terminal.toggle" },
351	]);	344	]);
352		345
353	const resolved = yield* Effect.gen(function* () {	346	const resolved = yield* Effect.gen(function* () {
354	const keybindings = yield* Keybindings;	347	const keybindings = yield* Keybindings.Keybindings;
355	return yield* keybindings.upsertKeybindingRule({	348	return yield* keybindings.upsertKeybindingRule({
356	key: "mod+shift+r",	349	key: "mod+shift+r",
357	command: "script.run-tests.run",	350	command: "script.run-tests.run",
@@ -371,12 +364,12 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 13 unmodified lines
371		364
372	it.effect("appends additional custom keybindings for the same command", () =>	365	it.effect("appends additional custom keybindings for the same command", () =>
373	Effect.gen(function* () {	366	Effect.gen(function* () {
374	const { keybindingsConfigPath } = yield* ServerConfig;	367	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
375	yield* writeKeybindingsConfig(keybindingsConfigPath, [	368	yield* writeKeybindingsConfig(keybindingsConfigPath, [
376	{ key: "mod+r", command: "script.run-tests.run" },	369	{ key: "mod+r", command: "script.run-tests.run" },
377	]);	370	]);
378	yield* Effect.gen(function* () {	371	yield* Effect.gen(function* () {
379	const keybindings = yield* Keybindings;	372	const keybindings = yield* Keybindings.Keybindings;
380	return yield* keybindings.upsertKeybindingRule({	373	return yield* keybindings.upsertKeybindingRule({
381	key: "mod+shift+r",	374	key: "mod+shift+r",
382	command: "script.run-tests.run",	375	command: "script.run-tests.run",
@@ -394,13 +387,13 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 11 unmodified lines
394		387
395	it.effect("replaces only the targeted custom keybinding", () =>	388	it.effect("replaces only the targeted custom keybinding", () =>
396	Effect.gen(function* () {	389	Effect.gen(function* () {
397	const { keybindingsConfigPath } = yield* ServerConfig;	390	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
398	yield* writeKeybindingsConfig(keybindingsConfigPath, [	391	yield* writeKeybindingsConfig(keybindingsConfigPath, [
399	{ key: "mod+r", command: "script.run-tests.run" },	392	{ key: "mod+r", command: "script.run-tests.run" },
400	{ key: "mod+shift+r", command: "script.run-tests.run" },	393	{ key: "mod+shift+r", command: "script.run-tests.run" },
401	]);	394	]);
402	yield* Effect.gen(function* () {	395	yield* Effect.gen(function* () {
403	const keybindings = yield* Keybindings;	396	const keybindings = yield* Keybindings.Keybindings;
404	return yield* keybindings.upsertKeybindingRule({	397	return yield* keybindings.upsertKeybindingRule({
405	key: "mod+alt+r",	398	key: "mod+alt+r",
406	command: "script.run-tests.run",	399	command: "script.run-tests.run",
@@ -419,13 +412,13 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 12 unmodified lines
419		412
420	it.effect("removes only the targeted custom keybinding", () =>	413	it.effect("removes only the targeted custom keybinding", () =>
421	Effect.gen(function* () {	414	Effect.gen(function* () {
422	const { keybindingsConfigPath } = yield* ServerConfig;	415	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
423	yield* writeKeybindingsConfig(keybindingsConfigPath, [	416	yield* writeKeybindingsConfig(keybindingsConfigPath, [
424	{ key: "mod+r", command: "script.run-tests.run" },	417	{ key: "mod+r", command: "script.run-tests.run" },
425	{ key: "mod+shift+r", command: "script.run-tests.run" },	418	{ key: "mod+shift+r", command: "script.run-tests.run" },
426	]);	419	]);
427	yield* Effect.gen(function* () {	420	yield* Effect.gen(function* () {
428	const keybindings = yield* Keybindings;	421	const keybindings = yield* Keybindings.Keybindings;
429	return yield* keybindings.removeKeybindingRule({	422	return yield* keybindings.removeKeybindingRule({
430	key: "mod+r",	423	key: "mod+r",
431	command: "script.run-tests.run",	424	command: "script.run-tests.run",
@@ -441,11 +434,11 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 9 unmodified lines
441	it.effect("refuses to overwrite malformed keybindings config", () =>	434	it.effect("refuses to overwrite malformed keybindings config", () =>
442	Effect.gen(function* () {	435	Effect.gen(function* () {
443	const fs = yield* FileSystem.FileSystem;	436	const fs = yield* FileSystem.FileSystem;
444	const { keybindingsConfigPath } = yield* ServerConfig;	437	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
445	yield* fs.writeFileString(keybindingsConfigPath, "{ not-json");	438	yield* fs.writeFileString(keybindingsConfigPath, "{ not-json");
446		439
447	const result = yield* Effect.gen(function* () {	440	const result = yield* Effect.gen(function* () {
448	const keybindings = yield* Keybindings;	441	const keybindings = yield* Keybindings.Keybindings;
449	return yield* keybindings.upsertKeybindingRule({	442	return yield* keybindings.upsertKeybindingRule({
450	key: "mod+shift+r",	443	key: "mod+shift+r",
451	command: "script.run-tests.run",	444	command: "script.run-tests.run",
@@ -461,14 +454,14 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 9 unmodified lines
461	it.effect("reports non-array config parse errors without duplicate prefix", () =>	454	it.effect("reports non-array config parse errors without duplicate prefix", () =>
462	Effect.gen(function* () {	455	Effect.gen(function* () {
463	const fs = yield* FileSystem.FileSystem;	456	const fs = yield* FileSystem.FileSystem;
464	const { keybindingsConfigPath } = yield* ServerConfig;	457	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
465	yield* fs.writeFileString(	458	yield* fs.writeFileString(
466	keybindingsConfigPath,	459	keybindingsConfigPath,
467	'{"key":"mod+j","command":"terminal.toggle"}',	460	'{"key":"mod+j","command":"terminal.toggle"}',
468	);	461	);
469		462
470	const firstResult = yield* Effect.gen(function* () {	463	const firstResult = yield* Effect.gen(function* () {
471	const keybindings = yield* Keybindings;	464	const keybindings = yield* Keybindings.Keybindings;
472	return yield* keybindings.upsertKeybindingRule({	465	return yield* keybindings.upsertKeybindingRule({
473	key: "mod+shift+r",	466	key: "mod+shift+r",
474	command: "script.run-tests.run",	467	command: "script.run-tests.run",
@@ -477,7 +470,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 2 unmodified lines
477	assertFailure(firstResult, "expected JSON array");	470	assertFailure(firstResult, "expected JSON array");
478		471
479	const secondResult = yield* Effect.gen(function* () {	472	const secondResult = yield* Effect.gen(function* () {
480	const keybindings = yield* Keybindings;	473	const keybindings = yield* Keybindings.Keybindings;
481	return yield* keybindings.upsertKeybindingRule({	474	return yield* keybindings.upsertKeybindingRule({
482	key: "mod+shift+r",	475	key: "mod+shift+r",
483	command: "script.run-tests.run",	476	command: "script.run-tests.run",
@@ -490,7 +483,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 6 unmodified lines
490	it.effect("fails when config directory is not writable", () =>	483	it.effect("fails when config directory is not writable", () =>
491	Effect.gen(function* () {	484	Effect.gen(function* () {
492	const fs = yield* FileSystem.FileSystem;	485	const fs = yield* FileSystem.FileSystem;
493	const { keybindingsConfigPath } = yield* ServerConfig;	486	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
494	const { dirname } = yield* Path.Path;	487	const { dirname } = yield* Path.Path;
495	yield* writeKeybindingsConfig(keybindingsConfigPath, [	488	yield* writeKeybindingsConfig(keybindingsConfigPath, [
496	{ key: "mod+j", command: "terminal.toggle" },	489	{ key: "mod+j", command: "terminal.toggle" },
@@ -498,7 +491,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 1 unmodified line
498	yield* fs.chmod(dirname(keybindingsConfigPath), 0o500);	491	yield* fs.chmod(dirname(keybindingsConfigPath), 0o500);
499		492
500	const result = yield* Effect.gen(function* () {	493	const result = yield* Effect.gen(function* () {
501	const keybindings = yield* Keybindings;	494	const keybindings = yield* Keybindings.Keybindings;
502	return yield* keybindings.upsertKeybindingRule({	495	return yield* keybindings.upsertKeybindingRule({
503	key: "mod+shift+r",	496	key: "mod+shift+r",
504	command: "script.run-tests.run",	497	command: "script.run-tests.run",
@@ -516,13 +509,13 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 11 unmodified lines
516		509
517	it.effect("caches loaded resolved config across repeated reads", () =>	510	it.effect("caches loaded resolved config across repeated reads", () =>
518	Effect.gen(function* () {	511	Effect.gen(function* () {
519	const { keybindingsConfigPath } = yield* ServerConfig;	512	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
520	yield* writeKeybindingsConfig(keybindingsConfigPath, [	513	yield* writeKeybindingsConfig(keybindingsConfigPath, [
521	{ key: "mod+j", command: "terminal.toggle" },	514	{ key: "mod+j", command: "terminal.toggle" },
522	]);	515	]);
523		516
524	const [first, second] = yield* Effect.gen(function* () {	517	const [first, second] = yield* Effect.gen(function* () {
525	const keybindings = yield* Keybindings;	518	const keybindings = yield* Keybindings.Keybindings;
526	const firstLoad = (yield* keybindings.loadConfigState).keybindings;	519	const firstLoad = (yield* keybindings.loadConfigState).keybindings;
527	const secondLoad = (yield* keybindings.loadConfigState).keybindings;	520	const secondLoad = (yield* keybindings.loadConfigState).keybindings;
528	return [firstLoad, secondLoad] as const;	521	return [firstLoad, secondLoad] as const;
@@ -535,13 +528,13 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 6 unmodified lines
535		528
536	it.effect("updates cached resolved config after upsert", () =>	529	it.effect("updates cached resolved config after upsert", () =>
537	Effect.gen(function* () {	530	Effect.gen(function* () {
538	const { keybindingsConfigPath } = yield* ServerConfig;	531	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
539	yield* writeKeybindingsConfig(keybindingsConfigPath, [	532	yield* writeKeybindingsConfig(keybindingsConfigPath, [
540	{ key: "mod+j", command: "terminal.toggle" },	533	{ key: "mod+j", command: "terminal.toggle" },
541	]);	534	]);
542		535
543	const loadedAfterUpsert = yield* Effect.gen(function* () {	536	const loadedAfterUpsert = yield* Effect.gen(function* () {
544	const keybindings = yield* Keybindings;	537	const keybindings = yield* Keybindings.Keybindings;
545	yield* keybindings.loadConfigState;	538	yield* keybindings.loadConfigState;
546	yield* keybindings.upsertKeybindingRule({	539	yield* keybindings.upsertKeybindingRule({
547	key: "mod+shift+r",	540	key: "mod+shift+r",
@@ -557,7 +550,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 9 unmodified lines
557		550
558	it.effect("serializes concurrent upserts to avoid lost updates", () =>	551	it.effect("serializes concurrent upserts to avoid lost updates", () =>
559	Effect.gen(function* () {	552	Effect.gen(function* () {
560	const { keybindingsConfigPath } = yield* ServerConfig;	553	const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
561	yield* writeKeybindingsConfig(keybindingsConfigPath, []);	554	yield* writeKeybindingsConfig(keybindingsConfigPath, []);
562		555
563	const commands = Array.from(	556	const commands = Array.from(
@@ -565,7 +558,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { · 1 unmodified line
565	(_, index): KeybindingCommand => `script.concurrent-${index}.run`,	558	(_, index): KeybindingCommand => `script.concurrent-${index}.run`,
566	);	559	);
567	yield* Effect.gen(function* () {	560	yield* Effect.gen(function* () {
568	const keybindings = yield* Keybindings;	561	const keybindings = yield* Keybindings.Keybindings;
569	yield* Effect.all(	562	yield* Effect.all(
570	commands.map((command, index) =>	563	commands.map((command, index) =>
571	keybindings.upsertKeybindingRule({	564	keybindings.upsertKeybindingRule({

apps/server/src/keybindings.ts+63−67

 import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 import * as Semaphore from "effect/Semaphore";
-import { ServerConfig } from "./config.ts";
+import * as ServerConfig from "./config.ts";
 import { writeFileStringAtomically } from "./atomicWrite.ts";
 import { fromJsonStringPretty, fromLenientJson } from "@t3tools/shared/schemaJson";
 import {
   return merged.slice(-MAX_KEYBINDINGS_COUNT);
 }
-/**
- * KeybindingsShape - Service API for keybinding configuration operations.
- */
-export interface KeybindingsShape {
-  /**
-   * Start the keybindings runtime and attach file watching.
-   *
-   * Safe to call multiple times. The first successful call establishes the
-   * runtime; later calls await the same startup.
-   */
-  readonly start: Effect.Effect<void, KeybindingsConfigError>;
-  /**
-   * Await keybindings runtime readiness.
-   *
-   * Readiness means the config directory exists, the watcher is attached, the
-   * startup sync has completed, and the current snapshot has been loaded.
-   */
-  readonly ready: Effect.Effect<void, KeybindingsConfigError>;
-  /**
-   * Ensure the on-disk keybindings file exists and includes all default
-   * commands so newly-added defaults are backfilled on startup.
-   */
-  readonly syncDefaultKeybindingsOnStartup: Effect.Effect<void, KeybindingsConfigError>;
-  /**
-   * Load runtime keybindings state along with non-fatal configuration issues.
-   */
-  readonly loadConfigState: Effect.Effect<KeybindingsConfigState, KeybindingsConfigError>;
-  /**
-   * Read the latest keybindings snapshot from cache/disk.
-   */
-  readonly getSnapshot: Effect.Effect<KeybindingsConfigState, KeybindingsConfigError>;
-  /**
-   * Stream of keybindings config change events.
-   */
-  readonly streamChanges: Stream.Stream<KeybindingsChangeEvent>;
-  /**
-   * Upsert a keybinding rule and persist the resulting configuration.
-   *
-   * Writes config atomically and enforces the max rule count by truncating
-   * oldest entries when needed.
-   */
-  readonly upsertKeybindingRule: (
-    input: ServerUpsertKeybindingInput,
-  ) => Effect.Effect<ResolvedKeybindingsConfig, KeybindingsConfigError>;
-  /**
-   * Remove a single persisted keybinding rule by exact key/command/when match.
-   */
-  readonly removeKeybindingRule: (
-    input: ServerRemoveKeybindingInput,
-  ) => Effect.Effect<ResolvedKeybindingsConfig, KeybindingsConfigError>;
-}
 /**
  * Keybindings - Service tag for keybinding configuration operations.
  */
-export class Keybindings extends Context.Service<Keybindings, KeybindingsShape>()(
+export class Keybindings extends Context.Service<
-  "t3/keybindings",
+  Keybindings,
-) {}
+  {
+    /**
+     * Start the keybindings runtime and attach file watching.
+     *
+     * Safe to call multiple times. The first successful call establishes the
+     * runtime; later calls await the same startup.
+     */
+    readonly start: Effect.Effect<void, KeybindingsConfigError>;
+    /**
+     * Await keybindings runtime readiness.
+     *
+     * Readiness means the config directory exists, the watcher is attached, the
+     * startup sync has completed, and the current snapshot has been loaded.
+     */
+    readonly ready: Effect.Effect<void, KeybindingsConfigError>;
+    /**
+     * Ensure the on-disk keybindings file exists and includes all default
+     * commands so newly-added defaults are backfilled on startup.
+     */
+    readonly syncDefaultKeybindingsOnStartup: Effect.Effect<void, KeybindingsConfigError>;
+    /**
+     * Load runtime keybindings state along with non-fatal configuration issues.
+     */
+    readonly loadConfigState: Effect.Effect<KeybindingsConfigState, KeybindingsConfigError>;
+    /**
+     * Read the latest keybindings snapshot from cache/disk.
+     */
+    readonly getSnapshot: Effect.Effect<KeybindingsConfigState, KeybindingsConfigError>;
+    /**
+     * Stream of keybindings config change events.
+     */
+    readonly streamChanges: Stream.Stream<KeybindingsChangeEvent>;
+    /**
+     * Upsert a keybinding rule and persist the resulting configuration.
+     *
+     * Writes config atomically and enforces the max rule count by truncating
+     * oldest entries when needed.
+     */
+    readonly upsertKeybindingRule: (
+      input: ServerUpsertKeybindingInput,
+    ) => Effect.Effect<ResolvedKeybindingsConfig, KeybindingsConfigError>;
+    /**
+     * Remove a single persisted keybinding rule by exact key/command/when match.
+     */
+    readonly removeKeybindingRule: (
+      input: ServerRemoveKeybindingInput,
+    ) => Effect.Effect<ResolvedKeybindingsConfig, KeybindingsConfigError>;
+  }
+>()("t3/keybindings") {}
-const makeKeybindings = Effect.gen(function* () {
+const make = Effect.gen(function* () {
-  const { keybindingsConfigPath } = yield* ServerConfig;
+  const { keybindingsConfigPath } = yield* ServerConfig.ServerConfig;
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
   const upsertSemaphore = yield* Semaphore.make(1);
           return nextResolved;
         }),
       ),
-  } satisfies KeybindingsShape;
+  } satisfies Keybindings["Service"];
 });
-export const KeybindingsLive = Layer.effect(Keybindings, makeKeybindings);
+export const layer = Layer.effect(Keybindings, make);

apps/server/src/mcp/McpHttpServer.test.ts+9−1

@@ -107,7 +107,15 @@ it.effect("registers annotated tools and preserves authenticated request context · 106 unmodified lines
107	Effect.gen(function* () {	107	Effect.gen(function* () {
108	const server = yield* McpServer.McpServer;	108	const server = yield* McpServer.McpServer;
109	const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;	109	const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;
110	const requests = yield* broker.connect("mcp-test-client");	110	const requests = yield* broker.connect({
		111	clientId: "mcp-test-client",
		112	environmentId,
		113	threadId,
		114	tabId,
		115	visible: true,
		116	supportsAutomation: true,
		117	focusedAt: "2026-06-11T00:00:00.000Z",
		118	});
111	yield* Stream.runForEach(requests, (request) =>	119	yield* Stream.runForEach(requests, (request) =>
112	broker.respond({	120	broker.respond({
113	requestId: request.requestId,	121	requestId: request.requestId,

apps/server/src/mcp/PreviewAutomationBroker.test.ts+122−20

@@ -2,10 +2,13 @@ import { expect, it } from "@effect/vitest"; · 1 unmodified line
2	import {	2	import {
3	EnvironmentId,	3	EnvironmentId,
4	PreviewAutomationNoFocusedOwnerError,	4	PreviewAutomationNoFocusedOwnerError,
		5	PreviewAutomationUnavailableError,
5	ProviderInstanceId,	6	ProviderInstanceId,
6	ThreadId,	7	ThreadId,
		8	type PreviewAutomationOwner,
7	} from "@t3tools/contracts";	9	} from "@t3tools/contracts";
8	import * as Effect from "effect/Effect";	10	import * as Effect from "effect/Effect";
		11	import * as Fiber from "effect/Fiber";
9	import * as Stream from "effect/Stream";	12	import * as Stream from "effect/Stream";
10		13
11	import * as PreviewAutomationBroker from "./PreviewAutomationBroker.ts";	14	import * as PreviewAutomationBroker from "./PreviewAutomationBroker.ts";
@@ -20,11 +23,22 @@ const scope = { · 8 unmodified lines
20	expiresAt: 2,	23	expiresAt: 2,
21	};	24	};
22		25
23	it.effect("routes a request to the focused owner and correlates its response", () =>	26	const makeOwner = (overrides: Partial<PreviewAutomationOwner> = {}): PreviewAutomationOwner => ({
		27	clientId: "client-1",
		28	environmentId: scope.environmentId,
		29	threadId: scope.threadId,
		30	tabId: null,
		31	visible: false,
		32	supportsAutomation: true,
		33	focusedAt: "2026-06-11T00:00:00.000Z",
		34	...overrides,
		35	});
		36
		37	it.effect("atomically registers a connected owner and correlates its response", () =>
24	Effect.scoped(	38	Effect.scoped(
25	Effect.gen(function* () {	39	Effect.gen(function* () {
26	const broker = yield* PreviewAutomationBroker.__testing.make;	40	const broker = yield* PreviewAutomationBroker.__testing.make;
27	const requests = yield* broker.connect("client-1");	41	const requests = yield* broker.connect(makeOwner());
28	yield* Stream.runForEach(requests, (request) =>	42	yield* Stream.runForEach(requests, (request) =>
29	broker.respond({	43	broker.respond({
30	requestId: request.requestId,	44	requestId: request.requestId,
@@ -33,15 +47,6 @@ it.effect("routes a request to the focused owner and correlates its response", ( · 2 unmodified lines
33	}),	47	}),
34	).pipe(Effect.forkScoped);	48	).pipe(Effect.forkScoped);
35	yield* Effect.yieldNow;	49	yield* Effect.yieldNow;
36	yield* broker.reportOwner({
37	clientId: "client-1",
38	environmentId: scope.environmentId,
39	threadId: scope.threadId,
40	tabId: null,
41	visible: false,
42	supportsAutomation: true,
43	focusedAt: "2026-06-11T00:00:00.000Z",
44	});
45		50
46	const result = yield* broker.invoke<{ available: boolean }>({	51	const result = yield* broker.invoke<{ available: boolean }>({
47	scope,	52	scope,
@@ -68,22 +73,119 @@ it.effect("routes interactive commands to a hidden durable browser host", () => · 20 unmodified lines
68	Effect.scoped(	73	Effect.scoped(
69	Effect.gen(function* () {	74	Effect.gen(function* () {
70	const broker = yield* PreviewAutomationBroker.__testing.make;	75	const broker = yield* PreviewAutomationBroker.__testing.make;
71	const requests = yield* broker.connect("client-hidden");	76	const requests = yield* broker.connect(
		77	makeOwner({ clientId: "client-hidden", tabId: "tab-hidden" }),
		78	);
		79	yield* Stream.runForEach(requests, (request) =>
		80	broker.respond({ requestId: request.requestId, ok: true }),
		81	).pipe(Effect.forkScoped);
		82	yield* Effect.yieldNow;
		83
		84	yield* broker.invoke<void>({ scope, operation: "click", input: { x: 10, y: 10 } });
		85	}),
		86	),
		87	);
		88
		89	it.effect("lets the browser host resolve an active tab that has not been reported yet", () =>
		90	Effect.scoped(
		91	Effect.gen(function* () {
		92	const broker = yield* PreviewAutomationBroker.__testing.make;
		93	const requests = yield* broker.connect(makeOwner({ tabId: null }));
		94	let routedTabId: string \| undefined;
		95	yield* Stream.runForEach(requests, (request) => {
		96	routedTabId = request.tabId;
		97	return broker.respond({ requestId: request.requestId, ok: true });
		98	}).pipe(Effect.forkScoped);
		99	yield* Effect.yieldNow;
		100
		101	yield* broker.invoke<void>({ scope, operation: "click", input: { x: 10, y: 10 } });
		102
		103	expect(routedTabId).toBeUndefined();
		104	}),
		105	),
		106	);
		107
		108	it.effect("preserves current owner metadata when its request stream reconnects", () =>
		109	Effect.scoped(
		110	Effect.gen(function* () {
		111	const broker = yield* PreviewAutomationBroker.__testing.make;
		112	const firstRequests = yield* broker.connect(makeOwner());
		113	yield* Stream.runDrain(firstRequests).pipe(Effect.forkScoped);
		114	yield* broker.reportOwner(makeOwner({ tabId: "tab-current", visible: true }));
		115
		116	const reconnectedRequests = yield* broker.connect(makeOwner());
		117	let routedTabId: string \| undefined;
		118	yield* Stream.runForEach(reconnectedRequests, (request) => {
		119	routedTabId = request.tabId;
		120	return broker.respond({ requestId: request.requestId, ok: true });
		121	}).pipe(Effect.forkScoped);
		122	yield* Effect.yieldNow;
		123
		124	yield* broker.invoke<void>({ scope, operation: "click", input: { x: 10, y: 10 } });
		125
		126	expect(routedTabId).toBe("tab-current");
		127	}),
		128	),
		129	);
		130
		131	it.effect("ignores stale owner cleanup after the client moves to another thread", () =>
		132	Effect.scoped(
		133	Effect.gen(function* () {
		134	const broker = yield* PreviewAutomationBroker.__testing.make;
		135	const requests = yield* broker.connect(makeOwner());
72	yield* Stream.runForEach(requests, (request) =>	136	yield* Stream.runForEach(requests, (request) =>
73	broker.respond({ requestId: request.requestId, ok: true }),	137	broker.respond({ requestId: request.requestId, ok: true }),
74	).pipe(Effect.forkScoped);	138	).pipe(Effect.forkScoped);
75	yield* Effect.yieldNow;	139	yield* Effect.yieldNow;
76	yield* broker.reportOwner({	140
77	clientId: "client-hidden",	141	yield* broker.clearOwner({
		142	clientId: "client-1",
78	environmentId: scope.environmentId,	143	environmentId: scope.environmentId,
79	threadId: scope.threadId,	144	threadId: ThreadId.make("thread-stale"),
80	tabId: "tab-hidden",
81	visible: false,
82	supportsAutomation: true,
83	focusedAt: "2026-06-11T00:00:00.000Z",
84	});	145	});
85		146
86	yield* broker.invoke<void>({ scope, operation: "click", input: { x: 10, y: 10 } });	147	yield* broker.invoke<void>({ scope, operation: "status", input: {} });
		148	}),
		149	),
		150	);
		151
		152	it.effect("fails requests assigned to a browser stream when that stream reconnects", () =>
		153	Effect.scoped(
		154	Effect.gen(function* () {
		155	const broker = yield* PreviewAutomationBroker.__testing.make;
		156	const _requests = yield* broker.connect(makeOwner());
		157	const pending = yield* broker
		158	.invoke<void>({ scope, operation: "status", input: {} })
		159	.pipe(Effect.flip, Effect.forkScoped);
		160	yield* Effect.yieldNow;
		161
		162	const _replacementRequests = yield* broker.connect(makeOwner());
		163
		164	const error = yield* Fiber.join(pending);
		165	expect(error).toBeInstanceOf(PreviewAutomationUnavailableError);
		166	}),
		167	),
		168	);
		169
		170	it.effect("falls back to an older connected owner when a newer report is not connected", () =>
		171	Effect.scoped(
		172	Effect.gen(function* () {
		173	const broker = yield* PreviewAutomationBroker.__testing.make;
		174	const requests = yield* broker.connect(makeOwner({ clientId: "client-connected" }));
		175	yield* Stream.runForEach(requests, (request) =>
		176	broker.respond({ requestId: request.requestId, ok: true, result: "connected" }),
		177	).pipe(Effect.forkScoped);
		178	yield* Effect.yieldNow;
		179	yield* broker.reportOwner(
		180	makeOwner({
		181	clientId: "client-report-only",
		182	focusedAt: "2026-06-11T00:00:01.000Z",
		183	}),
		184	);
		185
		186	const result = yield* broker.invoke<string>({ scope, operation: "status", input: {} });
		187
		188	expect(result).toBe("connected");
87	}),	189	}),
88	),	190	),
89	);	191	);

apps/server/src/mcp/PreviewAutomationBroker.ts+40−25

   type PreviewAutomationError,
   type PreviewAutomationOperation,
   type PreviewAutomationOwner,
+  type PreviewAutomationOwnerIdentity,
   type PreviewAutomationRequest,
   type PreviewAutomationResponse,
   type PreviewTabId,
 }
 export interface PreviewAutomationBrokerShape {
-  readonly connect: (clientId: string) => Effect.Effect<Stream.Stream<PreviewAutomationRequest>>;
+  readonly connect: (
+    owner: PreviewAutomationOwner,
+  ) => Effect.Effect<Stream.Stream<PreviewAutomationRequest>>;
   readonly reportOwner: (
     owner: PreviewAutomationOwner,
   ) => Effect.Effect<void, PreviewAutomationError>;
-  readonly clearOwner: (clientId: string) => Effect.Effect<void>;
+  readonly clearOwner: (owner: PreviewAutomationOwnerIdentity) => Effect.Effect<void>;
   readonly respond: (
     response: PreviewAutomationResponse,
   ) => Effect.Effect<void, PreviewAutomationError>;
 }
 interface PendingRequest {
-  readonly clientId: string;
+  readonly queue: ClientConnection["queue"];
   readonly deferred: Deferred.Deferred<unknown, PreviewAutomationError>;
 }
     queue: ClientConnection["queue"],
   ) {
     const toFail = yield* SynchronizedRef.modify(state, (current) => {
-      if (current.clients.get(clientId)?.queue !== queue) {
-        return [[] as ReadonlyArray<PendingRequest>, current] as const;
-      }
       const clients = new Map(current.clients);
       const owners = new Map(current.owners);
       const pending = new Map(current.pending);
       const disconnected: PendingRequest[] = [];
-      clients.delete(clientId);
+      if (current.clients.get(clientId)?.queue === queue) {
-      owners.delete(clientId);
+        clients.delete(clientId);
+        owners.delete(clientId);
+      }
       for (const [requestId, entry] of pending) {
-        if (entry.clientId === clientId) {
+        if (entry.queue === queue) {
           pending.delete(requestId);
           disconnected.push(entry);
         }
   const connect: PreviewAutomationBrokerShape["connect"] = Effect.fn(
     "PreviewAutomationBroker.connect",
-  )(function* (clientId) {
+  )(function* (owner) {
+    const clientId = owner.clientId;
     const queue = yield* Queue.unbounded<import("@t3tools/contracts").PreviewAutomationRequest>();
     const previous = yield* SynchronizedRef.modify(state, (current) => {
       const clients = new Map(current.clients);
+      const owners = new Map(current.owners);
+      const existingOwner = current.owners.get(clientId);
       clients.set(clientId, { clientId, queue });
-      return [current.clients.get(clientId), { ...current, clients }] as const;
+      owners.set(
+        clientId,
+        existingOwner?.environmentId === owner.environmentId &&
+          existingOwner.threadId === owner.threadId
+          ? { ...existingOwner, supportsAutomation: owner.supportsAutomation }
+          : owner,
+      );
+      return [current.clients.get(clientId), { ...current, clients, owners }] as const;
     });
     if (previous) yield* disconnect(clientId, previous.queue);
     return Stream.fromQueue(queue).pipe(Stream.ensuring(disconnect(clientId, queue)));
   const clearOwner: PreviewAutomationBrokerShape["clearOwner"] = Effect.fn(
     "PreviewAutomationBroker.clearOwner",
-  )(function* (clientId) {
+  )(function* (owner) {
     yield* SynchronizedRef.update(state, (current) => {
+      const currentOwner = current.owners.get(owner.clientId);
+      if (
+        !currentOwner ||
+        currentOwner.environmentId !== owner.environmentId ||
+        currentOwner.threadId !== owner.threadId
+      ) {
+        return current;
+      }
       const owners = new Map(current.owners);
-      owners.delete(clientId);
+      owners.delete(owner.clientId);
       return { ...current, owners };
     });
   });
           owner.supportsAutomation,
       )
       .sort((left, right) => right.focusedAt.localeCompare(left.focusedAt));
-    const owner = candidates[0];
+    const owner = candidates.find((candidate) => current.clients.has(candidate.clientId));
     if (!owner) {
+      if (candidates.length > 0) {
+        return yield* new PreviewAutomationUnavailableError({
+          message: "The browser host is not connected.",
+        });
+      }
       return yield* new PreviewAutomationNoFocusedOwnerError({
         message: "No desktop browser host is available for this thread.",
       });
         message: "The browser host is not connected.",
       });
     }
-    if (
-      input.operation !== "open" &&
-      input.operation !== "status" &&
-      !owner.tabId &&
-      !input.tabId
-    ) {
-      return yield* new PreviewAutomationTabNotFoundError({
-        message: "The browser host does not have an active tab.",
-      });
-    }
     const timeoutMs = input.timeoutMs ?? 15_000;
     const deferred = yield* Deferred.make<unknown, PreviewAutomationError>();
     const requestId = yield* SynchronizedRef.modify(state, (next) => {
       const requestId = `preview-${next.requestSequence}`;
       const pending = new Map(next.pending);
-      pending.set(requestId, { clientId: owner.clientId, deferred });
+      pending.set(requestId, { queue: connection.queue, deferred });
       return [requestId, { ...next, pending, requestSequence: next.requestSequence + 1 }] as const;
     });
     const removePending = SynchronizedRef.update(state, (next) => {

apps/server/src/provider/Layers/ProviderRegistry.test.ts+116−76

 import { checkCodexProviderStatus, type CodexAppServerProviderSnapshot } from "./CodexProvider.ts";
 import { checkClaudeProviderStatus } from "./ClaudeProvider.ts";
-import { OpenCodeRuntimeLive } from "../opencodeRuntime.ts";
+import * as OpenCodeRuntime from "../opencodeRuntime.ts";
-import { NoOpProviderEventLoggers, ProviderEventLoggers } from "./ProviderEventLoggers.ts";
+import * as ProviderEventLoggers from "./ProviderEventLoggers.ts";
 import { ProviderInstanceRegistryHydrationLive } from "./ProviderInstanceRegistryHydration.ts";
 import {
   haveProvidersChanged,
   ProviderRegistryLive,
   selectProvidersByKind,
 } from "./ProviderRegistry.ts";
-import { ServerConfig } from "../../config.ts";
+import * as ServerConfig from "../../config.ts";
-import { ServerSettingsService, type ServerSettingsShape } from "../../serverSettings.ts";
+import * as ServerSettingsModule from "../../serverSettings.ts";
 import { readProviderStatusCache, resolveProviderStatusCachePath } from "../providerStatusCache.ts";
 import type { ProviderInstance } from "../ProviderDriver.ts";
-import { ProviderInstanceRegistry } from "../Services/ProviderInstanceRegistry.ts";
+import * as ProviderInstanceRegistry from "../Services/ProviderInstanceRegistry.ts";
-import { ProviderRegistry } from "../Services/ProviderRegistry.ts";
+import * as ProviderRegistry from "../Services/ProviderRegistry.ts";
 import { makeManualOnlyProviderMaintenanceCapabilities } from "../providerMaintenance.ts";
 const decodeServerSettings = Schema.decodeSync(ServerSettings);
 const encodeServerSettings = Schema.encodeSync(ServerSettings);
       get streamChanges() {
         return Stream.fromPubSub(changes);
       },
-    } satisfies ServerSettingsShape;
+    } satisfies ServerSettingsModule.ServerSettingsService["Service"];
   });
 }
-it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), TestHttpClientLive))(
+it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), TestHttpClientLive))(
   "ProviderRegistry",
   (it) => {
     describe("checkCodexProviderStatus", () => {
             adapter: {} as ProviderInstance["adapter"],
             textGeneration: {} as ProviderInstance["textGeneration"],
           } satisfies ProviderInstance;
-          const instanceRegistryLayer = Layer.succeed(ProviderInstanceRegistry, {
+          const instanceRegistryLayer = Layer.succeed(
-            getInstance: (instanceId) =>
+            ProviderInstanceRegistry.ProviderInstanceRegistry,
-              Effect.succeed(instanceId === codexInstanceId ? instance : undefined),
+            {
-            listInstances: Effect.succeed([instance]),
+              getInstance: (instanceId) =>
-            listUnavailable: Effect.succeed([]),
+                Effect.succeed(instanceId === codexInstanceId ? instance : undefined),
-            streamChanges: Stream.empty,
+              listInstances: Effect.succeed([instance]),
-            subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
+              listUnavailable: Effect.succeed([]),
-          });
+              streamChanges: Stream.empty,
+              subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
+            },
+          );
           const scope = yield* Scope.make();
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           const runtimeServices = yield* Layer.build(
             ),
           ).pipe(Scope.provide(scope));
           yield* Effect.gen(function* () {
-            const registry = yield* ProviderRegistry;
+            const registry = yield* ProviderRegistry.ProviderRegistry;
             assert.deepStrictEqual(yield* registry.getProviders, [initialProvider]);
             assert.strictEqual(yield* Ref.get(refreshCalls), 0);
           }).pipe(Effect.provide(runtimeServices));
             adapter: {} as ProviderInstance["adapter"],
             textGeneration: {} as ProviderInstance["textGeneration"],
           } satisfies ProviderInstance;
-          const instanceRegistryLayer = Layer.succeed(ProviderInstanceRegistry, {
+          const instanceRegistryLayer = Layer.succeed(
-            getInstance: (instanceId) =>
+            ProviderInstanceRegistry.ProviderInstanceRegistry,
-              Effect.succeed(instanceId === cursorInstanceId ? instance : undefined),
+            {
-            listInstances: Effect.succeed([instance]),
+              getInstance: (instanceId) =>
-            listUnavailable: Effect.succeed([]),
+                Effect.succeed(instanceId === cursorInstanceId ? instance : undefined),
-            streamChanges: Stream.empty,
+              listInstances: Effect.succeed([instance]),
-            subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), (pubsub) =>
+              listUnavailable: Effect.succeed([]),
-              PubSub.subscribe(pubsub),
+              streamChanges: Stream.empty,
-            ),
+              subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), (pubsub) =>
-          });
+                PubSub.subscribe(pubsub),
+              ),
+            },
+          );
           const scope = yield* Scope.make();
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           const runtimeServices = yield* Layer.build(
           ).pipe(Scope.provide(scope));
           yield* Effect.gen(function* () {
-            const registry = yield* ProviderRegistry;
+            const registry = yield* ProviderRegistry.ProviderRegistry;
-            const config = yield* ServerConfig;
+            const config = yield* ServerConfig.ServerConfig;
             const filePath = yield* resolveProviderStatusCachePath({
               cacheDir: config.providerStatusCacheDir,
               instanceId: cursorInstanceId,
             adapter: {} as ProviderInstance["adapter"],
             textGeneration: {} as ProviderInstance["textGeneration"],
           } satisfies ProviderInstance;
-          const instanceRegistryLayer = Layer.succeed(ProviderInstanceRegistry, {
+          const instanceRegistryLayer = Layer.succeed(
-            getInstance: (instanceId) =>
+            ProviderInstanceRegistry.ProviderInstanceRegistry,
-              Effect.succeed(instanceId === codexInstanceId ? instance : undefined),
+            {
-            listInstances: Effect.succeed([instance]),
+              getInstance: (instanceId) =>
-            listUnavailable: Effect.succeed([]),
+                Effect.succeed(instanceId === codexInstanceId ? instance : undefined),
-            streamChanges: Stream.empty,
+              listInstances: Effect.succeed([instance]),
-            subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), (pubsub) =>
+              listUnavailable: Effect.succeed([]),
-              PubSub.subscribe(pubsub),
+              streamChanges: Stream.empty,
-            ),
+              subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), (pubsub) =>
-          });
+                PubSub.subscribe(pubsub),
+              ),
+            },
+          );
           const scope = yield* Scope.make();
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           const runtimeServices = yield* Layer.build(
           ).pipe(Scope.provide(scope));
           yield* Effect.gen(function* () {
-            const registry = yield* ProviderRegistry;
+            const registry = yield* ProviderRegistry.ProviderRegistry;
             assert.deepStrictEqual(yield* registry.getProviders, [cachedProvider]);
             assert.deepStrictEqual(yield* registry.refresh(codexDriver), [cachedProvider]);
           const instancesRef = yield* Ref.make<ReadonlyArray<ProviderInstance>>([codexInstance]);
           const failNextList = yield* Ref.make(false);
           const wait = () => Effect.yieldNow;
-          const instanceRegistryLayer = Layer.succeed(ProviderInstanceRegistry, {
+          const instanceRegistryLayer = Layer.succeed(
-            getInstance: (instanceId) =>
+            ProviderInstanceRegistry.ProviderInstanceRegistry,
-              Ref.get(instancesRef).pipe(
+            {
-                Effect.map((instances) =>
+              getInstance: (instanceId) =>
-                  instances.find((instance) => instance.instanceId === instanceId),
+                Ref.get(instancesRef).pipe(
+                  Effect.map((instances) =>
+                    instances.find((instance) => instance.instanceId === instanceId),
+                  ),
                 ),
-              ),
+              listInstances: Effect.gen(function* () {
-            listInstances: Effect.gen(function* () {
+                const shouldFail = yield* Ref.get(failNextList);
-              const shouldFail = yield* Ref.get(failNextList);
+                if (shouldFail) {
-              if (shouldFail) {
+                  yield* Ref.set(failNextList, false);
-                yield* Ref.set(failNextList, false);
+                  return yield* Effect.die(new Error("simulated registry list failure"));
-                return yield* Effect.die(new Error("simulated registry list failure"));
+                }
-              }
+                return yield* Ref.get(instancesRef);
-              return yield* Ref.get(instancesRef);
+              }),
-            }),
+              listUnavailable: Effect.succeed([]),
-            listUnavailable: Effect.succeed([]),
+              streamChanges: Stream.fromPubSub(changes),
-            streamChanges: Stream.fromPubSub(changes),
+              subscribeChanges: PubSub.subscribe(changes),
-            subscribeChanges: PubSub.subscribe(changes),
+            },
-          });
+          );
           const scope = yield* Scope.make();
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           const runtimeServices = yield* Layer.build(
           ).pipe(Scope.provide(scope));
           yield* Effect.gen(function* () {
-            const registry = yield* ProviderRegistry;
+            const registry = yield* ProviderRegistry.ProviderRegistry;
             assert.deepStrictEqual(yield* registry.getProviders, [codexProvider]);
             yield* Ref.set(failNextList, true);
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           const providerRegistryLayer = ProviderRegistryLive.pipe(
             Layer.provideMerge(ProviderInstanceRegistryHydrationLive),
-            Layer.provideMerge(Layer.succeed(ServerSettingsService, serverSettings)),
+            Layer.provideMerge(
+              Layer.succeed(ServerSettingsModule.ServerSettingsService, serverSettings),
+            ),
             Layer.provideMerge(
               ServerConfig.layerTest(process.cwd(), {
                 prefix: "t3-provider-registry-",
               }),
             ),
             Layer.provideMerge(TestHttpClientLive),
-            Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
+            Layer.provideMerge(
-            Layer.provideMerge(OpenCodeRuntimeLive),
+              Layer.succeed(
+                ProviderEventLoggers.ProviderEventLoggers,
+                ProviderEventLoggers.NoOpProviderEventLoggers,
+              ),
+            ),
+            Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
             // NO spawner mock — `ChildProcessSpawner` is supplied by the
             // outer `NodeServices.layer` on `it.layer(...)` and will
             // genuinely spawn a subprocess. The missing-binary ENOENT is
           );
           yield* Effect.gen(function* () {
-            const registry = yield* ProviderRegistry;
+            const registry = yield* ProviderRegistry.ProviderRegistry;
             let providers = yield* registry.getProviders;
             for (
               let attempts = 0;
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           const providerRegistryLayer = ProviderRegistryLive.pipe(
             Layer.provideMerge(ProviderInstanceRegistryHydrationLive),
-            Layer.provideMerge(Layer.succeed(ServerSettingsService, serverSettings)),
+            Layer.provideMerge(
+              Layer.succeed(ServerSettingsModule.ServerSettingsService, serverSettings),
+            ),
             Layer.provideMerge(
               ServerConfig.layerTest(process.cwd(), {
                 prefix: "t3-provider-registry-",
               }),
             ),
             Layer.provideMerge(TestHttpClientLive),
-            Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
+            Layer.provideMerge(
-            Layer.provideMerge(OpenCodeRuntimeLive),
+              Layer.succeed(
+                ProviderEventLoggers.ProviderEventLoggers,
+                ProviderEventLoggers.NoOpProviderEventLoggers,
+              ),
+            ),
+            Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
             Layer.updateService(ChildProcessSpawner.ChildProcessSpawner, (spawner) =>
               ChildProcessSpawner.make((command) => {
                 spawnedCommands.push((command as { readonly command: string }).command);
           );
           yield* Effect.gen(function* () {
-            const registry = yield* ProviderRegistry;
+            const registry = yield* ProviderRegistry.ProviderRegistry;
             // Boot-time probe: the default codex instance is enabled with
             // `firstMissing`, so the real spawner yields ENOENT and the
             // snapshot should be `status: "error"`.
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           const providerRegistryLayer = ProviderRegistryLive.pipe(
             Layer.provideMerge(ProviderInstanceRegistryHydrationLive),
-            Layer.provideMerge(Layer.succeed(ServerSettingsService, serverSettings)),
+            Layer.provideMerge(
+              Layer.succeed(ServerSettingsModule.ServerSettingsService, serverSettings),
+            ),
             Layer.provideMerge(
               ServerConfig.layerTest(process.cwd(), {
                 prefix: "t3-provider-registry-",
               }),
             ),
             Layer.provideMerge(TestHttpClientLive),
-            Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
+            Layer.provideMerge(
-            Layer.provideMerge(OpenCodeRuntimeLive),
+              Layer.succeed(
+                ProviderEventLoggers.ProviderEventLoggers,
+                ProviderEventLoggers.NoOpProviderEventLoggers,
+              ),
+            ),
+            Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
             Layer.provideMerge(NodeServices.layer),
           );
           const runtimeServices = yield* Layer.build(providerRegistryLayer).pipe(
           );
           yield* Effect.gen(function* () {
-            const registry = yield* ProviderRegistry;
+            const registry = yield* ProviderRegistry.ProviderRegistry;
             const providers = yield* registry.getProviders;
             const ghost = providers.find((provider) => provider.instanceId === "ghost_main");
             yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
             const providerRegistryLayer = ProviderRegistryLive.pipe(
               Layer.provideMerge(ProviderInstanceRegistryHydrationLive),
-              Layer.provideMerge(Layer.succeed(ServerSettingsService, serverSettings)),
+              Layer.provideMerge(
+                Layer.succeed(ServerSettingsModule.ServerSettingsService, serverSettings),
+              ),
               Layer.provideMerge(
                 ServerConfig.layerTest(process.cwd(), {
                   prefix: "t3-provider-registry-",
                 }),
               ),
               Layer.provideMerge(TestHttpClientLive),
-              Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
+              Layer.provideMerge(
-              Layer.provideMerge(OpenCodeRuntimeLive),
+                Layer.succeed(
+                  ProviderEventLoggers.ProviderEventLoggers,
+                  ProviderEventLoggers.NoOpProviderEventLoggers,
+                ),
+              ),
+              Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
               Layer.provideMerge(
                 mockCommandSpawnerLayer((command, args) => {
                   if (command === "agent") {
             );
             const runtimeServices = yield* Layer.build(
               Layer.mergeAll(
-                Layer.succeed(ServerSettingsService, serverSettings),
+                Layer.succeed(ServerSettingsModule.ServerSettingsService, serverSettings),
                 providerRegistryLayer,
               ),
             ).pipe(Scope.provide(scope));
             yield* Effect.gen(function* () {
-              const registry = yield* ProviderRegistry;
+              const registry = yield* ProviderRegistry.ProviderRegistry;
               const providers = yield* registry.getProviders;
               const cursorProvider = providers.find(
                 (provider) => provider.instanceId === ProviderInstanceId.make("cursor"),

apps/server/src/provider/providerUpdateSettings.ts+2−2

@@ -3,7 +3,7 @@ import * as Effect from "effect/Effect"; · 2 unmodified lines
3	import * as Equal from "effect/Equal";	3	import * as Equal from "effect/Equal";
4	import * as Stream from "effect/Stream";	4	import * as Stream from "effect/Stream";
5		5
6	import type { ServerSettingsShape } from "../serverSettings.ts";	6	import type * as ServerSettingsModule from "../serverSettings.ts";
7		7
8	export interface ProviderSnapshotSettings<Settings> {	8	export interface ProviderSnapshotSettings<Settings> {
9	readonly provider: Settings;	9	readonly provider: Settings;
@@ -29,7 +29,7 @@ export function haveProviderSnapshotSettingsChanged<Settings>( · 19 unmodified lines
29		29
30	export function makeProviderSnapshotSettingsSource<Settings>(	30	export function makeProviderSnapshotSettingsSource<Settings>(
31	provider: Settings,	31	provider: Settings,
32	serverSettings: ServerSettingsShape,	32	serverSettings: ServerSettingsModule.ServerSettingsService["Service"],
33	): {	33	): {
34	readonly getSettings: Effect.Effect<ProviderSnapshotSettings<Settings>, ServerSettingsError>;	34	readonly getSettings: Effect.Effect<ProviderSnapshotSettings<Settings>, ServerSettingsError>;
35	readonly streamSettings: Stream.Stream<ProviderSnapshotSettings<Settings>>;	35	readonly streamSettings: Stream.Stream<ProviderSnapshotSettings<Settings>>;

apps/server/src/server.test.ts+95−100

 const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
-import type { ServerConfigShape } from "./config.ts";
+import * as ServerConfig from "./config.ts";
-import { deriveServerPaths, ServerConfig } from "./config.ts";
 import { makeRoutesLayer } from "./server.ts";
-import {
+import * as CheckpointDiffQuery from "./checkpointing/Services/CheckpointDiffQuery.ts";
-  CheckpointDiffQuery,
+import * as GitManager from "./git/GitManager.ts";
-  type CheckpointDiffQueryShape,
+import * as Keybindings from "./keybindings.ts";
-} from "./checkpointing/Services/CheckpointDiffQuery.ts";
-import { GitManager, type GitManagerShape } from "./git/GitManager.ts";
-import { Keybindings, type KeybindingsShape } from "./keybindings.ts";
 import * as ExternalLauncher from "./process/externalLauncher.ts";
-import {
+import * as OrchestrationEngine from "./orchestration/Services/OrchestrationEngine.ts";
-  OrchestrationEngineService,
-  type OrchestrationEngineShape,
-} from "./orchestration/Services/OrchestrationEngine.ts";
 import { OrchestrationListenerCallbackError } from "./orchestration/Errors.ts";
-import {
+import * as ProjectionSnapshotQuery from "./orchestration/Services/ProjectionSnapshotQuery.ts";
-  ProjectionSnapshotQuery,
-  type ProjectionSnapshotQueryShape,
-} from "./orchestration/Services/ProjectionSnapshotQuery.ts";
 import { SqlitePersistenceMemory } from "./persistence/Layers/Sqlite.ts";
 import { PersistenceSqlError } from "./persistence/Errors.ts";
-import {
+import * as ProviderRegistry from "./provider/Services/ProviderRegistry.ts";
-  ProviderRegistry,
-  type ProviderRegistryShape,
-} from "./provider/Services/ProviderRegistry.ts";
 import { makeManualOnlyProviderMaintenanceCapabilities } from "./provider/providerMaintenance.ts";
-import { ServerLifecycleEvents, type ServerLifecycleEventsShape } from "./serverLifecycleEvents.ts";
+import * as ServerLifecycleEvents from "./serverLifecycleEvents.ts";
-import { ServerRuntimeStartup, type ServerRuntimeStartupShape } from "./serverRuntimeStartup.ts";
+import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts";
-import { ServerSettingsService, type ServerSettingsShape } from "./serverSettings.ts";
+import * as ServerSettings from "./serverSettings.ts";
-import { TerminalManager, type TerminalManagerShape } from "./terminal/Services/Manager.ts";
+import * as TerminalManager from "./terminal/Services/Manager.ts";
 import * as PreviewManager from "./preview/Manager.ts";
 import * as PortScanner from "./preview/PortScanner.ts";
-import {
+import * as BrowserTraceCollector from "./observability/Services/BrowserTraceCollector.ts";
-  BrowserTraceCollector,
-  type BrowserTraceCollectorShape,
-} from "./observability/Services/BrowserTraceCollector.ts";
 import { ProjectFaviconResolverLive } from "./project/Layers/ProjectFaviconResolver.ts";
-import {
+import * as ProjectSetupScriptRunner from "./project/Services/ProjectSetupScriptRunner.ts";
-  ProjectSetupScriptRunner,
+import * as RepositoryIdentityResolver from "./project/Services/RepositoryIdentityResolver.ts";
-  ProjectSetupScriptRunnerError,
+import * as ServerEnvironment from "./environment/Services/ServerEnvironment.ts";
-  type ProjectSetupScriptRunnerShape,
-} from "./project/Services/ProjectSetupScriptRunner.ts";
-import {
-  RepositoryIdentityResolver,
-  type RepositoryIdentityResolverShape,
-} from "./project/Services/RepositoryIdentityResolver.ts";
-import {
-  ServerEnvironment,
-  type ServerEnvironmentShape,
-} from "./environment/Services/ServerEnvironment.ts";
 import * as WorkspaceEntries from "./workspace/WorkspaceEntries.ts";
 import { WorkspaceFileSystemLive } from "./workspace/Layers/WorkspaceFileSystem.ts";
 import { WorkspacePathsLive } from "./workspace/Layers/WorkspacePaths.ts";
 import * as SourceControlRepositoryService from "./sourceControl/SourceControlRepositoryService.ts";
 import * as ServerSecretStore from "./auth/ServerSecretStore.ts";
 import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";
-import {
+import * as CloudManagedEndpointRuntime from "./cloud/ManagedEndpointRuntime.ts";
-  CloudManagedEndpointRuntime,
-  type CloudManagedEndpointRuntimeShape,
-} from "./cloud/ManagedEndpointRuntime.ts";
 import * as CloudCliTokenManager from "./cloud/CliTokenManager.ts";
 import * as ProcessDiagnostics from "./diagnostics/ProcessDiagnostics.ts";
 import * as ProcessResourceMonitor from "./diagnostics/ProcessResourceMonitor.ts";
   });
 const buildAppUnderTest = (options?: {
-  config?: Partial<ServerConfigShape>;
+  config?: Partial<ServerConfig.ServerConfig["Service"]>;
   layers?: {
-    keybindings?: Partial<KeybindingsShape>;
+    keybindings?: Partial<Keybindings.Keybindings["Service"]>;
-    providerRegistry?: Partial<ProviderRegistryShape>;
+    providerRegistry?: Partial<ProviderRegistry.ProviderRegistry["Service"]>;
-    serverSettings?: Partial<ServerSettingsShape>;
+    serverSettings?: Partial<ServerSettings.ServerSettingsService["Service"]>;
-    externalLauncher?: Partial<ExternalLauncher.ExternalLauncherShape>;
+    externalLauncher?: Partial<ExternalLauncher.ExternalLauncher["Service"]>;
-    vcsDriver?: Partial<VcsDriver.VcsDriverShape>;
+    vcsDriver?: Partial<VcsDriver.VcsDriver["Service"]>;
-    vcsDriverRegistry?: Partial<VcsDriverRegistry.VcsDriverRegistryShape>;
+    vcsDriverRegistry?: Partial<VcsDriverRegistry.VcsDriverRegistry["Service"]>;
-    gitVcsDriver?: Partial<GitVcsDriver.GitVcsDriverShape>;
+    gitVcsDriver?: Partial<GitVcsDriver.GitVcsDriver["Service"]>;
-    gitManager?: Partial<GitManagerShape>;
+    gitManager?: Partial<GitManager.GitManager["Service"]>;
-    sourceControlRepositoryService?: Partial<SourceControlRepositoryService.SourceControlRepositoryServiceShape>;
+    sourceControlRepositoryService?: Partial<
-    reviewService?: Partial<ReviewService.ReviewServiceShape>;
+      SourceControlRepositoryService.SourceControlRepositoryService["Service"]
-    vcsStatusBroadcaster?: Partial<VcsStatusBroadcaster.VcsStatusBroadcasterShape>;
+    >;
-    projectSetupScriptRunner?: Partial<ProjectSetupScriptRunnerShape>;
+    reviewService?: Partial<ReviewService.ReviewService["Service"]>;
-    terminalManager?: Partial<TerminalManagerShape>;
+    vcsStatusBroadcaster?: Partial<VcsStatusBroadcaster.VcsStatusBroadcaster["Service"]>;
-    orchestrationEngine?: Partial<OrchestrationEngineShape>;
+    projectSetupScriptRunner?: Partial<
-    projectionSnapshotQuery?: Partial<ProjectionSnapshotQueryShape>;
+      ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"]
-    checkpointDiffQuery?: Partial<CheckpointDiffQueryShape>;
+    >;
-    browserTraceCollector?: Partial<BrowserTraceCollectorShape>;
+    terminalManager?: Partial<TerminalManager.TerminalManager["Service"]>;
-    serverLifecycleEvents?: Partial<ServerLifecycleEventsShape>;
+    orchestrationEngine?: Partial<OrchestrationEngine.OrchestrationEngineService["Service"]>;
-    serverRuntimeStartup?: Partial<ServerRuntimeStartupShape>;
+    projectionSnapshotQuery?: Partial<ProjectionSnapshotQuery.ProjectionSnapshotQuery["Service"]>;
-    serverEnvironment?: Partial<ServerEnvironmentShape>;
+    checkpointDiffQuery?: Partial<CheckpointDiffQuery.CheckpointDiffQuery["Service"]>;
-    repositoryIdentityResolver?: Partial<RepositoryIdentityResolverShape>;
+    browserTraceCollector?: Partial<BrowserTraceCollector.BrowserTraceCollector["Service"]>;
-    cloudManagedEndpointRuntime?: Partial<CloudManagedEndpointRuntimeShape>;
+    serverLifecycleEvents?: Partial<ServerLifecycleEvents.ServerLifecycleEvents["Service"]>;
-    relayClient?: Partial<RelayClient.RelayClientShape>;
+    serverRuntimeStartup?: Partial<ServerRuntimeStartup.ServerRuntimeStartup["Service"]>;
-    cloudCliTokenManager?: Partial<CloudCliTokenManager.CloudCliTokenManagerShape>;
+    serverEnvironment?: Partial<ServerEnvironment.ServerEnvironment["Service"]>;
+    repositoryIdentityResolver?: Partial<
+      RepositoryIdentityResolver.RepositoryIdentityResolver["Service"]
+    >;
+    cloudManagedEndpointRuntime?: Partial<
+      CloudManagedEndpointRuntime.CloudManagedEndpointRuntime["Service"]
+    >;
+    relayClient?: Partial<RelayClient.RelayClient["Service"]>;
+    cloudCliTokenManager?: Partial<CloudCliTokenManager.CloudCliTokenManager["Service"]>;
   };
 }) =>
   Effect.gen(function* () {
     const tempBaseDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-router-test-" });
     const baseDir = options?.config?.baseDir ?? tempBaseDir;
     const devUrl = options?.config?.devUrl;
-    const derivedPaths = yield* deriveServerPaths(baseDir, devUrl);
+    const derivedPaths = yield* ServerConfig.deriveServerPaths(baseDir, devUrl);
-    const config: ServerConfigShape = {
+    const config: ServerConfig.ServerConfig["Service"] = {
       logLevel: "Info",
       traceMinLevel: "Info",
       traceTimingEnabled: true,
       tailscaleServePort: 443,
       ...options?.config,
     };
-    const layerConfig = Layer.succeed(ServerConfig, config);
+    const layerConfig = ServerConfig.layer(config);
-    const defaultVcsDriver: VcsDriver.VcsDriverShape = {
+    const defaultVcsDriver: VcsDriver.VcsDriver["Service"] = {
       capabilities: {
         kind: "git",
         supportsWorktrees: true,
     const gitVcsDriverLayer = Layer.mock(GitVcsDriver.GitVcsDriver)({
       ...options?.layers?.gitVcsDriver,
     });
-    const gitManagerLayer = Layer.mock(GitManager)({
+    const gitManagerLayer = Layer.mock(GitManager.GitManager)({
       ...options?.layers?.gitManager,
     });
     const workspaceEntriesLayer = WorkspaceEntries.layer.pipe(
       disableLogger: true,
     }).pipe(
       Layer.provide(
-        Layer.mock(Keybindings)({
+        Layer.mock(Keybindings.Keybindings)({
           loadConfigState: Effect.succeed({
             keybindings: [],
             issues: [],
         }),
       ),
       Layer.provide(
-        Layer.mock(ProviderRegistry)({
+        Layer.mock(ProviderRegistry.ProviderRegistry)({
           getProviders: Effect.succeed([]),
           refresh: () => Effect.succeed([]),
           refreshInstance: () => Effect.succeed([]),
         }),
       ),
       Layer.provide(
-        Layer.mock(ServerSettingsService)({
+        Layer.mock(ServerSettings.ServerSettingsService)({
           start: Effect.void,
           ready: Effect.void,
           getSettings: Effect.succeed(DEFAULT_SERVER_SETTINGS),
       ),
       Layer.provideMerge(vcsStatusBroadcasterLayer),
       Layer.provide(
-        Layer.mock(ProjectSetupScriptRunner)({
+        Layer.mock(ProjectSetupScriptRunner.ProjectSetupScriptRunner)({
           runForThread: () => Effect.succeed({ status: "no-script" as const }),
           ...options?.layers?.projectSetupScriptRunner,
         }),
       ),
       Layer.provide(
-        Layer.mock(TerminalManager)({
+        Layer.mock(TerminalManager.TerminalManager)({
           ...options?.layers?.terminalManager,
         }),
       ),
         ),
       ),
       Layer.provide(
-        Layer.mock(OrchestrationEngineService)({
+        Layer.mock(OrchestrationEngine.OrchestrationEngineService)({
           readEvents: () => Stream.empty,
           dispatch: () => Effect.succeed({ sequence: 0 }),
           streamDomainEvents: Stream.empty,
         }),
       ),
       Layer.provide(
-        Layer.mock(ProjectionSnapshotQuery)({
+        Layer.mock(ProjectionSnapshotQuery.ProjectionSnapshotQuery)({
           getCommandReadModel: () => Effect.succeed(makeDefaultOrchestrationReadModel()),
           getSnapshot: () => Effect.succeed(makeDefaultOrchestrationReadModel()),
           getShellSnapshot: () =>
         }),
       ),
       Layer.provide(
-        Layer.mock(CheckpointDiffQuery)({
+        Layer.mock(CheckpointDiffQuery.CheckpointDiffQuery)({
           getTurnDiff: () =>
             Effect.succeed({
               threadId: defaultThreadId,
     const appLayer = servedRoutesLayer.pipe(
       Layer.provide(
-        Layer.mock(BrowserTraceCollector)({
+        Layer.mock(BrowserTraceCollector.BrowserTraceCollector)({
           record: () => Effect.void,
           ...options?.layers?.browserTraceCollector,
         }),
       ),
       Layer.provide(
-        Layer.mock(ServerLifecycleEvents)({
+        Layer.mock(ServerLifecycleEvents.ServerLifecycleEvents)({
           publish: (event) => Effect.succeed({ ...(event as any), sequence: 1 }),
           snapshot: Effect.succeed({ sequence: 0, events: [] }),
           stream: Stream.empty,
         }),
       ),
       Layer.provide(
-        Layer.mock(ServerRuntimeStartup)({
+        Layer.mock(ServerRuntimeStartup.ServerRuntimeStartup)({
           awaitCommandReady: Effect.void,
           markHttpListening: Effect.void,
           enqueueCommand: (effect) => effect,
         }),
       ),
       Layer.provide(
-        Layer.mock(ServerEnvironment)({
+        Layer.mock(ServerEnvironment.ServerEnvironment)({
           getEnvironmentId: Effect.succeed(testEnvironmentDescriptor.environmentId),
           getDescriptor: Effect.succeed(testEnvironmentDescriptor),
           ...options?.layers?.serverEnvironment,
         }),
       ),
       Layer.provide(
-        Layer.mock(RepositoryIdentityResolver)({
+        Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
           resolve: () => Effect.succeed(null),
           ...options?.layers?.repositoryIdentityResolver,
         }),
       ),
       Layer.provide(
         Layer.succeed(
-          CloudManagedEndpointRuntime,
+          CloudManagedEndpointRuntime.CloudManagedEndpointRuntime,
-          CloudManagedEndpointRuntime.of({
+          CloudManagedEndpointRuntime.CloudManagedEndpointRuntime.of({
             applyConfig: () => Effect.succeed({ status: "disabled" }),
             ...options?.layers?.cloudManagedEndpointRuntime,
           }),
           }),
         );
         const fetchRemote = vi.fn(
-          (_: Parameters<GitVcsDriver.GitVcsDriverShape["fetchRemote"]>[0]) =>
+          (_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["fetchRemote"]>[0]) =>
             Effect.sync(() => {
               bootstrapGitOperations.push("fetch");
             }),
         );
         const fetchedOriginCommit = "0123456789abcdef0123456789abcdef01234567";
         const resolveRemoteTrackingCommit = vi.fn(
-          (_: Parameters<GitVcsDriver.GitVcsDriverShape["resolveRemoteTrackingCommit"]>[0]) =>
+          (_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["resolveRemoteTrackingCommit"]>[0]) =>
             Effect.sync(() => {
               bootstrapGitOperations.push("resolve-remote-commit");
               return {
             }),
         );
         const createWorktree = vi.fn(
-          (_: Parameters<GitVcsDriver.GitVcsDriverShape["createWorktree"]>[0]) =>
+          (_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["createWorktree"]>[0]) =>
             Effect.sync(() => {
               bootstrapGitOperations.push("create-worktree");
               return {
             }),
         );
         const runForThread = vi.fn(
-          (_: Parameters<ProjectSetupScriptRunnerShape["runForThread"]>[0]) =>
+          (
+            _: Parameters<
+              ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"]["runForThread"]
+            >[0],
+          ) =>
             Effect.succeed({
               status: "started" as const,
               scriptId: "setup",
     Effect.gen(function* () {
       const dispatchedCommands: Array<OrchestrationCommand> = [];
       const createWorktree = vi.fn(
-        (_: Parameters<GitVcsDriver.GitVcsDriverShape["createWorktree"]>[0]) =>
+        (_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["createWorktree"]>[0]) =>
           Effect.succeed({
             worktree: {
               refName: "t3code/bootstrap-refName",
           }),
       );
       const runForThread = vi.fn(
-        (_: Parameters<ProjectSetupScriptRunnerShape["runForThread"]>[0]) =>
+        (
-          Effect.fail(new ProjectSetupScriptRunnerError({ message: "pty unavailable" })),
+          _: Parameters<
+            ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"]["runForThread"]
+          >[0],
+        ) =>
+          Effect.fail(
+            new ProjectSetupScriptRunner.ProjectSetupScriptRunnerError({
+              message: "pty unavailable",
+            }),
+          ),
       );
       yield* buildAppUnderTest({
     Effect.gen(function* () {
       const dispatchedCommands: Array<OrchestrationCommand> = [];
       const createWorktree = vi.fn(
-        (_: Parameters<GitVcsDriver.GitVcsDriverShape["createWorktree"]>[0]) =>
+        (_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["createWorktree"]>[0]) =>
           Effect.succeed({
             worktree: {
               refName: "t3code/bootstrap-refName",
           }),
       );
       const runForThread = vi.fn(
-        (_: Parameters<ProjectSetupScriptRunnerShape["runForThread"]>[0]) =>
+        (
+          _: Parameters<
+            ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"]["runForThread"]
+          >[0],
+        ) =>
           Effect.succeed({
             status: "started" as const,
             scriptId: "setup",
     Effect.gen(function* () {
       const dispatchedCommands: Array<OrchestrationCommand> = [];
       const createWorktree = vi.fn(
-        (_: Parameters<GitVcsDriver.GitVcsDriverShape["createWorktree"]>[0]) =>
+        (_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["createWorktree"]>[0]) =>
           Effect.die(new Error("worktree exploded")),
       );

apps/server/src/server.ts+17−17

apps/server/src/serverLifecycleEvents.test.ts+3−3

@@ -4,13 +4,13 @@ import { assertTrue } from "@effect/vitest/utils"; · 3 unmodified lines
4	import * as Effect from "effect/Effect";	4	import * as Effect from "effect/Effect";
5	import * as Option from "effect/Option";	5	import * as Option from "effect/Option";
6		6
7	import { ServerLifecycleEvents, ServerLifecycleEventsLive } from "./serverLifecycleEvents.ts";	7	import * as ServerLifecycleEvents from "./serverLifecycleEvents.ts";
8		8
9	it.effect(	9	it.effect(
10	"publishes lifecycle events without subscribers and snapshots the latest welcome/ready",	10	"publishes lifecycle events without subscribers and snapshots the latest welcome/ready",
11	() =>	11	() =>
12	Effect.gen(function* () {	12	Effect.gen(function* () {
13	const lifecycleEvents = yield* ServerLifecycleEvents;	13	const lifecycleEvents = yield* ServerLifecycleEvents.ServerLifecycleEvents;
14	const environment = {	14	const environment = {
15	environmentId: EnvironmentId.make("environment-test"),	15	environmentId: EnvironmentId.make("environment-test"),
16	label: "Test environment",	16	label: "Test environment",
@@ -49,5 +49,5 @@ it.effect( · 32 unmodified lines
49	const snapshot = yield* lifecycleEvents.snapshot;	49	const snapshot = yield* lifecycleEvents.snapshot;
50	assert.equal(snapshot.sequence, 2);	50	assert.equal(snapshot.sequence, 2);
51	assert.deepEqual(snapshot.events.map((event) => event.type).toSorted(), ["ready", "welcome"]);	51	assert.deepEqual(snapshot.events.map((event) => event.type).toSorted(), ["ready", "welcome"]);
52	}).pipe(Effect.provide(ServerLifecycleEventsLive)),	52	}).pipe(Effect.provide(ServerLifecycleEvents.layer)),
53	);	53	);

apps/server/src/serverLifecycleEvents.ts+34−37

@@ -1,9 +1,9 @@
1	import type { ServerLifecycleStreamEvent } from "@t3tools/contracts";	1	import type { ServerLifecycleStreamEvent } from "@t3tools/contracts";
		2	import * as Context from "effect/Context";
2	import * as Effect from "effect/Effect";	3	import * as Effect from "effect/Effect";
3	import * as Layer from "effect/Layer";	4	import * as Layer from "effect/Layer";
4	import * as PubSub from "effect/PubSub";	5	import * as PubSub from "effect/PubSub";
5	import * as Ref from "effect/Ref";	6	import * as Ref from "effect/Ref";
6	import * as Context from "effect/Context";
7	import * as Stream from "effect/Stream";	7	import * as Stream from "effect/Stream";
8		8
9	type LifecycleEventInput =	9	type LifecycleEventInput =
@@ -15,44 +15,41 @@ interface SnapshotState { · 5 unmodified lines
15	readonly events: ReadonlyArray<ServerLifecycleStreamEvent>;	15	readonly events: ReadonlyArray<ServerLifecycleStreamEvent>;
16	}	16	}
17		17
18	export interface ServerLifecycleEventsShape {
19	readonly publish: (event: LifecycleEventInput) => Effect.Effect<ServerLifecycleStreamEvent>;
20	readonly snapshot: Effect.Effect<SnapshotState>;
21	readonly stream: Stream.Stream<ServerLifecycleStreamEvent>;
22	}
23
24	export class ServerLifecycleEvents extends Context.Service<	18	export class ServerLifecycleEvents extends Context.Service<
25	ServerLifecycleEvents,	19	ServerLifecycleEvents,
26	ServerLifecycleEventsShape	20	{
		21	readonly publish: (event: LifecycleEventInput) => Effect.Effect<ServerLifecycleStreamEvent>;
		22	readonly snapshot: Effect.Effect<SnapshotState>;
		23	readonly stream: Stream.Stream<ServerLifecycleStreamEvent>;
		24	}
27	>()("t3/serverLifecycleEvents") {}	25	>()("t3/serverLifecycleEvents") {}
28		26
29	export const ServerLifecycleEventsLive = Layer.effect(	27	const make = Effect.gen(function* () {
30	ServerLifecycleEvents,	28	const pubsub = yield* PubSub.unbounded<ServerLifecycleStreamEvent>();
31	Effect.gen(function* () {	29	const state = yield* Ref.make<SnapshotState>({
32	const pubsub = yield* PubSub.unbounded<ServerLifecycleStreamEvent>();	30	sequence: 0,
33	const state = yield* Ref.make<SnapshotState>({	31	events: [],
34	sequence: 0,	32	});
35	events: [],	33
36	});	34	return {
		35	publish: (event) =>
		36	Ref.modify(state, (current) => {
		37	const nextSequence = current.sequence + 1;
		38	const nextEvent = {
		39	...event,
		40	sequence: nextSequence,
		41	} satisfies ServerLifecycleStreamEvent;
		42	const nextEvents =
		43	nextEvent.type === "welcome"
		44	? [nextEvent, ...current.events.filter((entry) => entry.type !== "welcome")]
		45	: [nextEvent, ...current.events.filter((entry) => entry.type !== "ready")];
		46	return [nextEvent, { sequence: nextSequence, events: nextEvents }] as const;
		47	}).pipe(Effect.tap((event) => PubSub.publish(pubsub, event))),
		48	snapshot: Ref.get(state),
		49	get stream() {
		50	return Stream.fromPubSub(pubsub);
		51	},
		52	} satisfies ServerLifecycleEvents["Service"];
		53	});
37		54
38	return {	55	export const layer = Layer.effect(ServerLifecycleEvents, make);
39	publish: (event) =>
40	Ref.modify(state, (current) => {
41	const nextSequence = current.sequence + 1;
42	const nextEvent = {
43	...event,
44	sequence: nextSequence,
45	} satisfies ServerLifecycleStreamEvent;
46	const nextEvents =
47	nextEvent.type === "welcome"
48	? [nextEvent, ...current.events.filter((entry) => entry.type !== "welcome")]
49	: [nextEvent, ...current.events.filter((entry) => entry.type !== "ready")];
50	return [nextEvent, { sequence: nextSequence, events: nextEvents }] as const;
51	}).pipe(Effect.tap((event) => PubSub.publish(pubsub, event))),
52	snapshot: Ref.get(state),
53	get stream() {
54	return Stream.fromPubSub(pubsub);
55	},
56	} satisfies ServerLifecycleEventsShape;
57	}),
58	);

apps/server/src/serverRuntimeStartup.test.ts+32−42

 import * as Ref from "effect/Ref";
 import * as Stream from "effect/Stream";
-import { ServerConfig } from "./config.ts";
+import * as ServerConfig from "./config.ts";
-import {
+import * as OrchestrationEngine from "./orchestration/Services/OrchestrationEngine.ts";
-  OrchestrationEngineService,
+import * as ProjectionSnapshotQuery from "./orchestration/Services/ProjectionSnapshotQuery.ts";
-  type OrchestrationEngineShape,
+import * as AnalyticsService from "./telemetry/Services/AnalyticsService.ts";
-} from "./orchestration/Services/OrchestrationEngine.ts";
+import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts";
-import { ProjectionSnapshotQuery } from "./orchestration/Services/ProjectionSnapshotQuery.ts";
-import { AnalyticsService } from "./telemetry/Services/AnalyticsService.ts";
-import {
-  getAutoBootstrapDefaultModelSelection,
-  launchStartupHeartbeat,
-  makeCommandGate,
-  resolveAutoBootstrapWelcomeTargets,
-  resolveWelcomeBase,
-  ServerRuntimeStartupError,
-} from "./serverRuntimeStartup.ts";
 it("uses the canonical Codex default for auto-bootstrapped model selection", () => {
-  assert.deepStrictEqual(getAutoBootstrapDefaultModelSelection(), {
+  assert.deepStrictEqual(ServerRuntimeStartup.getAutoBootstrapDefaultModelSelection(), {
     instanceId: ProviderInstanceId.make("codex"),
     model: DEFAULT_MODEL,
   });
   Effect.scoped(
     Effect.gen(function* () {
       const executionCount = yield* Ref.make(0);
-      const commandGate = yield* makeCommandGate;
+      const commandGate = yield* ServerRuntimeStartup.makeCommandGate;
       const queuedCommandFiber = yield* commandGate
         .enqueueCommand(Ref.updateAndGet(executionCount, (count) => count + 1))
 it.effect("enqueueCommand fails queued work when readiness fails", () =>
   Effect.scoped(
     Effect.gen(function* () {
-      const commandGate = yield* makeCommandGate;
+      const commandGate = yield* ServerRuntimeStartup.makeCommandGate;
       const failure = yield* Deferred.make<void, never>();
       const queuedCommandFiber = yield* commandGate
         .pipe(Effect.forkScoped);
       yield* commandGate.failCommandReady(
-        new ServerRuntimeStartupError({
+        new ServerRuntimeStartup.ServerRuntimeStartupError({
-          message: "startup failed",
+          stage: "command-readiness",
         }),
       );
       const error = yield* Effect.flip(Fiber.join(queuedCommandFiber));
-      assert.equal(error.message, "startup failed");
+      assert.equal(error.message, "Server runtime startup failed before command readiness.");
     }),
   ),
 );
     Effect.gen(function* () {
       const releaseCounts = yield* Deferred.make<void, never>();
-      yield* launchStartupHeartbeat.pipe(
+      yield* ServerRuntimeStartup.launchStartupHeartbeat.pipe(
-        Effect.provideService(ProjectionSnapshotQuery, {
+        Effect.provideService(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
           getCommandReadModel: () => Effect.die("unused"),
           getSnapshot: () => Effect.die("unused"),
           getShellSnapshot: () => Effect.die("unused"),
           getThreadShellById: () => Effect.succeed(Option.none()),
           getThreadDetailById: () => Effect.succeed(Option.none()),
         }),
-        Effect.provideService(AnalyticsService, {
+        Effect.provideService(AnalyticsService.AnalyticsService, {
           record: () => Effect.void,
           flush: Effect.void,
         }),
 it.effect("resolveWelcomeBase derives cwd and project name from server config", () =>
   Effect.gen(function* () {
-    const welcome = yield* resolveWelcomeBase.pipe(
+    const welcome = yield* ServerRuntimeStartup.resolveWelcomeBase.pipe(
-      Effect.provideService(ServerConfig, {
+      Effect.provideService(ServerConfig.ServerConfig, {
         cwd: "/tmp/startup-project",
       } as never),
     );
   return Effect.gen(function* () {
     const dispatchCalls = yield* Ref.make<ReadonlyArray<string>>([]);
-    const targets = yield* resolveAutoBootstrapWelcomeTargets.pipe(
+    const targets = yield* ServerRuntimeStartup.resolveAutoBootstrapWelcomeTargets.pipe(
-      Effect.provideService(ServerConfig, {
+      Effect.provideService(ServerConfig.ServerConfig, {
         cwd: "/tmp/startup-project",
         autoBootstrapProjectFromCwd: true,
       } as never),
-      Effect.provideService(ProjectionSnapshotQuery, {
+      Effect.provideService(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
         getCommandReadModel: () => Effect.die("unused"),
         getSnapshot: () => Effect.die("unused"),
         getShellSnapshot: () => Effect.die("unused"),
               id: bootstrapProjectId,
               title: "Startup Project",
               workspaceRoot: "/tmp/startup-project",
-              defaultModelSelection: getAutoBootstrapDefaultModelSelection(),
+              defaultModelSelection: ServerRuntimeStartup.getAutoBootstrapDefaultModelSelection(),
               scripts: [],
               createdAt: "2026-01-01T00:00:00.000Z",
               updatedAt: "2026-01-01T00:00:00.000Z",
         getThreadShellById: () => Effect.die("unused"),
         getThreadDetailById: () => Effect.die("unused"),
       }),
-      Effect.provideService(OrchestrationEngineService, {
+      Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
         readEvents: () => Stream.empty,
         dispatch: (command) =>
           Ref.update(dispatchCalls, (calls) => [...calls, command.type]).pipe(
             Effect.as({ sequence: 1 }),
           ),
         streamDomainEvents: Stream.empty,
-      } satisfies OrchestrationEngineShape),
+      } satisfies OrchestrationEngine.OrchestrationEngineService["Service"]),
       Effect.provide(NodeServices.layer),
     );
 it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when missing", () =>
   Effect.gen(function* () {
     const dispatchCalls = yield* Ref.make<ReadonlyArray<string>>([]);
-    const targets = yield* resolveAutoBootstrapWelcomeTargets.pipe(
+    const targets = yield* ServerRuntimeStartup.resolveAutoBootstrapWelcomeTargets.pipe(
-      Effect.provideService(ServerConfig, {
+      Effect.provideService(ServerConfig.ServerConfig, {
         cwd: "/tmp/startup-project",
         autoBootstrapProjectFromCwd: true,
       } as never),
-      Effect.provideService(ProjectionSnapshotQuery, {
+      Effect.provideService(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
         getCommandReadModel: () => Effect.die("unused"),
         getSnapshot: () => Effect.die("unused"),
         getShellSnapshot: () => Effect.die("unused"),
         getThreadShellById: () => Effect.die("unused"),
         getThreadDetailById: () => Effect.die("unused"),
       }),
-      Effect.provideService(OrchestrationEngineService, {
+      Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
         readEvents: () => Stream.empty,
         dispatch: (command) =>
           Ref.update(dispatchCalls, (calls) => [...calls, command.type]).pipe(
             Effect.as({ sequence: 1 }),
           ),
         streamDomainEvents: Stream.empty,
-      } satisfies OrchestrationEngineShape),
+      } satisfies OrchestrationEngine.OrchestrationEngineService["Service"]),
       Effect.provide(NodeServices.layer),
     );
     });
     const dispatchCalls = yield* Ref.make<ReadonlyArray<string>>([]);
-    const error = yield* resolveAutoBootstrapWelcomeTargets.pipe(
+    const error = yield* ServerRuntimeStartup.resolveAutoBootstrapWelcomeTargets.pipe(
-      Effect.provideService(ServerConfig, {
+      Effect.provideService(ServerConfig.ServerConfig, {
         cwd: "/tmp/startup-project",
         autoBootstrapProjectFromCwd: true,
       } as never),
-      Effect.provideService(ProjectionSnapshotQuery, {
+      Effect.provideService(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
         getCommandReadModel: () => Effect.die("unused"),
         getSnapshot: () => Effect.die("unused"),
         getShellSnapshot: () => Effect.die("unused"),
         getThreadShellById: () => Effect.die("unused"),
         getThreadDetailById: () => Effect.die("unused"),
       }),
-      Effect.provideService(OrchestrationEngineService, {
+      Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
         readEvents: () => Stream.empty,
         dispatch: (command) =>
           Ref.update(dispatchCalls, (calls) => [...calls, command.type]).pipe(
             Effect.as({ sequence: 1 }),
           ),
         streamDomainEvents: Stream.empty,
-      } satisfies OrchestrationEngineShape),
+      } satisfies OrchestrationEngine.OrchestrationEngineService["Service"]),
       Effect.provideService(Crypto.Crypto, {
         ...crypto,
         randomUUIDv4: Effect.fail(uuidError),

apps/server/src/serverRuntimeStartup.ts+53−48

@@ -7,8 +7,10 @@ import { · 6 unmodified lines
7	ProviderInstanceId,	7	ProviderInstanceId,
8	ThreadId,	8	ThreadId,
9	} from "@t3tools/contracts";	9	} from "@t3tools/contracts";
10	import * as Data from "effect/Data";	10	import * as Console from "effect/Console";
		11	import * as Context from "effect/Context";
11	import * as Crypto from "effect/Crypto";	12	import * as Crypto from "effect/Crypto";
		13	import * as DateTime from "effect/DateTime";
12	import * as Deferred from "effect/Deferred";	14	import * as Deferred from "effect/Deferred";
13	import * as Effect from "effect/Effect";	15	import * as Effect from "effect/Effect";
14	import * as Exit from "effect/Exit";	16	import * as Exit from "effect/Exit";
@@ -17,23 +19,21 @@ import * as Option from "effect/Option"; · 2 unmodified lines
17	import * as Path from "effect/Path";	19	import * as Path from "effect/Path";
18	import * as Queue from "effect/Queue";	20	import * as Queue from "effect/Queue";
19	import * as Ref from "effect/Ref";	21	import * as Ref from "effect/Ref";
		22	import * as Schema from "effect/Schema";
20	import * as Scope from "effect/Scope";	23	import * as Scope from "effect/Scope";
21	import * as Context from "effect/Context";
22	import * as Console from "effect/Console";
23	import * as DateTime from "effect/DateTime";
24		24
25	import { ServerConfig } from "./config.ts";	25	import * as ServerConfig from "./config.ts";
26	import { Keybindings } from "./keybindings.ts";	26	import * as Keybindings from "./keybindings.ts";
27	import * as ExternalLauncher from "./process/externalLauncher.ts";	27	import * as ExternalLauncher from "./process/externalLauncher.ts";
28	import { OrchestrationEngineService } from "./orchestration/Services/OrchestrationEngine.ts";	28	import * as OrchestrationEngine from "./orchestration/Services/OrchestrationEngine.ts";
29	import { ProjectionSnapshotQuery } from "./orchestration/Services/ProjectionSnapshotQuery.ts";	29	import * as ProjectionSnapshotQuery from "./orchestration/Services/ProjectionSnapshotQuery.ts";
30	import { OrchestrationReactor } from "./orchestration/Services/OrchestrationReactor.ts";	30	import * as OrchestrationReactor from "./orchestration/Services/OrchestrationReactor.ts";
31	import { ServerLifecycleEvents } from "./serverLifecycleEvents.ts";	31	import * as ServerLifecycleEvents from "./serverLifecycleEvents.ts";
32	import { ServerSettingsService } from "./serverSettings.ts";	32	import * as ServerSettings from "./serverSettings.ts";
33	import { ServerEnvironment } from "./environment/Services/ServerEnvironment.ts";	33	import * as ServerEnvironment from "./environment/Services/ServerEnvironment.ts";
34	import { AnalyticsService } from "./telemetry/Services/AnalyticsService.ts";	34	import * as AnalyticsService from "./telemetry/Services/AnalyticsService.ts";
35	import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";	35	import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";
36	import { ProviderSessionReaper } from "./provider/Services/ProviderSessionReaper.ts";	36	import * as ProviderSessionReaper from "./provider/Services/ProviderSessionReaper.ts";
37	import {	37	import {
38	formatHeadlessServeOutput,	38	formatHeadlessServeOutput,
39	formatHostForUrl,	39	formatHostForUrl,
@@ -41,22 +41,30 @@ import { · 1 unmodified line
41	issueHeadlessServeAccessInfo,	41	issueHeadlessServeAccessInfo,
42	} from "./startupAccess.ts";	42	} from "./startupAccess.ts";
43		43
44	export class ServerRuntimeStartupError extends Data.TaggedError("ServerRuntimeStartupError")<{	44	export class ServerRuntimeStartupError extends Schema.TaggedErrorClass<ServerRuntimeStartupError>()(
45	readonly message: string;	45	"ServerRuntimeStartupError",
46	readonly cause?: unknown;	46	{
47	}> {}	47	stage: Schema.Literal("command-readiness"),
48		48	cause: Schema.optional(Schema.Defect()),
49	export interface ServerRuntimeStartupShape {	49	},
50	readonly awaitCommandReady: Effect.Effect<void, ServerRuntimeStartupError>;	50	) {
51	readonly markHttpListening: Effect.Effect<void>;	51	override get message(): string {
52	readonly enqueueCommand: <A, E>(	52	switch (this.stage) {
53	effect: Effect.Effect<A, E>,	53	case "command-readiness":
54	) => Effect.Effect<A, E \| ServerRuntimeStartupError>;	54	return "Server runtime startup failed before command readiness.";
		55	}
		56	}
55	}	57	}
56		58
57	export class ServerRuntimeStartup extends Context.Service<	59	export class ServerRuntimeStartup extends Context.Service<
58	ServerRuntimeStartup,	60	ServerRuntimeStartup,
59	ServerRuntimeStartupShape	61	{
		62	readonly awaitCommandReady: Effect.Effect<void, ServerRuntimeStartupError>;
		63	readonly markHttpListening: Effect.Effect<void>;
		64	readonly enqueueCommand: <A, E>(
		65	effect: Effect.Effect<A, E>,
		66	) => Effect.Effect<A, E \| ServerRuntimeStartupError>;
		67	}
60	>()("t3/serverRuntimeStartup") {}	68	>()("t3/serverRuntimeStartup") {}
61		69
62	interface QueuedCommand {	70	interface QueuedCommand {
@@ -124,8 +132,8 @@ export const makeCommandGate = Effect.gen(function* () { · 61 unmodified lines
124	});	132	});
125		133
126	export const recordStartupHeartbeat = Effect.gen(function* () {	134	export const recordStartupHeartbeat = Effect.gen(function* () {
127	const analytics = yield* AnalyticsService;	135	const analytics = yield* AnalyticsService.AnalyticsService;
128	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;	136	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
129		137
130	const { threadCount, projectCount } = yield* projectionSnapshotQuery.getCounts().pipe(	138	const { threadCount, projectCount } = yield* projectionSnapshotQuery.getCounts().pipe(
131	Effect.catch((cause) =>	139	Effect.catch((cause) =>
@@ -160,7 +168,7 @@ export const getAutoBootstrapDefaultModelSelection = (): ModelSelection => ({ · 28 unmodified lines
160	});	168	});
161		169
162	export const resolveWelcomeBase = Effect.gen(function* () {	170	export const resolveWelcomeBase = Effect.gen(function* () {
163	const serverConfig = yield* ServerConfig;	171	const serverConfig = yield* ServerConfig.ServerConfig;
164	const segments = serverConfig.cwd.split(/[/\\]/).filter(Boolean);	172	const segments = serverConfig.cwd.split(/[/\\]/).filter(Boolean);
165	const projectName = segments[segments.length - 1] ?? "project";	173	const projectName = segments[segments.length - 1] ?? "project";
166		174
@@ -173,9 +181,9 @@ export const resolveWelcomeBase = Effect.gen(function* () { · 6 unmodified lines
173	export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {	181	export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
174	const crypto = yield* Crypto.Crypto;	182	const crypto = yield* Crypto.Crypto;
175	const randomUUID = crypto.randomUUIDv4;	183	const randomUUID = crypto.randomUUIDv4;
176	const serverConfig = yield* ServerConfig;	184	const serverConfig = yield* ServerConfig.ServerConfig;
177	const projectionReadModelQuery = yield* ProjectionSnapshotQuery;	185	const projectionReadModelQuery = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
178	const orchestrationEngine = yield* OrchestrationEngineService;	186	const orchestrationEngine = yield* OrchestrationEngine.OrchestrationEngineService;
179	const path = yield* Path.Path;	187	const path = yield* Path.Path;
180		188
181	let bootstrapProjectId: ProjectId \| undefined;	189	let bootstrapProjectId: ProjectId \| undefined;
@@ -243,7 +251,7 @@ export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () { · 61 unmodified lines
243	});	251	});
244		252
245	const resolveStartupBrowserTarget = Effect.gen(function* () {	253	const resolveStartupBrowserTarget = Effect.gen(function* () {
246	const serverConfig = yield* ServerConfig;	254	const serverConfig = yield* ServerConfig.ServerConfig;
247	const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;	255	const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
248	const localUrl = `http://localhost:${serverConfig.port}`;	256	const localUrl = `http://localhost:${serverConfig.port}`;
249	const bindUrl =	257	const bindUrl =
@@ -260,7 +268,7 @@ const resolveStartupBrowserTarget = Effect.gen(function* () { · 10 unmodified lines
260		268
261	const maybeOpenBrowser = (target: string) =>	269	const maybeOpenBrowser = (target: string) =>
262	Effect.gen(function* () {	270	Effect.gen(function* () {
263	const serverConfig = yield* ServerConfig;	271	const serverConfig = yield* ServerConfig.ServerConfig;
264	if (serverConfig.noBrowser) {	272	if (serverConfig.noBrowser) {
265	return;	273	return;
266	}	274	}
@@ -281,14 +289,14 @@ const runStartupPhase = <A, E, R>(phase: string, effect: Effect.Effect<A, E, R>) · 14 unmodified lines
281	Effect.withSpan(`server.startup.${phase}`),	289	Effect.withSpan(`server.startup.${phase}`),
282	);	290	);
283		291
284	export const makeServerRuntimeStartup = Effect.gen(function* () {	292	const make = Effect.gen(function* () {
285	const serverConfig = yield* ServerConfig;	293	const serverConfig = yield* ServerConfig.ServerConfig;
286	const keybindings = yield* Keybindings;	294	const keybindings = yield* Keybindings.Keybindings;
287	const orchestrationReactor = yield* OrchestrationReactor;	295	const orchestrationReactor = yield* OrchestrationReactor.OrchestrationReactor;
288	const providerSessionReaper = yield* ProviderSessionReaper;	296	const providerSessionReaper = yield* ProviderSessionReaper.ProviderSessionReaper;
289	const lifecycleEvents = yield* ServerLifecycleEvents;	297	const lifecycleEvents = yield* ServerLifecycleEvents.ServerLifecycleEvents;
290	const serverSettings = yield* ServerSettingsService;	298	const serverSettings = yield* ServerSettings.ServerSettingsService;
291	const serverEnvironment = yield* ServerEnvironment;	299	const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;
292	const crypto = yield* Crypto.Crypto;	300	const crypto = yield* Crypto.Crypto;
293		301
294	const commandGate = yield* makeCommandGate;	302	const commandGate = yield* makeCommandGate;
@@ -409,7 +417,7 @@ export const makeServerRuntimeStartup = Effect.gen(function* () { · 114 unmodified lines
409	const startupExit = yield* Effect.exit(startup);	417	const startupExit = yield* Effect.exit(startup);
410	if (Exit.isFailure(startupExit)) {	418	if (Exit.isFailure(startupExit)) {
411	const error = new ServerRuntimeStartupError({	419	const error = new ServerRuntimeStartupError({
412	message: "Server runtime startup failed before command readiness.",	420	stage: "command-readiness",
413	cause: startupExit.cause,	421	cause: startupExit.cause,
414	});	422	});
415	yield* Effect.logError("server runtime startup failed", { cause: startupExit.cause });	423	yield* Effect.logError("server runtime startup failed", { cause: startupExit.cause });
@@ -461,10 +469,7 @@ export const makeServerRuntimeStartup = Effect.gen(function* () { · 45 unmodified lines
461	awaitCommandReady: commandGate.awaitCommandReady,	469	awaitCommandReady: commandGate.awaitCommandReady,
462	markHttpListening: Deferred.succeed(httpListening, undefined),	470	markHttpListening: Deferred.succeed(httpListening, undefined),
463	enqueueCommand: commandGate.enqueueCommand,	471	enqueueCommand: commandGate.enqueueCommand,
464	} satisfies ServerRuntimeStartupShape;	472	} satisfies ServerRuntimeStartup["Service"];
465	});	473	});
466		474
467	export const ServerRuntimeStartupLive = Layer.effect(	475	export const layer = Layer.effect(ServerRuntimeStartup, make);
468	ServerRuntimeStartup,
469	makeServerRuntimeStartup,
470	);

apps/server/src/serverRuntimeState.ts+3−3

@@ -5,7 +5,7 @@ import * as Option from "effect/Option"; · 4 unmodified lines
5	import * as Schema from "effect/Schema";	5	import * as Schema from "effect/Schema";
6		6
7	import { writeFileStringAtomically } from "./atomicWrite.ts";	7	import { writeFileStringAtomically } from "./atomicWrite.ts";
8	import { type ServerConfigShape } from "./config.ts";	8	import type * as ServerConfig from "./config.ts";
9	import { formatHostForUrl, isWildcardHost } from "./startupAccess.ts";	9	import { formatHostForUrl, isWildcardHost } from "./startupAccess.ts";
10		10
11	export const PersistedServerRuntimeState = Schema.Struct({	11	export const PersistedServerRuntimeState = Schema.Struct({
@@ -23,7 +23,7 @@ const decodePersistedServerRuntimeState = Schema.decodeUnknownEffect( · 11 unmodified lines
23	);	23	);
24		24
25	const runtimeOriginForConfig = (	25	const runtimeOriginForConfig = (
26	config: Pick<ServerConfigShape, "host">,	26	config: Pick<ServerConfig.ServerConfig["Service"], "host">,
27	port: number,	27	port: number,
28	): PersistedServerRuntimeState["origin"] => {	28	): PersistedServerRuntimeState["origin"] => {
29	const hostname =	29	const hostname =
@@ -32,7 +32,7 @@ const runtimeOriginForConfig = ( · 2 unmodified lines
32	};	32	};
33		33
34	export const makePersistedServerRuntimeState = (input: {	34	export const makePersistedServerRuntimeState = (input: {
35	readonly config: Pick<ServerConfigShape, "host">;	35	readonly config: Pick<ServerConfig.ServerConfig["Service"], "host">;
36	readonly port: number;	36	readonly port: number;
37	}): Effect.Effect<PersistedServerRuntimeState> =>	37	}): Effect.Effect<PersistedServerRuntimeState> =>
38	Effect.map(DateTime.now, (now) => ({	38	Effect.map(DateTime.now, (now) => ({

apps/server/src/serverSettings.test.ts+19−17

 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import { ServerConfig } from "./config.ts";
+import * as ServerSecretStore from "./auth/ServerSecretStore.ts";
-import { ServerSettingsLive, ServerSettingsService } from "./serverSettings.ts";
+import * as ServerConfig from "./config.ts";
+import * as ServerSettingsModule from "./serverSettings.ts";
 const decodeSettingsPatch = Schema.decodeUnknownEffect(ServerSettingsPatch);
 const decodeServerSettings = Schema.decodeUnknownEffect(ServerSettings);
 const makeServerSettingsLayer = () =>
-  ServerSettingsLive.pipe(
+  ServerSettingsModule.layer.pipe(
+    Layer.provide(ServerSecretStore.layer),
     Layer.provideMerge(
       Layer.fresh(
         ServerConfig.layerTest(process.cwd(), {
   it.effect("deep merges nested settings updates without dropping siblings", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       yield* serverSettings.updateSettings({
         providers: {
   it.effect("preserves model when switching providers via textGenerationModelSelection", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       // Start with Claude text generation selection
       yield* serverSettings.updateSettings({
   it.effect("preserves custom provider instance text generation selections", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       const next = yield* serverSettings.updateSettings({
         providerInstances: {
     "uses explicit provider instance enabled state over legacy provider enabled state",
     () =>
       Effect.gen(function* () {
-        const serverSettings = yield* ServerSettingsService;
+        const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
         const instanceId = ProviderInstanceId.make("claude_openrouter");
         const next = yield* serverSettings.updateSettings({
   it.effect("preserves enabled text generation selections for non-built-in drivers", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       const instanceId = ProviderInstanceId.make("openrouter_text");
       const next = yield* serverSettings.updateSettings({
   it.effect("drops stale text generation options when resetting model selection", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       yield* serverSettings.updateSettings({
         textGenerationModelSelection: {
   it.effect("replaces provider instance maps when clearing optional fields", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       const codexId = ProviderInstanceId.make("codex");
       yield* serverSettings.updateSettings({
   it.effect("trims provider path settings when updates are applied", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       const next = yield* serverSettings.updateSettings({
         providers: {
   it.effect("trims observability settings when updates are applied", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       const next = yield* serverSettings.updateSettings({
         addProjectBaseDirectory: "  ~/Development  ",
   it.effect("defaults blank binary paths to provider executables", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
       const next = yield* serverSettings.updateSettings({
         providers: {
   it.effect("writes only non-default server settings to disk", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
-      const serverConfig = yield* ServerConfig;
+      const serverConfig = yield* ServerConfig.ServerConfig;
       const fileSystem = yield* FileSystem.FileSystem;
       const next = yield* serverSettings.updateSettings({
         addProjectBaseDirectory: "~/Development",
   it.effect("stores sensitive provider instance environment values outside settings.json", () =>
     Effect.gen(function* () {
-      const serverSettings = yield* ServerSettingsService;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
-      const serverConfig = yield* ServerConfig;
+      const serverConfig = yield* ServerConfig.ServerConfig;
       const fileSystem = yield* FileSystem.FileSystem;
       const instanceId = ProviderInstanceId.make("codex_personal");

apps/server/src/serverSettings.ts+56−57

@@ -26,26 +26,26 @@ import { · 25 unmodified lines
26	type ServerSettingsPatch,	26	type ServerSettingsPatch,
27	} from "@t3tools/contracts";	27	} from "@t3tools/contracts";
28	import * as Cache from "effect/Cache";	28	import * as Cache from "effect/Cache";
		29	import * as Cause from "effect/Cause";
		30	import * as Context from "effect/Context";
29	import * as Deferred from "effect/Deferred";	31	import * as Deferred from "effect/Deferred";
30	import * as Duration from "effect/Duration";	32	import * as Duration from "effect/Duration";
		33	import * as Equal from "effect/Equal";
31	import * as Effect from "effect/Effect";	34	import * as Effect from "effect/Effect";
32	import * as Exit from "effect/Exit";	35	import * as Exit from "effect/Exit";
33	import * as FileSystem from "effect/FileSystem";	36	import * as FileSystem from "effect/FileSystem";
34	import * as Layer from "effect/Layer";	37	import * as Layer from "effect/Layer";
35	import * as Option from "effect/Option";	38	import * as Option from "effect/Option";
36	import * as Path from "effect/Path";	39	import * as Path from "effect/Path";
37	import * as Equal from "effect/Equal";
38	import * as PubSub from "effect/PubSub";	40	import * as PubSub from "effect/PubSub";
39	import * as Ref from "effect/Ref";	41	import * as Ref from "effect/Ref";
40	import * as Schema from "effect/Schema";	42	import * as Schema from "effect/Schema";
41	import * as SchemaIssue from "effect/SchemaIssue";	43	import * as SchemaIssue from "effect/SchemaIssue";
		44	import * as Semaphore from "effect/Semaphore";
42	import * as Scope from "effect/Scope";	45	import * as Scope from "effect/Scope";
43	import * as Context from "effect/Context";
44	import * as Stream from "effect/Stream";	46	import * as Stream from "effect/Stream";
45	import * as Cause from "effect/Cause";
46	import * as Semaphore from "effect/Semaphore";
47	import { writeFileStringAtomically } from "./atomicWrite.ts";	47	import { writeFileStringAtomically } from "./atomicWrite.ts";
48	import { ServerConfig } from "./config.ts";	48	import * as ServerConfig from "./config.ts";
49	import { type DeepPartial, deepMerge } from "@t3tools/shared/Struct";	49	import { type DeepPartial, deepMerge } from "@t3tools/shared/Struct";
50	import { fromJsonStringPretty, fromLenientJson } from "@t3tools/shared/schemaJson";	50	import { fromJsonStringPretty, fromLenientJson } from "@t3tools/shared/schemaJson";
51	import { applyServerSettingsPatch } from "@t3tools/shared/serverSettings";	51	import { applyServerSettingsPatch } from "@t3tools/shared/serverSettings";
@@ -109,59 +109,60 @@ export function redactServerSettingsForClient(settings: ServerSettings): ServerS · 57 unmodified lines
109	return { ...settings, providerInstances };	109	return { ...settings, providerInstances };
110	}	110	}
111		111
112	export interface ServerSettingsShape {	112	export class ServerSettingsService extends Context.Service<
113	/** Start the settings runtime and attach file watching. */	113	ServerSettingsService,
114	readonly start: Effect.Effect<void, ServerSettingsError>;	114	{
115		115	/** Start the settings runtime and attach file watching. */
116	/** Await settings runtime readiness. */	116	readonly start: Effect.Effect<void, ServerSettingsError>;
117	readonly ready: Effect.Effect<void, ServerSettingsError>;
118		117
119	/** Read the current settings. */	118	/** Await settings runtime readiness. */
120	readonly getSettings: Effect.Effect<ServerSettings, ServerSettingsError>;	119	readonly ready: Effect.Effect<void, ServerSettingsError>;
121		120
122	/** Patch settings and persist. Returns the new full settings object. */	121	/** Read the current settings. */
123	readonly updateSettings: (	122	readonly getSettings: Effect.Effect<ServerSettings, ServerSettingsError>;
124	patch: ServerSettingsPatch,
125	) => Effect.Effect<ServerSettings, ServerSettingsError>;
126		123
127	/** Stream of settings change events. */	124	/** Patch settings and persist. Returns the new full settings object. */
128	readonly streamChanges: Stream.Stream<ServerSettings>;	125	readonly updateSettings: (
129	}	126	patch: ServerSettingsPatch,
		127	) => Effect.Effect<ServerSettings, ServerSettingsError>;
130		128
131	export class ServerSettingsService extends Context.Service<	129	/** Stream of settings change events. */
132	ServerSettingsService,	130	readonly streamChanges: Stream.Stream<ServerSettings>;
133	ServerSettingsShape	131	}
134	>()("t3/serverSettings/ServerSettingsService") {	132	>()("t3/serverSettings/ServerSettingsService") {
135	static readonly layerTest = (overrides: DeepPartial<ServerSettings> = {}) =>	133	/** @deprecated Import and use `layerTest` from this module. */
136	Layer.effect(	134	static readonly layerTest = (overrides: DeepPartial<ServerSettings> = {}) => layerTest(overrides);
137	ServerSettingsService,
138	Effect.gen(function* () {
139	const { automaticGitFetchInterval, ...overridesForMerge } = overrides;
140	const merged = deepMerge(DEFAULT_SERVER_SETTINGS, overridesForMerge);
141	const initialSettings = yield* normalizeServerSettings({
142	...merged,
143	...(automaticGitFetchInterval !== undefined
144	? { automaticGitFetchInterval: automaticGitFetchInterval as Duration.Duration }
145	: {}),
146	});
147	const currentSettingsRef = yield* Ref.make<ServerSettings>(initialSettings);
148
149	return {
150	start: Effect.void,
151	ready: Effect.void,
152	getSettings: Ref.get(currentSettingsRef),
153	updateSettings: (patch) =>
154	Ref.get(currentSettingsRef).pipe(
155	Effect.map((currentSettings) => applyServerSettingsPatch(currentSettings, patch)),
156	Effect.flatMap(normalizeServerSettings),
157	Effect.tap((nextSettings) => Ref.set(currentSettingsRef, nextSettings)),
158	),
159	streamChanges: Stream.empty,
160	} satisfies ServerSettingsShape;
161	}),
162	);
163	}	135	}
164		136
		137	const makeTest = (overrides: DeepPartial<ServerSettings> = {}) =>
		138	Effect.gen(function* () {
		139	const { automaticGitFetchInterval, ...overridesForMerge } = overrides;
		140	const merged = deepMerge(DEFAULT_SERVER_SETTINGS, overridesForMerge);
		141	const initialSettings = yield* normalizeServerSettings({
		142	...merged,
		143	...(automaticGitFetchInterval !== undefined
		144	? { automaticGitFetchInterval: automaticGitFetchInterval as Duration.Duration }
		145	: {}),
		146	});
		147	const currentSettingsRef = yield* Ref.make<ServerSettings>(initialSettings);
		148
		149	return {
		150	start: Effect.void,
		151	ready: Effect.void,
		152	getSettings: Ref.get(currentSettingsRef),
		153	updateSettings: (patch) =>
		154	Ref.get(currentSettingsRef).pipe(
		155	Effect.map((currentSettings) => applyServerSettingsPatch(currentSettings, patch)),
		156	Effect.flatMap(normalizeServerSettings),
		157	Effect.tap((nextSettings) => Ref.set(currentSettingsRef, nextSettings)),
		158	),
		159	streamChanges: Stream.empty,
		160	} satisfies ServerSettingsService["Service"];
		161	});
		162
		163	export const layerTest = (overrides: DeepPartial<ServerSettings> = {}) =>
		164	Layer.effect(ServerSettingsService, makeTest(overrides));
		165
165	const ServerSettingsJson = fromLenientJson(ServerSettings);	166	const ServerSettingsJson = fromLenientJson(ServerSettings);
166	const decodeServerSettingsJsonExit = Schema.decodeUnknownExit(ServerSettingsJson);	167	const decodeServerSettingsJsonExit = Schema.decodeUnknownExit(ServerSettingsJson);
167		168
@@ -255,8 +256,8 @@ function stripDefaultServerSettings(current: unknown, defaults: unknown): unknow · 87 unmodified lines
255	return Object.is(current, defaults) ? undefined : current;	256	return Object.is(current, defaults) ? undefined : current;
256	}	257	}
257		258
258	const makeServerSettings = Effect.gen(function* () {	259	const make = Effect.gen(function* () {
259	const { settingsPath } = yield* ServerConfig;	260	const { settingsPath } = yield* ServerConfig.ServerConfig;
260	const fs = yield* FileSystem.FileSystem;	261	const fs = yield* FileSystem.FileSystem;
261	const pathService = yield* Path.Path;	262	const pathService = yield* Path.Path;
262	const secretStore = yield* ServerSecretStore.ServerSecretStore;	263	const secretStore = yield* ServerSecretStore.ServerSecretStore;
@@ -578,9 +579,7 @@ const makeServerSettings = Effect.gen(function* () { · 315 unmodified lines
578	Stream.map(resolveTextGenerationProvider),	579	Stream.map(resolveTextGenerationProvider),
579	);	580	);
580	},	581	},
581	} satisfies ServerSettingsShape;	582	} satisfies ServerSettingsService["Service"];
582	});	583	});
583		584
584	export const ServerSettingsLive = Layer.effect(ServerSettingsService, makeServerSettings).pipe(	585	export const layer = Layer.effect(ServerSettingsService, make);
585	Layer.provide(ServerSecretStore.layer),
586	);

apps/server/src/vcs/GitVcsDriverCore.test.ts+73−0

@@ -100,6 +100,41 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => { · 99 unmodified lines
100	assert.deepStrictEqual(paths, ["complete.txt", "final.txt"]);	100	assert.deepStrictEqual(paths, ["complete.txt", "final.txt"]);
101	}),	101	}),
102	);	102	);
		103
		104	it.effect("honors whitespace filtering for worktree and branch previews", () =>
		105	Effect.gen(function* () {
		106	const cwd = yield* makeTmpDir();
		107	const { initialBranch } = yield* initRepoWithCommit(cwd);
		108	const driver = yield* GitVcsDriver.GitVcsDriver;
		109	yield* git(cwd, ["checkout", "-b", "feature/whitespace"]);
		110	yield* writeTextFile(cwd, "README.md", "# test\n");
		111	yield* git(cwd, ["add", "README.md"]);
		112	yield* git(cwd, ["commit", "-m", "change whitespace"]);
		113	yield* writeTextFile(cwd, "README.md", "# test\n");
		114
		115	const included = yield* driver.getReviewDiffPreview({
		116	cwd,
		117	baseRef: initialBranch,
		118	ignoreWhitespace: false,
		119	});
		120	const ignored = yield* driver.getReviewDiffPreview({
		121	cwd,
		122	baseRef: initialBranch,
		123	ignoreWhitespace: true,
		124	});
		125
		126	assert.isNotEmpty(included.sources.find((source) => source.kind === "working-tree")?.diff);
		127	assert.isNotEmpty(included.sources.find((source) => source.kind === "branch-range")?.diff);
		128	assert.strictEqual(
		129	ignored.sources.find((source) => source.kind === "working-tree")?.diff,
		130	"",
		131	);
		132	assert.strictEqual(
		133	ignored.sources.find((source) => source.kind === "branch-range")?.diff,
		134	"",
		135	);
		136	}),
		137	);
103	});	138	});
104		139
105	describe("repository status", () => {	140	describe("repository status", () => {
@@ -342,6 +377,44 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => { · 236 unmodified lines
342	});	377	});
343		378
344	describe("refName operations", () => {	379	describe("refName operations", () => {
		380	it.effect("optionally includes remote refs that match local branches", () =>
		381	Effect.gen(function* () {
		382	const cwd = yield* makeTmpDir();
		383	const remote = yield* makeTmpDir("git-vcs-driver-remote-");
		384	const { initialBranch } = yield* initRepoWithCommit(cwd);
		385	yield* git(remote, ["init", "--bare"]);
		386	yield* git(cwd, ["remote", "add", "origin", remote]);
		387	yield* git(cwd, ["push", "-u", "origin", initialBranch]);
		388	const driver = yield* GitVcsDriver.GitVcsDriver;
		389
		390	const deduplicated = yield* driver.listRefs({ cwd });
		391	assert.equal(
		392	deduplicated.refs.some((ref) => ref.name === `origin/${initialBranch}`),
		393	false,
		394	);
		395
		396	const complete = yield* driver.listRefs({ cwd, includeMatchingRemoteRefs: true });
		397	assert.equal(
		398	complete.refs.some((ref) => ref.name === initialBranch),
		399	true,
		400	);
		401	assert.equal(
		402	complete.refs.some((ref) => ref.name === `origin/${initialBranch}`),
		403	true,
		404	);
		405
		406	const remoteOnly = yield* driver.listRefs({
		407	cwd,
		408	includeMatchingRemoteRefs: true,
		409	refKind: "remote",
		410	limit: 1,
		411	});
		412	assert.equal(remoteOnly.refs.length, 1);
		413	assert.equal(remoteOnly.refs[0]?.name, `origin/${initialBranch}`);
		414	assert.equal(remoteOnly.refs[0]?.isRemote, true);
		415	}),
		416	);
		417
345	it.effect("creates, checks out, renames, and lists refs", () =>	418	it.effect("creates, checks out, renames, and lists refs", () =>
346	Effect.gen(function* () {	419	Effect.gen(function* () {
347	const cwd = yield* makeTmpDir();	420	const cwd = yield* makeTmpDir();

apps/server/src/vcs/GitVcsDriverCore.ts+25−6

     const dirtyTrackedResult = yield* executeGit(
       "GitVcsDriver.getReviewDiffPreview.dirtyTracked",
       input.cwd,
-      ["diff", "--patch", "--minimal", "HEAD", "--"],
+      [
+        "diff",
+        "--patch",
+        "--minimal",
+        ...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),
+        "HEAD",
+        "--",
+      ],
       {
         maxOutputBytes: REVIEW_DIFF_PATCH_MAX_OUTPUT_BYTES,
         appendTruncationMarker: true,
         ? yield* executeGit(
             "GitVcsDriver.getReviewDiffPreview.base",
             input.cwd,
-            ["diff", "--patch", "--minimal", `${baseRef}...HEAD`],
+            [
+              "diff",
+              "--patch",
+              "--minimal",
+              ...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),
+              `${baseRef}...HEAD`,
+            ],
             {
               maxOutputBytes: REVIEW_DIFF_PATCH_MAX_OUTPUT_BYTES,
               appendTruncationMarker: true,
             })
           : [];
+      const allBranches = input.includeMatchingRemoteRefs
+        ? [...localBranches, ...remoteBranches]
+        : dedupeRemoteBranchesWithLocalMatches([...localBranches, ...remoteBranches]);
+      const branchesForKind =
+        input.refKind === "local"
+          ? allBranches.filter((ref) => !ref.isRemote)
+          : input.refKind === "remote"
+            ? allBranches.filter((ref) => ref.isRemote)
+            : allBranches;
       const refs = paginateBranches({
-        refs: filterBranchesForListQuery(
+        refs: filterBranchesForListQuery(branchesForKind, input.query),
-          dedupeRemoteBranchesWithLocalMatches([...localBranches, ...remoteBranches]),
-          input.query,
-        ),
         cursor: input.cursor,
         limit: input.limit,
       });

apps/server/src/ws.ts+2−2

@@ -1489,7 +1489,7 @@ const makeWsRpcLayer = (currentSession: AuthenticatedSession) => · 1488 unmodified lines
1489	[WS_METHODS.previewAutomationConnect]: (input) =>	1489	[WS_METHODS.previewAutomationConnect]: (input) =>
1490	observeRpcStreamEffect(	1490	observeRpcStreamEffect(
1491	WS_METHODS.previewAutomationConnect,	1491	WS_METHODS.previewAutomationConnect,
1492	previewAutomationBroker.connect(input.clientId),	1492	previewAutomationBroker.connect(input),
1493	{ "rpc.aggregate": "preview-automation" },	1493	{ "rpc.aggregate": "preview-automation" },
1494	),	1494	),
1495	[WS_METHODS.previewAutomationRespond]: (input) =>	1495	[WS_METHODS.previewAutomationRespond]: (input) =>
@@ -1507,7 +1507,7 @@ const makeWsRpcLayer = (currentSession: AuthenticatedSession) => · 11 unmodified lines
1507	[WS_METHODS.previewAutomationClearOwner]: (input) =>	1507	[WS_METHODS.previewAutomationClearOwner]: (input) =>
1508	observeRpcEffect(	1508	observeRpcEffect(
1509	WS_METHODS.previewAutomationClearOwner,	1509	WS_METHODS.previewAutomationClearOwner,
1510	previewAutomationBroker.clearOwner(input.clientId),	1510	previewAutomationBroker.clearOwner(input),
1511	{ "rpc.aggregate": "preview-automation" },	1511	{ "rpc.aggregate": "preview-automation" },
1512	),	1512	),
1513	[WS_METHODS.subscribePreviewEvents]: (_input) =>	1513	[WS_METHODS.subscribePreviewEvents]: (_input) =>

apps/web/src/components/ChatView.tsx+13−120

 import { Debouncer } from "@tanstack/react-pacer";
 import { useAtomValue } from "@effect/atom-react";
 import { lazy, memo, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useNavigate, useSearch } from "@tanstack/react-router";
+import { useNavigate } from "@tanstack/react-router";
 import { useShallow } from "zustand/react/shallow";
 import {
   isAtomCommandInterrupted,
 import { AsyncResult } from "effect/unstable/reactivity";
 import { isElectron } from "../env";
 import { readLocalApi } from "../localApi";
-import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";
+import { useDiffPanelStore } from "../diffPanelStore";
 import {
   collapseExpandedComposerCursor,
   parseStandaloneComposerSlashCommand,
 import { useMediaQuery } from "../hooks/useMediaQuery";
 import { RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY } from "../rightPanelLayout";
 import {
-  selectActiveRightPanelKindWithUrl,
+  selectActiveRightPanel,
   selectActiveRightPanelSurface,
   selectThreadRightPanelState,
   type RightPanelSurface,
   const timestampFormat = settings.timestampFormat;
   const autoOpenPlanSidebar = settings.autoOpenPlanSidebar;
   const navigate = useNavigate();
-  const rawSearch = useSearch({
-    strict: false,
-    select: (params) => parseDiffRouteSearch(params),
-  });
   const { resolvedTheme } = useTheme();
   // Granular store selectors — avoid subscribing to prompt changes.
   const composerRuntimeMode = useComposerDraftStore(
     composerInteractionMode ?? activeThread?.interactionMode ?? DEFAULT_INTERACTION_MODE;
   const isLocalDraftThread = !isServerThread && localDraftThread !== undefined;
   const canCheckoutPullRequestIntoThread = isLocalDraftThread;
-  const diffOpen = rawSearch.diff === "1";
   const activeThreadId = activeThread?.id ?? null;
   const runningTerminalIds = useThreadRunningTerminalIds({
     environmentId: activeThread?.environmentId ?? null,
   );
   const activeThreadKey = activeThreadRef ? scopedThreadKey(activeThreadRef) : null;
   const activeRightPanelKind = useRightPanelStore((state) =>
-    selectActiveRightPanelKindWithUrl(state.byThreadKey, activeThreadRef, diffOpen),
+    selectActiveRightPanel(state.byThreadKey, activeThreadRef),
   );
+  const diffOpen = activeRightPanelKind === "diff";
   const rightPanelState = useRightPanelStore((state) =>
     selectThreadRightPanelState(state.byThreadKey, activeThreadRef),
   );
   const planSidebarOpen = activeRightPanelKind === "plan";
-  useEffect(() => {
-    if (!activeThreadRef || !diffOpen) return;
-    useRightPanelStore.getState().open(activeThreadRef, "diff");
-  }, [activeThreadRef, diffOpen]);
   const existingOpenTerminalThreadKeys = useMemo(() => {
     const existingThreadKeys = new Set<string>([...serverThreadKeys, ...draftThreadKeys]);
     return openTerminalThreadKeys.filter((nextThreadKey) => existingThreadKeys.has(nextThreadKey));
     if (activeThreadRef) {
       useRightPanelStore.getState().toggle(activeThreadRef, "diff");
     }
-    void navigate({
+  }, [activeThreadRef, diffOpen, isServerThread, onDiffPanelOpen]);
-      to: "/$environmentId/$threadId",
-      params: {
-        environmentId,
-        threadId,
-      },
-      replace: true,
-      search: (previous) => {
-        const rest = stripDiffSearchParams(previous);
-        return diffOpen ? { ...rest, diff: undefined } : { ...rest, diff: "1" };
-      },
-    });
-  }, [
-    activeThreadRef,
-    diffOpen,
-    environmentId,
-    isServerThread,
-    navigate,
-    onDiffPanelOpen,
-    threadId,
-  ]);
   const envLocked = Boolean(
     activeThread &&
     if (!activeThreadRef || !isServerThread || !isGitRepo) return;
     useRightPanelStore.getState().open(activeThreadRef, "diff");
     onDiffPanelOpen?.();
-    void navigate({
+  }, [activeThreadRef, isGitRepo, isServerThread, onDiffPanelOpen]);
-      to: "/$environmentId/$threadId",
-      params: { environmentId, threadId },
-      replace: true,
-      search: (previous) => ({ ...stripDiffSearchParams(previous), diff: "1" }),
-    });
-  }, [
-    activeThreadRef,
-    environmentId,
-    isGitRepo,
-    isServerThread,
-    navigate,
-    onDiffPanelOpen,
-    threadId,
-  ]);
   const addFilesSurface = useCallback(() => {
     if (!activeThreadRef || !activeProject) return;
     useRightPanelStore.getState().open(activeThreadRef, "files");
       useRightPanelStore.getState().close(activeThreadRef);
       return;
     }
-    if (diffOpen) {
-      void navigate({
-        to: "/$environmentId/$threadId",
-        params: { environmentId, threadId },
-        replace: true,
-        search: (previous) => ({ ...stripDiffSearchParams(previous), diff: undefined }),
-      });
-    }
     const activeTabId = activePreviewState.activeTabId;
     if (activeTabId) {
       useRightPanelStore.getState().openBrowser(activeThreadRef, activeTabId);
     } else {
       createBrowserSurface();
     }
-  }, [
+  }, [activePreviewState.activeTabId, activeThreadRef, createBrowserSurface, previewPanelOpen]);
-    activePreviewState.activeTabId,
-    activeThreadRef,
-    createBrowserSurface,
-    diffOpen,
-    environmentId,
-    navigate,
-    previewPanelOpen,
-    threadId,
-  ]);
   const closePreviewPanel = useCallback(() => {
     if (activeThreadRef) {
       setMaximizedRightPanelThreadKey(null);
       }
       if (surface.kind === "diff" && !diffOpen) {
         onDiffPanelOpen?.();
-        void navigate({
-          to: "/$environmentId/$threadId",
-          params: { environmentId, threadId },
-          replace: true,
-          search: (previous) => ({ ...stripDiffSearchParams(previous), diff: "1" }),
-        });
-      } else if (surface.kind !== "diff" && diffOpen) {
-        void navigate({
-          to: "/$environmentId/$threadId",
-          params: { environmentId, threadId },
-          replace: true,
-          search: (previous) => ({ ...stripDiffSearchParams(previous), diff: undefined }),
-        });
       }
     },
-    [
+    [activeThreadRef, diffOpen, dismissPlanSidebarForCurrentTurn, onDiffPanelOpen, planSidebarOpen],
-      activeThreadRef,
-      diffOpen,
-      dismissPlanSidebarForCurrentTurn,
-      environmentId,
-      navigate,
-      onDiffPanelOpen,
-      planSidebarOpen,
-      threadId,
-    ],
   );
   const toggleRightPanel = useCallback(() => {
     if (!activeThreadRef) return;
           }
         }
       }
-      if (diffOpen && surfaces.some((surface) => surface.kind === "diff")) {
-        void navigate({
-          to: "/$environmentId/$threadId",
-          params: { environmentId, threadId },
-          replace: true,
-          search: (previous) => ({ ...stripDiffSearchParams(previous), diff: undefined }),
-        });
-      }
     },
     [
       activeThreadRef,
       activePreviewState.sessions,
       closePreview,
       closeTerminalMutation,
-      diffOpen,
       dismissPlanSidebarForCurrentTurn,
-      environmentId,
-      navigate,
       storeCloseTerminal,
-      threadId,
     ],
   );
   const syncActivePreviewSurface = useCallback(() => {
   }, []);
   const onOpenTurnDiff = useCallback(
     (turnId: TurnId, filePath?: string) => {
-      if (!isServerThread) {
+      if (!isServerThread || !activeThreadRef) return;
-        return;
+      useDiffPanelStore.getState().selectTurn(activeThreadRef, turnId, filePath);
-      }
+      useRightPanelStore.getState().open(activeThreadRef, "diff");
       onDiffPanelOpen?.();
-      void navigate({
-        to: "/$environmentId/$threadId",
-        params: {
-          environmentId,
-          threadId,
-        },
-        search: (previous) => {
-          const rest = stripDiffSearchParams(previous);
-          return filePath
-            ? { ...rest, diff: "1", diffTurnId: turnId, diffFilePath: filePath }
-            : { ...rest, diff: "1", diffTurnId: turnId };
-        },
-      });
     },
-    [environmentId, isServerThread, navigate, onDiffPanelOpen, threadId],
+    [activeThreadRef, isServerThread, onDiffPanelOpen],
   );
   // Both the Map and the revert handler are read from refs at call-time so
   // the callback reference is fully stable and never busts context identity.

apps/web/src/components/DiffPanel.tsx+436−345

@@ -1,35 +1,28 @@
1	import { useAtomValue } from "@effect/atom-react";	1	import { useAtomValue } from "@effect/atom-react";
2	import { Virtualizer } from "@pierre/diffs/react";	2	import { useParams } from "@tanstack/react-router";
3	import { useNavigate, useParams, useSearch } from "@tanstack/react-router";
4	import { scopeThreadRef } from "@t3tools/client-runtime/environment";
5	import {	3	import {
6	isAtomCommandInterrupted,	4	isAtomCommandInterrupted,
7	squashAtomCommandFailure,	5	squashAtomCommandFailure,
8	} from "@t3tools/client-runtime/state/runtime";	6	} from "@t3tools/client-runtime/state/runtime";
9	import type { ScopedThreadRef, TurnId } from "@t3tools/contracts";	7	import type { ScopedThreadRef, TurnId } from "@t3tools/contracts";
10	import {	8	import {
		9	ArrowRightIcon,
		10	CheckIcon,
11	ChevronDownIcon,	11	ChevronDownIcon,
12	ChevronLeftIcon,
13	ChevronRightIcon,	12	ChevronRightIcon,
14	Columns2Icon,	13	Columns2Icon,
15	PilcrowIcon,	14	PilcrowIcon,
16	Rows3Icon,	15	Rows3Icon,
		16	SearchIcon,
17	TextWrapIcon,	17	TextWrapIcon,
18	} from "lucide-react";	18	} from "lucide-react";
19	import {	19	import { useCallback, useEffect, useMemo, useRef, useState } from "react";
20	type WheelEvent as ReactWheelEvent,
21	useCallback,
22	useEffect,
23	useMemo,
24	useRef,
25	useState,
26	} from "react";
27	import { useOpenInPreferredEditor } from "../editorPreferences";	20	import { useOpenInPreferredEditor } from "../editorPreferences";
28	import { type DraftId } from "../composerDraftStore";	21	import { type DraftId } from "../composerDraftStore";
29	import { openDiffFilePrimaryAction } from "../diffFileActions";	22	import { openDiffFilePrimaryAction } from "../diffFileActions";
30	import { useCheckpointDiff } from "~/lib/checkpointDiffState";	23	import { useCheckpointDiff } from "~/lib/checkpointDiffState";
31	import { cn } from "~/lib/utils";	24	import { cn } from "~/lib/utils";
32	import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";	25	import { selectThreadDiffPanelSelection, useDiffPanelStore } from "../diffPanelStore";
33	import { useTheme } from "../hooks/useTheme";	26	import { useTheme } from "../hooks/useTheme";
34	import {	27	import {
35	buildFileDiffRenderKey,	28	buildFileDiffRenderKey,
@@ -40,19 +33,41 @@ import { · 4 unmodified lines
40	} from "../lib/diffRendering";	33	} from "../lib/diffRendering";
41	import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";	34	import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
42	import { useProject, useThread } from "../state/entities";	35	import { useProject, useThread } from "../state/entities";
43	import { buildThreadRouteParams, resolveThreadRouteRef } from "../threadRoutes";	36	import { resolveThreadRouteRef } from "../threadRoutes";
44	import { useSettings } from "../hooks/useSettings";	37	import { useSettings } from "../hooks/useSettings";
45	import { formatShortTimestamp } from "../timestampFormat";	38	import { formatShortTimestamp } from "../timestampFormat";
46	import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";	39	import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";
47	import { AnnotatableFileDiff } from "./diffs/AnnotatableFileDiff";	40	import { AnnotatableCodeView, type AnnotatableCodeViewHandle } from "./diffs/AnnotatableFileDiff";
48	import { ToggleGroup, Toggle } from "./ui/toggle-group";	41	import { ToggleGroup, Toggle } from "./ui/toggle-group";
		42	import { Switch } from "./ui/switch";
		43	import {
		44	Combobox,
		45	ComboboxEmpty,
		46	ComboboxInput,
		47	ComboboxItem,
		48	ComboboxList,
		49	ComboboxPopup,
		50	ComboboxTrigger,
		51	} from "./ui/combobox";
		52	import {
		53	DropdownMenu,
		54	DropdownMenuContent,
		55	DropdownMenuItem,
		56	DropdownMenuSub,
		57	DropdownMenuSubContent,
		58	DropdownMenuSubTrigger,
		59	DropdownMenuTrigger,
		60	} from "./ui/menu";
49	import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";	61	import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
50	import { useEnvironmentQuery } from "../state/query";	62	import { useEnvironmentQuery } from "../state/query";
51	import { serverEnvironment } from "../state/server";	63	import { serverEnvironment } from "../state/server";
		64	import { reviewEnvironment } from "../state/review";
52	import { vcsEnvironment } from "../state/vcs";	65	import { vcsEnvironment } from "../state/vcs";
		66	import { buildBaseRefChoices, filterBaseRefChoices } from "../lib/baseRefChoices";
53		67
54	type DiffRenderMode = "stacked" \| "split";	68	type DiffRenderMode = "stacked" \| "split";
55	type DiffThemeType = "light" \| "dark";	69	type DiffThemeType = "light" \| "dark";
		70	const AUTOMATIC_BASE_REF = "__automatic_base_ref__";
56		71
57	interface CollapsedDiffFilesState {	72	interface CollapsedDiffFilesState {
58	readonly scopeKey: string \| null;	73	readonly scopeKey: string \| null;
@@ -167,27 +182,24 @@ interface DiffPanelProps { · 108 unmodified lines
167	export { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider";	182	export { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider";
168		183
169	export default function DiffPanel({ mode = "inline", composerDraftTarget }: DiffPanelProps) {	184	export default function DiffPanel({ mode = "inline", composerDraftTarget }: DiffPanelProps) {
170	const navigate = useNavigate();
171	const { resolvedTheme } = useTheme();	185	const { resolvedTheme } = useTheme();
172	const settings = useSettings();	186	const settings = useSettings();
173	const [diffRenderMode, setDiffRenderMode] = useState<DiffRenderMode>("stacked");	187	const [diffRenderMode, setDiffRenderMode] = useState<DiffRenderMode>("stacked");
174	const [diffWordWrap, setDiffWordWrap] = useState(settings.diffWordWrap);	188	const [diffWordWrap, setDiffWordWrap] = useState(settings.diffWordWrap);
175	const [diffIgnoreWhitespace, setDiffIgnoreWhitespace] = useState(settings.diffIgnoreWhitespace);	189	const [diffIgnoreWhitespace, setDiffIgnoreWhitespace] = useState(settings.diffIgnoreWhitespace);
		190	const [baseRefQuery, setBaseRefQuery] = useState("");
176	const [collapsedDiffFiles, setCollapsedDiffFiles] = useState<CollapsedDiffFilesState>(() => ({	191	const [collapsedDiffFiles, setCollapsedDiffFiles] = useState<CollapsedDiffFilesState>(() => ({
177	scopeKey: null,	192	scopeKey: null,
178	fileKeys: EMPTY_COLLAPSED_DIFF_FILE_KEYS,	193	fileKeys: EMPTY_COLLAPSED_DIFF_FILE_KEYS,
179	}));	194	}));
180	const patchViewportRef = useRef<HTMLDivElement>(null);	195	const codeViewRef = useRef<AnnotatableCodeViewHandle>(null);
181	const turnStripRef = useRef<HTMLDivElement>(null);
182	const previousDiffOpenRef = useRef(false);
183	const [canScrollTurnStripLeft, setCanScrollTurnStripLeft] = useState(false);
184	const [canScrollTurnStripRight, setCanScrollTurnStripRight] = useState(false);
185	const routeThreadRef = useParams({	196	const routeThreadRef = useParams({
186	strict: false,	197	strict: false,
187	select: (params) => resolveThreadRouteRef(params),	198	select: (params) => resolveThreadRouteRef(params),
188	});	199	});
189	const diffSearch = useSearch({ strict: false, select: (search) => parseDiffRouteSearch(search) });	200	const diffSelection = useDiffPanelStore((state) =>
190	const diffOpen = diffSearch.diff === "1";	201	selectThreadDiffPanelSelection(state.byThreadKey, routeThreadRef),
		202	);
191	const activeThreadId = routeThreadRef?.threadId ?? null;	203	const activeThreadId = routeThreadRef?.threadId ?? null;
192	const activeThread = useThread(routeThreadRef);	204	const activeThread = useThread(routeThreadRef);
193	const activeProjectId = activeThread?.projectId ?? null;	205	const activeProjectId = activeThread?.projectId ?? null;
@@ -233,8 +245,20 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff · 39 unmodified lines
233	[inferredCheckpointTurnCountByTurnId, turnDiffSummaries],	245	[inferredCheckpointTurnCountByTurnId, turnDiffSummaries],
234	);	246	);
235		247
236	const selectedTurnId = diffSearch.diffTurnId ?? null;	248	useEffect(() => {
237	const selectedFilePath = selectedTurnId !== null ? (diffSearch.diffFilePath ?? null) : null;	249	if (!routeThreadRef \|\| diffSelection.kind !== "turn") return;
		250	useDiffPanelStore.getState().reconcileTurnSelection(
		251	routeThreadRef,
		252	orderedTurnDiffSummaries.map((summary) => summary.turnId),
		253	);
		254	}, [diffSelection, orderedTurnDiffSummaries, routeThreadRef]);
		255
		256	const selectedTurnId = diffSelection.kind === "turn" ? diffSelection.turnId : null;
		257	const selectedGitScope = diffSelection.kind === "unstaged" ? "unstaged" : "branch";
		258	const selectedBaseRef = diffSelection.kind === "branch" ? diffSelection.baseRef : null;
		259	const selectedFilePath = diffSelection.kind === "turn" ? diffSelection.filePath : null;
		260	const selectedFileRevealRequestId =
		261	diffSelection.kind === "turn" ? diffSelection.revealRequestId : 0;
238	const selectedTurn =	262	const selectedTurn =
239	selectedTurnId === null	263	selectedTurnId === null
240	? undefined	264	? undefined
@@ -243,7 +267,16 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff · 2 unmodified lines
243	const selectedCheckpointTurnCount =	267	const selectedCheckpointTurnCount =
244	selectedTurn &&	268	selectedTurn &&
245	(selectedTurn.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[selectedTurn.turnId]);	269	(selectedTurn.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[selectedTurn.turnId]);
246	const reviewSectionId = selectedTurn ? `turn:${selectedTurn.turnId}` : "conversation";	270	const latestTurn = orderedTurnDiffSummaries[0];
		271	const selectedScopeLabel =
		272	selectedTurnId === null
		273	? selectedGitScope === "unstaged"
		274	? "Working tree"
		275	: "Branch changes"
		276	: selectedTurn?.turnId === latestTurn?.turnId
		277	? "Latest turn"
		278	: `Turn ${selectedCheckpointTurnCount ?? "?"}`;
		279	const reviewSectionId = selectedTurn ? `turn:${selectedTurn.turnId}` : selectedGitScope;
247	const collapseScopeKey = routeThreadRef	280	const collapseScopeKey = routeThreadRef
248	? `${routeThreadRef.environmentId}:${routeThreadRef.threadId}:${reviewSectionId}`	281	? `${routeThreadRef.environmentId}:${routeThreadRef.threadId}:${reviewSectionId}`
249	: null;	282	: null;
@@ -253,7 +286,9 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff · 3 unmodified lines
253	: EMPTY_COLLAPSED_DIFF_FILE_KEYS;	286	: EMPTY_COLLAPSED_DIFF_FILE_KEYS;
254	const reviewSectionTitle = selectedTurn	287	const reviewSectionTitle = selectedTurn
255	? `Turn ${selectedCheckpointTurnCount ?? "?"}`	288	? `Turn ${selectedCheckpointTurnCount ?? "?"}`
256	: "All turns";	289	: selectedGitScope === "unstaged"
		290	? "Working tree"
		291	: "Branch changes";
257	const selectedCheckpointRange = useMemo(	292	const selectedCheckpointRange = useMemo(
258	() =>	293	() =>
259	typeof selectedCheckpointTurnCount === "number"	294	typeof selectedCheckpointTurnCount === "number"
@@ -264,62 +299,116 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff · 4 unmodified lines
264	: null,	299	: null,
265	[selectedCheckpointTurnCount],	300	[selectedCheckpointTurnCount],
266	);	301	);
267	const conversationCheckpointTurnCount = useMemo(() => {
268	const turnCounts: Array<number> = [];
269	for (const summary of orderedTurnDiffSummaries) {
270	const value =
271	summary.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[summary.turnId];
272	if (typeof value === "number") {
273	turnCounts.push(value);
274	}
275	}
276	if (turnCounts.length === 0) {
277	return undefined;
278	}
279	const latest = Math.max(...turnCounts);
280	return latest > 0 ? latest : undefined;
281	}, [inferredCheckpointTurnCountByTurnId, orderedTurnDiffSummaries]);
282	const conversationCheckpointRange = useMemo(
283	() =>
284	!selectedTurn && typeof conversationCheckpointTurnCount === "number"
285	? {
286	fromTurnCount: 0,
287	toTurnCount: conversationCheckpointTurnCount,
288	}
289	: null,
290	[conversationCheckpointTurnCount, selectedTurn],
291	);
292	const activeCheckpointRange = selectedTurn
293	? selectedCheckpointRange
294	: conversationCheckpointRange;
295	const conversationCacheScope = useMemo(() => {
296	if (selectedTurn \|\| orderedTurnDiffSummaries.length === 0) {
297	return null;
298	}
299	return `conversation:${orderedTurnDiffSummaries.map((summary) => summary.turnId).join(",")}`;
300	}, [orderedTurnDiffSummaries, selectedTurn]);
301	const activeCheckpointDiff = useCheckpointDiff(	302	const activeCheckpointDiff = useCheckpointDiff(
302	{	303	{
303	environmentId: activeThread?.environmentId ?? null,	304	environmentId: activeThread?.environmentId ?? null,
304	threadId: activeThreadId,	305	threadId: activeThreadId,
305	fromTurnCount: activeCheckpointRange?.fromTurnCount ?? null,	306	fromTurnCount: selectedCheckpointRange?.fromTurnCount ?? null,
306	toTurnCount: activeCheckpointRange?.toTurnCount ?? null,	307	toTurnCount: selectedCheckpointRange?.toTurnCount ?? null,
307	ignoreWhitespace: diffIgnoreWhitespace,	308	ignoreWhitespace: diffIgnoreWhitespace,
308	cacheScope: selectedTurn ? `turn:${selectedTurn.turnId}` : conversationCacheScope,	309	cacheScope: selectedTurn ? `turn:${selectedTurn.turnId}` : null,
309	},	310	},
310	{ enabled: isGitRepo },	311	{ enabled: isGitRepo && selectedTurn !== undefined },
311	);	312	);
312	const selectedTurnCheckpointDiff = selectedTurn ? activeCheckpointDiff.data?.diff : undefined;	313	const primaryBranchDiffPreview = useEnvironmentQuery(
313	const conversationCheckpointDiff = selectedTurn ? undefined : activeCheckpointDiff.data?.diff;	314	selectedTurnId === null && activeThread && activeCwd
314	const isLoadingCheckpointDiff = activeCheckpointDiff.isPending;	315	? reviewEnvironment.diffPreview({
315	const checkpointDiffError = activeCheckpointDiff.error;	316	environmentId: activeThread.environmentId,
316		317	input: {
317	const selectedPatch = selectedTurn ? selectedTurnCheckpointDiff : conversationCheckpointDiff;	318	cwd: activeCwd,
		319	...(selectedBaseRef ? { baseRef: selectedBaseRef } : {}),
		320	ignoreWhitespace: diffIgnoreWhitespace,
		321	},
		322	})
		323	: null,
		324	);
		325	const shouldRetryBranchDiffAtEnvironmentCwd =
		326	selectedTurnId === null &&
		327	primaryBranchDiffPreview.error?.includes("configured workspace root") === true &&
		328	serverConfig?.cwd !== undefined &&
		329	serverConfig.cwd !== activeCwd;
		330	const fallbackBranchDiffPreview = useEnvironmentQuery(
		331	shouldRetryBranchDiffAtEnvironmentCwd && activeThread && serverConfig
		332	? reviewEnvironment.diffPreview({
		333	environmentId: activeThread.environmentId,
		334	input: {
		335	cwd: serverConfig.cwd,
		336	...(selectedBaseRef ? { baseRef: selectedBaseRef } : {}),
		337	ignoreWhitespace: diffIgnoreWhitespace,
		338	},
		339	})
		340	: null,
		341	);
		342	const branchDiffPreview = shouldRetryBranchDiffAtEnvironmentCwd
		343	? fallbackBranchDiffPreview
		344	: primaryBranchDiffPreview;
		345	const selectedGitSource = branchDiffPreview.data?.sources.find(
		346	(source) => source.kind === (selectedGitScope === "unstaged" ? "working-tree" : "branch-range"),
		347	);
		348	const localBranchRefs = useEnvironmentQuery(
		349	selectedTurnId === null &&
		350	selectedGitScope === "branch" &&
		351	activeThread &&
		352	branchDiffPreview.data?.cwd
		353	? vcsEnvironment.listRefs({
		354	environmentId: activeThread.environmentId,
		355	input: {
		356	cwd: branchDiffPreview.data.cwd,
		357	includeMatchingRemoteRefs: true,
		358	refKind: "local",
		359	...(baseRefQuery.trim().length > 0 ? { query: baseRefQuery.trim() } : {}),
		360	limit: 100,
		361	},
		362	})
		363	: null,
		364	);
		365	const remoteBranchRefs = useEnvironmentQuery(
		366	selectedTurnId === null &&
		367	selectedGitScope === "branch" &&
		368	activeThread &&
		369	branchDiffPreview.data?.cwd
		370	? vcsEnvironment.listRefs({
		371	environmentId: activeThread.environmentId,
		372	input: {
		373	cwd: branchDiffPreview.data.cwd,
		374	includeMatchingRemoteRefs: true,
		375	refKind: "remote",
		376	...(baseRefQuery.trim().length > 0 ? { query: baseRefQuery.trim() } : {}),
		377	limit: 100,
		378	},
		379	})
		380	: null,
		381	);
		382	const baseRefChoices = buildBaseRefChoices(
		383	localBranchRefs.data?.refs.filter((ref) => ref.name !== selectedGitSource?.headRef) ?? [],
		384	remoteBranchRefs.data?.refs ?? [],
		385	);
		386	const matchingBaseRefChoices = filterBaseRefChoices(baseRefChoices, baseRefQuery);
		387	const valueForBaseRefChoice = (choice: (typeof baseRefChoices)[number]) =>
		388	selectedBaseRef && selectedBaseRef === choice.remote?.name
		389	? selectedBaseRef
		390	: (choice.local?.name ?? choice.remote?.name ?? choice.id);
		391	const baseRefItems = [AUTOMATIC_BASE_REF, ...baseRefChoices.map(valueForBaseRefChoice)];
		392	const filteredBaseRefItems = [
		393	...(baseRefQuery.trim().length === 0 ? [AUTOMATIC_BASE_REF] : []),
		394	...matchingBaseRefChoices.map(valueForBaseRefChoice),
		395	];
		396	const gitDiff = selectedGitSource?.diff;
		397
		398	const selectedPatch = selectedTurn ? activeCheckpointDiff.data?.diff : gitDiff;
		399	const isSelectedPatchTruncated = !selectedTurn && selectedGitSource?.truncated === true;
		400	const isLoadingSelectedPatch = selectedTurn
		401	? activeCheckpointDiff.isPending
		402	: branchDiffPreview.isPending;
		403	const selectedPatchError = selectedTurn ? activeCheckpointDiff.error : branchDiffPreview.error;
318	const hasResolvedPatch = typeof selectedPatch === "string";	404	const hasResolvedPatch = typeof selectedPatch === "string";
319	const hasNoNetChanges = hasResolvedPatch && selectedPatch.trim().length === 0;	405	const hasNoNetChanges = hasResolvedPatch && selectedPatch.trim().length === 0;
320	const renderablePatch = useMemo(	406	const renderablePatch = useMemo(
321	() => getRenderablePatch(selectedPatch, `diff-panel:${resolvedTheme}`),	407	() =>
322	[resolvedTheme, selectedPatch],	408	getRenderablePatch(selectedPatch, `diff-panel:${resolvedTheme}`, {
		409	compactPartialHunkOffsets: selectedTurnId === null,
		410	}),
		411	[resolvedTheme, selectedPatch, selectedTurnId],
323	);	412	);
324	const renderableFiles = useMemo(() => {	413	const renderableFiles = useMemo(() => {
325	if (!renderablePatch \|\| renderablePatch.kind !== "files") {	414	if (!renderablePatch \|\| renderablePatch.kind !== "files") {
@@ -332,24 +421,26 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff · 6 unmodified lines
332	}),	421	}),
333	);	422	);
334	}, [renderablePatch]);	423	}, [renderablePatch]);
		424	const codeViewFiles = useMemo(
		425	() =>
		426	renderableFiles.map((fileDiff) => {
		427	const fileKey = buildFileDiffRenderKey(fileDiff);
		428	return {
		429	fileDiff,
		430	filePath: resolveFileDiffPath(fileDiff),
		431	fileKey,
		432	collapsed: collapsedDiffFileKeys.has(fileKey),
		433	};
		434	}),
		435	[collapsedDiffFileKeys, renderableFiles],
		436	);
335		437
336	useEffect(() => {	438	useEffect(() => {
337	if (diffOpen && !previousDiffOpenRef.current) {	439	if (!selectedFilePath) return;
338	setDiffWordWrap(settings.diffWordWrap);	440	const file = codeViewFiles.find((candidate) => candidate.filePath === selectedFilePath);
339	setDiffIgnoreWhitespace(settings.diffIgnoreWhitespace);	441	if (!file) return;
340	}	442	codeViewRef.current?.scrollTo({ type: "item", id: file.fileKey, align: "start" });
341	previousDiffOpenRef.current = diffOpen;	443	}, [codeViewFiles, selectedFilePath, selectedFileRevealRequestId]);
342	}, [diffOpen, settings.diffIgnoreWhitespace, settings.diffWordWrap]);
343
344	useEffect(() => {
345	if (!selectedFilePath \|\| !patchViewportRef.current) {
346	return;
347	}
348	const target = Array.from(
349	patchViewportRef.current.querySelectorAll<HTMLElement>("[data-diff-file-path]"),
350	).find((element) => element.dataset.diffFilePath === selectedFilePath);
351	target?.scrollIntoView({ block: "nearest" });
352	}, [selectedFilePath, renderableFiles]);
353		444
354	const openDiffFile = useCallback(	445	const openDiffFile = useCallback(
355	(filePath: string) => {	446	(filePath: string) => {
@@ -385,186 +476,190 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff · 29 unmodified lines
385	);	476	);
386		477
387	const selectTurn = (turnId: TurnId) => {	478	const selectTurn = (turnId: TurnId) => {
388	if (!activeThread) return;	479	if (!routeThreadRef) return;
389	void navigate({	480	useDiffPanelStore.getState().selectTurn(routeThreadRef, turnId);
390	to: "/$environmentId/$threadId",
391	params: buildThreadRouteParams(scopeThreadRef(activeThread.environmentId, activeThread.id)),
392	search: (previous) => {
393	const rest = stripDiffSearchParams(previous);
394	return { ...rest, diff: "1", diffTurnId: turnId };
395	},
396	});
397	};	481	};
398	const selectWholeConversation = () => {	482	const selectGitScope = (scope: "branch" \| "unstaged") => {
399	if (!activeThread) return;	483	if (!routeThreadRef) return;
400	void navigate({	484	useDiffPanelStore.getState().selectGitScope(routeThreadRef, scope);
401	to: "/$environmentId/$threadId",	485	};
402	params: buildThreadRouteParams(scopeThreadRef(activeThread.environmentId, activeThread.id)),	486	const selectBranchBaseRef = (baseRef: string \| null) => {
403	search: (previous) => {	487	if (!routeThreadRef) return;
404	const rest = stripDiffSearchParams(previous);	488	useDiffPanelStore.getState().selectBranchBaseRef(routeThreadRef, baseRef);
405	return { ...rest, diff: "1" };
406	},
407	});
408	};	489	};
409	const updateTurnStripScrollState = useCallback(() => {
410	const element = turnStripRef.current;
411	if (!element) {
412	setCanScrollTurnStripLeft(false);
413	setCanScrollTurnStripRight(false);
414	return;
415	}
416
417	const maxScrollLeft = Math.max(0, element.scrollWidth - element.clientWidth);
418	setCanScrollTurnStripLeft(element.scrollLeft > 4);
419	setCanScrollTurnStripRight(element.scrollLeft < maxScrollLeft - 4);
420	}, []);
421	const scrollTurnStripBy = useCallback((offset: number) => {
422	const element = turnStripRef.current;
423	if (!element) return;
424	element.scrollBy({ left: offset, behavior: "smooth" });
425	}, []);
426	const onTurnStripWheel = useCallback((event: ReactWheelEvent<HTMLDivElement>) => {
427	const element = turnStripRef.current;
428	if (!element) return;
429	if (element.scrollWidth <= element.clientWidth + 1) return;
430	if (Math.abs(event.deltaY) <= Math.abs(event.deltaX)) return;
431
432	event.preventDefault();
433	element.scrollBy({ left: event.deltaY, behavior: "auto" });
434	}, []);
435
436	useEffect(() => {
437	const element = turnStripRef.current;
438	if (!element) return;
439
440	const frameId = window.requestAnimationFrame(() => updateTurnStripScrollState());
441	const onScroll = () => updateTurnStripScrollState();
442
443	element.addEventListener("scroll", onScroll, { passive: true });
444
445	const resizeObserver = new ResizeObserver(() => updateTurnStripScrollState());
446	resizeObserver.observe(element);
447
448	return () => {
449	window.cancelAnimationFrame(frameId);
450	element.removeEventListener("scroll", onScroll);
451	resizeObserver.disconnect();
452	};
453	}, [updateTurnStripScrollState]);
454
455	useEffect(() => {
456	const frameId = window.requestAnimationFrame(() => updateTurnStripScrollState());
457	return () => {
458	window.cancelAnimationFrame(frameId);
459	};
460	}, [orderedTurnDiffSummaries, selectedTurnId, updateTurnStripScrollState]);
461
462	useEffect(() => {
463	const element = turnStripRef.current;
464	if (!element) return;
465
466	const selectedChip = element.querySelector<HTMLElement>("[data-turn-chip-selected='true']");
467	selectedChip?.scrollIntoView({ block: "nearest", inline: "nearest", behavior: "smooth" });
468	}, [selectedTurn?.turnId, selectedTurnId]);
469		490
470	const headerRow = (	491	const headerRow = (
471	<>	492	<>
472	<div className="relative min-w-0 flex-1 [-webkit-app-region:no-drag]">	493	<div className="flex min-w-0 flex-1 items-center gap-3 [-webkit-app-region:no-drag]">
473	<button	494	<DropdownMenu>
474	type="button"	495	<DropdownMenuTrigger
475	className={cn(	496	className="inline-flex h-6 max-w-full items-center gap-1 rounded-md bg-muted/70 px-2 text-xs font-medium text-foreground outline-none transition-colors hover:bg-muted focus-visible:ring-2 focus-visible:ring-ring"
476	"absolute left-0 top-1/2 z-20 inline-flex size-6 -translate-y-1/2 items-center justify-center rounded-md border bg-background/90 text-muted-foreground transition-colors",	497	aria-label={`Diff scope: ${selectedScopeLabel}`}
477	canScrollTurnStripLeft
478	? "border-border/70 hover:border-border hover:text-foreground"
479	: "cursor-not-allowed border-border/40 text-muted-foreground/40",
480	)}
481	onClick={() => scrollTurnStripBy(-180)}
482	disabled={!canScrollTurnStripLeft}
483	aria-label="Scroll turn list left"
484	>
485	<ChevronLeftIcon className="size-3.5" />
486	</button>
487	<button
488	type="button"
489	className={cn(
490	"absolute right-0 top-1/2 z-20 inline-flex size-6 -translate-y-1/2 items-center justify-center rounded-md border bg-background/90 text-muted-foreground transition-colors",
491	canScrollTurnStripRight
492	? "border-border/70 hover:border-border hover:text-foreground"
493	: "cursor-not-allowed border-border/40 text-muted-foreground/40",
494	)}
495	onClick={() => scrollTurnStripBy(180)}
496	disabled={!canScrollTurnStripRight}
497	aria-label="Scroll turn list right"
498	>
499	<ChevronRightIcon className="size-3.5" />
500	</button>
501	<div
502	ref={turnStripRef}
503	className="turn-chip-strip flex gap-1 overflow-x-auto px-8 py-0.5"
504	style={
505	canScrollTurnStripLeft \|\| canScrollTurnStripRight
506	? {
507	maskImage: `linear-gradient(to right, ${canScrollTurnStripLeft ? "transparent 24px, black 72px" : "black"}, ${canScrollTurnStripRight ? "black calc(100% - 72px), transparent calc(100% - 24px)" : "black"})`,
508	}
509	: undefined
510	}
511	onWheel={onTurnStripWheel}
512	>
513	<button
514	type="button"
515	className="shrink-0 rounded-md"
516	onClick={selectWholeConversation}
517	data-turn-chip-selected={selectedTurnId === null}
518	>	498	>
519	<div	499	<span className="truncate">{selectedScopeLabel}</span>
520	className={cn(	500	<ChevronDownIcon className="size-3.5 shrink-0 text-muted-foreground" />
521	"rounded-md border px-2 py-1 text-left transition-colors",	501	</DropdownMenuTrigger>
522	selectedTurnId === null	502	<DropdownMenuContent align="start" className="w-60">
523	? "border-border bg-accent text-accent-foreground"	503	<DropdownMenuItem onClick={() => selectGitScope("unstaged")}>
524	: "border-border/70 bg-background/70 text-muted-foreground/80 hover:border-border hover:text-foreground/80",	504	<span>Working tree</span>
		505	{selectedTurnId === null && selectedGitScope === "unstaged" && (
		506	<CheckIcon className="ml-auto" />
		507	)}
		508	</DropdownMenuItem>
		509	<DropdownMenuItem onClick={() => selectGitScope("branch")}>
		510	<span>Branch changes</span>
		511	{selectedTurnId === null && selectedGitScope === "branch" && (
		512	<CheckIcon className="ml-auto" />
525	)}	513	)}
		514	</DropdownMenuItem>
		515	<DropdownMenuItem
		516	onClick={() => {
		517	if (latestTurn) selectTurn(latestTurn.turnId);
		518	}}
526	>	519	>
527	<div className="text-[10px] leading-tight font-medium">All turns</div>	520	<span>Latest turn</span>
528	</div>	521	{selectedTurnId !== null && selectedTurn?.turnId === latestTurn?.turnId && (
529	</button>	522	<CheckIcon className="ml-auto" />
530	{orderedTurnDiffSummaries.map((summary) => (	523	)}
531	<Tooltip key={summary.turnId}>	524	</DropdownMenuItem>
532	<TooltipTrigger	525	<DropdownMenuSub>
533	render={	526	<DropdownMenuSubTrigger>Turn</DropdownMenuSubTrigger>
534	<button	527	<DropdownMenuSubContent className="w-64">
535	type="button"	528	{orderedTurnDiffSummaries.map((summary) => {
536	aria-label={summary.turnId}	529	const turnCount =
537	className="shrink-0 rounded-md"	530	summary.checkpointTurnCount ??
538	onClick={() => selectTurn(summary.turnId)}	531	inferredCheckpointTurnCountByTurnId[summary.turnId] ??
539	data-turn-chip-selected={summary.turnId === selectedTurn?.turnId}	532	"?";
540	/>	533	return (
541	}	534	<DropdownMenuItem
		535	key={summary.turnId}
		536	onClick={() => selectTurn(summary.turnId)}
		537	>
		538	<span>Turn {turnCount}</span>
		539	<span className="ml-auto text-xs tabular-nums text-muted-foreground">
		540	{formatShortTimestamp(summary.completedAt, settings.timestampFormat)}
		541	</span>
		542	{summary.turnId === selectedTurn?.turnId && <CheckIcon className="ml-1" />}
		543	</DropdownMenuItem>
		544	);
		545	})}
		546	</DropdownMenuSubContent>
		547	</DropdownMenuSub>
		548	</DropdownMenuContent>
		549	</DropdownMenu>
		550	{selectedTurnId === null && selectedGitScope === "branch" && selectedGitSource?.baseRef && (
		551	<div
		552	className="flex min-w-0 max-w-full items-center gap-2 overflow-hidden text-xs text-muted-foreground"
		553	title={`${selectedGitSource.headRef ?? "HEAD"} → ${selectedGitSource.baseRef}`}
		554	aria-label={`Comparing ${selectedGitSource.headRef ?? "HEAD"} against ${selectedGitSource.baseRef}`}
		555	>
		556	<span className="min-w-0 max-w-48 truncate">{selectedGitSource.headRef ?? "HEAD"}</span>
		557	<ArrowRightIcon className="size-3.5 shrink-0 opacity-70" />
		558	<Combobox
		559	items={baseRefItems}
		560	filteredItems={filteredBaseRefItems}
		561	value={selectedBaseRef ?? AUTOMATIC_BASE_REF}
		562	onOpenChange={(open) => {
		563	if (!open) setBaseRefQuery("");
		564	}}
		565	onValueChange={(value) => {
		566	if (!value) return;
		567	selectBranchBaseRef(value === AUTOMATIC_BASE_REF ? null : value);
		568	}}
		569	>
		570	<ComboboxTrigger
		571	className="inline-flex min-w-0 max-w-48 items-center gap-1 overflow-hidden rounded-md px-1.5 py-1 outline-none transition-colors hover:bg-muted hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"
		572	aria-label={`Change comparison target. Currently ${selectedGitSource.baseRef}`}
		573	>
		574	<span className="min-w-0 truncate">{selectedGitSource.baseRef}</span>
		575	<ChevronDownIcon className="size-3.5 shrink-0 opacity-70" />
		576	</ComboboxTrigger>
		577	<ComboboxPopup
		578	align="start"
		579	className="w-72 min-w-0 max-w-[calc(100vw-1rem)] overflow-hidden [&>[data-slot=combobox-popup]]:min-w-0 [&>[data-slot=combobox-popup]]:overflow-hidden"
542	>	580	>
543	<div	581	<div className="min-w-0 shrink-0 px-3 pt-2.5">
544	className={cn(	582	<div className="relative -translate-y-px border-b border-border/70 pb-1.5 transition-colors focus-within:border-ring">
545	"rounded-md border px-2 py-1 text-left transition-colors",	583	<SearchIcon
546	summary.turnId === selectedTurn?.turnId	584	aria-hidden="true"
547	? "border-border bg-accent text-accent-foreground"	585	className="pointer-events-none absolute top-1.5 left-0 size-4 shrink-0 text-muted-foreground/55"
548	: "border-border/70 bg-background/70 text-muted-foreground/80 hover:border-border hover:text-foreground/80",	586	/>
549	)}	587	<ComboboxInput
550	>	588	className="[&_input]:h-6.5 [&_input]:ps-5 [&_input]:font-sans [&_input]:leading-6.5"
551	<div className="flex items-center gap-1">	589	inputClassName="rounded-none bg-transparent text-sm"
552	<span className="text-[10px] leading-tight font-medium">	590	placeholder="Search refs..."
553	Turn{" "}	591	showTrigger={false}
554	{summary.checkpointTurnCount ??	592	size="sm"
555	inferredCheckpointTurnCountByTurnId[summary.turnId] ??	593	unstyled
556	"?"}	594	value={baseRefQuery}
557	</span>	595	onChange={(event) => setBaseRefQuery(event.target.value)}
558	<span className="text-[9px] leading-tight opacity-70 tabular-nums">	596	/>
559	{formatShortTimestamp(summary.completedAt, settings.timestampFormat)}
560	</span>
561	</div>	597	</div>
562	</div>	598	</div>
563	</TooltipTrigger>	599	<div className="grid shrink-0 grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 border-b border-border/70 ps-3 pe-6.5 pt-2 pb-1.5 font-medium text-[10px] text-muted-foreground uppercase tracking-wide">
564	<TooltipPopup side="top">{summary.turnId}</TooltipPopup>	600	<span aria-hidden="true" />
565	</Tooltip>	601	<div className="grid min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center">
566	))}	602	<span>Branch</span>
567	</div>	603	<span className="text-right">Remote</span>
		604	</div>
		605	</div>
		606	<ComboboxEmpty>No matching refs.</ComboboxEmpty>
		607	<ComboboxList className="max-h-64 min-w-0 overflow-x-hidden">
		608	<ComboboxItem
		609	className="h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0"
		610	contentClassName="w-full min-w-0 overflow-hidden"
		611	value={AUTOMATIC_BASE_REF}
		612	>
		613	<span className="block min-w-0 truncate">Automatic</span>
		614	</ComboboxItem>
		615	{baseRefChoices.map((choice) => {
		616	const item = valueForBaseRefChoice(choice);
		617	const hasBoth = choice.local !== null && choice.remote !== null;
		618	const useRemote = choice.remote?.name === item;
		619	return (
		620	<ComboboxItem
		621	key={choice.id}
		622	className="h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0"
		623	contentClassName="w-full min-w-0 overflow-hidden"
		624	value={item}
		625	>
		626	<div className="grid w-full min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center overflow-hidden">
		627	<span className="block min-w-0 truncate pe-2">{choice.label}</span>
		628	{hasBoth ? (
		629	<div
		630	className="flex justify-end"
		631	onClick={(event) => event.stopPropagation()}
		632	onPointerDown={(event) => event.stopPropagation()}
		633	>
		634	<Switch
		635	aria-label={`Use remote version of ${choice.label}`}
		636	checked={useRemote}
		637	className="[--thumb-size:--spacing(3)]"
		638	onCheckedChange={(checked) => {
		639	const nextRef = checked
		640	? choice.remote?.name
		641	: choice.local?.name;
		642	if (nextRef) selectBranchBaseRef(nextRef);
		643	}}
		644	/>
		645	</div>
		646	) : choice.remote ? (
		647	<span
		648	className="flex justify-end text-muted-foreground"
		649	title="Remote only"
		650	>
		651	<CheckIcon aria-hidden="true" className="size-3" />
		652	</span>
		653	) : null}
		654	</div>
		655	</ComboboxItem>
		656	);
		657	})}
		658	</ComboboxList>
		659	</ComboboxPopup>
		660	</Combobox>
		661	</div>
		662	)}
568	</div>	663	</div>
569	<div className="flex shrink-0 items-center gap-1 [-webkit-app-region:no-drag]">	664	<div className="flex shrink-0 items-center gap-1 [-webkit-app-region:no-drag]">
570	<ToggleGroup	665	<ToggleGroup
@@ -644,24 +739,35 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff · 73 unmodified lines
644	<div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">	739	<div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">
645	Turn diffs are unavailable because this project is not a git repository.	740	Turn diffs are unavailable because this project is not a git repository.
646	</div>	741	</div>
647	) : orderedTurnDiffSummaries.length === 0 ? (	742	) : selectedTurnId !== null && orderedTurnDiffSummaries.length === 0 ? (
648	<div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">	743	<div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">
649	No completed turns yet.	744	No completed turns yet.
650	</div>	745	</div>
651	) : (	746	) : (
652	<>	747	<>
653	<div	748	<div className="diff-panel-viewport flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden">
654	ref={patchViewportRef}	749	{isSelectedPatchTruncated && (
655	className="diff-panel-viewport min-h-0 min-w-0 flex-1 overflow-hidden"	750	<p className="shrink-0 border-b border-border/70 bg-muted/40 px-3 py-1.5 text-[11px] text-muted-foreground">
656	>	751	This diff was truncated because it exceeded the preview limit. The changes shown are
657	{checkpointDiffError && !renderablePatch && (	752	incomplete.
		753	</p>
		754	)}
		755	{selectedPatchError && !renderablePatch && (
658	<div className="px-3">	756	<div className="px-3">
659	<p className="mb-2 text-[11px] text-red-500/80">{checkpointDiffError}</p>	757	<p className="mb-2 text-[11px] text-red-500/80">{selectedPatchError}</p>
660	</div>	758	</div>
661	)}	759	)}
662	{!renderablePatch ? (	760	{!renderablePatch ? (
663	isLoadingCheckpointDiff ? (	761	isLoadingSelectedPatch ? (
664	<DiffPanelLoadingState label="Loading checkpoint diff..." />	762	<DiffPanelLoadingState
		763	label={
		764	selectedTurn
		765	? "Loading checkpoint diff..."
		766	: selectedGitScope === "unstaged"
		767	? "Loading working tree diff..."
		768	: "Loading branch diff..."
		769	}
		770	/>
665	) : (	771	) : (
666	<div className="flex h-full items-center justify-center px-3 py-2 text-xs text-muted-foreground/70">	772	<div className="flex h-full items-center justify-center px-3 py-2 text-xs text-muted-foreground/70">
667	<p>	773	<p>
@@ -672,88 +778,73 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff · 4 unmodified lines
672	</div>	778	</div>
673	)	779	)
674	) : renderablePatch.kind === "files" ? (	780	) : renderablePatch.kind === "files" ? (
675	<Virtualizer	781	<div
676	className="diff-render-surface h-full min-h-0 overflow-auto px-2 pb-2"	782	className="min-h-0 flex-1"
677	config={{	783	onClickCapture={(event) => {
678	overscrollSize: 600,	784	const composedPath = event.nativeEvent.composedPath?.() ?? [];
679	intersectionObserverMargin: 1200,	785	const title = composedPath.find(
		786	(node): node is HTMLElement =>
		787	node instanceof HTMLElement && node.hasAttribute("data-title"),
		788	);
		789	const filePath = title?.textContent?.trim();
		790	if (filePath) openDiffFile(filePath);
680	}}	791	}}
681	>	792	>
682	{renderableFiles.map((fileDiff) => {	793	<AnnotatableCodeView
683	const filePath = resolveFileDiffPath(fileDiff);	794	viewerRef={codeViewRef}
684	const fileKey = buildFileDiffRenderKey(fileDiff);	795	key={collapseScopeKey ?? reviewSectionId}
685	const themedFileKey = `${fileKey}:${resolvedTheme}`;	796	className="diff-render-surface h-full min-h-0 overflow-auto"
686	const collapsed = collapsedDiffFileKeys.has(fileKey);	797	files={codeViewFiles}
687	return (	798	sectionId={reviewSectionId}
688	<div	799	sectionTitle={reviewSectionTitle}
689	key={themedFileKey}	800	composerDraftTarget={composerDraftTarget}
690	data-diff-file-path={filePath}	801	renderHeaderPrefix={(fileDiff, fileKey, collapsed) => {
691	className="diff-render-file group/diff-file mb-2 rounded-md first:mt-2 last:mb-0"	802	const filePath = resolveFileDiffPath(fileDiff);
692	onClickCapture={(event) => {	803	return (
693	const nativeEvent = event.nativeEvent as MouseEvent;	804	<Tooltip>
694	const composedPath = nativeEvent.composedPath?.() ?? [];	805	<TooltipTrigger
695	const clickedHeader = composedPath.some((node) => {	806	render={
696	if (!(node instanceof Element)) return false;	807	<button
697	return node.hasAttribute("data-title");	808	type="button"
698	});	809	className={cn(
699	if (!clickedHeader) return;	810	"inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-sm border-0 bg-transparent p-0 transition-colors hover:bg-foreground/10 focus-visible:outline-hidden",
700	openDiffFile(filePath);	811	getDiffCollapseIconClassName(fileDiff),
701	}}
702	>
703	<AnnotatableFileDiff
704	fileDiff={fileDiff}
705	filePath={filePath}
706	sectionId={reviewSectionId}
707	sectionTitle={reviewSectionTitle}
708	composerDraftTarget={composerDraftTarget}
709	renderHeaderPrefix={() => (
710	<Tooltip>
711	<TooltipTrigger
712	render={
713	<button
714	type="button"
715	className={cn(
716	"inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-sm border-0 bg-transparent p-0 transition-colors hover:bg-foreground/10 focus-visible:outline-hidden",
717	getDiffCollapseIconClassName(fileDiff),
718	)}
719	aria-label={
720	collapsed ? `Expand ${filePath}` : `Collapse ${filePath}`
721	}
722	aria-expanded={!collapsed}
723	onClick={(event) => {
724	event.stopPropagation();
725	toggleDiffFileCollapsed(fileKey);
726	}}
727	/>
728	}
729	>
730	{collapsed ? (
731	<ChevronRightIcon className="size-4" />
732	) : (
733	<ChevronDownIcon className="size-4" />
734	)}	812	)}
735	</TooltipTrigger>	813	aria-label={collapsed ? `Expand ${filePath}` : `Collapse ${filePath}`}
736	<TooltipPopup side="top">	814	aria-expanded={!collapsed}
737	{collapsed ? "Expand diff" : "Collapse diff"}	815	onClick={(event) => {
738	</TooltipPopup>	816	event.stopPropagation();
739	</Tooltip>	817	toggleDiffFileCollapsed(fileKey);
740	)}	818	}}
741	options={{	819	/>
742	collapsed,	820	}
743	diffStyle: diffRenderMode === "split" ? "split" : "unified",	821	>
744	lineDiffType: "none",	822	{collapsed ? (
745	overflow: diffWordWrap ? "wrap" : "scroll",	823	<ChevronRightIcon className="size-4" />
746	theme: resolveDiffThemeName(resolvedTheme),	824	) : (
747	themeType: resolvedTheme as DiffThemeType,	825	<ChevronDownIcon className="size-4" />
748	unsafeCSS: DIFF_PANEL_UNSAFE_CSS,	826	)}
749	}}	827	</TooltipTrigger>
750	/>	828	<TooltipPopup side="top">
751	</div>	829	{collapsed ? "Expand diff" : "Collapse diff"}
752	);	830	</TooltipPopup>
753	})}	831	</Tooltip>
754	</Virtualizer>	832	);
		833	}}
		834	options={{
		835	diffStyle: diffRenderMode === "split" ? "split" : "unified",
		836	lineDiffType: "none",
		837	overflow: diffWordWrap ? "wrap" : "scroll",
		838	theme: resolveDiffThemeName(resolvedTheme),
		839	themeType: resolvedTheme as DiffThemeType,
		840	unsafeCSS: DIFF_PANEL_UNSAFE_CSS,
		841	stickyHeaders: true,
		842	layout: { paddingTop: 8, paddingBottom: 8, gap: 8 },
		843	}}
		844	/>
		845	</div>
755	) : (	846	) : (
756	<div className="h-full overflow-auto p-2">	847	<div className="min-h-0 flex-1 overflow-auto p-2">
757	<div className="space-y-2">	848	<div className="space-y-2">
758	<p className="text-[11px] text-muted-foreground/75">{renderablePatch.reason}</p>	849	<p className="text-[11px] text-muted-foreground/75">{renderablePatch.reason}</p>
759	<pre	850	<pre

apps/web/src/components/DiffPanelShell.tsx+2−8

 export function DiffPanelHeaderSkeleton() {
   return (
     <>
-      <div className="relative min-w-0 flex-1">
+      <div className="min-w-0 flex-1">
-        <Skeleton className="absolute left-0 top-1/2 size-6 -translate-y-1/2 rounded-md border border-border/50" />
+        <Skeleton className="h-8 w-32 rounded-lg" />
-        <Skeleton className="absolute right-0 top-1/2 size-6 -translate-y-1/2 rounded-md border border-border/50" />
-        <div className="flex gap-1 overflow-hidden px-8 py-0.5">
-          <Skeleton className="h-6 w-16 shrink-0 rounded-md" />
-          <Skeleton className="h-6 w-24 shrink-0 rounded-md" />
-          <Skeleton className="h-6 w-24 shrink-0 rounded-md max-sm:hidden" />
-        </div>
       </div>
       <div className="flex shrink-0 gap-1">
         <Skeleton className="size-7 rounded-md" />

apps/web/src/components/diffs/AnnotatableFileDiff.tsx+209−2

@@ -1,14 +1,23 @@
1	import type {	1	import type {
2	AnnotationSide,	2	AnnotationSide,
		3	CodeViewDiffItem,
		4	CodeViewItem,
3	DiffLineAnnotation,	5	DiffLineAnnotation,
4	FileDiffMetadata,	6	FileDiffMetadata,
5	SelectedLineRange,	7	SelectedLineRange,
6	} from "@pierre/diffs";	8	} from "@pierre/diffs";
7	import { FileDiff, type FileDiffProps } from "@pierre/diffs/react";	9	import {
		10	CodeView,
		11	type CodeViewHandle,
		12	type CodeViewProps,
		13	FileDiff,
		14	type FileDiffProps,
		15	} from "@pierre/diffs/react";
8	import type { ScopedThreadRef } from "@t3tools/contracts";	16	import type { ScopedThreadRef } from "@t3tools/contracts";
9	import { useCallback, useMemo, useState, type ReactNode } from "react";	17	import { useCallback, useMemo, useState, type ReactNode, type Ref } from "react";
10		18
11	import { type DraftId, useComposerDraftStore } from "~/composerDraftStore";	19	import { type DraftId, useComposerDraftStore } from "~/composerDraftStore";
		20	import { fnv1a32 } from "~/lib/diffRendering";
12	import {	21	import {
13	buildDiffReviewComment,	22	buildDiffReviewComment,
14	restoreDiffReviewCommentRange,	23	restoreDiffReviewCommentRange,
@@ -31,6 +40,7 @@ interface DiffCommentAnnotationGroup { · 16 unmodified lines
31	}	40	}
32		41
33	type DiffCommentLineAnnotation = DiffLineAnnotation<DiffCommentAnnotationGroup>;	42	type DiffCommentLineAnnotation = DiffLineAnnotation<DiffCommentAnnotationGroup>;
		43	export type AnnotatableCodeViewHandle = CodeViewHandle<DiffCommentAnnotationGroup>;
34	const EMPTY_REVIEW_COMMENTS: ReadonlyArray<ReviewCommentContext> = [];	44	const EMPTY_REVIEW_COMMENTS: ReadonlyArray<ReviewCommentContext> = [];
35		45
36	function annotationSide(range: SelectedLineRange): AnnotationSide {	46	function annotationSide(range: SelectedLineRange): AnnotationSide {
@@ -237,3 +247,200 @@ export function AnnotatableFileDiff({ · 200 unmodified lines
237	/>	247	/>
238	);	248	);
239	}	249	}
		250
		251	interface AnnotatableCodeViewProps {
		252	files: ReadonlyArray<{
		253	fileDiff: FileDiffMetadata;
		254	filePath: string;
		255	fileKey: string;
		256	collapsed: boolean;
		257	}>;
		258	sectionId: string;
		259	sectionTitle: string;
		260	composerDraftTarget: ScopedThreadRef \| DraftId;
		261	options: NonNullable<CodeViewProps<DiffCommentAnnotationGroup>["options"]>;
		262	viewerRef?: Ref<AnnotatableCodeViewHandle>;
		263	className?: string;
		264	renderHeaderPrefix: (
		265	fileDiff: FileDiffMetadata,
		266	fileKey: string,
		267	collapsed: boolean,
		268	) => ReactNode;
		269	}
		270
		271	interface DiffSelectionContext {
		272	item: CodeViewItem<DiffCommentAnnotationGroup>;
		273	}
		274
		275	export function AnnotatableCodeView({
		276	files,
		277	sectionId,
		278	sectionTitle,
		279	composerDraftTarget,
		280	options,
		281	viewerRef,
		282	className,
		283	renderHeaderPrefix,
		284	}: AnnotatableCodeViewProps) {
		285	const addReviewComment = useComposerDraftStore((store) => store.addReviewComment);
		286	const removeReviewComment = useComposerDraftStore((store) => store.removeReviewComment);
		287	const reviewComments = useComposerDraftStore(
		288	(store) => store.getComposerDraft(composerDraftTarget)?.reviewComments ?? EMPTY_REVIEW_COMMENTS,
		289	);
		290	const [selectedLines, setSelectedLines] = useState<{
		291	id: string;
		292	range: SelectedLineRange;
		293	} \| null>(null);
		294	const [draft, setDraft] = useState<{
		295	fileKey: string;
		296	annotation: DiffCommentLineAnnotation;
		297	} \| null>(null);
		298
		299	const filesByKey = useMemo(() => new Map(files.map((file) => [file.fileKey, file])), [files]);
		300	const items = useMemo<CodeViewDiffItem<DiffCommentAnnotationGroup>[]>(
		301	() =>
		302	files.map(({ fileDiff, filePath, fileKey, collapsed }) => {
		303	const persisted = reviewComments
		304	.filter(
		305	(comment) =>
		306	comment.sectionId === sectionId &&
		307	comment.filePath === filePath &&
		308	(comment.fenceLanguage ?? "diff") === "diff",
		309	)
		310	.reduce<DiffCommentLineAnnotation[]>((annotations, comment) => {
		311	const range = restoreDiffReviewCommentRange(fileDiff, comment);
		312	if (!range) return annotations;
		313	return appendAnnotationEntry(annotations, range, {
		314	id: comment.id,
		315	kind: "comment",
		316	range,
		317	rangeLabel: comment.rangeLabel,
		318	text: comment.text,
		319	});
		320	}, []);
		321	const annotations =
		322	draft?.fileKey === fileKey ? [...persisted, draft.annotation] : persisted;
		323	return {
		324	id: fileKey,
		325	type: "diff",
		326	fileDiff,
		327	annotations,
		328	collapsed,
		329	version: fnv1a32(
		330	`${collapsed ? "1" : "0"}:${annotations
		331	.flatMap((annotation) =>
		332	annotation.metadata.entries.map(
		333	(entry) => `${entry.id}:${entry.rangeLabel}:${entry.text}`,
		334	),
		335	)
		336	.join(":")}`,
		337	),
		338	};
		339	}),
		340	[draft, files, reviewComments, sectionId],
		341	);
		342
		343	const removeEntry = useCallback(
		344	(entryId: string) => {
		345	setSelectedLines(null);
		346	if (draft?.annotation.metadata.entries.some((entry) => entry.id === entryId)) {
		347	setDraft(null);
		348	} else {
		349	removeReviewComment(composerDraftTarget, entryId);
		350	}
		351	},
		352	[composerDraftTarget, draft, removeReviewComment],
		353	);
		354
		355	const submitEntry = useCallback(
		356	(entryId: string, text: string) => {
		357	const entry = draft?.annotation.metadata.entries.find(
		358	(candidate) => candidate.id === entryId,
		359	);
		360	const file = draft ? filesByKey.get(draft.fileKey) : undefined;
		361	if (!entry \|\| !file) return;
		362	const comment = buildDiffReviewComment({
		363	id: entry.id,
		364	sectionId,
		365	sectionTitle,
		366	filePath: file.filePath,
		367	fileDiff: file.fileDiff,
		368	range: entry.range,
		369	text,
		370	});
		371	if (comment) addReviewComment(composerDraftTarget, comment);
		372	setSelectedLines(null);
		373	setDraft(null);
		374	},
		375	[addReviewComment, composerDraftTarget, draft, filesByKey, sectionId, sectionTitle],
		376	);
		377
		378	const beginComment = useCallback(
		379	(range: SelectedLineRange \| null, context: DiffSelectionContext) => {
		380	if (!range) return;
		381	const item = context.item;
		382	if (item.type !== "diff") return;
		383	const file = filesByKey.get(item.id);
		384	if (!file) return;
		385	const id = nextFileCommentId();
		386	const comment = buildDiffReviewComment({
		387	id,
		388	sectionId,
		389	sectionTitle,
		390	filePath: file.filePath,
		391	fileDiff: file.fileDiff,
		392	range,
		393	text: "",
		394	});
		395	if (!comment) return;
		396	setDraft({
		397	fileKey: item.id,
		398	annotation: {
		399	side: annotationSide(range),
		400	lineNumber: range.end,
		401	metadata: {
		402	entries: [{ id, kind: "draft", range, rangeLabel: comment.rangeLabel, text: "" }],
		403	},
		404	},
		405	});
		406	},
		407	[filesByKey, sectionId, sectionTitle],
		408	);
		409
		410	const hasOpenComment = draft !== null;
		411	return (
		412	<CodeView<DiffCommentAnnotationGroup>
		413	{...(viewerRef ? { ref: viewerRef } : {})}
		414	{...(className ? { className } : {})}
		415	items={items}
		416	selectedLines={selectedLines}
		417	onSelectedLinesChange={setSelectedLines}
		418	options={{
		419	...options,
		420	enableGutterUtility: !hasOpenComment,
		421	enableLineSelection: !hasOpenComment,
		422	onLineSelectionEnd: beginComment,
		423	}}
		424	renderHeaderPrefix={(item) =>
		425	item.type === "diff"
		426	? renderHeaderPrefix(item.fileDiff, item.id, item.collapsed === true)
		427	: null
		428	}
		429	renderAnnotation={(annotation) => (
		430	<div className="py-1">
		431	{annotation.metadata.entries.map((entry) => (
		432	<LocalCommentAnnotation
		433	key={entry.id}
		434	kind={entry.kind}
		435	rangeLabel={entry.rangeLabel}
		436	text={entry.text}
		437	onCancel={() => removeEntry(entry.id)}
		438	onComment={(text) => submitEntry(entry.id, text)}
		439	onDelete={() => removeEntry(entry.id)}
		440	/>
		441	))}
		442	</div>
		443	)}
		444	/>
		445	);
		446	}

apps/web/src/components/preview/PreviewAutomationOwner.test.ts+2−2

@@ -3,11 +3,11 @@ import { describe, expect, it } from "vite-plus/test"; · 2 unmodified lines
3	import { observeAutomationOwnerConnectedGeneration } from "./PreviewAutomationOwner";	3	import { observeAutomationOwnerConnectedGeneration } from "./PreviewAutomationOwner";
4		4
5	describe("observeAutomationOwnerConnectedGeneration", () => {	5	describe("observeAutomationOwnerConnectedGeneration", () => {
6	it("re-reports ownership only after a later transport generation connects", () => {	6	it("reports ownership when the initial transport generation connects", () => {
7	const initial = observeAutomationOwnerConnectedGeneration(null, 1);	7	const initial = observeAutomationOwnerConnectedGeneration(null, 1);
8	expect(initial).toEqual({	8	expect(initial).toEqual({
9	nextGeneration: 1,	9	nextGeneration: 1,
10	shouldReport: false,	10	shouldReport: true,
11	});	11	});
12		12
13	const disconnected = observeAutomationOwnerConnectedGeneration(initial.nextGeneration, null);	13	const disconnected = observeAutomationOwnerConnectedGeneration(initial.nextGeneration, null);

apps/web/src/components/preview/PreviewAutomationOwner.tsx+86−99

 "use client";
+import { useAtomValue } from "@effect/atom-react";
 import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
 import type {
   PreviewAutomationNavigateInput,
   PreviewAutomationOpenInput,
   PreviewAutomationRequest,
-  PreviewAutomationResponse,
+  PreviewAutomationOwner as PreviewAutomationOwnerState,
   PreviewAutomationStatus,
   ScopedThreadRef,
 } from "@t3tools/contracts";
-import { useCallback, useEffect, useId, useRef } from "react";
+import { useCallback, useEffect, useEffectEvent, useId, useMemo, useRef, useState } from "react";
 import {
   applyPreviewServerSnapshot,
 import { resolveBrowserNavigationTarget } from "~/browser/browserTargetResolver";
 import { startBrowserRecording, stopBrowserRecording } from "~/browser/browserRecording";
 import { previewEnvironment } from "~/state/preview";
-import { useEnvironmentQuery } from "~/state/query";
 import { useEnvironmentConnectionState } from "~/state/environments";
 import { useAtomCommand } from "~/state/use-atom-command";
 import { previewBridge } from "./previewBridge";
+import {
+  createLatestPreviewAutomationRequestHandler,
+  createPreviewAutomationRequestConsumerAtom,
+} from "./previewAutomationRequestConsumer";
 export function observeAutomationOwnerConnectedGeneration(
   previousGeneration: number | null,
   }
   return {
     nextGeneration: connectedGeneration,
-    shouldReport: previousGeneration !== null && previousGeneration !== connectedGeneration,
+    shouldReport: previousGeneration !== connectedGeneration,
   };
 }
   };
 };
-const serializeError = (error: unknown): NonNullable<PreviewAutomationResponse["error"]> => {
+const previewTabNotFoundError = (): Error => {
-  if (error instanceof Error) {
+  const error = new Error("Preview tab is not initialized.");
-    const detail =
+  error.name = "PreviewAutomationTabNotFoundError";
-      "detail" in error && (error as { detail?: unknown }).detail !== undefined
+  return error;
-        ? (error as { detail?: unknown }).detail
-        : undefined;
-    return {
-      _tag: error.name.startsWith("PreviewAutomation")
-        ? error.name
-        : "PreviewAutomationExecutionError",
-      message: error.message,
-      ...(detail === undefined ? {} : { detail }),
-    };
-  }
-  return {
-    _tag: "PreviewAutomationExecutionError",
-    message: String(error),
-  };
 };
 export function PreviewAutomationOwner(props: {
 }) {
   const { threadRef, visible } = props;
   const automationClientId = useId();
-  const automationRequests = useEnvironmentQuery(
+  const initialAutomationOwner = useMemo<PreviewAutomationOwnerState>(
-    previewEnvironment.automationRequests({
+    () => ({
+      clientId: automationClientId,
       environmentId: threadRef.environmentId,
-      input: { clientId: automationClientId },
+      threadId: threadRef.threadId,
+      tabId: null,
+      visible: false,
+      supportsAutomation: Boolean(previewBridge?.automation),
+      focusedAt: new Date().toISOString(),
     }),
+    [automationClientId, threadRef.environmentId, threadRef.threadId],
   );
+  const automationRequestsAtom = previewEnvironment.automationRequests({
+    environmentId: threadRef.environmentId,
+    input: initialAutomationOwner,
+  });
   const connectionState = useEnvironmentConnectionState(threadRef.environmentId).data;
   const connectedGeneration =
     connectionState?.phase === "connected" ? connectionState.generation : null;
     previewEnvironment.clearAutomationOwner,
     "preview automation owner clear",
   );
-  const ownerStateRef = useRef({ threadRef, visible });
   const connectedGenerationRef = useRef<number | null>(null);
-  const handlerRef = useRef<(request: PreviewAutomationRequest) => Promise<unknown>>(
+  const reportCurrentAutomationOwner = useEffectEvent(() => {
-    async () => undefined,
+    const state = readThreadPreviewState(threadRef);
-  );
+    return reportAutomationOwner({
+      environmentId: threadRef.environmentId,
+      input: {
+        clientId: automationClientId,
+        environmentId: threadRef.environmentId,
+        threadId: threadRef.threadId,
+        tabId: state.snapshot?.tabId ?? null,
+        visible,
+        supportsAutomation: Boolean(previewBridge?.automation),
+        focusedAt: new Date().toISOString(),
+      },
+    });
+  });
   useEffect(() => {
-    ownerStateRef.current = { threadRef, visible };
+    void reportCurrentAutomationOwner();
   }, [threadRef, visible]);
   const handleRequest = useCallback(
           return currentStatus(threadRef, input.show ?? true);
         }
         case "navigate": {
-          if (!previewBridge || !tabId) throw new Error("Preview tab is not initialized.");
+          if (!previewBridge || !tabId) throw previewTabNotFoundError();
           const input = request.input as PreviewAutomationNavigateInput;
           const resolution = resolveBrowserNavigationTarget(
             threadRef.environmentId,
           return currentStatus(threadRef, visible);
         }
         case "snapshot":
-          if (!previewBridge || !tabId) throw new Error("Preview tab is not initialized.");
+          if (!previewBridge || !tabId) throw previewTabNotFoundError();
           return previewBridge.automation.snapshot(tabId);
         case "click":
-          if (!previewBridge || !tabId) throw new Error("Preview tab is not initialized.");
+          if (!previewBridge || !tabId) throw previewTabNotFoundError();
           return previewBridge.automation.click(
             tabId,
             request.input as Parameters<typeof previewBridge.automation.click>[1],
           );
         case "type":
-          if (!previewBridge || !tabId) throw new Error("Preview tab is not initialized.");
+          if (!previewBridge || !tabId) throw previewTabNotFoundError();
           return previewBridge.automation.type(
             tabId,
             request.input as Parameters<typeof previewBridge.automation.type>[1],
           );
         case "press":
-          if (!previewBridge || !tabId) throw new Error("Preview tab is not initialized.");
+          if (!previewBridge || !tabId) throw previewTabNotFoundError();
           return previewBridge.automation.press(
             tabId,
             request.input as Parameters<typeof previewBridge.automation.press>[1],
           );
         case "scroll":
-          if (!previewBridge || !tabId) throw new Error("Preview tab is not initialized.");
+          if (!previewBridge || !tabId) throw previewTabNotFoundError();
           return previewBridge.automation.scroll(
             tabId,
             request.input as Parameters<typeof previewBridge.automation.scroll>[1],
           );
         case "evaluate":
-          if (!previewBridge || !tabId) throw new Error("Preview tab is not initialized.");
+          if (!previewBridge || !tabId) throw previewTabNotFoundError();
           return previewBridge.automation.evaluate(
             tabId,
             request.input as Parameters<typeof previewBridge.automation.evaluate>[1],
           );
         case "waitFor":
-          if (!previewBridge || !tabId) throw new Error("Preview tab is not initialized.");
+          if (!previewBridge || !tabId) throw previewTabNotFoundError();
           return previewBridge.automation.waitFor(
             tabId,
             request.input as Parameters<typeof previewBridge.automation.waitFor>[1],
           );
         case "recordingStart": {
-          if (!tabId) throw new Error("Preview tab is not initialized.");
+          if (!tabId) throw previewTabNotFoundError();
           const startedAt = await startBrowserRecording(tabId);
           return {
             tabId,
           };
         }
         case "recordingStop": {
-          if (!tabId) throw new Error("Preview tab is not initialized.");
+          if (!tabId) throw previewTabNotFoundError();
           const artifact = await stopBrowserRecording(tabId);
           if (!artifact) throw new Error("No active recording exists for this preview tab.");
           return artifact;
     },
     [open, threadRef, visible],
   );
+  const [requestHandler] = useState(() =>
+    createLatestPreviewAutomationRequestHandler(handleRequest),
+  );
   useEffect(() => {
-    handlerRef.current = handleRequest;
+    requestHandler.set(handleRequest);
-  }, [handleRequest]);
+  }, [handleRequest, requestHandler]);
-  useEffect(() => {
+  const automationRequestConsumerAtom = useMemo(
-    const request = automationRequests.data;
+    () =>
-    if (!request) return;
+      createPreviewAutomationRequestConsumerAtom({
-    void handlerRef.current(request).then(
+        requestsAtom: automationRequestsAtom,
-      (result) =>
+        handleRequest: requestHandler.handle,
-        respondToAutomation({
+        respond: (response) =>
-          environmentId: threadRef.environmentId,
+          respondToAutomation({
-          input: {
+            environmentId: threadRef.environmentId,
-            requestId: request.requestId,
+            input: response,
-            ok: true,
+          }),
-            ...(result === undefined ? {} : { result }),
+        label: `preview:automation-request-consumer:${automationClientId}`,
-          },
+      }),
-        }),
+    [
-      (error) =>
+      automationClientId,
-        respondToAutomation({
+      automationRequestsAtom,
-          environmentId: threadRef.environmentId,
+      requestHandler,
-          input: {
+      respondToAutomation,
-            requestId: request.requestId,
+      threadRef.environmentId,
-            ok: false,
+    ],
-            error: serializeError(error),
+  );
-          },
+  useAtomValue(automationRequestConsumerAtom);
-        }),
-    );
-  }, [automationRequests.data, respondToAutomation, threadRef.environmentId]);
   useEffect(() => {
     const observation = observeAutomationOwnerConnectedGeneration(
     connectedGenerationRef.current = observation.nextGeneration;
     if (!observation.shouldReport) return;
-    const ownerState = ownerStateRef.current;
+    void reportCurrentAutomationOwner();
-    const state = readThreadPreviewState(ownerState.threadRef);
+  }, [connectedGeneration]);
-    void reportAutomationOwner({
-      environmentId: ownerState.threadRef.environmentId,
-      input: {
-        clientId: automationClientId,
-        environmentId: ownerState.threadRef.environmentId,
-        threadId: ownerState.threadRef.threadId,
-        tabId: state.snapshot?.tabId ?? null,
-        visible: ownerState.visible,
-        supportsAutomation: Boolean(previewBridge?.automation),
-        focusedAt: new Date().toISOString(),
-      },
-    });
-  }, [automationClientId, connectedGeneration, reportAutomationOwner]);
   useEffect(() => {
-    const report = () => {
+    const report = () => void reportCurrentAutomationOwner();
-      const state = readThreadPreviewState(threadRef);
-      void reportAutomationOwner({
-        environmentId: threadRef.environmentId,
-        input: {
-          clientId: automationClientId,
-          environmentId: threadRef.environmentId,
-          threadId: threadRef.threadId,
-          tabId: state.snapshot?.tabId ?? null,
-          visible,
-          supportsAutomation: Boolean(previewBridge?.automation),
-          focusedAt: new Date().toISOString(),
-        },
-      });
-    };
-    report();
     window.addEventListener("focus", report);
     const unsubscribe = subscribeThreadPreviewState(threadRef, (state, previous) => {
       if (state.snapshot?.tabId !== previous.snapshot?.tabId) {
       unsubscribe();
       void clearAutomationOwner({
         environmentId: threadRef.environmentId,
-        input: { clientId: automationClientId },
+        input: {
+          clientId: automationClientId,
+          environmentId: threadRef.environmentId,
+          threadId: threadRef.threadId,
+        },
       });
     };
-  }, [automationClientId, clearAutomationOwner, reportAutomationOwner, threadRef, visible]);
+  }, [automationClientId, clearAutomationOwner, threadRef]);
   return null;
 }

apps/web/src/components/preview/previewAutomationRequestConsumer.test.ts+81−0

@@ -0,0 +1,81 @@
	1	import type { PreviewAutomationRequest, PreviewAutomationResponse } from "@t3tools/contracts";
	2	import { ThreadId } from "@t3tools/contracts";
	3	import { AsyncResult, Atom, AtomRegistry } from "effect/unstable/reactivity";
	4	import { describe, expect, it, vi } from "vite-plus/test";
	5
	6	import {
	7	createPreviewAutomationRequestConsumerAtom,
	8	serializePreviewAutomationError,
	9	} from "./previewAutomationRequestConsumer";
	10
	11	const request = (requestId: string): PreviewAutomationRequest => ({
	12	requestId,
	13	threadId: ThreadId.make("thread-1"),
	14	operation: "status",
	15	input: {},
	16	timeoutMs: 15_000,
	17	});
	18
	19	describe("previewAutomationRequestConsumer", () => {
	20	it("consumes every request emitted before React can render", async () => {
	21	const requestsAtom = Atom.make<AsyncResult.AsyncResult<PreviewAutomationRequest, Error>>(
	22	AsyncResult.initial<PreviewAutomationRequest, Error>(false),
	23	);
	24	const handleRequest = vi.fn(async (value: PreviewAutomationRequest) => ({
	25	requestId: value.requestId,
	26	}));
	27	const responses: PreviewAutomationResponse[] = [];
	28	const respond = vi.fn(async (response: PreviewAutomationResponse) => {
	29	responses.push(response);
	30	});
	31	const consumerAtom = createPreviewAutomationRequestConsumerAtom({
	32	requestsAtom,
	33	handleRequest,
	34	respond,
	35	label: "test:preview-automation-consumer",
	36	});
	37	const registry = AtomRegistry.make();
	38	registry.mount(consumerAtom);
	39
	40	registry.set(requestsAtom, AsyncResult.success(request("request-1")));
	41	registry.set(requestsAtom, AsyncResult.success(request("request-2")));
	42
	43	await vi.waitFor(() => expect(respond).toHaveBeenCalledTimes(2));
	44	expect(handleRequest.mock.calls.map(([value]) => value.requestId)).toEqual([
	45	"request-1",
	46	"request-2",
	47	]);
	48	expect(responses.map((response) => response.requestId)).toEqual(["request-1", "request-2"]);
	49	registry.dispose();
	50	});
	51
	52	it("consumes a request that arrived immediately before the consumer mounted", async () => {
	53	const requestsAtom = Atom.make(
	54	AsyncResult.success<PreviewAutomationRequest, Error>(request("request-ready")),
	55	);
	56	const respond = vi.fn(async (_response: PreviewAutomationResponse) => undefined);
	57	const consumerAtom = createPreviewAutomationRequestConsumerAtom({
	58	requestsAtom,
	59	handleRequest: async () => undefined,
	60	respond,
	61	label: "test:preview-automation-initial-request",
	62	});
	63	const registry = AtomRegistry.make();
	64
	65	registry.mount(consumerAtom);
	66
	67	await vi.waitFor(() => expect(respond).toHaveBeenCalledTimes(1));
	68	expect(respond).toHaveBeenCalledWith({ requestId: "request-ready", ok: true });
	69	registry.dispose();
	70	});
	71
	72	it("preserves typed automation errors in responses", () => {
	73	const error = new Error("No preview tab");
	74	error.name = "PreviewAutomationTabNotFoundError";
	75
	76	expect(serializePreviewAutomationError(error)).toEqual({
	77	_tag: "PreviewAutomationTabNotFoundError",
	78	message: "No preview tab",
	79	});
	80	});
	81	});

apps/web/src/components/preview/previewAutomationRequestConsumer.ts+83−0

@@ -0,0 +1,83 @@
	1	import type { PreviewAutomationRequest, PreviewAutomationResponse } from "@t3tools/contracts";
	2	import { AsyncResult, Atom } from "effect/unstable/reactivity";
	3
	4	type AutomationRequestResult<E> = AsyncResult.AsyncResult<PreviewAutomationRequest, E>;
	5	type AutomationRequestHandler = (request: PreviewAutomationRequest) => Promise<unknown>;
	6
	7	export function createLatestPreviewAutomationRequestHandler(initial: AutomationRequestHandler): {
	8	readonly set: (handler: AutomationRequestHandler) => void;
	9	readonly handle: AutomationRequestHandler;
	10	} {
	11	let current = initial;
	12	return {
	13	set: (handler) => {
	14	current = handler;
	15	},
	16	handle: (request) => current(request),
	17	};
	18	}
	19
	20	export function serializePreviewAutomationError(
	21	error: unknown,
	22	): NonNullable<PreviewAutomationResponse["error"]> {
	23	if (error instanceof Error) {
	24	const detail =
	25	"detail" in error && (error as { detail?: unknown }).detail !== undefined
	26	? (error as { detail?: unknown }).detail
	27	: undefined;
	28	return {
	29	_tag: error.name.startsWith("PreviewAutomation")
	30	? error.name
	31	: "PreviewAutomationExecutionError",
	32	message: error.message,
	33	...(detail === undefined ? {} : { detail }),
	34	};
	35	}
	36	return {
	37	_tag: "PreviewAutomationExecutionError",
	38	message: String(error),
	39	};
	40	}
	41
	42	export function createPreviewAutomationRequestConsumerAtom<E>(options: {
	43	readonly requestsAtom: Atom.Atom<AutomationRequestResult<E>>;
	44	readonly handleRequest: (request: PreviewAutomationRequest) => Promise<unknown>;
	45	readonly respond: (response: PreviewAutomationResponse) => Promise<unknown>;
	46	readonly label: string;
	47	}): Atom.Atom<void> {
	48	return Atom.make((get) => {
	49	let disposed = false;
	50	let requestsVersion = 0;
	51
	52	const consume = (result: AutomationRequestResult<E>) => {
	53	if (!AsyncResult.isSuccess(result)) return;
	54	const request = result.value;
	55	void options.handleRequest(request).then(
	56	(value) =>
	57	options.respond({
	58	requestId: request.requestId,
	59	ok: true,
	60	...(value === undefined ? {} : { result: value }),
	61	}),
	62	(error) =>
	63	options.respond({
	64	requestId: request.requestId,
	65	ok: false,
	66	error: serializePreviewAutomationError(error),
	67	}),
	68	);
	69	};
	70
	71	get.addFinalizer(() => {
	72	disposed = true;
	73	});
	74	const initialRequest = get.once(options.requestsAtom);
	75	get.subscribe(options.requestsAtom, (result) => {
	76	requestsVersion += 1;
	77	consume(result);
	78	});
	79	queueMicrotask(() => {
	80	if (!disposed && requestsVersion === 0) consume(initialRequest);
	81	});
	82	}).pipe(Atom.setIdleTTL(0), Atom.withLabel(options.label));
	83	}

apps/web/src/diffPanelStore.test.ts+68−0

@@ -0,0 +1,68 @@
	1	import { scopeThreadRef } from "@t3tools/client-runtime/environment";
	2	import { EnvironmentId, ThreadId, TurnId } from "@t3tools/contracts";
	3	import { beforeEach, describe, expect, it } from "vite-plus/test";
	4
	5	import { selectThreadDiffPanelSelection, useDiffPanelStore } from "./diffPanelStore";
	6
	7	const THREAD_REF = scopeThreadRef(EnvironmentId.make("environment-1"), ThreadId.make("thread-1"));
	8
	9	describe("diffPanelStore", () => {
	10	beforeEach(() => useDiffPanelStore.setState({ byThreadKey: {}, branchBaseRefByThreadKey: {} }));
	11
	12	it("defaults each thread to branch changes with automatic base selection", () => {
	13	expect(
	14	selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),
	15	).toEqual({ kind: "branch", baseRef: null });
	16	});
	17
	18	it("clears incompatible selection fields when changing scopes", () => {
	19	const store = useDiffPanelStore.getState();
	20	store.selectTurn(THREAD_REF, TurnId.make("turn-1"), "src/app.ts");
	21	store.selectGitScope(THREAD_REF, "unstaged");
	22
	23	expect(
	24	selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),
	25	).toEqual({ kind: "unstaged" });
	26
	27	useDiffPanelStore.getState().selectBranchBaseRef(THREAD_REF, " origin/main ");
	28	expect(
	29	selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),
	30	).toEqual({ kind: "branch", baseRef: "origin/main" });
	31	});
	32
	33	it("increments the reveal request when opening the same turn file again", () => {
	34	const turnId = TurnId.make("turn-1");
	35	useDiffPanelStore.getState().selectTurn(THREAD_REF, turnId, "src/app.ts");
	36	useDiffPanelStore.getState().selectTurn(THREAD_REF, turnId, "src/app.ts");
	37
	38	expect(
	39	selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),
	40	).toEqual({ kind: "turn", turnId, filePath: "src/app.ts", revealRequestId: 2 });
	41	});
	42
	43	it("restores the selected branch base after visiting another scope", () => {
	44	useDiffPanelStore.getState().selectBranchBaseRef(THREAD_REF, "origin/main");
	45	useDiffPanelStore.getState().selectGitScope(THREAD_REF, "unstaged");
	46	useDiffPanelStore.getState().selectGitScope(THREAD_REF, "branch");
	47
	48	expect(
	49	selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),
	50	).toEqual({ kind: "branch", baseRef: "origin/main" });
	51	});
	52
	53	it("reconciles a missing turn selection to the latest available turn", () => {
	54	const missingTurnId = TurnId.make("turn-missing");
	55	const latestTurnId = TurnId.make("turn-latest");
	56	useDiffPanelStore.getState().selectTurn(THREAD_REF, missingTurnId, "src/app.ts");
	57	useDiffPanelStore.getState().reconcileTurnSelection(THREAD_REF, [latestTurnId]);
	58
	59	expect(
	60	selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),
	61	).toEqual({
	62	kind: "turn",
	63	turnId: latestTurnId,
	64	filePath: "src/app.ts",
	65	revealRequestId: 1,
	66	});
	67	});
	68	});

apps/web/src/diffPanelStore.ts+139−0

@@ -0,0 +1,139 @@
	1	import { scopedThreadKey } from "@t3tools/client-runtime/environment";
	2	import type { ScopedThreadRef, TurnId } from "@t3tools/contracts";
	3	import { create } from "zustand";
	4	import { createJSONStorage, persist } from "zustand/middleware";
	5
	6	import { resolveStorage } from "./lib/storage";
	7
	8	export type DiffPanelSelection =
	9	\| { kind: "branch"; baseRef: string \| null }
	10	\| { kind: "unstaged" }
	11	\| { kind: "turn"; turnId: TurnId; filePath: string \| null; revealRequestId: number };
	12
	13	const DEFAULT_SELECTION: DiffPanelSelection = { kind: "branch", baseRef: null };
	14
	15	interface DiffPanelStoreState {
	16	byThreadKey: Record<string, DiffPanelSelection>;
	17	branchBaseRefByThreadKey: Record<string, string \| null>;
	18	selectGitScope: (ref: ScopedThreadRef, scope: "branch" \| "unstaged") => void;
	19	selectBranchBaseRef: (ref: ScopedThreadRef, baseRef: string \| null) => void;
	20	selectTurn: (ref: ScopedThreadRef, turnId: TurnId, filePath?: string) => void;
	21	reconcileTurnSelection: (ref: ScopedThreadRef, availableTurnIds: ReadonlyArray<TurnId>) => void;
	22	removeThread: (ref: ScopedThreadRef) => void;
	23	}
	24
	25	function normalizeBaseRef(baseRef: string \| null): string \| null {
	26	const normalized = baseRef?.trim();
	27	return normalized ? normalized : null;
	28	}
	29
	30	export const useDiffPanelStore = create<DiffPanelStoreState>()(
	31	persist(
	32	(set) => ({
	33	byThreadKey: {},
	34	branchBaseRefByThreadKey: {},
	35	selectGitScope: (ref, scope) =>
	36	set((state) => {
	37	const threadKey = scopedThreadKey(ref);
	38	const previous = state.byThreadKey[threadKey];
	39	const previousBaseRef =
	40	previous?.kind === "branch"
	41	? previous.baseRef
	42	: (state.branchBaseRefByThreadKey[threadKey] ?? null);
	43	return {
	44	byThreadKey: {
	45	...state.byThreadKey,
	46	[threadKey]:
	47	scope === "branch"
	48	? { kind: "branch", baseRef: previousBaseRef }
	49	: { kind: "unstaged" },
	50	},
	51	branchBaseRefByThreadKey:
	52	previous?.kind === "branch"
	53	? { ...state.branchBaseRefByThreadKey, [threadKey]: previous.baseRef }
	54	: state.branchBaseRefByThreadKey,
	55	};
	56	}),
	57	selectBranchBaseRef: (ref, baseRef) =>
	58	set((state) => {
	59	const threadKey = scopedThreadKey(ref);
	60	const normalizedBaseRef = normalizeBaseRef(baseRef);
	61	return {
	62	byThreadKey: {
	63	...state.byThreadKey,
	64	[threadKey]: { kind: "branch", baseRef: normalizedBaseRef },
	65	},
	66	branchBaseRefByThreadKey: {
	67	...state.branchBaseRefByThreadKey,
	68	[threadKey]: normalizedBaseRef,
	69	},
	70	};
	71	}),
	72	selectTurn: (ref, turnId, filePath) =>
	73	set((state) => {
	74	const threadKey = scopedThreadKey(ref);
	75	const previous = state.byThreadKey[threadKey];
	76	return {
	77	byThreadKey: {
	78	...state.byThreadKey,
	79	[threadKey]: {
	80	kind: "turn",
	81	turnId,
	82	filePath: filePath?.trim() \|\| null,
	83	revealRequestId: previous?.kind === "turn" ? previous.revealRequestId + 1 : 1,
	84	},
	85	},
	86	};
	87	}),
	88	reconcileTurnSelection: (ref, availableTurnIds) =>
	89	set((state) => {
	90	const threadKey = scopedThreadKey(ref);
	91	const previous = state.byThreadKey[threadKey];
	92	const latestTurnId = availableTurnIds[0];
	93	if (
	94	previous?.kind !== "turn" \|\|
	95	latestTurnId === undefined \|\|
	96	availableTurnIds.includes(previous.turnId)
	97	) {
	98	return state;
	99	}
	100	return {
	101	byThreadKey: {
	102	...state.byThreadKey,
	103	[threadKey]: { ...previous, turnId: latestTurnId },
	104	},
	105	};
	106	}),
	107	removeThread: (ref) =>
	108	set((state) => {
	109	const threadKey = scopedThreadKey(ref);
	110	if (!(threadKey in state.byThreadKey) && !(threadKey in state.branchBaseRefByThreadKey)) {
	111	return state;
	112	}
	113	const { [threadKey]: _removed, ...byThreadKey } = state.byThreadKey;
	114	const { [threadKey]: _removedBaseRef, ...branchBaseRefByThreadKey } =
	115	state.branchBaseRefByThreadKey;
	116	return { byThreadKey, branchBaseRefByThreadKey };
	117	}),
	118	}),
	119	{
	120	name: "t3code:diff-panel-state:v1",
	121	version: 1,
	122	storage: createJSONStorage(() =>
	123	resolveStorage(typeof window !== "undefined" ? window.localStorage : undefined),
	124	),
	125	partialize: (state) => ({
	126	byThreadKey: state.byThreadKey,
	127	branchBaseRefByThreadKey: state.branchBaseRefByThreadKey,
	128	}),
	129	},
	130	),
	131	);
	132
	133	export function selectThreadDiffPanelSelection(
	134	byThreadKey: Record<string, DiffPanelSelection>,
	135	ref: ScopedThreadRef \| null \| undefined,
	136	): DiffPanelSelection {
	137	if (!ref) return DEFAULT_SELECTION;
	138	return byThreadKey[scopedThreadKey(ref)] ?? DEFAULT_SELECTION;
	139	}

apps/web/src/diffRouteSearch.test.ts+0−74

@@ -1,74 +0,0 @@
1	import { describe, expect, it } from "vite-plus/test";
2
3	import { parseDiffRouteSearch } from "./diffRouteSearch";
4
5	describe("parseDiffRouteSearch", () => {
6	it("parses valid diff search values", () => {
7	const parsed = parseDiffRouteSearch({
8	diff: "1",
9	diffTurnId: "turn-1",
10	diffFilePath: "src/app.ts",
11	});
12
13	expect(parsed).toEqual({
14	diff: "1",
15	diffTurnId: "turn-1",
16	diffFilePath: "src/app.ts",
17	});
18	});
19
20	it("treats numeric and boolean diff toggles as open", () => {
21	expect(
22	parseDiffRouteSearch({
23	diff: 1,
24	diffTurnId: "turn-1",
25	}),
26	).toEqual({
27	diff: "1",
28	diffTurnId: "turn-1",
29	});
30
31	expect(
32	parseDiffRouteSearch({
33	diff: true,
34	diffTurnId: "turn-1",
35	}),
36	).toEqual({
37	diff: "1",
38	diffTurnId: "turn-1",
39	});
40	});
41
42	it("drops turn and file values when diff is closed", () => {
43	const parsed = parseDiffRouteSearch({
44	diff: "0",
45	diffTurnId: "turn-1",
46	diffFilePath: "src/app.ts",
47	});
48
49	expect(parsed).toEqual({});
50	});
51
52	it("drops file value when turn is not selected", () => {
53	const parsed = parseDiffRouteSearch({
54	diff: "1",
55	diffFilePath: "src/app.ts",
56	});
57
58	expect(parsed).toEqual({
59	diff: "1",
60	});
61	});
62
63	it("normalizes whitespace-only values", () => {
64	const parsed = parseDiffRouteSearch({
65	diff: "1",
66	diffTurnId: " ",
67	diffFilePath: " ",
68	});
69
70	expect(parsed).toEqual({
71	diff: "1",
72	});
73	});
74	});

apps/web/src/diffRouteSearch.ts+0−39

@@ -1,39 +0,0 @@
1	import { TurnId } from "@t3tools/contracts";
2
3	export interface DiffRouteSearch {
4	diff?: "1" \| undefined;
5	diffTurnId?: TurnId \| undefined;
6	diffFilePath?: string \| undefined;
7	}
8
9	function isDiffOpenValue(value: unknown): boolean {
10	return value === "1" \|\| value === 1 \|\| value === true;
11	}
12
13	function normalizeSearchString(value: unknown): string \| undefined {
14	if (typeof value !== "string") {
15	return undefined;
16	}
17	const normalized = value.trim();
18	return normalized.length > 0 ? normalized : undefined;
19	}
20
21	export function stripDiffSearchParams<T extends Record<string, unknown>>(
22	params: T,
23	): Omit<T, "diff" \| "diffTurnId" \| "diffFilePath"> {
24	const { diff: _diff, diffTurnId: _diffTurnId, diffFilePath: _diffFilePath, ...rest } = params;
25	return rest as Omit<T, "diff" \| "diffTurnId" \| "diffFilePath">;
26	}
27
28	export function parseDiffRouteSearch(search: Record<string, unknown>): DiffRouteSearch {
29	const diff = isDiffOpenValue(search.diff) ? "1" : undefined;
30	const diffTurnIdRaw = diff ? normalizeSearchString(search.diffTurnId) : undefined;
31	const diffTurnId = diffTurnIdRaw ? TurnId.make(diffTurnIdRaw) : undefined;
32	const diffFilePath = diff && diffTurnId ? normalizeSearchString(search.diffFilePath) : undefined;
33
34	return {
35	...(diff ? { diff } : {}),
36	...(diffTurnId ? { diffTurnId } : {}),
37	...(diffFilePath ? { diffFilePath } : {}),
38	};
39	}

apps/web/src/environments/primary/httpClient.ts+5−8

 import { resolvePrimaryEnvironmentHttpUrl } from "./target";
-export type PrimaryEnvironmentHttpClientShape = Effect.Success<
-  ReturnType<typeof makeEnvironmentHttpApiClient>
->;
 export class PrimaryEnvironmentHttpClient extends Context.Service<
   PrimaryEnvironmentHttpClient,
-  PrimaryEnvironmentHttpClientShape
+  Effect.Success<ReturnType<typeof makeEnvironmentHttpApiClient>>
 >()("@t3tools/web/environments/primary/httpClient/PrimaryEnvironmentHttpClient") {}
-export const primaryEnvironmentHttpClientLive = Layer.effect(
+const make = Effect.suspend(() =>
-  PrimaryEnvironmentHttpClient,
+  makeEnvironmentHttpApiClient(resolvePrimaryEnvironmentHttpUrl("/")),
-  Effect.suspend(() => makeEnvironmentHttpApiClient(resolvePrimaryEnvironmentHttpUrl("/"))),
 );
+export const layer = Layer.effect(PrimaryEnvironmentHttpClient, make);

apps/web/src/index.css+2−1

@@ -689,7 +689,8 @@ label:has(> select#reasoning-effort) select { · 688 unmodified lines
689	background: color-mix(in srgb, var(--background) 94%, var(--card));	689	background: color-mix(in srgb, var(--background) 94%, var(--card));
690	}	690	}
691		691
692	.diff-render-file {	692	.diff-render-file,
		693	.diff-render-surface > diffs-container {
693	border: 1px solid var(--border);	694	border: 1px solid var(--border);
694	border-radius: 0.5rem;	695	border-radius: 0.5rem;
695	overflow: clip;	696	overflow: clip;

apps/web/src/lib/baseRefChoices.test.ts+52−0

@@ -0,0 +1,52 @@
	1	import { describe, expect, it } from "vite-plus/test";
	2	import type { VcsRef } from "@t3tools/contracts";
	3	import { buildBaseRefChoices, filterBaseRefChoices } from "./baseRefChoices";
	4
	5	function ref(name: string, remoteName?: string): VcsRef {
	6	return {
	7	name,
	8	current: false,
	9	isDefault: false,
	10	isRemote: remoteName !== undefined,
	11	...(remoteName ? { remoteName } : {}),
	12	worktreePath: null,
	13	};
	14	}
	15
	16	describe("buildBaseRefChoices", () => {
	17	it("pairs matching local and remote branches and prefers origin", () => {
	18	const choices = buildBaseRefChoices(
	19	[ref("main")],
	20	[ref("upstream/main", "upstream"), ref("origin/main", "origin")],
	21	);
	22
	23	expect(choices).toEqual([
	24	expect.objectContaining({
	25	label: "main",
	26	local: expect.objectContaining({ name: "main" }),
	27	remote: expect.objectContaining({ name: "origin/main" }),
	28	}),
	29	expect.objectContaining({
	30	label: "upstream/main",
	31	local: null,
	32	remote: expect.objectContaining({ name: "upstream/main" }),
	33	}),
	34	]);
	35	});
	36	});
	37
	38	describe("filterBaseRefChoices", () => {
	39	it("filters stale server results against the current query", () => {
	40	const choices = buildBaseRefChoices(
	41	[ref("main"), ref("feature/search")],
	42	[ref("origin/main", "origin"), ref("origin/feature/search", "origin")],
	43	);
	44
	45	expect(filterBaseRefChoices(choices, "SEARCH").map((choice) => choice.label)).toEqual([
	46	"feature/search",
	47	]);
	48	expect(filterBaseRefChoices(choices, "origin/main").map((choice) => choice.label)).toEqual([
	49	"main",
	50	]);
	51	});
	52	});

apps/web/src/lib/baseRefChoices.ts+61−0

@@ -0,0 +1,61 @@
	1	import type { VcsRef } from "@t3tools/contracts";
	2
	3	export interface BaseRefChoice {
	4	readonly id: string;
	5	readonly label: string;
	6	readonly local: VcsRef \| null;
	7	readonly remote: VcsRef \| null;
	8	}
	9
	10	function remoteBranchName(ref: VcsRef): string {
	11	if (ref.remoteName && ref.name.startsWith(`${ref.remoteName}/`)) {
	12	return ref.name.slice(ref.remoteName.length + 1);
	13	}
	14	return ref.name;
	15	}
	16
	17	export function buildBaseRefChoices(
	18	localRefs: ReadonlyArray<VcsRef>,
	19	remoteRefs: ReadonlyArray<VcsRef>,
	20	): ReadonlyArray<BaseRefChoice> {
	21	const unusedRemoteRefs = new Set(remoteRefs);
	22	const pairedChoices = localRefs.map((local) => {
	23	const matches = remoteRefs.filter(
	24	(remote) => unusedRemoteRefs.has(remote) && remoteBranchName(remote) === local.name,
	25	);
	26	const remote =
	27	matches.find((candidate) => candidate.remoteName === "origin") ?? matches[0] ?? null;
	28	if (remote) unusedRemoteRefs.delete(remote);
	29	return {
	30	id: `local:${local.name}`,
	31	label: local.name,
	32	local,
	33	remote,
	34	};
	35	});
	36
	37	const remoteOnlyChoices = remoteRefs
	38	.filter((remote) => unusedRemoteRefs.has(remote))
	39	.map((remote) => ({
	40	id: `remote:${remote.name}`,
	41	label: remote.name,
	42	local: null,
	43	remote,
	44	}));
	45
	46	return [...pairedChoices, ...remoteOnlyChoices];
	47	}
	48
	49	export function filterBaseRefChoices(
	50	choices: ReadonlyArray<BaseRefChoice>,
	51	query: string,
	52	): ReadonlyArray<BaseRefChoice> {
	53	const normalizedQuery = query.trim().toLocaleLowerCase();
	54	if (normalizedQuery.length === 0) return choices;
	55	return choices.filter(
	56	(choice) =>
	57	choice.label.toLocaleLowerCase().includes(normalizedQuery) \|\|
	58	choice.local?.name.toLocaleLowerCase().includes(normalizedQuery) === true \|\|
	59	choice.remote?.name.toLocaleLowerCase().includes(normalizedQuery) === true,
	60	);
	61	}

apps/web/src/lib/diffRendering.test.ts+54−1

@@ -1,5 +1,5 @@
1	import { describe, expect, it } from "vite-plus/test";	1	import { describe, expect, it } from "vite-plus/test";
2	import { buildPatchCacheKey } from "./diffRendering";	2	import { buildPatchCacheKey, getRenderablePatch } from "./diffRendering";
3		3
4	describe("buildPatchCacheKey", () => {	4	describe("buildPatchCacheKey", () => {
5	it("returns a stable cache key for identical content", () => {	5	it("returns a stable cache key for identical content", () => {
@@ -29,3 +29,56 @@ describe("buildPatchCacheKey", () => { · 23 unmodified lines
29	);	29	);
30	});	30	});
31	});	31	});
		32
		33	describe("getRenderablePatch", () => {
		34	it("compacts partial hunk render offsets for virtualized review diffs", () => {
		35	const patch = [
		36	"diff --git a/example.ts b/example.ts",
		37	"index 1111111..2222222 100644",
		38	"--- a/example.ts",
		39	"+++ b/example.ts",
		40	"@@ -48,4 +48,4 @@",
		41	" context",
		42	"-before",
		43	"+after",
		44	" context",
		45	" context",
		46	"@@ -80,3 +80,4 @@",
		47	" context",
		48	"+added",
		49	" context",
		50	" context",
		51	].join("\n");
		52
		53	const parsed = getRenderablePatch(patch, "review", {
		54	compactPartialHunkOffsets: true,
		55	});
		56	expect(parsed?.kind).toBe("files");
		57	if (parsed?.kind !== "files") return;
		58
		59	const file = parsed.files[0];
		60	expect(file?.hunks[0]?.collapsedBefore).toBe(47);
		61	expect(file?.hunks[0]?.unifiedLineStart).toBe(0);
		62	expect(file?.hunks[1]?.collapsedBefore).toBeGreaterThan(0);
		63	expect(file?.hunks[1]?.unifiedLineStart).toBe(file?.hunks[0]?.unifiedLineCount);
		64	expect(file?.unifiedLineCount).toBe(
		65	file?.hunks.reduce((total, hunk) => total + hunk.unifiedLineCount, 0),
		66	);
		67	});
		68
		69	it("retains source-file offsets for checkpoint diffs", () => {
		70	const patch = [
		71	"diff --git a/example.ts b/example.ts",
		72	"--- a/example.ts",
		73	"+++ b/example.ts",
		74	"@@ -48,1 +48,1 @@",
		75	"-before",
		76	"+after",
		77	].join("\n");
		78
		79	const parsed = getRenderablePatch(patch, "checkpoint");
		80	expect(parsed?.kind).toBe("files");
		81	if (parsed?.kind !== "files") return;
		82	expect(parsed.files[0]?.hunks[0]?.unifiedLineStart).toBe(47);
		83	});
		84	});

apps/web/src/lib/diffRendering.ts+41−1

@@ -52,9 +52,45 @@ export type RenderablePatch = · 51 unmodified lines
52	reason: string;	52	reason: string;
53	};	53	};
54		54
		55	interface RenderablePatchOptions {
		56	/**
		57	* Pierre's partial-patch parser keeps hunk render starts in source-file
		58	* coordinates. Its virtualizer iterates partial patches as compact rows, so
		59	* review diffs need compact render starts while retaining collapsedBefore
		60	* for the "N unmodified lines" separator.
		61	*/
		62	compactPartialHunkOffsets?: boolean;
		63	}
		64
		65	export function compactPartialHunkOffsets(file: FileDiffMetadata): FileDiffMetadata {
		66	if (!file.isPartial) return file;
		67
		68	let splitLineStart = 0;
		69	let unifiedLineStart = 0;
		70	const hunks = file.hunks.map((hunk) => {
		71	const compactHunk = {
		72	...hunk,
		73	splitLineStart,
		74	unifiedLineStart,
		75	};
		76	splitLineStart += hunk.splitLineCount;
		77	unifiedLineStart += hunk.unifiedLineCount;
		78	return compactHunk;
		79	});
		80
		81	return {
		82	...file,
		83	hunks,
		84	splitLineCount: splitLineStart,
		85	unifiedLineCount: unifiedLineStart,
		86	...(file.cacheKey ? { cacheKey: `${file.cacheKey}:compact-partial` } : {}),
		87	};
		88	}
		89
55	export function getRenderablePatch(	90	export function getRenderablePatch(
56	patch: string \| undefined,	91	patch: string \| undefined,
57	cacheScope = "diff-panel",	92	cacheScope = "diff-panel",
		93	options: RenderablePatchOptions = {},
58	): RenderablePatch \| null {	94	): RenderablePatch \| null {
59	if (!patch) return null;	95	if (!patch) return null;
60	const normalizedPatch = patch.trim();	96	const normalizedPatch = patch.trim();
@@ -65,7 +101,11 @@ export function getRenderablePatch( · 4 unmodified lines
65	normalizedPatch,	101	normalizedPatch,
66	buildPatchCacheKey(normalizedPatch, cacheScope),	102	buildPatchCacheKey(normalizedPatch, cacheScope),
67	);	103	);
68	const files = parsedPatches.flatMap((parsedPatch) => parsedPatch.files);	104	const files = parsedPatches.flatMap((parsedPatch) =>
		105	options.compactPartialHunkOffsets
		106	? parsedPatch.files.map(compactPartialHunkOffsets)
		107	: parsedPatch.files,
		108	);
69	if (files.length > 0) {	109	if (files.length > 0) {
70	return { kind: "files", files };	110	return { kind: "files", files };
71	}	111	}

apps/web/src/lib/runtime.ts+6−8

 import { remoteHttpClientLayer } from "@t3tools/client-runtime/rpc";
 import { makeRelayClientTracingLayer } from "@t3tools/shared/relayTracing";
-import {
+import * as PrimaryEnvironmentHttpClient from "../environments/primary/httpClient";
-  PrimaryEnvironmentHttpClient,
-  primaryEnvironmentHttpClientLive,
-} from "../environments/primary/httpClient";
 import { primaryEnvironmentHttpLayer } from "../environments/primary/httpLayer";
 import { browserCryptoLayer } from "../cloud/dpop";
 export const remoteHttpRuntime = ManagedRuntime.make(httpClientLayer);
 const primaryHttpRuntime = ManagedRuntime.make(
-  primaryEnvironmentHttpClientLive.pipe(Layer.provide(primaryEnvironmentHttpLayer)),
+  PrimaryEnvironmentHttpClient.layer.pipe(Layer.provide(primaryEnvironmentHttpLayer)),
 );
 export type PrimaryHttpEffectRunner = <A, E>(
-  effect: Effect.Effect<A, E, PrimaryEnvironmentHttpClient>,
+  effect: Effect.Effect<A, E, PrimaryEnvironmentHttpClient.PrimaryEnvironmentHttpClient>,
 ) => Promise<A>;
 const livePrimaryHttpRunner: PrimaryHttpEffectRunner = (effect) =>
 let primaryHttpRunner = livePrimaryHttpRunner;
-export const runPrimaryHttp = <A, E>(effect: Effect.Effect<A, E, PrimaryEnvironmentHttpClient>) =>
+export const runPrimaryHttp = <A, E>(
-  primaryHttpRunner(effect);
+  effect: Effect.Effect<A, E, PrimaryEnvironmentHttpClient.PrimaryEnvironmentHttpClient>,
+) => primaryHttpRunner(effect);
 export function __setPrimaryHttpRunnerForTests(runner?: PrimaryHttpEffectRunner): void {
   primaryHttpRunner = runner ?? livePrimaryHttpRunner;

apps/web/src/rightPanelStore.test.ts+0−11

   migratePersistedRightPanelState,
   selectActiveRightPanel,
   selectActiveRightPanelSurface,
-  selectActiveRightPanelKindWithUrl,
   selectThreadRightPanelState,
   useRightPanelStore,
 } from "./rightPanelStore";
     expect(selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, refA)).toBe("plan");
   });
-  it("?diff=1 always wins over persisted state", () => {
-    useRightPanelStore.getState().open(refA, "preview");
-    expect(
-      selectActiveRightPanelKindWithUrl(useRightPanelStore.getState().byThreadKey, refA, true),
-    ).toBe("diff");
-    expect(
-      selectActiveRightPanelKindWithUrl(useRightPanelStore.getState().byThreadKey, refA, false),
-    ).toBe("preview");
-  });
   it("removeThread clears persisted state", () => {
     useRightPanelStore.getState().open(refA, "plan");
     useRightPanelStore.getState().removeThread(refA);

apps/web/src/rightPanelStore.ts+0−10

@@ -550,13 +550,3 @@ export function selectActiveRightPanelSurface( · 549 unmodified lines
550	if (!state.isOpen) return null;	550	if (!state.isOpen) return null;
551	return state.surfaces.find((surface) => surface.id === state.activeSurfaceId) ?? null;	551	return state.surfaces.find((surface) => surface.id === state.activeSurfaceId) ?? null;
552	}	552	}
553
554	export function selectActiveRightPanelKindWithUrl(
555	byThreadKey: Record<string, ThreadRightPanelState>,
556	ref: ScopedThreadRef \| null \| undefined,
557	diffSearchActive: boolean,
558	): RightPanelKind \| null {
559	if (!selectThreadRightPanelState(byThreadKey, ref).isOpen) return null;
560	if (diffSearchActive) return "diff";
561	return selectActiveRightPanel(byThreadKey, ref);
562	}

apps/web/src/routes/_chat.$environmentId.$threadId.tsx+1−6

-import { createFileRoute, retainSearchParams, useNavigate } from "@tanstack/react-router";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
 import { useEffect } from "react";
 import ChatView from "../components/ChatView";
 import { threadHasStarted } from "../components/ChatView.logic";
 import { finalizePromotedDraftThreadByRef, useComposerDraftStore } from "../composerDraftStore";
-import { type DiffRouteSearch, parseDiffRouteSearch } from "../diffRouteSearch";
 import { resolveThreadRouteRef } from "../threadRoutes";
 import { SidebarInset } from "~/components/ui/sidebar";
 import { useEnvironmentThreadRefs, useThreadDetail, useThreadShell } from "../state/entities";
 }
 export const Route = createFileRoute("/_chat/$environmentId/$threadId")({
-  validateSearch: (search) => parseDiffRouteSearch(search),
-  search: {
-    middlewares: [retainSearchParams<DiffRouteSearch>(["diff"])],
-  },
   component: ChatThreadRouteView,
 });

infra/relay/alchemy.run.ts+3−3

@@ -7,7 +7,7 @@ import * as Effect from "effect/Effect"; · 6 unmodified lines
7	import * as Layer from "effect/Layer";	7	import * as Layer from "effect/Layer";
8	import * as Planetscale from "alchemy/Planetscale";	8	import * as Planetscale from "alchemy/Planetscale";
9		9
10	import { PlanetscaleDatabase, RelayHyperdrive } from "./src/db.ts";	10	import * as RelayDb from "./src/db.ts";
11	import { RelayObservability } from "./src/observability.ts";	11	import { RelayObservability } from "./src/observability.ts";
12	import { ManagedEndpointZone, RelayApiZone } from "./src/zone.ts";	12	import { ManagedEndpointZone, RelayApiZone } from "./src/zone.ts";
13	import Api from "./src/worker.ts";	13	import Api from "./src/worker.ts";
@@ -24,8 +24,8 @@ export default Alchemy.Stack( · 10 unmodified lines
24	state: Cloudflare.state(),	24	state: Cloudflare.state(),
25	},	25	},
26	Effect.gen(function* () {	26	Effect.gen(function* () {
27	const db = yield* PlanetscaleDatabase;	27	const db = yield* RelayDb.PlanetscaleDatabase;
28	const hyperdrive = yield* RelayHyperdrive;	28	const hyperdrive = yield* RelayDb.RelayHyperdrive;
29	const managedEndpointZone = yield* ManagedEndpointZone.pipe(Effect.orDie);	29	const managedEndpointZone = yield* ManagedEndpointZone.pipe(Effect.orDie);
30	const relayApiZone = yield* RelayApiZone.pipe(Effect.orDie);	30	const relayApiZone = yield* RelayApiZone.pipe(Effect.orDie);
31	const observability = yield* RelayObservability;	31	const observability = yield* RelayObservability;

infra/relay/src/Config.ts+19−14

 import * as Context from "effect/Context";
+import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
 import * as Schema from "effect/Schema";
   readonly environment: ApnsEnvironment;
 }
-export interface RelayConfigurationShape {
-  readonly relayIssuer: string;
-  readonly apns: ApnsCredentials;
-  readonly clerkSecretKey: Redacted.Redacted<string>;
-  readonly clerkPublishableKey: string;
-  readonly clerkJwtAudience: string;
-  readonly apnsDeliveryJobSigningSecret: Redacted.Redacted<string>;
-  readonly cloudMintPrivateKey: Redacted.Redacted<string>;
-  readonly cloudMintPublicKey: string;
-  readonly managedEndpointBaseDomain: string | undefined;
-  readonly managedEndpointNamespace: string | undefined;
-}
 export class RelayConfiguration extends Context.Service<
   RelayConfiguration,
-  RelayConfigurationShape
+  {
+    readonly relayIssuer: string;
+    readonly apns: ApnsCredentials;
+    readonly clerkSecretKey: Redacted.Redacted<string>;
+    readonly clerkPublishableKey: string;
+    readonly clerkJwtAudience: string;
+    readonly apnsDeliveryJobSigningSecret: Redacted.Redacted<string>;
+    readonly cloudMintPrivateKey: Redacted.Redacted<string>;
+    readonly cloudMintPublicKey: string;
+    readonly managedEndpointBaseDomain: string | undefined;
+    readonly managedEndpointNamespace: string | undefined;
+  }
 >()("t3code-relay/Config/RelayConfiguration") {}
+export const make = (configuration: RelayConfiguration["Service"]) =>
+  RelayConfiguration.of(configuration);
+export const layer = (configuration: RelayConfiguration["Service"]) =>
+  Layer.succeed(RelayConfiguration, make(configuration));

infra/relay/src/agentActivity/AgentActivityPublisher.test.ts+2−2

@@ -66,8 +66,8 @@ function makeAgentActivityRows( · 65 unmodified lines
66	}	66	}
67		67
68	function makeEnvironmentLinks(	68	function makeEnvironmentLinks(
69	overrides: Partial<EnvironmentLinks.EnvironmentLinksShape> = {},	69	overrides: Partial<EnvironmentLinks.EnvironmentLinks["Service"]> = {},
70	): EnvironmentLinks.EnvironmentLinksShape {	70	): EnvironmentLinks.EnvironmentLinks["Service"] {
71	return {	71	return {
72	upsert: () => Effect.void,	72	upsert: () => Effect.void,
73	listUsersForEnvironment: () => Effect.succeed(["dev:julius"]),	73	listUsersForEnvironment: () => Effect.succeed(["dev:julius"]),

infra/relay/src/agentActivity/AgentActivityRows.ts+2−2

@@ -9,7 +9,7 @@ import * as Option from "effect/Option"; · 8 unmodified lines
9	import * as Schema from "effect/Schema";	9	import * as Schema from "effect/Schema";
10	import { and, desc, eq, isNull } from "drizzle-orm";	10	import { and, desc, eq, isNull } from "drizzle-orm";
11		11
12	import { RelayDb } from "../db.ts";	12	import * as RelayDb from "../db.ts";
13	import { relayAgentActivityRows, relayEnvironmentLinks } from "../persistence/schema.ts";	13	import { relayAgentActivityRows, relayEnvironmentLinks } from "../persistence/schema.ts";
14		14
15	export class AgentActivityRowUpsertPersistenceError extends Schema.TaggedErrorClass<AgentActivityRowUpsertPersistenceError>()(	15	export class AgentActivityRowUpsertPersistenceError extends Schema.TaggedErrorClass<AgentActivityRowUpsertPersistenceError>()(
@@ -70,7 +70,7 @@ const decodeRelayAgentActivityStateJson = Schema.decodeUnknownOption( · 54 unmodified lines
70	);	70	);
71		71
72	const make = Effect.gen(function* () {	72	const make = Effect.gen(function* () {
73	const db = yield* RelayDb;	73	const db = yield* RelayDb.RelayDb;
74		74
75	return AgentActivityRows.of({	75	return AgentActivityRows.of({
76	upsert: Effect.fn("relay.agent_activity_rows.upsert")(	76	upsert: Effect.fn("relay.agent_activity_rows.upsert")(

infra/relay/src/agentActivity/ApnsClient.ts+6−6

infra/relay/src/agentActivity/ApnsDeliveries.test.ts+2−2

@@ -153,7 +153,7 @@ function makeLayer(input: { · 152 unmodified lines
153	Parameters<LiveActivities.LiveActivitiesShape["invalidateDeliveryToken"]>[0]	153	Parameters<LiveActivities.LiveActivitiesShape["invalidateDeliveryToken"]>[0]
154	>;	154	>;
155	readonly currentTargets?: ReadonlyArray<LiveActivities.TargetRow>;	155	readonly currentTargets?: ReadonlyArray<LiveActivities.TargetRow>;
156	readonly config?: RelayConfiguration.RelayConfigurationShape;	156	readonly config?: RelayConfiguration.RelayConfiguration["Service"];
157	readonly execute?: (	157	readonly execute?: (
158	request: HttpClientRequest.HttpClientRequest,	158	request: HttpClientRequest.HttpClientRequest,
159	) => Effect.Effect<HttpClientResponse.HttpClientResponse>;	159	) => Effect.Effect<HttpClientResponse.HttpClientResponse>;
@@ -213,7 +213,7 @@ function makeLayer(input: { · 53 unmodified lines
213	input.invalidatedTokens?.push(invalidated);	213	input.invalidatedTokens?.push(invalidated);
214	}),	214	}),
215	}),	215	}),
216	Layer.succeed(RelayConfiguration.RelayConfiguration, input.config ?? config),	216	RelayConfiguration.layer(input.config ?? config),
217	input.execute	217	input.execute
218	? Layer.succeed(HttpClient.HttpClient, HttpClient.make(input.execute))	218	? Layer.succeed(HttpClient.HttpClient, HttpClient.make(input.execute))
219	: FetchHttpClient.layer,	219	: FetchHttpClient.layer,

infra/relay/src/agentActivity/DeliveryAttempts.test.ts+13−13

@@ -3,7 +3,7 @@ import { describe, expect, it } from "@effect/vitest"; · 2 unmodified lines
3	import * as Effect from "effect/Effect";	3	import * as Effect from "effect/Effect";
4	import * as Layer from "effect/Layer";	4	import * as Layer from "effect/Layer";
5		5
6	import { RelayDb, type RelayDatabase } from "../db.ts";	6	import * as RelayDb from "../db.ts";
7	import { relayDeliveryAttempts } from "../persistence/schema.ts";	7	import { relayDeliveryAttempts } from "../persistence/schema.ts";
8	import * as DeliveryAttempts from "./DeliveryAttempts.ts";	8	import * as DeliveryAttempts from "./DeliveryAttempts.ts";
9		9
@@ -20,7 +20,7 @@ describe("DeliveryAttempts", () => { · 10 unmodified lines
20	},	20	},
21	};	21	};
22	},	22	},
23	} as unknown as RelayDatabase;	23	} as unknown as RelayDb.RelayDb["Service"];
24		24
25	return Effect.gen(function* () {	25	return Effect.gen(function* () {
26	const attempts = yield* DeliveryAttempts.DeliveryAttempts;	26	const attempts = yield* DeliveryAttempts.DeliveryAttempts;
@@ -52,7 +52,7 @@ describe("DeliveryAttempts", () => { · 25 unmodified lines
52	Effect.provide(	52	Effect.provide(
53	DeliveryAttempts.layer.pipe(	53	DeliveryAttempts.layer.pipe(
54	Layer.provide(NodeCryptoLayer.layer),	54	Layer.provide(NodeCryptoLayer.layer),
55	Layer.provide(Layer.succeed(RelayDb, fakeDb)),	55	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
56	),	56	),
57	),	57	),
58	);	58	);
@@ -78,7 +78,7 @@ describe("DeliveryAttempts", () => { · 19 unmodified lines
78	},	78	},
79	};	79	};
80	},	80	},
81	} as unknown as RelayDatabase;	81	} as unknown as RelayDb.RelayDb["Service"];
82		82
83	return Effect.gen(function* () {	83	return Effect.gen(function* () {
84	const attempts = yield* DeliveryAttempts.DeliveryAttempts;	84	const attempts = yield* DeliveryAttempts.DeliveryAttempts;
@@ -104,7 +104,7 @@ describe("DeliveryAttempts", () => { · 19 unmodified lines
104	Effect.provide(	104	Effect.provide(
105	DeliveryAttempts.layer.pipe(	105	DeliveryAttempts.layer.pipe(
106	Layer.provide(NodeCryptoLayer.layer),	106	Layer.provide(NodeCryptoLayer.layer),
107	Layer.provide(Layer.succeed(RelayDb, fakeDb)),	107	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
108	),	108	),
109	),	109	),
110	);	110	);
@@ -135,7 +135,7 @@ describe("DeliveryAttempts", () => { · 24 unmodified lines
135	}),	135	}),
136	}),	136	}),
137	}),	137	}),
138	} as unknown as RelayDatabase;	138	} as unknown as RelayDb.RelayDb["Service"];
139		139
140	return Effect.gen(function* () {	140	return Effect.gen(function* () {
141	const attempts = yield* DeliveryAttempts.DeliveryAttempts;	141	const attempts = yield* DeliveryAttempts.DeliveryAttempts;
@@ -154,7 +154,7 @@ describe("DeliveryAttempts", () => { · 12 unmodified lines
154	Effect.provide(	154	Effect.provide(
155	DeliveryAttempts.layer.pipe(	155	DeliveryAttempts.layer.pipe(
156	Layer.provide(NodeCryptoLayer.layer),	156	Layer.provide(NodeCryptoLayer.layer),
157	Layer.provide(Layer.succeed(RelayDb, fakeDb)),	157	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
158	),	158	),
159	),	159	),
160	);	160	);
@@ -185,7 +185,7 @@ describe("DeliveryAttempts", () => { · 24 unmodified lines
185	}),	185	}),
186	}),	186	}),
187	}),	187	}),
188	} as unknown as RelayDatabase;	188	} as unknown as RelayDb.RelayDb["Service"];
189		189
190	return Effect.gen(function* () {	190	return Effect.gen(function* () {
191	const attempts = yield* DeliveryAttempts.DeliveryAttempts;	191	const attempts = yield* DeliveryAttempts.DeliveryAttempts;
@@ -204,7 +204,7 @@ describe("DeliveryAttempts", () => { · 12 unmodified lines
204	Effect.provide(	204	Effect.provide(
205	DeliveryAttempts.layer.pipe(	205	DeliveryAttempts.layer.pipe(
206	Layer.provide(NodeCryptoLayer.layer),	206	Layer.provide(NodeCryptoLayer.layer),
207	Layer.provide(Layer.succeed(RelayDb, fakeDb)),	207	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
208	),	208	),
209	),	209	),
210	);	210	);
@@ -246,7 +246,7 @@ describe("DeliveryAttempts", () => { · 35 unmodified lines
246	};	246	};
247	},	247	},
248	}),	248	}),
249	} as unknown as RelayDatabase;	249	} as unknown as RelayDb.RelayDb["Service"];
250		250
251	return Effect.gen(function* () {	251	return Effect.gen(function* () {
252	const attempts = yield* DeliveryAttempts.DeliveryAttempts;	252	const attempts = yield* DeliveryAttempts.DeliveryAttempts;
@@ -266,7 +266,7 @@ describe("DeliveryAttempts", () => { · 13 unmodified lines
266	Effect.provide(	266	Effect.provide(
267	DeliveryAttempts.layer.pipe(	267	DeliveryAttempts.layer.pipe(
268	Layer.provide(NodeCryptoLayer.layer),	268	Layer.provide(NodeCryptoLayer.layer),
269	Layer.provide(Layer.succeed(RelayDb, fakeDb)),	269	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
270	),	270	),
271	),	271	),
272	);	272	);
@@ -290,7 +290,7 @@ describe("DeliveryAttempts", () => { · 17 unmodified lines
290	},	290	},
291	};	291	};
292	},	292	},
293	} as unknown as RelayDatabase;	293	} as unknown as RelayDb.RelayDb["Service"];
294		294
295	return Effect.gen(function* () {	295	return Effect.gen(function* () {
296	const attempts = yield* DeliveryAttempts.DeliveryAttempts;	296	const attempts = yield* DeliveryAttempts.DeliveryAttempts;
@@ -315,7 +315,7 @@ describe("DeliveryAttempts", () => { · 18 unmodified lines
315	Effect.provide(	315	Effect.provide(
316	DeliveryAttempts.layer.pipe(	316	DeliveryAttempts.layer.pipe(
317	Layer.provide(NodeCryptoLayer.layer),	317	Layer.provide(NodeCryptoLayer.layer),
318	Layer.provide(Layer.succeed(RelayDb, fakeDb)),	318	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
319	),	319	),
320	),	320	),
321	);	321	);

infra/relay/src/agentActivity/DeliveryAttempts.ts+2−2

@@ -7,7 +7,7 @@ import { and, eq, isNull } from "drizzle-orm"; · 6 unmodified lines
7	import * as Crypto from "effect/Crypto";	7	import * as Crypto from "effect/Crypto";
8	import * as Schema from "effect/Schema";	8	import * as Schema from "effect/Schema";
9		9
10	import { RelayDb } from "../db.ts";	10	import * as RelayDb from "../db.ts";
11	import { relayDeliveryAttempts } from "../persistence/schema.ts";	11	import { relayDeliveryAttempts } from "../persistence/schema.ts";
12		12
13	export class DeliveryAttemptRecordPersistenceError extends Schema.TaggedErrorClass<DeliveryAttemptRecordPersistenceError>()(	13	export class DeliveryAttemptRecordPersistenceError extends Schema.TaggedErrorClass<DeliveryAttemptRecordPersistenceError>()(
@@ -84,7 +84,7 @@ function insertValues( · 70 unmodified lines
84	}	84	}
85		85
86	const make = Effect.gen(function* () {	86	const make = Effect.gen(function* () {
87	const db = yield* RelayDb;	87	const db = yield* RelayDb.RelayDb;
88	const crypto = yield* Crypto.Crypto;	88	const crypto = yield* Crypto.Crypto;
89		89
90	const isExpiredClaim = (claimedAt: string \| null, now: DateTime.DateTime) => {	90	const isExpiredClaim = (claimedAt: string \| null, now: DateTime.DateTime) => {

infra/relay/src/agentActivity/Devices.test.ts+13−7

 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { RelayDb, type RelayDatabase } from "../db.ts";
+import * as RelayDb from "../db.ts";
 import { relayLiveActivities, relayMobileDevices } from "../persistence/schema.ts";
 import * as Devices from "./Devices.ts";
           },
         };
       },
-    } as unknown as RelayDatabase;
+    } as unknown as RelayDb.RelayDb["Service"];
     return Effect.gen(function* () {
       const devices = yield* Devices.Devices;
           pushToStartToken: "push-to-start-token",
         }),
       ]);
-    }).pipe(Effect.provide(Devices.layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))));
+    }).pipe(
+      Effect.provide(Devices.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)))),
+    );
   });
   it.effect("unregisters APNs state only for the current user device", () => {
           },
         };
       },
-    } as unknown as RelayDatabase;
+    } as unknown as RelayDb.RelayDb["Service"];
     return Effect.gen(function* () {
       const devices = yield* Devices.Devices;
           params: ["user-2", "device-1"],
         },
       ]);
-    }).pipe(Effect.provide(Devices.layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))));
+    }).pipe(
+      Effect.provide(Devices.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)))),
+    );
   });
   it.effect("lists safe notification state without exposing APNs tokens", () => {
           };
         },
       }),
-    } as unknown as RelayDatabase;
+    } as unknown as RelayDb.RelayDb["Service"];
     return Effect.gen(function* () {
       const devices = yield* Devices.Devices;
           updatedAt: "2026-06-01T00:00:00.000Z",
         },
       ]);
-    }).pipe(Effect.provide(Devices.layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))));
+    }).pipe(
+      Effect.provide(Devices.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)))),
+    );
   });
 });

infra/relay/src/agentActivity/Devices.ts+2−2

@@ -10,7 +10,7 @@ import * as Schema from "effect/Schema"; · 9 unmodified lines
10	import { and, eq } from "drizzle-orm";	10	import { and, eq } from "drizzle-orm";
11	import { sql } from "drizzle-orm";	11	import { sql } from "drizzle-orm";
12		12
13	import { RelayDb } from "../db.ts";	13	import * as RelayDb from "../db.ts";
14	import { relayLiveActivities, relayMobileDevices } from "../persistence/schema.ts";	14	import { relayLiveActivities, relayMobileDevices } from "../persistence/schema.ts";
15		15
16	export class DeviceRegistrationPersistenceError extends Schema.TaggedErrorClass<DeviceRegistrationPersistenceError>()(	16	export class DeviceRegistrationPersistenceError extends Schema.TaggedErrorClass<DeviceRegistrationPersistenceError>()(
@@ -59,7 +59,7 @@ export class Devices extends Context.Service<Devices, DevicesShape>()( · 42 unmodified lines
59	) {}	59	) {}
60		60
61	const make = Effect.gen(function* () {	61	const make = Effect.gen(function* () {
62	const db = yield* RelayDb;	62	const db = yield* RelayDb.RelayDb;
63		63
64	return Devices.of({	64	return Devices.of({
65	register: Effect.fn("relay.devices.register")(	65	register: Effect.fn("relay.devices.register")(

infra/relay/src/agentActivity/LiveActivities.test.ts+9−5

 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { RelayDb, type RelayDatabase } from "../db.ts";
+import * as RelayDb from "../db.ts";
 import { relayLiveActivities } from "../persistence/schema.ts";
 import * as LiveActivities from "./LiveActivities.ts";
             },
           };
         },
-      } as unknown as RelayDatabase;
+      } as unknown as RelayDb.RelayDb["Service"];
       return Effect.gen(function* () {
         const liveActivities = yield* LiveActivities.LiveActivities;
           }),
         );
       }).pipe(
-        Effect.provide(LiveActivities.layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))),
+        Effect.provide(
+          LiveActivities.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb))),
+        ),
       );
     },
   );
           },
         };
       },
-    } as unknown as RelayDatabase;
+    } as unknown as RelayDb.RelayDb["Service"];
     return Effect.gen(function* () {
       const liveActivities = yield* LiveActivities.LiveActivities;
         }),
       );
     }).pipe(
-      Effect.provide(LiveActivities.layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))),
+      Effect.provide(
+        LiveActivities.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb))),
+      ),
     );
   });
 });

infra/relay/src/agentActivity/LiveActivities.ts+2−2

@@ -12,7 +12,7 @@ import * as Layer from "effect/Layer"; · 11 unmodified lines
12	import * as Schema from "effect/Schema";	12	import * as Schema from "effect/Schema";
13	import { and, eq, sql } from "drizzle-orm";	13	import { and, eq, sql } from "drizzle-orm";
14		14
15	import { RelayDb } from "../db.ts";	15	import * as RelayDb from "../db.ts";
16	import { relayLiveActivities, relayMobileDevices } from "../persistence/schema.ts";	16	import { relayLiveActivities, relayMobileDevices } from "../persistence/schema.ts";
17		17
18	export class LiveActivityRegistrationPersistenceError extends Schema.TaggedErrorClass<LiveActivityRegistrationPersistenceError>()(	18	export class LiveActivityRegistrationPersistenceError extends Schema.TaggedErrorClass<LiveActivityRegistrationPersistenceError>()(
@@ -108,7 +108,7 @@ const encodeRelayAgentActivityAggregateStateJson = Schema.encodeEffect( · 89 unmodified lines
108	);	108	);
109		109
110	const make = Effect.gen(function* () {	110	const make = Effect.gen(function* () {
111	const db = yield* RelayDb;	111	const db = yield* RelayDb.RelayDb;
112		112
113	return LiveActivities.of({	113	return LiveActivities.of({
114	register: Effect.fn("relay.live_activities.register")(	114	register: Effect.fn("relay.live_activities.register")(

infra/relay/src/agentActivity/MobileRegistrations.test.ts+3−3

@@ -86,8 +86,8 @@ function makeAgentActivityRows( · 85 unmodified lines
86	}	86	}
87		87
88	function makeEnvironmentLinks(	88	function makeEnvironmentLinks(
89	overrides: Partial<EnvironmentLinks.EnvironmentLinksShape> = {},	89	overrides: Partial<EnvironmentLinks.EnvironmentLinks["Service"]> = {},
90	): EnvironmentLinks.EnvironmentLinksShape {	90	): EnvironmentLinks.EnvironmentLinks["Service"] {
91	return {	91	return {
92	upsert: () => Effect.void,	92	upsert: () => Effect.void,
93	listUsersForEnvironment: () => Effect.succeed(["dev:julius"]),	93	listUsersForEnvironment: () => Effect.succeed(["dev:julius"]),
@@ -153,7 +153,7 @@ function makeRegistrationReplayLayer(input: { · 59 unmodified lines
153	Layer.succeed(EnvironmentLinks.EnvironmentLinks, makeEnvironmentLinks()),	153	Layer.succeed(EnvironmentLinks.EnvironmentLinks, makeEnvironmentLinks()),
154	Layer.succeed(LiveActivities.LiveActivities, input.liveActivities),	154	Layer.succeed(LiveActivities.LiveActivities, input.liveActivities),
155	Layer.succeed(DeliveryAttempts.DeliveryAttempts, makeDeliveryAttempts()),	155	Layer.succeed(DeliveryAttempts.DeliveryAttempts, makeDeliveryAttempts()),
156	Layer.succeed(RelayConfiguration.RelayConfiguration, config),	156	RelayConfiguration.layer(config),
157	Layer.succeed(ApnsDeliveryQueue.ApnsDeliveryQueueSender, {	157	Layer.succeed(ApnsDeliveryQueue.ApnsDeliveryQueueSender, {
158	send: (body) =>	158	send: (body) =>
159	Effect.sync(() => {	159	Effect.sync(() => {

infra/relay/src/auth/DpopProofs.test.ts+9−5

 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import { RelayDb, type RelayDatabase } from "../db.ts";
+import * as RelayDb from "../db.ts";
 import { relayDpopProofs } from "../persistence/schema.ts";
 import * as DpopProofs from "./DpopProofs.ts";
           },
         };
       },
-    } as unknown as RelayDatabase;
+    } as unknown as RelayDb.RelayDb["Service"];
     return Effect.gen(function* () {
       const replay = yield* DpopProofs.DpopProofReplay;
           expiresAt: "2026-05-25T12:00:00.000Z",
         },
       ]);
-    }).pipe(Effect.provide(DpopProofs.layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))));
+    }).pipe(
+      Effect.provide(DpopProofs.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)))),
+    );
   });
   it.effect("prunes expired proof rows from the maintenance path", () => {
           },
         };
       },
-    } as unknown as RelayDatabase;
+    } as unknown as RelayDb.RelayDb["Service"];
     return Effect.gen(function* () {
       const replay = yield* DpopProofs.DpopProofReplay;
       yield* replay.pruneExpired;
       expect(calls).toEqual(["delete", "delete.where"]);
-    }).pipe(Effect.provide(DpopProofs.layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))));
+    }).pipe(
+      Effect.provide(DpopProofs.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)))),
+    );
   });
 });

infra/relay/src/auth/DpopProofs.ts+25−28

@@ -7,7 +7,7 @@ import * as HttpApiError from "effect/unstable/httpapi/HttpApiError"; · 6 unmodified lines
7	import { lt } from "drizzle-orm";	7	import { lt } from "drizzle-orm";
8		8
9	import { verifyDpopProof } from "@t3tools/shared/dpop";	9	import { verifyDpopProof } from "@t3tools/shared/dpop";
10	import { RelayDb } from "../db.ts";	10	import * as RelayDb from "../db.ts";
11	import { relayDpopProofs } from "../persistence/schema.ts";	11	import { relayDpopProofs } from "../persistence/schema.ts";
12		12
13	export class DpopProofReplayPersistenceError extends Schema.TaggedErrorClass<DpopProofReplayPersistenceError>()(	13	export class DpopProofReplayPersistenceError extends Schema.TaggedErrorClass<DpopProofReplayPersistenceError>()(
@@ -21,34 +21,31 @@ export class DpopProofReplayPersistenceError extends Schema.TaggedErrorClass<Dpo · 7 unmodified lines
21	}	21	}
22	}	22	}
23		23
24	export interface DpopProofReplayShape {	24	export class DpopProofReplay extends Context.Service<
25	readonly verifyAndConsume: (input: {	25	DpopProofReplay,
26	readonly proof: string \| undefined;	26	{
27	readonly method: string;	27	readonly verifyAndConsume: (input: {
28	readonly url: string;	28	readonly proof: string \| undefined;
29	readonly expectedThumbprint?: string;	29	readonly method: string;
30	readonly expectedAccessToken?: string;	30	readonly url: string;
31	readonly now: DateTime.DateTime;	31	readonly expectedThumbprint?: string;
32	}) => Effect.Effect<string, HttpApiError.Unauthorized \| DpopProofReplayPersistenceError>;	32	readonly expectedAccessToken?: string;
33		33	readonly now: DateTime.DateTime;
34	readonly consume: (input: {	34	}) => Effect.Effect<string, HttpApiError.Unauthorized \| DpopProofReplayPersistenceError>;
35	readonly thumbprint: string;	35	readonly consume: (input: {
36	readonly jti: string;	36	readonly thumbprint: string;
37	readonly iat: number;	37	readonly jti: string;
38	readonly expiresAt: DateTime.DateTime;	38	readonly iat: number;
39	}) => Effect.Effect<boolean, DpopProofReplayPersistenceError>;	39	readonly expiresAt: DateTime.DateTime;
40		40	}) => Effect.Effect<boolean, DpopProofReplayPersistenceError>;
41	readonly pruneExpired: Effect.Effect<void, DpopProofReplayPersistenceError>;	41	readonly pruneExpired: Effect.Effect<void, DpopProofReplayPersistenceError>;
42	}	42	}
43		43	>()("t3code-relay/auth/DpopProofs/DpopProofReplay") {}
44	export class DpopProofReplay extends Context.Service<DpopProofReplay, DpopProofReplayShape>()(
45	"t3code-relay/auth/DpopProofs/DpopProofReplay",
46	) {}
47		44
48	const make = Effect.gen(function* () {	45	const make = Effect.gen(function* () {
49	const db = yield* RelayDb;	46	const db = yield* RelayDb.RelayDb;
50		47
51	const consume: DpopProofReplayShape["consume"] = Effect.fn("relay.dpop_proofs.consume")(	48	const consume: DpopProofReplay["Service"]["consume"] = Effect.fn("relay.dpop_proofs.consume")(
52	function* (input) {	49	function* (input) {
53	const createdAt = DateTime.formatIso(yield* DateTime.now);	50	const createdAt = DateTime.formatIso(yield* DateTime.now);
54	const inserted = yield* db	51	const inserted = yield* db
@@ -67,7 +64,7 @@ const make = Effect.gen(function* () { · 12 unmodified lines
67	Effect.mapError((cause) => new DpopProofReplayPersistenceError({ cause })),	64	Effect.mapError((cause) => new DpopProofReplayPersistenceError({ cause })),
68	);	65	);
69		66
70	const verifyAndConsume: DpopProofReplayShape["verifyAndConsume"] = Effect.fn(	67	const verifyAndConsume: DpopProofReplay["Service"]["verifyAndConsume"] = Effect.fn(
71	"relay.dpop_proofs.verify_and_consume",	68	"relay.dpop_proofs.verify_and_consume",
72	)(function* (input) {	69	)(function* (input) {
73	yield* Effect.annotateCurrentSpan({	70	yield* Effect.annotateCurrentSpan({
@@ -114,7 +111,7 @@ const make = Effect.gen(function* () { · 40 unmodified lines
114	return result.thumbprint;	111	return result.thumbprint;
115	});	112	});
116		113
117	const pruneExpired: DpopProofReplayShape["pruneExpired"] = Effect.gen(function* () {	114	const pruneExpired: DpopProofReplay["Service"]["pruneExpired"] = Effect.gen(function* () {
118	const now = DateTime.formatIso(yield* DateTime.now);	115	const now = DateTime.formatIso(yield* DateTime.now);
119	yield* Effect.annotateCurrentSpan({ "relay.dpop_prune.before": now });	116	yield* Effect.annotateCurrentSpan({ "relay.dpop_prune.before": now });
120	yield* db.delete(relayDpopProofs).where(lt(relayDpopProofs.expiresAt, now));	117	yield* db.delete(relayDpopProofs).where(lt(relayDpopProofs.expiresAt, now));

infra/relay/src/auth/DpopProofs.verifyAndConsume.test.ts+3−3

@@ -10,7 +10,7 @@ import * as DateTime from "effect/DateTime"; · 9 unmodified lines
10	import * as Effect from "effect/Effect";	10	import * as Effect from "effect/Effect";
11	import * as Layer from "effect/Layer";	11	import * as Layer from "effect/Layer";
12		12
13	import { RelayDb, type RelayDatabase } from "../db.ts";	13	import * as RelayDb from "../db.ts";
14	import { relayDpopProofs } from "../persistence/schema.ts";	14	import { relayDpopProofs } from "../persistence/schema.ts";
15	import * as DpopProofs from "./DpopProofs.ts";	15	import * as DpopProofs from "./DpopProofs.ts";
16		16
@@ -78,8 +78,8 @@ function layer( · 61 unmodified lines
78	}),	78	}),
79	};	79	};
80	},	80	},
81	} as unknown as RelayDatabase;	81	} as unknown as RelayDb.RelayDb["Service"];
82	return DpopProofs.layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)));	82	return DpopProofs.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)));
83	}	83	}
84		84
85	function consumeEachProofOnce() {	85	function consumeEachProofOnce() {

infra/relay/src/auth/RelayTokens.test.ts+1−3

@@ -33,9 +33,7 @@ const config = RelayConfiguration.RelayConfiguration.of({ · 32 unmodified lines
33	managedEndpointNamespace: undefined,	33	managedEndpointNamespace: undefined,
34	});	34	});
35		35
36	const layer = RelayTokens.layer.pipe(	36	const layer = RelayTokens.layer.pipe(Layer.provide(RelayConfiguration.layer(config)));
37	Layer.provide(Layer.succeed(RelayConfiguration.RelayConfiguration, config)),
38	);
39		37
40	describe("RelayTokens", () => {	38	describe("RelayTokens", () => {
41	it.effect("issues a user-bound environment link challenge", () =>	39	it.effect("issues a user-bound environment link challenge", () =>

infra/relay/src/auth/RelayTokens.ts+36−37

@@ -93,45 +93,44 @@ function resolveDpopAccessTokenScopes(input: { · 92 unmodified lines
93	});	93	});
94	}	94	}
95		95
96	export interface RelayTokensShape {	96	export class RelayTokens extends Context.Service<
97	readonly resolveDpopAccessTokenScopes: typeof resolveDpopAccessTokenScopes;	97	RelayTokens,
98	readonly issueLinkChallenge: (input: {	98	{
99	readonly userId: string;	99	readonly resolveDpopAccessTokenScopes: typeof resolveDpopAccessTokenScopes;
100	readonly request: RelayEnvironmentLinkChallengeRequest;	100	readonly issueLinkChallenge: (input: {
101	readonly jti: string;	101	readonly userId: string;
102	readonly issuedAtEpochSeconds: number;	102	readonly request: RelayEnvironmentLinkChallengeRequest;
103	readonly expiresAtEpochSeconds: number;	103	readonly jti: string;
104	}) => Effect.Effect<string, RelayJwtError>;	104	readonly issuedAtEpochSeconds: number;
105	readonly verifyLinkChallenge: (input: {	105	readonly expiresAtEpochSeconds: number;
106	readonly token: string;	106	}) => Effect.Effect<string, RelayJwtError>;
107	readonly userId: string;	107	readonly verifyLinkChallenge: (input: {
108	readonly request: RelayEnvironmentLinkChallengeRequest;	108	readonly token: string;
109	readonly nowEpochSeconds: number;	109	readonly userId: string;
110	}) => Effect.Effect<LinkChallengeClaims \| null>;	110	readonly request: RelayEnvironmentLinkChallengeRequest;
111	readonly issueDpopAccessToken: (input: {	111	readonly nowEpochSeconds: number;
112	readonly userId: string;	112	}) => Effect.Effect<LinkChallengeClaims \| null>;
113	readonly proofKeyThumbprint: string;	113	readonly issueDpopAccessToken: (input: {
114	readonly jti: string;	114	readonly userId: string;
115	readonly issuedAtEpochSeconds: number;	115	readonly proofKeyThumbprint: string;
116	readonly expiresAtEpochSeconds: number;	116	readonly jti: string;
117	readonly clientId: RelayPublicClientId;	117	readonly issuedAtEpochSeconds: number;
118	readonly scopes: ReadonlyArray<RelayDpopAccessTokenScope>;	118	readonly expiresAtEpochSeconds: number;
119	}) => Effect.Effect<string, RelayJwtError>;	119	readonly clientId: RelayPublicClientId;
120	readonly verifyDpopAccessToken: (input: {	120	readonly scopes: ReadonlyArray<RelayDpopAccessTokenScope>;
121	readonly token: string;	121	}) => Effect.Effect<string, RelayJwtError>;
122	readonly nowEpochSeconds: number;	122	readonly verifyDpopAccessToken: (input: {
123	}) => Effect.Effect<RelayDpopAccessTokenClaims \| null>;	123	readonly token: string;
124	}	124	readonly nowEpochSeconds: number;
125		125	}) => Effect.Effect<RelayDpopAccessTokenClaims \| null>;
126	export class RelayTokens extends Context.Service<RelayTokens, RelayTokensShape>()(	126	}
127	"t3code-relay/auth/RelayTokens",	127	>()("t3code-relay/auth/RelayTokens") {}
128	) {}
129		128
130	const make = Effect.gen(function* () {	129	const make = Effect.gen(function* () {
131	const config = yield* RelayConfiguration.RelayConfiguration;	130	const config = yield* RelayConfiguration.RelayConfiguration;
132	const issuer = normalizeRelayIssuer(config.relayIssuer);	131	const issuer = normalizeRelayIssuer(config.relayIssuer);
133		132
134	const issueLinkChallenge: RelayTokensShape["issueLinkChallenge"] = Effect.fn(	133	const issueLinkChallenge: RelayTokens["Service"]["issueLinkChallenge"] = Effect.fn(
135	"relay.tokens.issue_link_challenge",	134	"relay.tokens.issue_link_challenge",
136	)(function* (input) {	135	)(function* (input) {
137	return yield* signRelayJwt({	136	return yield* signRelayJwt({
@@ -150,7 +149,7 @@ const make = Effect.gen(function* () { · 12 unmodified lines
150	});	149	});
151	});	150	});
152		151
153	const verifyLinkChallenge: RelayTokensShape["verifyLinkChallenge"] = Effect.fn(	152	const verifyLinkChallenge: RelayTokens["Service"]["verifyLinkChallenge"] = Effect.fn(
154	"relay.tokens.verify_link_challenge",	153	"relay.tokens.verify_link_challenge",
155	)((input) =>	154	)((input) =>
156	verifyRelayJwt({	155	verifyRelayJwt({
@@ -177,7 +176,7 @@ const make = Effect.gen(function* () { · 20 unmodified lines
177	),	176	),
178	);	177	);
179		178
180	const issueDpopAccessToken: RelayTokensShape["issueDpopAccessToken"] = Effect.fn(	179	const issueDpopAccessToken: RelayTokens["Service"]["issueDpopAccessToken"] = Effect.fn(
181	"relay.tokens.issue_dpop_access_token",	180	"relay.tokens.issue_dpop_access_token",
182	)(function* (input) {	181	)(function* (input) {
183	return yield* signRelayJwt({	182	return yield* signRelayJwt({
@@ -197,7 +196,7 @@ const make = Effect.gen(function* () { · 13 unmodified lines
197	});	196	});
198	});	197	});
199		198
200	const verifyDpopAccessToken: RelayTokensShape["verifyDpopAccessToken"] = Effect.fn(	199	const verifyDpopAccessToken: RelayTokens["Service"]["verifyDpopAccessToken"] = Effect.fn(
201	"relay.tokens.verify_dpop_access_token",	200	"relay.tokens.verify_dpop_access_token",
202	)((input) =>	201	)((input) =>
203	verifyRelayJwt({	202	verifyRelayJwt({

infra/relay/src/db.ts+6−5

@@ -10,11 +10,12 @@ import * as Effect from "effect/Effect"; · 9 unmodified lines
10		10
11	import { relayDatabaseMode } from "./dbConfig.ts";	11	import { relayDatabaseMode } from "./dbConfig.ts";
12		12
13	export interface RelayDatabase extends EffectPgDatabase {	13	export class RelayDb extends Context.Service<
14	readonly $client: PgClient;	14	RelayDb,
15	}	15	EffectPgDatabase & {
16		16	readonly $client: PgClient;
17	export class RelayDb extends Context.Service<RelayDb, RelayDatabase>()("t3code-relay/db/RelayDb") {}	17	}
		18	>()("t3code-relay/db/RelayDb") {}
18		19
19	export const PlanetscaleDatabase = Effect.gen(function* () {	20	export const PlanetscaleDatabase = Effect.gen(function* () {
20	const { stage } = yield* Alchemy.Stack;	21	const { stage } = yield* Alchemy.Stack;

infra/relay/src/environments/EnvironmentConnector.test.ts+5−5

@@ -161,8 +161,8 @@ function connectorTestLayer( · 160 unmodified lines
161	request: HttpClientRequest.HttpClientRequest,	161	request: HttpClientRequest.HttpClientRequest,
162	) => Effect.Effect<HttpClientResponse.HttpClientResponse>,	162	) => Effect.Effect<HttpClientResponse.HttpClientResponse>,
163	options?: {	163	options?: {
164	readonly links?: EnvironmentLinks.EnvironmentLinksShape;	164	readonly links?: EnvironmentLinks.EnvironmentLinks["Service"];
165	readonly allocations?: ManagedEndpointAllocations.ManagedEndpointAllocationsShape;	165	readonly allocations?: ManagedEndpointAllocations.ManagedEndpointAllocations["Service"];
166	},	166	},
167	) {	167	) {
168	return EnvironmentConnector.layer.pipe(	168	return EnvironmentConnector.layer.pipe(
@@ -174,7 +174,7 @@ function connectorTestLayer( · 5 unmodified lines
174	options?.allocations ?? makeAllocations(),	174	options?.allocations ?? makeAllocations(),
175	),	175	),
176	),	176	),
177	Layer.provide(Layer.succeed(RelayConfiguration.RelayConfiguration, settings)),	177	Layer.provide(RelayConfiguration.layer(settings)),
178	Layer.provide(Layer.succeed(HttpClient.HttpClient, HttpClient.make(execute))),	178	Layer.provide(Layer.succeed(HttpClient.HttpClient, HttpClient.make(execute))),
179	);	179	);
180	}	180	}
@@ -189,7 +189,7 @@ function makeAllocations( · 8 unmodified lines
189	dnsRecordId: "dns-record-id",	189	dnsRecordId: "dns-record-id",
190	readyAt: "2026-05-25T00:00:00.000Z",	190	readyAt: "2026-05-25T00:00:00.000Z",
191	},	191	},
192	): ManagedEndpointAllocations.ManagedEndpointAllocationsShape {	192	): ManagedEndpointAllocations.ManagedEndpointAllocations["Service"] {
193	return {	193	return {
194	get: () => Effect.succeed(allocation),	194	get: () => Effect.succeed(allocation),
195	reserve: () => Effect.die("unused"),	195	reserve: () => Effect.die("unused"),
@@ -202,7 +202,7 @@ function makeAllocations( · 6 unmodified lines
202		202
203	function makeLinks(	203	function makeLinks(
204	overrides: Partial<EnvironmentLinks.RelayLinkedEnvironmentRecord> = {},	204	overrides: Partial<EnvironmentLinks.RelayLinkedEnvironmentRecord> = {},
205	): EnvironmentLinks.EnvironmentLinksShape {	205	): EnvironmentLinks.EnvironmentLinks["Service"] {
206	return {	206	return {
207	upsert: () => Effect.void,	207	upsert: () => Effect.void,
208	listUsersForEnvironment: () => Effect.succeed([]),	208	listUsersForEnvironment: () => Effect.succeed([]),

infra/relay/src/environments/EnvironmentConnector.ts+15−15

 import * as Option from "effect/Option";
 import * as Redacted from "effect/Redacted";
 import * as Schema from "effect/Schema";
-import { FetchHttpClient, HttpClient, HttpClientError } from "effect/unstable/http";
+import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
+import * as HttpClient from "effect/unstable/http/HttpClient";
+import * as HttpClientError from "effect/unstable/http/HttpClientError";
 import * as EnvironmentLinks from "./EnvironmentLinks.ts";
 import * as ManagedEndpointAllocations from "./ManagedEndpointAllocations.ts";
 export const ENVIRONMENT_MINT_REQUEST_TIMEOUT_MS = 10_000;
 const ENVIRONMENT_HEALTH_CLOCK_SKEW_MILLIS = 60 * 1_000;
-export interface EnvironmentConnectorShape {
-  readonly connect: (input: {
-    readonly userId: string;
-    readonly environmentId: string;
-    readonly clientProofKeyThumbprint: string;
-    readonly deviceId?: string;
-  }) => Effect.Effect<RelayEnvironmentConnectResponse, EnvironmentConnectorError>;
-  readonly status: (input: {
-    readonly userId: string;
-    readonly environmentId: string;
-  }) => Effect.Effect<RelayEnvironmentStatusResponse, EnvironmentConnectorError>;
-}
 export class EnvironmentConnector extends Context.Service<
   EnvironmentConnector,
-  EnvironmentConnectorShape
+  {
+    readonly connect: (input: {
+      readonly userId: string;
+      readonly environmentId: string;
+      readonly clientProofKeyThumbprint: string;
+      readonly deviceId?: string;
+    }) => Effect.Effect<RelayEnvironmentConnectResponse, EnvironmentConnectorError>;
+    readonly status: (input: {
+      readonly userId: string;
+      readonly environmentId: string;
+    }) => Effect.Effect<RelayEnvironmentStatusResponse, EnvironmentConnectorError>;
+  }
 >()("t3code-relay/environments/EnvironmentConnector") {}
 const decodeMintResponseProof = Schema.decodeUnknownEffect(

infra/relay/src/environments/EnvironmentCredentials.test.ts+5−5

@@ -4,7 +4,7 @@ import { PgDialect, QueryBuilder } from "drizzle-orm/pg-core"; · 3 unmodified lines
4	import * as Effect from "effect/Effect";	4	import * as Effect from "effect/Effect";
5	import * as Layer from "effect/Layer";	5	import * as Layer from "effect/Layer";
6		6
7	import { RelayDb, type RelayDatabase } from "../db.ts";	7	import * as RelayDb from "../db.ts";
8	import { relayEnvironmentCredentials } from "../persistence/schema.ts";	8	import { relayEnvironmentCredentials } from "../persistence/schema.ts";
9	import * as EnvironmentCredentials from "./EnvironmentCredentials.ts";	9	import * as EnvironmentCredentials from "./EnvironmentCredentials.ts";
10		10
@@ -47,7 +47,7 @@ describe("EnvironmentCredentials", () => { · 36 unmodified lines
47	}),	47	}),
48	};	48	};
49	},	49	},
50	} as unknown as RelayDatabase;	50	} as unknown as RelayDb.RelayDb["Service"];
51		51
52	return Effect.gen(function* () {	52	return Effect.gen(function* () {
53	const credentials = yield* EnvironmentCredentials.EnvironmentCredentials;	53	const credentials = yield* EnvironmentCredentials.EnvironmentCredentials;
@@ -87,7 +87,7 @@ describe("EnvironmentCredentials", () => { · 33 unmodified lines
87	Effect.provide(	87	Effect.provide(
88	EnvironmentCredentials.layer.pipe(	88	EnvironmentCredentials.layer.pipe(
89	Layer.provide(NodeCryptoLayer.layer),	89	Layer.provide(NodeCryptoLayer.layer),
90	Layer.provide(Layer.succeed(RelayDb, fakeDb)),	90	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
91	),	91	),
92	),	92	),
93	);	93	);
@@ -118,7 +118,7 @@ describe("EnvironmentCredentials", () => { · 24 unmodified lines
118	},	118	},
119	};	119	};
120	},	120	},
121	} as unknown as RelayDatabase;	121	} as unknown as RelayDb.RelayDb["Service"];
122		122
123	return Effect.gen(function* () {	123	return Effect.gen(function* () {
124	const credentials = yield* EnvironmentCredentials.EnvironmentCredentials;	124	const credentials = yield* EnvironmentCredentials.EnvironmentCredentials;
@@ -150,7 +150,7 @@ describe("EnvironmentCredentials", () => { · 25 unmodified lines
150	Effect.provide(	150	Effect.provide(
151	EnvironmentCredentials.layer.pipe(	151	EnvironmentCredentials.layer.pipe(
152	Layer.provide(NodeCryptoLayer.layer),	152	Layer.provide(NodeCryptoLayer.layer),
153	Layer.provide(Layer.succeed(RelayDb, fakeDb)),	153	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
154	),	154	),
155	),	155	),
156	);	156	);

infra/relay/src/environments/EnvironmentCredentials.ts+18−20

 import * as Schema from "effect/Schema";
 import { and, eq, isNull, ne, notExists } from "drizzle-orm";
-import { RelayDb } from "../db.ts";
+import * as RelayDb from "../db.ts";
 import { relayEnvironmentCredentials, relayEnvironmentLinks } from "../persistence/schema.ts";
 export class EnvironmentCredentialCreatePersistenceError extends Schema.TaggedErrorClass<EnvironmentCredentialCreatePersistenceError>()(
   readonly environmentPublicKey: string;
 }
-export interface EnvironmentCredentialsShape {
-  readonly create: (input: {
-    readonly environmentId: string;
-    readonly environmentPublicKey: string;
-  }) => Effect.Effect<string, EnvironmentCredentialCreatePersistenceError>;
-  readonly authenticate: (
-    token: string,
-  ) => Effect.Effect<
-    Option.Option<EnvironmentCredentialPrincipal>,
-    EnvironmentCredentialAuthenticatePersistenceError
-  >;
-  readonly revokeForEnvironmentPublicKey: (input: {
-    readonly environmentId: string;
-    readonly environmentPublicKey: string;
-  }) => Effect.Effect<boolean, EnvironmentCredentialRevokePersistenceError>;
-}
 export class EnvironmentCredentials extends Context.Service<
   EnvironmentCredentials,
-  EnvironmentCredentialsShape
+  {
+    readonly create: (input: {
+      readonly environmentId: string;
+      readonly environmentPublicKey: string;
+    }) => Effect.Effect<string, EnvironmentCredentialCreatePersistenceError>;
+    readonly authenticate: (
+      token: string,
+    ) => Effect.Effect<
+      Option.Option<EnvironmentCredentialPrincipal>,
+      EnvironmentCredentialAuthenticatePersistenceError
+    >;
+    readonly revokeForEnvironmentPublicKey: (input: {
+      readonly environmentId: string;
+      readonly environmentPublicKey: string;
+    }) => Effect.Effect<boolean, EnvironmentCredentialRevokePersistenceError>;
+  }
 >()("t3code-relay/environments/EnvironmentCredentials") {}
 const make = Effect.gen(function* () {
-  const db = yield* RelayDb;
+  const db = yield* RelayDb.RelayDb;
   const crypto = yield* Crypto.Crypto;
   const hashToken = (token: string) =>
     crypto

infra/relay/src/environments/EnvironmentLinker.test.ts+3−3

@@ -105,14 +105,14 @@ const makeRequest = Effect.gen(function* () { · 104 unmodified lines
105	});	105	});
106		106
107	function testLayer(input?: {	107	function testLayer(input?: {
108	readonly upsert?: EnvironmentLinks.EnvironmentLinksShape["upsert"];	108	readonly upsert?: EnvironmentLinks.EnvironmentLinks["Service"]["upsert"];
109	readonly consume?: DpopProofs.DpopProofReplayShape["consume"];	109	readonly consume?: DpopProofs.DpopProofReplay["Service"]["consume"];
110	}) {	110	}) {
111	return EnvironmentLinker.layer.pipe(	111	return EnvironmentLinker.layer.pipe(
112	Layer.provideMerge(RelayTokens.layer),	112	Layer.provideMerge(RelayTokens.layer),
113	Layer.provide(	113	Layer.provide(
114	Layer.mergeAll(	114	Layer.mergeAll(
115	Layer.succeed(RelayConfiguration.RelayConfiguration, config),	115	RelayConfiguration.layer(config),
116	Layer.succeed(DpopProofs.DpopProofReplay, {	116	Layer.succeed(DpopProofs.DpopProofReplay, {
117	verifyAndConsume: () => Effect.die("unexpected DPoP proof verification"),	117	verifyAndConsume: () => Effect.die("unexpected DPoP proof verification"),
118	consume: input?.consume ?? (() => Effect.succeed(true)),	118	consume: input?.consume ?? (() => Effect.succeed(true)),

infra/relay/src/environments/EnvironmentLinker.ts+19−20

@@ -53,26 +53,25 @@ export type EnvironmentLinkError = · 52 unmodified lines
53	\| EnvironmentCredentials.EnvironmentCredentialCreatePersistenceError	53	\| EnvironmentCredentials.EnvironmentCredentialCreatePersistenceError
54	\| ManagedEndpointProvider.ManagedEndpointProviderError;	54	\| ManagedEndpointProvider.ManagedEndpointProviderError;
55		55
56	export interface EnvironmentLinkerShape {	56	export class EnvironmentLinker extends Context.Service<
57	readonly link: (input: {	57	EnvironmentLinker,
58	readonly userId: string;	58	{
59	readonly request: RelayEnvironmentLinkRequest;	59	readonly link: (input: {
60	}) => Effect.Effect<	60	readonly userId: string;
61	{	61	readonly request: RelayEnvironmentLinkRequest;
62	readonly environmentId: RelayEnvironmentLinkProofPayload["environmentId"];	62	}) => Effect.Effect<
63	readonly endpoint: RelayEnvironmentLinkProofPayload["endpoint"];	63	{
64	readonly endpointRuntime:	64	readonly environmentId: RelayEnvironmentLinkProofPayload["environmentId"];
65	\| ManagedEndpointProvider.ManagedEndpointProvisioningResult["runtime"]	65	readonly endpoint: RelayEnvironmentLinkProofPayload["endpoint"];
66	\| null;	66	readonly endpointRuntime:
67	readonly environmentCredential: string;	67	\| ManagedEndpointProvider.ManagedEndpointProvisioningResult["runtime"]
68	},	68	\| null;
69	EnvironmentLinkError	69	readonly environmentCredential: string;
70	>;	70	},
71	}	71	EnvironmentLinkError
72		72	>;
73	export class EnvironmentLinker extends Context.Service<EnvironmentLinker, EnvironmentLinkerShape>()(	73	}
74	"t3code-relay/environments/EnvironmentLinker",	74	>()("t3code-relay/environments/EnvironmentLinker") {}
75	) {}
76		75
77	const decodeProof = Schema.decodeUnknownEffect(RelayEnvironmentLinkProofPayload);	76	const decodeProof = Schema.decodeUnknownEffect(RelayEnvironmentLinkProofPayload);
78		77

infra/relay/src/environments/EnvironmentLinks.test.ts+16−8

 import * as Layer from "effect/Layer";
 import { PgDialect } from "drizzle-orm/pg-core";
-import { RelayDb, type RelayDatabase } from "../db.ts";
+import * as RelayDb from "../db.ts";
 import { relayEnvironmentLinks } from "../persistence/schema.ts";
-import { EnvironmentLinks, layer } from "./EnvironmentLinks.ts";
+import * as EnvironmentLinks from "./EnvironmentLinks.ts";
 describe("EnvironmentLinks", () => {
   it.effect("selects users when either notifications or Live Activities are enabled", () => {
           },
         };
       },
-    } as unknown as RelayDatabase;
+    } as unknown as RelayDb.RelayDb["Service"];
     return Effect.gen(function* () {
-      const links = yield* EnvironmentLinks;
+      const links = yield* EnvironmentLinks.EnvironmentLinks;
       expect(yield* links.listUsersForEnvironment({ environmentId: "env-1" })).toEqual([]);
       expect(whereConditions).toHaveLength(1);
       expect(query.sql).toContain('"relay_environment_links"."live_activities_enabled" = $3');
       expect(query.sql).toContain(" or ");
       expect(query.params).toEqual(["env-1", true, true]);
-    }).pipe(Effect.provide(layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))));
+    }).pipe(
+      Effect.provide(
+        EnvironmentLinks.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb))),
+      ),
+    );
   });
   it.effect("revokes only the active link owned by the requesting user", () => {
           },
         };
       },
-    } as unknown as RelayDatabase;
+    } as unknown as RelayDb.RelayDb["Service"];
     return Effect.gen(function* () {
-      const links = yield* EnvironmentLinks;
+      const links = yield* EnvironmentLinks.EnvironmentLinks;
       const revoked = yield* links.revokeForUser({
         userId: "user-1",
         environmentId: "env-1",
       expect(query.sql).toContain('"relay_environment_links"."environment_id" = $2');
       expect(query.sql).toContain('"relay_environment_links"."revoked_at" is null');
       expect(query.params).toEqual(["user-1", "env-1"]);
-    }).pipe(Effect.provide(layer.pipe(Layer.provide(Layer.succeed(RelayDb, fakeDb)))));
+    }).pipe(
+      Effect.provide(
+        EnvironmentLinks.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb))),
+      ),
+    );
   });
 });

infra/relay/src/environments/EnvironmentLinks.ts+40−41

@@ -11,7 +11,7 @@ import * as Layer from "effect/Layer"; · 10 unmodified lines
11	import * as Schema from "effect/Schema";	11	import * as Schema from "effect/Schema";
12	import { and, eq, isNull, or } from "drizzle-orm";	12	import { and, eq, isNull, or } from "drizzle-orm";
13		13
14	import { RelayDb } from "../db.ts";	14	import * as RelayDb from "../db.ts";
15	import { relayEnvironmentLinks } from "../persistence/schema.ts";	15	import { relayEnvironmentLinks } from "../persistence/schema.ts";
16		16
17	export interface RelayLinkedEnvironmentRecord extends RelayClientEnvironmentRecord {	17	export interface RelayLinkedEnvironmentRecord extends RelayClientEnvironmentRecord {
@@ -78,45 +78,44 @@ export class EnvironmentLinkRevokePersistenceError extends Schema.TaggedErrorCla · 60 unmodified lines
78	}	78	}
79	}	79	}
80		80
81	export interface EnvironmentLinksShape {	81	export class EnvironmentLinks extends Context.Service<
82	readonly upsert: (input: {	82	EnvironmentLinks,
83	readonly userId: string;	83	{
84	readonly request: RelayEnvironmentLinkRequest;	84	readonly upsert: (input: {
85	readonly proof: RelayEnvironmentLinkProofPayload;	85	readonly userId: string;
86	readonly endpoint: RelayManagedEndpoint;	86	readonly request: RelayEnvironmentLinkRequest;
87	}) => Effect.Effect<void, EnvironmentLinkUpsertPersistenceError>;	87	readonly proof: RelayEnvironmentLinkProofPayload;
88	readonly listUsersForEnvironment: (input: {	88	readonly endpoint: RelayManagedEndpoint;
89	readonly environmentId: string;	89	}) => Effect.Effect<void, EnvironmentLinkUpsertPersistenceError>;
90	}) => Effect.Effect<ReadonlyArray<string>, EnvironmentLinkUserListPersistenceError>;	90	readonly listUsersForEnvironment: (input: {
91	readonly listDeliveryUsersForEnvironment: (input: {	91	readonly environmentId: string;
92	readonly environmentId: string;	92	}) => Effect.Effect<ReadonlyArray<string>, EnvironmentLinkUserListPersistenceError>;
93	readonly environmentPublicKey: string;	93	readonly listDeliveryUsersForEnvironment: (input: {
94	}) => Effect.Effect<	94	readonly environmentId: string;
95	ReadonlyArray<AgentAwarenessDeliveryUserRecord>,	95	readonly environmentPublicKey: string;
96	EnvironmentLinkUserListPersistenceError	96	}) => Effect.Effect<
97	>;	97	ReadonlyArray<AgentAwarenessDeliveryUserRecord>,
98	readonly listPublicKeysForEnvironment: (input: {	98	EnvironmentLinkUserListPersistenceError
99	readonly environmentId: string;	99	>;
100	}) => Effect.Effect<ReadonlyArray<string>, EnvironmentPublicKeyListPersistenceError>;	100	readonly listPublicKeysForEnvironment: (input: {
101	readonly listForUser: (input: {	101	readonly environmentId: string;
102	readonly userId: string;	102	}) => Effect.Effect<ReadonlyArray<string>, EnvironmentPublicKeyListPersistenceError>;
103	}) => Effect.Effect<	103	readonly listForUser: (input: {
104	ReadonlyArray<RelayClientEnvironmentRecord>,	104	readonly userId: string;
105	EnvironmentLinkListPersistenceError	105	}) => Effect.Effect<
106	>;	106	ReadonlyArray<RelayClientEnvironmentRecord>,
107	readonly getForUser: (input: {	107	EnvironmentLinkListPersistenceError
108	readonly userId: string;	108	>;
109	readonly environmentId: string;	109	readonly getForUser: (input: {
110	}) => Effect.Effect<RelayLinkedEnvironmentRecord \| null, EnvironmentLinkLookupPersistenceError>;	110	readonly userId: string;
111	readonly revokeForUser: (input: {	111	readonly environmentId: string;
112	readonly userId: string;	112	}) => Effect.Effect<RelayLinkedEnvironmentRecord \| null, EnvironmentLinkLookupPersistenceError>;
113	readonly environmentId: string;	113	readonly revokeForUser: (input: {
114	}) => Effect.Effect<boolean, EnvironmentLinkRevokePersistenceError>;	114	readonly userId: string;
115	}	115	readonly environmentId: string;
116		116	}) => Effect.Effect<boolean, EnvironmentLinkRevokePersistenceError>;
117	export class EnvironmentLinks extends Context.Service<EnvironmentLinks, EnvironmentLinksShape>()(	117	}
118	"t3code-relay/environments/EnvironmentLinks",	118	>()("t3code-relay/environments/EnvironmentLinks") {}
119	) {}
120		119
121	function agentAwarenessDeliveryUserCondition(environmentId: string) {	120	function agentAwarenessDeliveryUserCondition(environmentId: string) {
122	return and(	121	return and(
@@ -140,7 +139,7 @@ function agentAwarenessDeliveryUserKeyCondition(input: { · 17 unmodified lines
140	}	139	}
141		140
142	const make = Effect.gen(function* () {	141	const make = Effect.gen(function* () {
143	const db = yield* RelayDb;	142	const db = yield* RelayDb.RelayDb;
144		143
145	return EnvironmentLinks.of({	144	return EnvironmentLinks.of({
146	upsert: Effect.fn("relay.environment_links.upsert")(	145	upsert: Effect.fn("relay.environment_links.upsert")(

infra/relay/src/environments/EnvironmentPublishSignatures.test.ts+2−2

@@ -80,11 +80,11 @@ const freshRequest = Effect.gen(function* () { · 79 unmodified lines
80	} satisfies RelayAgentActivityPublishRequest;	80	} satisfies RelayAgentActivityPublishRequest;
81	});	81	});
82		82
83	function layer(replay?: Partial<DpopProofs.DpopProofReplayShape>) {	83	function layer(replay?: Partial<DpopProofs.DpopProofReplay["Service"]>) {
84	return EnvironmentPublishSignatures.layer.pipe(	84	return EnvironmentPublishSignatures.layer.pipe(
85	Layer.provide(	85	Layer.provide(
86	Layer.merge(	86	Layer.merge(
87	Layer.succeed(RelayConfiguration.RelayConfiguration, config),	87	RelayConfiguration.layer(config),
88	Layer.succeed(DpopProofs.DpopProofReplay, {	88	Layer.succeed(DpopProofs.DpopProofReplay, {
89	verifyAndConsume:	89	verifyAndConsume:
90	replay?.verifyAndConsume ?? (() => Effect.die("unexpected DPoP proof verification")),	90	replay?.verifyAndConsume ?? (() => Effect.die("unexpected DPoP proof verification")),

infra/relay/src/environments/EnvironmentPublishSignatures.ts+8−10

   | EnvironmentPublishPublicKeyMissing
   | DpopProofs.DpopProofReplayPersistenceError;
-export interface EnvironmentPublishSignaturesShape {
-  readonly verify: (input: {
-    readonly environmentId: string;
-    readonly environmentPublicKey: string;
-    readonly threadId: string;
-    readonly request: RelayAgentActivityPublishRequest;
-  }) => Effect.Effect<void, EnvironmentPublishSignatureError>;
-}
 export class EnvironmentPublishSignatures extends Context.Service<
   EnvironmentPublishSignatures,
-  EnvironmentPublishSignaturesShape
+  {
+    readonly verify: (input: {
+      readonly environmentId: string;
+      readonly environmentPublicKey: string;
+      readonly threadId: string;
+      readonly request: RelayAgentActivityPublishRequest;
+    }) => Effect.Effect<void, EnvironmentPublishSignatureError>;
+  }
 >()("t3code-relay/environments/EnvironmentPublishSignatures") {}
 const decodeProof = Schema.decodeUnknownEffect(RelayAgentActivityPublishProofPayload);

infra/relay/src/environments/ManagedEndpointAllocations.ts+26−28

@@ -6,7 +6,7 @@ import * as Effect from "effect/Effect"; · 5 unmodified lines
6	import * as Layer from "effect/Layer";	6	import * as Layer from "effect/Layer";
7	import * as Schema from "effect/Schema";	7	import * as Schema from "effect/Schema";
8		8
9	import { RelayDb } from "../db.ts";	9	import * as RelayDb from "../db.ts";
10	import { isManagedEndpointHostname, managedEndpointForHostname } from "../deploymentConfig.ts";	10	import { isManagedEndpointHostname, managedEndpointForHostname } from "../deploymentConfig.ts";
11	import { relayManagedEndpointAllocations } from "../persistence/schema.ts";	11	import { relayManagedEndpointAllocations } from "../persistence/schema.ts";
12		12
@@ -66,26 +66,29 @@ interface RecordManagedEndpointDnsInput extends ManagedEndpointAllocationKey { · 53 unmodified lines
66	readonly dnsRecordId: string;	66	readonly dnsRecordId: string;
67	}	67	}
68		68
69	export interface ManagedEndpointAllocationsShape {	69	export class ManagedEndpointAllocations extends Context.Service<
70	readonly get: (	70	ManagedEndpointAllocations,
71	input: ManagedEndpointAllocationKey,	71	{
72	) => Effect.Effect<ManagedEndpointAllocation \| null, ManagedEndpointAllocationPersistenceError>;	72	readonly get: (
73	readonly reserve: (	73	input: ManagedEndpointAllocationKey,
74	input: ReserveManagedEndpointAllocationInput,	74	) => Effect.Effect<ManagedEndpointAllocation \| null, ManagedEndpointAllocationPersistenceError>;
75	) => Effect.Effect<ManagedEndpointAllocation, ManagedEndpointAllocationPersistenceError>;	75	readonly reserve: (
76	readonly recordTunnel: (	76	input: ReserveManagedEndpointAllocationInput,
77	input: RecordManagedEndpointTunnelInput,	77	) => Effect.Effect<ManagedEndpointAllocation, ManagedEndpointAllocationPersistenceError>;
78	) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;	78	readonly recordTunnel: (
79	readonly recordDns: (	79	input: RecordManagedEndpointTunnelInput,
80	input: RecordManagedEndpointDnsInput,	80	) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;
81	) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;	81	readonly recordDns: (
82	readonly markReady: (	82	input: RecordManagedEndpointDnsInput,
83	input: ManagedEndpointAllocationKey,	83	) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;
84	) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;	84	readonly markReady: (
85	readonly remove: (	85	input: ManagedEndpointAllocationKey,
86	input: ManagedEndpointAllocationKey,	86	) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;
87	) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;	87	readonly remove: (
88	}	88	input: ManagedEndpointAllocationKey,
		89	) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;
		90	}
		91	>()("t3code-relay/environments/ManagedEndpointAllocations") {}
89		92
90	const allocationSelection = {	93	const allocationSelection = {
91	userId: relayManagedEndpointAllocations.userId,	94	userId: relayManagedEndpointAllocations.userId,
@@ -109,7 +112,7 @@ const persistenceError = (cause: unknown) => · 17 unmodified lines
109	: new ManagedEndpointAllocationPersistenceError({ cause });	112	: new ManagedEndpointAllocationPersistenceError({ cause });
110		113
111	const make = Effect.gen(function* () {	114	const make = Effect.gen(function* () {
112	const db = yield* RelayDb;	115	const db = yield* RelayDb.RelayDb;
113		116
114	return ManagedEndpointAllocations.of({	117	return ManagedEndpointAllocations.of({
115	get: Effect.fn("relay.managed_endpoint_allocations.get")(function* (	118	get: Effect.fn("relay.managed_endpoint_allocations.get")(function* (
@@ -198,9 +201,4 @@ const make = Effect.gen(function* () { · 82 unmodified lines
198	});	201	});
199	});	202	});
200		203
201	export class ManagedEndpointAllocations extends Context.Service<	204	export const layer = Layer.effect(ManagedEndpointAllocations, make);
202	ManagedEndpointAllocations,
203	ManagedEndpointAllocationsShape
204	>()("t3code-relay/environments/ManagedEndpointAllocations") {
205	static readonly layer = Layer.effect(this, make);
206	}

infra/relay/src/environments/ManagedEndpointProvider.test.ts+3−3

@@ -204,9 +204,9 @@ function providerLayer( · 203 unmodified lines
204	) {	204	) {
205	return ManagedEndpointProvider.layer.pipe(	205	return ManagedEndpointProvider.layer.pipe(
206	Layer.provideMerge(NodeServices.layer),	206	Layer.provideMerge(NodeServices.layer),
207	Layer.provide(Layer.succeed(RelayConfiguration.RelayConfiguration, config)),	207	Layer.provide(RelayConfiguration.layer(config)),
208	Layer.provide(Layer.succeed(ManagedEndpointProvider.ManagedEndpointTunnelClient, tunnelClient)),	208	Layer.provide(ManagedEndpointProvider.layerTunnelClient(tunnelClient)),
209	Layer.provide(Layer.succeed(ManagedEndpointProvider.ManagedEndpointDnsClient, dnsClient)),	209	Layer.provide(ManagedEndpointProvider.layerDnsClient(dnsClient)),
210	Layer.provide(	210	Layer.provide(
211	Layer.succeed(ManagedEndpointAllocations.ManagedEndpointAllocations, allocations),	211	Layer.succeed(ManagedEndpointAllocations.ManagedEndpointAllocations, allocations),
212	),	212	),

infra/relay/src/environments/ManagedEndpointProvider.ts+69−63

   managedEndpointHostname,
   managedEndpointTunnelName,
 } from "../deploymentConfig.ts";
-import { ManagedEndpointAllocations } from "./ManagedEndpointAllocations.ts";
+import * as ManagedEndpointAllocations from "./ManagedEndpointAllocations.ts";
 export class ManagedEndpointProvisioningNotConfigured extends Schema.TaggedErrorClass<ManagedEndpointProvisioningNotConfigured>()(
   "ManagedEndpointProvisioningNotConfigured",
   readonly runtime: RelayManagedEndpointRuntimeConfig;
 }
-export interface ManagedEndpointProviderShape {
-  readonly provision: (input: {
-    readonly userId: string;
-    readonly environmentId: string;
-    readonly origin: RelayManagedEndpointOrigin;
-  }) => Effect.Effect<ManagedEndpointProvisioningResult, ManagedEndpointProviderError>;
-  readonly deprovision: (input: {
-    readonly userId: string;
-    readonly environmentId: string;
-  }) => Effect.Effect<void, ManagedEndpointDeprovisioningFailed>;
-}
 export class ManagedEndpointProvider extends Context.Service<
   ManagedEndpointProvider,
-  ManagedEndpointProviderShape
+  {
+    readonly provision: (input: {
+      readonly userId: string;
+      readonly environmentId: string;
+      readonly origin: RelayManagedEndpointOrigin;
+    }) => Effect.Effect<ManagedEndpointProvisioningResult, ManagedEndpointProviderError>;
+    readonly deprovision: (input: {
+      readonly userId: string;
+      readonly environmentId: string;
+    }) => Effect.Effect<void, ManagedEndpointDeprovisioningFailed>;
+  }
 >()("t3code-relay/environments/ManagedEndpointProvider") {}
 interface ManagedEndpointTunnel {
   }
 }
-export interface ManagedEndpointTunnelClientShape {
-  readonly list: (request: {
-    readonly name: string;
-    readonly isDeleted: false;
-  }) => Effect.Effect<
-    { readonly result: ReadonlyArray<ManagedEndpointTunnel> },
-    ManagedEndpointTunnelClientError
-  >;
-  readonly create: (request: {
-    readonly name: string;
-    readonly configSrc: "cloudflare";
-  }) => Effect.Effect<ManagedEndpointTunnel, ManagedEndpointTunnelClientError>;
-  readonly putConfiguration: (
-    tunnelId: string,
-    config: {
-      readonly ingress: Array<{
-        readonly hostname?: string;
-        readonly service: string;
-      }>;
-    },
-  ) => Effect.Effect<unknown, ManagedEndpointTunnelClientError>;
-  readonly getToken: (tunnelId: string) => Effect.Effect<string, ManagedEndpointTunnelClientError>;
-  readonly delete: (tunnelId: string) => Effect.Effect<unknown, ManagedEndpointTunnelClientError>;
-}
 export class ManagedEndpointTunnelClient extends Context.Service<
   ManagedEndpointTunnelClient,
-  ManagedEndpointTunnelClientShape
+  {
+    readonly list: (request: {
+      readonly name: string;
+      readonly isDeleted: false;
+    }) => Effect.Effect<
+      { readonly result: ReadonlyArray<ManagedEndpointTunnel> },
+      ManagedEndpointTunnelClientError
+    >;
+    readonly create: (request: {
+      readonly name: string;
+      readonly configSrc: "cloudflare";
+    }) => Effect.Effect<ManagedEndpointTunnel, ManagedEndpointTunnelClientError>;
+    readonly putConfiguration: (
+      tunnelId: string,
+      config: {
+        readonly ingress: Array<{
+          readonly hostname?: string;
+          readonly service: string;
+        }>;
+      },
+    ) => Effect.Effect<unknown, ManagedEndpointTunnelClientError>;
+    readonly getToken: (
+      tunnelId: string,
+    ) => Effect.Effect<string, ManagedEndpointTunnelClientError>;
+    readonly delete: (tunnelId: string) => Effect.Effect<unknown, ManagedEndpointTunnelClientError>;
+  }
 >()("t3code-relay/environments/ManagedEndpointProvider/ManagedEndpointTunnelClient") {}
+export const makeTunnelClient = (client: ManagedEndpointTunnelClient["Service"]) =>
+  ManagedEndpointTunnelClient.of(client);
+export const layerTunnelClient = (client: ManagedEndpointTunnelClient["Service"]) =>
+  Layer.succeed(ManagedEndpointTunnelClient, makeTunnelClient(client));
 interface ManagedEndpointCnameRecordInput {
   readonly type: "CNAME";
   readonly name: string;
   }
 }
-export interface ManagedEndpointDnsClientShape {
-  readonly listRecords: (
-    hostname: string,
-  ) => Effect.Effect<ReadonlyArray<{ readonly id: string }>, ManagedEndpointDnsClientError>;
-  readonly createRecord: (
-    request: ManagedEndpointCnameRecordInput,
-  ) => Effect.Effect<{ readonly id: string }, ManagedEndpointDnsClientError>;
-  readonly updateRecord: (
-    dnsRecordId: string,
-    request: ManagedEndpointCnameRecordInput,
-  ) => Effect.Effect<unknown, ManagedEndpointDnsClientError>;
-  readonly deleteRecord: (
-    dnsRecordId: string,
-  ) => Effect.Effect<unknown, ManagedEndpointDnsClientError>;
-}
 export class ManagedEndpointDnsClient extends Context.Service<
   ManagedEndpointDnsClient,
-  ManagedEndpointDnsClientShape
+  {
+    readonly listRecords: (
+      hostname: string,
+    ) => Effect.Effect<ReadonlyArray<{ readonly id: string }>, ManagedEndpointDnsClientError>;
+    readonly createRecord: (
+      request: ManagedEndpointCnameRecordInput,
+    ) => Effect.Effect<{ readonly id: string }, ManagedEndpointDnsClientError>;
+    readonly updateRecord: (
+      dnsRecordId: string,
+      request: ManagedEndpointCnameRecordInput,
+    ) => Effect.Effect<unknown, ManagedEndpointDnsClientError>;
+    readonly deleteRecord: (
+      dnsRecordId: string,
+    ) => Effect.Effect<unknown, ManagedEndpointDnsClientError>;
+  }
 >()("t3code-relay/environments/ManagedEndpointProvider/ManagedEndpointDnsClient") {}
+export const makeDnsClient = (client: ManagedEndpointDnsClient["Service"]) =>
+  ManagedEndpointDnsClient.of(client);
+export const layerDnsClient = (client: ManagedEndpointDnsClient["Service"]) =>
+  Layer.succeed(ManagedEndpointDnsClient, makeDnsClient(client));
 const requireCloudflareSettings = Effect.fnUntraced(function* (
-  settings: RelayConfiguration.RelayConfigurationShape,
+  settings: RelayConfiguration.RelayConfiguration["Service"],
 ) {
   if (!settings.managedEndpointBaseDomain || !settings.managedEndpointNamespace) {
     return yield* new ManagedEndpointProvisioningNotConfigured();
   const crypto = yield* Crypto.Crypto;
   const tunnels = yield* ManagedEndpointTunnelClient;
   const dns = yield* ManagedEndpointDnsClient;
-  const allocations = yield* ManagedEndpointAllocations;
+  const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
   const updateExistingDnsRecords = Effect.fnUntraced(function* (
     records: ReadonlyArray<{ readonly id: string }>,
   layer.pipe(
     Layer.provide(
       Layer.mergeAll(
-        Layer.succeed(
+        layerTunnelClient(
-          ManagedEndpointTunnelClient,
           ManagedEndpointTunnelClient.of({
             list: (request) =>
               tunnelClient.list(request).pipe(
               ),
           }),
         ),
-        Layer.succeed(
+        layerDnsClient(
-          ManagedEndpointDnsClient,
           ManagedEndpointDnsClient.of({
             listRecords: (hostname) =>
               dnsClient.listDnsRecords({ search: hostname }).pipe(

infra/relay/src/http/Api.test.ts+2−2

@@ -30,7 +30,7 @@ vi.mock("@clerk/backend", () => ({ · 29 unmodified lines
30	verifyToken: vi.fn(),	30	verifyToken: vi.fn(),
31	}));	31	}));
32		32
33	const relaySettings: RelayConfiguration.RelayConfigurationShape = {	33	const relaySettings: RelayConfiguration.RelayConfiguration["Service"] = {
34	relayIssuer: "https://relay.example.test",	34	relayIssuer: "https://relay.example.test",
35	apns: {	35	apns: {
36	teamId: "apns-team",	36	teamId: "apns-team",
@@ -110,7 +110,7 @@ describe("relay environment authentication", () => { · 73 unmodified lines
110	const failure = new EnvironmentCredentials.EnvironmentCredentialAuthenticatePersistenceError({	110	const failure = new EnvironmentCredentials.EnvironmentCredentialAuthenticatePersistenceError({
111	cause: "database unavailable",	111	cause: "database unavailable",
112	});	112	});
113	const credentials: EnvironmentCredentials.EnvironmentCredentialsShape = {	113	const credentials: EnvironmentCredentials.EnvironmentCredentials["Service"] = {
114	create: () => Effect.die("unused create"),	114	create: () => Effect.die("unused create"),
115	authenticate: () => Effect.fail(failure),	115	authenticate: () => Effect.fail(failure),
116	revokeForEnvironmentPublicKey: () => Effect.die("unused revoke"),	116	revokeForEnvironmentPublicKey: () => Effect.die("unused revoke"),

infra/relay/src/http/Api.ts+8−5

 import * as EnvironmentPublishSignatures from "../environments/EnvironmentPublishSignatures.ts";
 import * as MobileRegistrations from "../agentActivity/MobileRegistrations.ts";
 import { withSpanAttributes } from "../observability.ts";
-import { RelayDb } from "../db.ts";
+import * as RelayDb from "../db.ts";
 const relayCorsAllowedMethods = ["GET", "POST", "DELETE", "OPTIONS"] as const;
 const relayCorsAllowedHeaders = [
   RelayApi,
   "health",
   Effect.fnUntraced(function* (handlers) {
-    const db = yield* RelayDb;
+    const db = yield* RelayDb.RelayDb;
     return handlers.handle(
       "health",
       Effect.fn("relay.api.health")(
         audience.some((entry) => typeof entry === "string" && entry === expectedAudience);
 }
-function verifyClerkBearerToken(config: RelayConfiguration.RelayConfigurationShape, token: string) {
+function verifyClerkBearerToken(
+  config: RelayConfiguration.RelayConfiguration["Service"],
+  token: string,
+) {
   return Effect.tryPromise({
     try: () =>
       verifyToken(token, {
 }
 function verifyClerkOAuthBearerToken(
-  config: RelayConfiguration.RelayConfigurationShape,
+  config: RelayConfiguration.RelayConfiguration["Service"],
   token: string,
 ) {
   return Effect.tryPromise({
 }
 export function verifyRelayClientBearerToken(
-  config: RelayConfiguration.RelayConfigurationShape,
+  config: RelayConfiguration.RelayConfiguration["Service"],
   token: string,
 ) {
   return verifyClerkBearerToken(config, token).pipe(

infra/relay/src/observability.test.ts+2−2

@@ -9,7 +9,7 @@ import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest"; · 8 unmodified lines
9	import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";	9	import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
10	import type { OtlpTracer } from "effect/unstable/observability";	10	import type { OtlpTracer } from "effect/unstable/observability";
11		11
12	import { EnvironmentConnectNotAuthorized } from "./environments/EnvironmentConnector.ts";	12	import * as EnvironmentConnector from "./environments/EnvironmentConnector.ts";
13	import { makeRelayTraceLayer } from "./observability.ts";	13	import { makeRelayTraceLayer } from "./observability.ts";
14		14
15	interface ExportedRequest {	15	interface ExportedRequest {
@@ -43,7 +43,7 @@ it.effect("exports schema error fields as span attributes", () => · 27 unmodified lines
43	);	43	);
44		44
45	yield* Effect.fail(	45	yield* Effect.fail(
46	new EnvironmentConnectNotAuthorized({	46	new EnvironmentConnector.EnvironmentConnectNotAuthorized({
47	environmentId: "environment-1",	47	environmentId: "environment-1",
48	operation: "connect",	48	operation: "connect",
49	reason: "managed_endpoint_allocation_not_ready",	49	reason: "managed_endpoint_allocation_not_ready",

infra/relay/src/worker.ts+4−9

 import * as EnvironmentLinks from "./environments/EnvironmentLinks.ts";
 import * as ManagedEndpointAllocations from "./environments/ManagedEndpointAllocations.ts";
 import * as LiveActivities from "./agentActivity/LiveActivities.ts";
-import { RelayDb, RelayHyperdrive } from "./db.ts";
+import * as RelayDb from "./db.ts";
 import { RelayApnsDeliveryDeadLetterQueue, RelayApnsDeliveryQueue } from "./queues.ts";
 import * as RelayConfiguration from "./Config.ts";
 import * as AgentActivityPublisher from "./agentActivity/AgentActivityPublisher.ts";
     const cloudMintPrivateKey = yield* cloudMintKeyPair.privateKey;
     const cloudMintPublicKey = yield* cloudMintKeyPair.publicKey;
-    const hyperdrive = yield* Cloudflare.Hyperdrive.bind(yield* RelayHyperdrive);
+    const hyperdrive = yield* Cloudflare.Hyperdrive.bind(yield* RelayDb.RelayHyperdrive);
     const db = yield* Drizzle.postgres(hyperdrive.connectionString);
     const managedEndpointTunnelBinding = yield* Cloudflare.TunnelReadWrite.bind();
       Layer.provideMerge(AgentActivityRows.layer),
       Layer.provideMerge(Devices.layer),
       Layer.provideMerge(EnvironmentCredentials.layer),
-      Layer.provideMerge(
+      Layer.provideMerge(Layer.mergeAll(EnvironmentLinks.layer, ManagedEndpointAllocations.layer)),
-        Layer.mergeAll(
-          EnvironmentLinks.layer,
-          ManagedEndpointAllocations.ManagedEndpointAllocations.layer,
-        ),
-      ),
       Layer.provideMerge(LiveActivities.layer),
       Layer.provideMerge(DeliveryAttempts.layer),
       Layer.provideMerge(RelayTokens.layer),
-      Layer.provideMerge(Layer.succeed(RelayDb, db)),
+      Layer.provideMerge(Layer.succeed(RelayDb.RelayDb, db)),
       Layer.provideMerge(Layer.effect(RelayConfiguration.RelayConfiguration, loadSettings)),
       Layer.provideMerge(webcryptoLayer),
     );

packages/client-runtime/src/state/preview.ts+4−0

     automationRequests: createEnvironmentRpcSubscriptionAtomFamily(runtime, {
       label: "environment-data:preview:automation-requests",
       tag: WS_METHODS.previewAutomationConnect,
+      // Automation requests are commands, not cached query data. Dispose the
+      // stream immediately with its owner so stale requests cannot replay when
+      // a thread remounts and the server can clear disconnected hosts promptly.
+      idleTtlMs: 0,
     }),
     open: createEnvironmentRpcCommand(runtime, {
       label: "environment-data:preview:open",

packages/contracts/src/git.ts+2−0

   cwd: TrimmedNonEmptyStringSchema,
   query: Schema.optional(TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(256))),
   cursor: Schema.optional(NonNegativeInt),
+  includeMatchingRemoteRefs: Schema.optional(Schema.Boolean),
+  refKind: Schema.optional(Schema.Literals(["all", "local", "remote"])),
   limit: Schema.optional(
     PositiveInt.check(Schema.isLessThanOrEqualTo(GIT_LIST_BRANCHES_MAX_LIMIT)),
   ),

packages/contracts/src/ipc.ts+2−1

   PreviewAutomationClickInput,
   PreviewAutomationEvaluateInput,
   PreviewAutomationOwner,
+  PreviewAutomationOwnerIdentity,
   PreviewAutomationPressInput,
   PreviewAutomationRequest,
   PreviewAutomationResponse,
       ) => () => void;
       respond: (response: PreviewAutomationResponse) => Promise<void>;
       reportOwner: (owner: PreviewAutomationOwner) => Promise<void>;
-      clearOwner: (input: { clientId: string }) => Promise<void>;
+      clearOwner: (input: PreviewAutomationOwnerIdentity) => Promise<void>;
     };
     onEvent: (
       callback: (event: PreviewEvent) => void,

packages/contracts/src/previewAutomation.ts+6−1

 });
 export type PreviewAutomationRecordingArtifact = typeof PreviewAutomationRecordingArtifact.Type;
-export const PreviewAutomationOwner = Schema.Struct({
+export const PreviewAutomationOwnerIdentity = Schema.Struct({
   clientId: TrimmedNonEmptyString,
   environmentId: EnvironmentId,
   threadId: ThreadId,
+});
+export type PreviewAutomationOwnerIdentity = typeof PreviewAutomationOwnerIdentity.Type;
+export const PreviewAutomationOwner = Schema.Struct({
+  ...PreviewAutomationOwnerIdentity.fields,
   tabId: Schema.NullOr(PreviewTabId),
   visible: Schema.Boolean,
   supportsAutomation: Schema.Boolean,

packages/contracts/src/relay.ts+11−15

-import * as Schema from "effect/Schema";
 import * as Context from "effect/Context";
+import * as Schema from "effect/Schema";
 import * as HttpApi from "effect/unstable/httpapi/HttpApi";
 import * as HttpApiEndpoint from "effect/unstable/httpapi/HttpApiEndpoint";
 import * as HttpApiGroup from "effect/unstable/httpapi/HttpApiGroup";
   RelayInternalError,
 ] as const;
-export interface RelayClientPrincipalShape {
-  readonly userId: string;
-  readonly token: string;
-  readonly proofKeyThumbprint?: string;
-  readonly dpopScopes?: ReadonlyArray<RelayDpopAccessTokenScope>;
-}
 export class RelayClientPrincipal extends Context.Service<
   RelayClientPrincipal,
-  RelayClientPrincipalShape
+  {
+    readonly userId: string;
+    readonly token: string;
+    readonly proofKeyThumbprint?: string;
+    readonly dpopScopes?: ReadonlyArray<RelayDpopAccessTokenScope>;
+  }
 >()("@t3tools/contracts/relay/RelayClientPrincipal") {}
-export interface RelayEnvironmentPrincipalShape {
-  readonly environmentId: string;
-  readonly environmentPublicKey: string;
-}
 export class RelayEnvironmentPrincipal extends Context.Service<
   RelayEnvironmentPrincipal,
-  RelayEnvironmentPrincipalShape
+  {
+    readonly environmentId: string;
+    readonly environmentPublicKey: string;
+  }
 >()("@t3tools/contracts/relay/RelayEnvironmentPrincipal") {}
 const RelayClientBearerAuthorization = HttpApiSecurity.http({ scheme: "bearer" }).pipe(

packages/contracts/src/review.ts+1−0

@@ -6,6 +6,7 @@ import { VcsError } from "./vcs.ts"; · 5 unmodified lines
6	export const ReviewDiffPreviewInput = Schema.Struct({	6	export const ReviewDiffPreviewInput = Schema.Struct({
7	cwd: TrimmedNonEmptyString,	7	cwd: TrimmedNonEmptyString,
8	baseRef: Schema.optional(TrimmedNonEmptyString),	8	baseRef: Schema.optional(TrimmedNonEmptyString),
		9	ignoreWhitespace: Schema.optionalKey(Schema.Boolean),
9	});	10	});
10	export type ReviewDiffPreviewInput = typeof ReviewDiffPreviewInput.Type;	11	export type ReviewDiffPreviewInput = typeof ReviewDiffPreviewInput.Type;
11		12

packages/contracts/src/rpc.ts+3−2

 import {
   PreviewAutomationError,
   PreviewAutomationOwner,
+  PreviewAutomationOwnerIdentity,
   PreviewAutomationRequest,
   PreviewAutomationResponse,
 } from "./previewAutomation.ts";
 });
 export const WsPreviewAutomationConnectRpc = Rpc.make(WS_METHODS.previewAutomationConnect, {
-  payload: Schema.Struct({ clientId: Schema.String }),
+  payload: PreviewAutomationOwner,
   success: PreviewAutomationRequest,
   error: Schema.Union([PreviewAutomationError, EnvironmentAuthorizationError]),
   stream: true,
 });
 export const WsPreviewAutomationClearOwnerRpc = Rpc.make(WS_METHODS.previewAutomationClearOwner, {
-  payload: Schema.Struct({ clientId: Schema.String }),
+  payload: PreviewAutomationOwnerIdentity,
   error: Schema.Union([PreviewAutomationError, EnvironmentAuthorizationError]),
 });

pnpm-lock.yaml+250−252

     dependencies:
       '@callstack/liquid-glass':
         specifier: ^0.7.1
-        version: 0.7.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 0.7.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@clerk/expo':
         specifier: 3.4.8-snapshot.v20260619001138
-        version: 3.4.8-snapshot.v20260619001138(expo-auth-session@56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo-constants@56.0.16)(expo-crypto@56.0.4(expo@56.0.8))(expo-secure-store@56.0.4(expo@56.0.8))(expo-web-browser@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 3.4.8-snapshot.v20260619001138(expo-auth-session@56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo-constants@56.0.16)(expo-crypto@56.0.4(expo@56.0.8))(expo-secure-store@56.0.4(expo@56.0.8))(expo-web-browser@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@effect/atom-react':
         specifier: 4.0.0-beta.78
         version: 4.0.0-beta.78(effect@4.0.0-beta.78(patch_hash=c502bc684210b707dfceb87d8fe6ad6843395af6e19cfc02cd65854898bde2c5))(react@19.2.3)(scheduler@0.27.0)
         version: 0.4.2
       '@expo/ui':
         specifier: ~56.0.8
-        version: 56.0.15(961c4aa6f32829b318e3c87ef20ad401)
+        version: 56.0.15(ab3f255d102c60ba0fd2bbe4e47ba584)
       '@legendapp/list':
         specifier: 3.0.0-beta.44
-        version: 3.0.0-beta.44(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 3.0.0-beta.44(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@noble/curves':
         specifier: 'catalog:'
         version: 1.9.1
         version: 1.3.0-beta.5(patch_hash=7cb6da88544119adda056b2f46f43956f99326227732da0b345081e285a6c53a)(@shikijs/themes@4.2.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@react-native-menu/menu':
         specifier: ^2.0.0
-        version: 2.0.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 2.0.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@shikijs/core':
         specifier: 4.2.0
         version: 4.2.0
         version: link:../../packages/contracts
       '@t3tools/mobile-markdown-text':
         specifier: file:./modules/t3-markdown-text
-        version: file:apps/mobile/modules/t3-markdown-text(f0ff241d48c23db461fff5d47e450578)
+        version: file:apps/mobile/modules/t3-markdown-text(e909ee9a8f7fbe234da80c739fca4984)
       '@t3tools/mobile-review-diff-native':
         specifier: file:./modules/t3-review-diff
         version: file:apps/mobile/modules/t3-review-diff
         version: 4.0.0-beta.78(patch_hash=c502bc684210b707dfceb87d8fe6ad6843395af6e19cfc02cd65854898bde2c5)
       expo:
         specifier: ^56.0.0
-        version: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+        version: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       expo-asset:
         specifier: ~56.0.15
-        version: 56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
+        version: 56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
       expo-auth-session:
         specifier: ~56.0.12
-        version: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-build-properties:
         specifier: ~56.0.15
         version: 56.0.16(expo@56.0.8)
       expo-camera:
         specifier: ~56.0.7
-        version: 56.0.7(@types/emscripten@1.41.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 56.0.7(@types/emscripten@1.41.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-clipboard:
         specifier: ~56.0.3
-        version: 56.0.3(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 56.0.3(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-constants:
         specifier: ~56.0.16
-        version: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+        version: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       expo-crypto:
         specifier: ~56.0.4
         version: 56.0.4(expo@56.0.8)
       expo-dev-client:
         specifier: ~56.0.16
-        version: 56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+        version: 56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       expo-file-system:
         specifier: ~56.0.7
-        version: 56.0.7(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+        version: 56.0.7(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       expo-font:
         specifier: ~56.0.5
-        version: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-glass-effect:
         specifier: ~56.0.4
-        version: 56.0.4(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 56.0.4(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-haptics:
         specifier: ~56.0.3
         version: 56.0.3(expo@56.0.8)
         version: 56.0.15(expo@56.0.8)
       expo-linking:
         specifier: ~56.0.12
-        version: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-network:
         specifier: ~56.0.5
         version: 56.0.5(expo@56.0.8)(react@19.2.3)
       expo-notifications:
         specifier: ~56.0.14
-        version: 56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
+        version: 56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
       expo-paste-input:
         specifier: ^0.1.15
-        version: 0.1.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 0.1.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-router:
         specifier: ~56.2.7
-        version: 56.2.8(5bfdf39b8f760e4dc2d5c3acffc97310)
+        version: 56.2.8(c021de11d02907bd585610408f5252e8)
       expo-secure-store:
         specifier: ~56.0.4
         version: 56.0.4(expo@56.0.8)
         version: 56.0.10(expo@56.0.8)(typescript@6.0.3)
       expo-symbols:
         specifier: ~56.0.5
-        version: 56.0.5(expo-font@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 56.0.5(expo-font@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-updates:
         specifier: ~56.0.17
-        version: 56.0.17(expo-dev-client@56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 56.0.17(expo-dev-client@56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-web-browser:
         specifier: ~56.0.5
-        version: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+        version: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       expo-widgets:
         specifier: ~56.0.15
-        version: 56.0.16(961c4aa6f32829b318e3c87ef20ad401)
+        version: 56.0.16(ab3f255d102c60ba0fd2bbe4e47ba584)
       punycode:
         specifier: ^2.3.1
         version: 2.3.1
         version: 19.2.3(react@19.2.3)
       react-native:
         specifier: 0.85.3
-        version: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+        version: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       react-native-gesture-handler:
         specifier: ~2.31.1
-        version: 2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-image-viewing:
         specifier: ^0.2.2
-        version: 0.2.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 0.2.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-keyboard-controller:
         specifier: 1.21.6
-        version: 1.21.6(react-native-reanimated@4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 1.21.6(react-native-reanimated@4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-nitro-markdown:
         specifier: ^0.5.0
-        version: 0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-nitro-modules:
         specifier: ^0.35.4
-        version: 0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-reanimated:
         specifier: 4.3.1
-        version: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-safe-area-context:
         specifier: ~5.7.0
-        version: 5.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 5.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-screens:
         specifier: 4.25.2
-        version: 4.25.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 4.25.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-shiki-engine:
         specifier: ^0.3.12
-        version: 0.3.12(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 0.3.12(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-svg:
         specifier: 15.15.4
-        version: 15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-webview:
         specifier: ^13.16.1
-        version: 13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-worklets:
         specifier: 0.8.3
-        version: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       shiki:
         specifier: 4.2.0
         version: 4.2.0
         version: 3.6.0
       uniwind:
         specifier: ^1.6.2
-        version: 1.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.0)
+        version: 1.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.0)
     devDependencies:
       '@effect/vitest':
         specifier: 4.0.0-beta.78
     optionalDependencies:
       '@types/react': 19.2.16
-  '@callstack/liquid-glass@0.7.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@callstack/liquid-glass@0.7.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
   '@capsizecss/unpack@4.0.0':
     dependencies:
       electron-store: 8.2.0
       react-dom: 19.2.6(react@19.2.6)
-  '@clerk/expo@3.4.8-snapshot.v20260619001138(expo-auth-session@56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo-constants@56.0.16)(expo-crypto@56.0.4(expo@56.0.8))(expo-secure-store@56.0.4(expo@56.0.8))(expo-web-browser@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@clerk/expo@3.4.8-snapshot.v20260619001138(expo-auth-session@56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo-constants@56.0.16)(expo-crypto@56.0.4(expo@56.0.8))(expo-secure-store@56.0.4(expo@56.0.8))(expo-web-browser@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       '@clerk/clerk-js': 6.18.2-snapshot.v20260619001138(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@clerk/react': 6.10.4-snapshot.v20260619001138(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@clerk/shared': 4.19.2-snapshot.v20260619001138(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       base-64: 1.0.0
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      react-native-url-polyfill: 2.0.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      react-native-url-polyfill: 2.0.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       tslib: 2.8.1
     optionalDependencies:
-      expo-auth-session: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-auth-session: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       expo-crypto: 56.0.4(expo@56.0.8)
       expo-secure-store: 56.0.4(expo@56.0.8)
-      expo-web-browser: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-web-browser: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       react-dom: 19.2.3(react@19.2.3)
   '@clerk/react@6.10.4-snapshot.v20260619001138(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
   '@expo-google-fonts/material-symbols@0.4.38': {}
-  '@expo/cli@56.1.13(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-constants@56.0.16)(expo-font@56.0.5)(expo-router@56.2.8)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)':
+  '@expo/cli@56.1.13(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-constants@56.0.16)(expo-font@56.0.5)(expo-router@56.2.8)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)':
     dependencies:
       '@expo/code-signing-certificates': 0.0.6
       '@expo/config': 56.0.9(typescript@6.0.3)
       '@expo/image-utils': 0.10.1(typescript@6.0.3)
       '@expo/inline-modules': 0.0.10(typescript@6.0.3)
       '@expo/json-file': 10.2.0
-      '@expo/log-box': 56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/log-box': 56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@expo/metro': 56.0.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
       '@expo/metro-config': 56.0.13(patch_hash=8cb08b5bb7051ed9d2dbe46a2c293c5a1e17f1bd6ddf30de27909e18c921ff46)(bufferutil@4.1.0)(expo@56.0.8)(typescript@6.0.3)(utf-8-validate@6.0.6)
       '@expo/metro-file-map': 56.0.3
       connect: 3.7.0
       debug: 4.4.3
       dnssd-advertise: 1.1.4
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       expo-server: 56.0.4
       fetch-nodeshim: 0.4.10
       getenv: 2.0.0
       ws: 8.21.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
       zod: 3.25.76
     optionalDependencies:
-      expo-router: 56.2.8(5bfdf39b8f760e4dc2d5c3acffc97310)
+      expo-router: 56.2.8(c021de11d02907bd585610408f5252e8)
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - '@expo/dom-webview'
       - '@expo/metro-runtime'
     transitivePeerDependencies:
       - supports-color
-  '@expo/devtools@56.0.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@expo/devtools@56.0.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       chalk: 4.1.2
     optionalDependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  '@expo/dom-webview@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@expo/dom-webview@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
   '@expo/env@2.3.0':
     dependencies:
       - supports-color
       - typescript
-  '@expo/log-box@56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@expo/log-box@56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
-      '@expo/dom-webview': 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/dom-webview': 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       anser: 1.4.10
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       stacktrace-parser: 0.1.11
   '@expo/metro-config@56.0.13(patch_hash=8cb08b5bb7051ed9d2dbe46a2c293c5a1e17f1bd6ddf30de27909e18c921ff46)(bufferutil@4.1.0)(expo@56.0.8)(typescript@6.0.3)(utf-8-validate@6.0.6)':
       postcss: 8.5.15
       resolve-from: 5.0.0
     optionalDependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
     transitivePeerDependencies:
       - supports-color
-  '@expo/metro-runtime@56.0.13(@expo/log-box@56.0.12)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@expo/metro-runtime@56.0.13(@expo/log-box@56.0.12)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
-      '@expo/log-box': 56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/log-box': 56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       anser: 1.4.10
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       pretty-format: 29.7.0
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       stacktrace-parser: 0.1.11
       whatwg-fetch: 3.6.20
     optionalDependencies:
   '@expo/router-server@56.0.12(@expo/metro-runtime@56.0.13)(expo-constants@56.0.16)(expo-font@56.0.5)(expo-router@56.2.8)(expo-server@56.0.4)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       debug: 4.4.3
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
-      expo-font: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-font: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-server: 56.0.4
       react: 19.2.3
     optionalDependencies:
-      '@expo/metro-runtime': 56.0.13(@expo/log-box@56.0.12)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/metro-runtime': 56.0.13(@expo/log-box@56.0.12)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      expo-router: 56.2.8(5bfdf39b8f760e4dc2d5c3acffc97310)
+      expo-router: 56.2.8(c021de11d02907bd585610408f5252e8)
       react-dom: 19.2.3(react@19.2.3)
     transitivePeerDependencies:
       - supports-color
   '@expo/sudo-prompt@9.3.2': {}
-  '@expo/ui@56.0.15(961c4aa6f32829b318e3c87ef20ad401)':
+  '@expo/ui@56.0.15(ab3f255d102c60ba0fd2bbe4e47ba584)':
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       sf-symbols-typescript: 2.2.0
       vaul: 1.1.2(@types/react-dom@19.2.3(@types/react@19.2.16))(@types/react@19.2.16)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
     optionalDependencies:
       '@babel/core': 7.29.7
       react-dom: 19.2.3(react@19.2.3)
-      react-native-reanimated: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-reanimated: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
     dependencies:
       jsbi: 4.3.2
-  '@legendapp/list@3.0.0-beta.44(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@legendapp/list@3.0.0-beta.44(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       react: 19.2.3
       use-sync-external-store: 1.6.0(react@19.2.3)
     optionalDependencies:
       react-dom: 19.2.3(react@19.2.3)
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
   '@legendapp/list@3.0.0-beta.44(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       prompts: 2.4.2
       tinyexec: 1.2.4
-  '@react-native-masked-view/masked-view@0.3.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@react-native-masked-view/masked-view@0.3.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  '@react-native-menu/menu@2.0.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@react-native-menu/menu@2.0.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
   '@react-native/assets-registry@0.85.3': {}
       tinyglobby: 0.2.17
       yargs: 17.7.2
-  '@react-native/community-cli-plugin@0.85.3(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(bufferutil@4.1.0)(utf-8-validate@6.0.6)':
+  '@react-native/community-cli-plugin@0.85.3(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(bufferutil@4.1.0)(utf-8-validate@6.0.6)':
     dependencies:
       '@react-native/dev-middleware': 0.85.3(bufferutil@4.1.0)(utf-8-validate@6.0.6)
       debug: 4.4.3
       metro-core: 0.84.4
       semver: 7.8.1
     optionalDependencies:
-      '@react-native/metro-config': 0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6)
+      '@react-native/metro-config': 0.85.3(@babel/core@7.29.7)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
     transitivePeerDependencies:
       - supports-color
-  '@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6)':
+  '@react-native/metro-config@0.85.3(@babel/core@7.29.7)':
     dependencies:
       '@react-native/js-polyfills': 0.85.3
       '@react-native/metro-babel-transformer': 0.85.3(@babel/core@7.29.7)
       metro-runtime: 0.84.4
     transitivePeerDependencies:
       - '@babel/core'
-      - bufferutil
       - supports-color
-      - utf-8-validate
   '@react-native/normalize-colors@0.85.3': {}
-  '@react-native/virtualized-lists@0.85.3(@types/react@19.2.16)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@react-native/virtualized-lists@0.85.3(@types/react@19.2.16)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       invariant: 2.2.4
       nullthrows: 1.1.1
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     optionalDependencies:
       '@types/react': 19.2.16
     dependencies:
       defer-to-connect: 2.0.1
-  '@t3tools/mobile-markdown-text@file:apps/mobile/modules/t3-markdown-text(f0ff241d48c23db461fff5d47e450578)':
+  '@t3tools/mobile-markdown-text@file:apps/mobile/modules/t3-markdown-text(e909ee9a8f7fbe234da80c739fca4984)':
     dependencies:
-      expo-asset: 56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
+      expo-asset: 56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
-      expo-clipboard: 56.0.3(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-clipboard: 56.0.3(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-haptics: 56.0.3(expo@56.0.8)
-      expo-symbols: 56.0.5(expo-font@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-symbols: 56.0.5(expo-font@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      react-native-nitro-markdown: 0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-nitro-markdown: 0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
   '@t3tools/mobile-review-diff-native@file:apps/mobile/modules/t3-review-diff': {}
       react-refresh: 0.14.2
     optionalDependencies:
       '@babel/runtime': 7.29.7
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      expo-widgets: 56.0.16(961c4aa6f32829b318e3c87ef20ad401)
+      expo-widgets: 56.0.16(ab3f255d102c60ba0fd2bbe4e47ba584)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
   expo-application@56.0.3(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-  expo-asset@56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3):
+  expo-asset@56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3):
     dependencies:
       '@expo/image-utils': 0.10.1(typescript@6.0.3)
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - supports-color
       - typescript
-  expo-auth-session@56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-auth-session@56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       expo-application: 56.0.3(expo@56.0.8)
-      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       expo-crypto: 56.0.4(expo@56.0.8)
-      expo-linking: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-linking: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      expo-web-browser: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-web-browser: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       invariant: 2.2.4
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - expo
       - supports-color
   expo-build-properties@56.0.16(expo@56.0.8):
     dependencies:
       '@expo/schema-utils': 56.0.1
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       resolve-from: 5.0.0
       semver: 7.8.1
-  expo-camera@56.0.7(@types/emscripten@1.41.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-camera@56.0.7(@types/emscripten@1.41.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       barcode-detector: 3.2.0(@types/emscripten@1.41.5)
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - '@types/emscripten'
-  expo-clipboard@56.0.3(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-clipboard@56.0.3(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  expo-constants@56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
+  expo-constants@56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
     dependencies:
       '@expo/env': 2.3.0
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - supports-color
   expo-crypto@56.0.4(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-  expo-dev-client@56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
+  expo-dev-client@56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      expo-dev-launcher: 56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-dev-launcher: 56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
-      expo-dev-menu: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-dev-menu: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       expo-dev-menu-interface: 56.0.1(expo@56.0.8)
       expo-manifests: 56.0.4(expo@56.0.8)
       expo-updates-interface: 56.0.2(expo@56.0.8)
     transitivePeerDependencies:
       - react-native
-  expo-dev-launcher@56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
+  expo-dev-launcher@56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
     dependencies:
       '@expo/schema-utils': 56.0.1
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      expo-dev-menu: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-dev-menu: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       expo-manifests: 56.0.4(expo@56.0.8)
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
   expo-dev-menu-interface@56.0.1(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-  expo-dev-menu@56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
+  expo-dev-menu@56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       expo-dev-menu-interface: 56.0.1(expo@56.0.8)
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
   expo-eas-client@56.0.1: {}
-  expo-file-system@56.0.7(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
+  expo-file-system@56.0.7(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  expo-font@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-font@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       fontfaceobserver: 2.3.0
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  expo-glass-effect@56.0.4(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-glass-effect@56.0.4(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
   expo-haptics@56.0.3(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
   expo-image-loader@56.0.3(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
   expo-image-picker@56.0.15(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       expo-image-loader: 56.0.3(expo@56.0.8)
   expo-json-utils@56.0.0: {}
   expo-keep-awake@56.0.3(expo@56.0.8)(react@19.2.3):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-  expo-linking@56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-linking@56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
-      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       invariant: 2.2.4
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - expo
       - supports-color
   expo-manifests@56.0.4(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       expo-json-utils: 56.0.0
   expo-modules-autolinking@56.0.14(typescript@6.0.3):
       - supports-color
       - typescript
-  expo-modules-core@56.0.14(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-modules-core@56.0.14(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       '@expo/expo-modules-macros-plugin': 0.0.9
-      expo-modules-jsi: 56.0.7(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-modules-jsi: 56.0.7(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       invariant: 2.2.4
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     optionalDependencies:
-      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-  expo-modules-jsi@56.0.7(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
+  expo-modules-jsi@56.0.7(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
     dependencies:
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
   expo-network@56.0.5(expo@56.0.8)(react@19.2.3):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-  expo-notifications@56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3):
+  expo-notifications@56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3):
     dependencies:
       '@expo/image-utils': 0.10.1(typescript@6.0.3)
       abort-controller: 3.0.0
       badgin: 1.2.3
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       expo-application: 56.0.3(expo@56.0.8)
-      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - supports-color
       - typescript
-  expo-paste-input@0.1.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-paste-input@0.1.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  expo-router@56.2.8(5bfdf39b8f760e4dc2d5c3acffc97310):
+  expo-router@56.2.8(c021de11d02907bd585610408f5252e8):
     dependencies:
-      '@expo/log-box': 56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/log-box': 56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      '@expo/metro-runtime': 56.0.13(@expo/log-box@56.0.12)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/metro-runtime': 56.0.13(@expo/log-box@56.0.12)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@expo/schema-utils': 56.0.1
-      '@expo/ui': 56.0.15(961c4aa6f32829b318e3c87ef20ad401)
+      '@expo/ui': 56.0.15(ab3f255d102c60ba0fd2bbe4e47ba584)
       '@radix-ui/react-slot': 1.2.4(@types/react@19.2.16)(react@19.2.3)
       '@radix-ui/react-tabs': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.16))(@types/react@19.2.16)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@react-native-masked-view/masked-view': 0.3.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@react-native-masked-view/masked-view': 0.3.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@testing-library/jest-dom': 6.9.1
       '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
       client-only: 0.0.1
       color: 4.2.3
       debug: 4.4.3
       escape-string-regexp: 4.0.0
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
-      expo-glass-effect: 56.0.4(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-glass-effect: 56.0.4(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      expo-linking: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-linking: 56.0.13(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-server: 56.0.4
-      expo-symbols: 56.0.5(expo-font@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-symbols: 56.0.5(expo-font@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       fast-deep-equal: 3.1.3
       invariant: 2.2.4
       nanoid: 3.3.12
       react: 19.2.3
       react-fast-compare: 3.2.2
       react-is: 19.2.7
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      react-native-drawer-layout: 4.2.4(0e9729601f58a7a7ae26c76fe6017455)
+      react-native-drawer-layout: 4.2.4(react-native-gesture-handler@2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-reanimated@4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      react-native-safe-area-context: 5.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-safe-area-context: 5.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      react-native-screens: 4.25.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-screens: 4.25.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       server-only: 0.0.1
       sf-symbols-typescript: 2.2.0
       shallowequal: 1.1.0
       vaul: 1.1.2(@types/react-dom@19.2.3(@types/react@19.2.16))(@types/react@19.2.16)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
     optionalDependencies:
       react-dom: 19.2.3(react@19.2.3)
-      react-native-gesture-handler: 2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-gesture-handler: 2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      react-native-reanimated: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-reanimated: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
     transitivePeerDependencies:
       - '@babel/core'
       - '@testing-library/dom'
   expo-secure-store@56.0.4(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
   expo-server@56.0.4: {}
     dependencies:
       '@expo/config-plugins': 56.0.8(typescript@6.0.3)
       '@expo/image-utils': 0.10.1(typescript@6.0.3)
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       xml2js: 0.6.0
     transitivePeerDependencies:
       - supports-color
   expo-structured-headers@56.0.0: {}
-  expo-symbols@56.0.5(expo-font@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-symbols@56.0.5(expo-font@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       '@expo-google-fonts/material-symbols': 0.4.38
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      expo-font: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-font: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       sf-symbols-typescript: 2.2.0
   expo-updates-interface@56.0.2(expo@56.0.8):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-  expo-updates@56.0.17(expo-dev-client@56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  expo-updates@56.0.17(expo-dev-client@56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       '@expo/code-signing-certificates': 0.0.6
       '@expo/plist': 0.7.0
       arg: 4.1.3
       chalk: 4.1.2
       debug: 4.4.3
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       expo-eas-client: 56.0.1
       expo-manifests: 56.0.4(expo@56.0.8)
       expo-structured-headers: 56.0.0
       ignore: 5.3.2
       nullthrows: 1.1.1
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       resolve-from: 5.0.0
     optionalDependencies:
-      expo-dev-client: 56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-dev-client: 56.0.18(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
     transitivePeerDependencies:
       - supports-color
-  expo-web-browser@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
+  expo-web-browser@56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
     dependencies:
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  expo-widgets@56.0.16(961c4aa6f32829b318e3c87ef20ad401):
+  expo-widgets@56.0.16(ab3f255d102c60ba0fd2bbe4e47ba584):
     dependencies:
       '@expo/plist': 0.7.0
-      '@expo/ui': 56.0.15(961c4aa6f32829b318e3c87ef20ad401)
+      '@expo/ui': 56.0.15(ab3f255d102c60ba0fd2bbe4e47ba584)
-      expo: 56.0.8(63f7aade424ad9e7b1154b679fa2a14d)
+      expo: 56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
       - react-native-reanimated
       - react-native-worklets
-  expo@56.0.8(63f7aade424ad9e7b1154b679fa2a14d):
+  expo@56.0.8(@babel/core@7.29.7)(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-router@56.2.8)(expo-widgets@56.0.16)(react-dom@19.2.3(react@19.2.3))(react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6):
     dependencies:
       '@babel/runtime': 7.29.7
-      '@expo/cli': 56.1.13(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-constants@56.0.16)(expo-font@56.0.5)(expo-router@56.2.8)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
+      '@expo/cli': 56.1.13(@expo/dom-webview@56.0.5)(@expo/metro-runtime@56.0.13)(bufferutil@4.1.0)(expo-constants@56.0.16)(expo-font@56.0.5)(expo-router@56.2.8)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)(utf-8-validate@6.0.6)
       '@expo/config': 56.0.9(typescript@6.0.3)
       '@expo/config-plugins': 56.0.8(typescript@6.0.3)
-      '@expo/devtools': 56.0.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/devtools': 56.0.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@expo/fingerprint': 0.19.3
       '@expo/local-build-cache-provider': 56.0.8(typescript@6.0.3)
-      '@expo/log-box': 56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/log-box': 56.0.12(@expo/dom-webview@56.0.5)(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@expo/metro': 56.0.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
       '@expo/metro-config': 56.0.13(patch_hash=8cb08b5bb7051ed9d2dbe46a2c293c5a1e17f1bd6ddf30de27909e18c921ff46)(bufferutil@4.1.0)(expo@56.0.8)(typescript@6.0.3)(utf-8-validate@6.0.6)
       '@ungap/structured-clone': 1.3.1
       babel-preset-expo: 56.0.14(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo-widgets@56.0.16)(expo@56.0.8)(react-refresh@0.14.2)
-      expo-asset: 56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
+      expo-asset: 56.0.15(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
-      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-constants: 56.0.16(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
-      expo-file-system: 56.0.7(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
+      expo-file-system: 56.0.7(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))
-      expo-font: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-font: 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       expo-keep-awake: 56.0.3(expo@56.0.8)(react@19.2.3)
       expo-modules-autolinking: 56.0.14(typescript@6.0.3)
-      expo-modules-core: 56.0.14(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      expo-modules-core: 56.0.14(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       pretty-format: 29.7.0
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       react-refresh: 0.14.2
       whatwg-url-minimum: 0.1.2
     optionalDependencies:
-      '@expo/dom-webview': 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/dom-webview': 56.0.5(expo@56.0.8)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      '@expo/metro-runtime': 56.0.13(@expo/log-box@56.0.12)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@expo/metro-runtime': 56.0.13(@expo/log-box@56.0.12)(expo@56.0.8)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-dom: 19.2.3(react@19.2.3)
-      react-native-webview: 13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-webview: 13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
     transitivePeerDependencies:
       - '@babel/core'
       - bufferutil
     transitivePeerDependencies:
       - supports-color
-  react-native-drawer-layout@4.2.4(0e9729601f58a7a7ae26c76fe6017455):
+  react-native-drawer-layout@4.2.4(react-native-gesture-handler@2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-reanimated@4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       color: 4.2.3
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      react-native-gesture-handler: 2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-gesture-handler: 2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      react-native-reanimated: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-reanimated: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       use-latest-callback: 0.2.6(react@19.2.3)
-  react-native-gesture-handler@2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-gesture-handler@2.31.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       '@egjs/hammerjs': 2.0.17
       '@types/react-test-renderer': 19.1.0
       hoist-non-react-statics: 3.3.2
       invariant: 2.2.4
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  react-native-image-viewing@0.2.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-image-viewing@0.2.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  react-native-is-edge-to-edge@1.3.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-is-edge-to-edge@1.3.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  react-native-keyboard-controller@1.21.6(react-native-reanimated@4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-keyboard-controller@1.21.6(react-native-reanimated@4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      react-native-is-edge-to-edge: 1.3.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-is-edge-to-edge: 1.3.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      react-native-reanimated: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-reanimated: 4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-  react-native-nitro-markdown@0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-nitro-markdown@0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      react-native-nitro-modules: 0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-nitro-modules: 0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
     optionalDependencies:
-      react-native-svg: 15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-svg: 15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-  react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  react-native-reanimated@4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-reanimated@4.3.1(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      react-native-is-edge-to-edge: 1.3.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-is-edge-to-edge: 1.3.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
-      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       semver: 7.8.1
-  react-native-safe-area-context@5.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-safe-area-context@5.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  react-native-screens@4.25.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-screens@4.25.2(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
       react-freeze: 1.0.4(react@19.2.3)
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       warn-once: 0.1.1
-  react-native-shiki-engine@0.3.12(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-shiki-engine@0.3.12(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       '@shikijs/types': 4.2.0
       '@shikijs/vscode-textmate': 10.0.2
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  react-native-svg@15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-svg@15.15.4(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       css-select: 5.2.2
       css-tree: 1.1.3
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       warn-once: 0.1.1
-  react-native-url-polyfill@2.0.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
+  react-native-url-polyfill@2.0.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)):
     dependencies:
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       whatwg-url-without-unicode: 8.0.0-3
-  react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-webview@13.16.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       escape-string-regexp: 4.0.0
       invariant: 2.2.4
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-  react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       '@babel/core': 7.29.7
       '@babel/plugin-transform-arrow-functions': 7.29.7(@babel/core@7.29.7)
       '@babel/plugin-transform-template-literals': 7.29.7(@babel/core@7.29.7)
       '@babel/plugin-transform-unicode-regex': 7.29.7(@babel/core@7.29.7)
       '@babel/preset-typescript': 7.29.7(@babel/core@7.29.7)
-      '@react-native/metro-config': 0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6)
+      '@react-native/metro-config': 0.85.3(@babel/core@7.29.7)
       convert-source-map: 2.0.0
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       semver: 7.8.1
     transitivePeerDependencies:
       - supports-color
-  react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6):
+  react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6):
     dependencies:
       '@react-native/assets-registry': 0.85.3
       '@react-native/codegen': 0.85.3(@babel/core@7.29.7)
-      '@react-native/community-cli-plugin': 0.85.3(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(bufferutil@4.1.0)(utf-8-validate@6.0.6)
+      '@react-native/community-cli-plugin': 0.85.3(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(bufferutil@4.1.0)(utf-8-validate@6.0.6)
       '@react-native/gradle-plugin': 0.85.3
       '@react-native/js-polyfills': 0.85.3
       '@react-native/normalize-colors': 0.85.3
-      '@react-native/virtualized-lists': 0.85.3(@types/react@19.2.16)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      '@react-native/virtualized-lists': 0.85.3(@types/react@19.2.16)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       abort-controller: 3.0.0
       anser: 1.4.10
       ansi-regex: 5.0.1
   universalify@2.0.1: {}
-  uniwind@1.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.0):
+  uniwind@1.7.0(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.0):
     dependencies:
       '@tailwindcss/node': 4.2.1
       '@tailwindcss/oxide': 4.2.1
       culori: 4.0.2
       lightningcss: 1.30.1
       react: 19.2.3
-      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
+      react-native: 0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
       tailwindcss: 4.3.0
   unpipe@1.0.0: {}

Merge upstream/main: Effect-service refactors

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -33,7 +33,7 @@ import * as Effect from "effect/Effect"; · 32 unmodified lines
33	import * as Schema from "effect/Schema";	33	import * as Schema from "effect/Schema";
34		34
35	import * as IpcChannels from "../channels.ts";	35	import * as IpcChannels from "../channels.ts";
36	import { makeIpcMethod } from "../DesktopIpc.ts";	36	import * as DesktopIpc from "../DesktopIpc.ts";
37	import * as DesktopSshEnvironment from "../../ssh/DesktopSshEnvironment.ts";	37	import * as DesktopSshEnvironment from "../../ssh/DesktopSshEnvironment.ts";
38	import * as DesktopSshPasswordPrompts from "../../ssh/DesktopSshPasswordPrompts.ts";	38	import * as DesktopSshPasswordPrompts from "../../ssh/DesktopSshPasswordPrompts.ts";
39		39
@@ -107,7 +107,7 @@ const withLoopbackSshApi = · 67 unmodified lines
107	),	107	),
108	);	108	);
109		109
110	export const discoverSshHosts = makeIpcMethod({	110	export const discoverSshHosts = DesktopIpc.makeIpcMethod({
111	channel: IpcChannels.DISCOVER_SSH_HOSTS_CHANNEL,	111	channel: IpcChannels.DISCOVER_SSH_HOSTS_CHANNEL,
112	payload: Schema.Void,	112	payload: Schema.Void,
113	result: Schema.Array(DesktopDiscoveredSshHostSchema),	113	result: Schema.Array(DesktopDiscoveredSshHostSchema),
@@ -117,7 +117,7 @@ export const discoverSshHosts = makeIpcMethod({ · 3 unmodified lines
117	}),	117	}),
118	});	118	});
119		119
120	export const ensureSshEnvironment = makeIpcMethod({	120	export const ensureSshEnvironment = DesktopIpc.makeIpcMethod({
121	channel: IpcChannels.ENSURE_SSH_ENVIRONMENT_CHANNEL,	121	channel: IpcChannels.ENSURE_SSH_ENVIRONMENT_CHANNEL,
122	payload: DesktopSshEnvironmentEnsureInputSchema,	122	payload: DesktopSshEnvironmentEnsureInputSchema,
123	result: DesktopSshEnvironmentEnsureResultSchema,	123	result: DesktopSshEnvironmentEnsureResultSchema,
@@ -139,7 +139,7 @@ export const ensureSshEnvironment = makeIpcMethod({ · 15 unmodified lines
139	}),	139	}),
140	});	140	});
141		141
142	export const disconnectSshEnvironment = makeIpcMethod({	142	export const disconnectSshEnvironment = DesktopIpc.makeIpcMethod({
143	channel: IpcChannels.DISCONNECT_SSH_ENVIRONMENT_CHANNEL,	143	channel: IpcChannels.DISCONNECT_SSH_ENVIRONMENT_CHANNEL,
144	payload: DesktopSshEnvironmentTargetSchema,	144	payload: DesktopSshEnvironmentTargetSchema,
145	result: Schema.Void,	145	result: Schema.Void,
@@ -149,7 +149,7 @@ export const disconnectSshEnvironment = makeIpcMethod({ · 3 unmodified lines
149	}),	149	}),
150	});	150	});
151		151
152	export const fetchSshEnvironmentDescriptor = makeIpcMethod({	152	export const fetchSshEnvironmentDescriptor = DesktopIpc.makeIpcMethod({
153	channel: IpcChannels.FETCH_SSH_ENVIRONMENT_DESCRIPTOR_CHANNEL,	153	channel: IpcChannels.FETCH_SSH_ENVIRONMENT_DESCRIPTOR_CHANNEL,
154	payload: DesktopSshHttpBaseUrlInputSchema,	154	payload: DesktopSshHttpBaseUrlInputSchema,
155	result: ExecutionEnvironmentDescriptor,	155	result: ExecutionEnvironmentDescriptor,
@@ -160,7 +160,7 @@ export const fetchSshEnvironmentDescriptor = makeIpcMethod({ · 4 unmodified lines
160	}),	160	}),
161	});	161	});
162		162
163	export const bootstrapSshBearerSession = makeIpcMethod({	163	export const bootstrapSshBearerSession = DesktopIpc.makeIpcMethod({
164	channel: IpcChannels.BOOTSTRAP_SSH_BEARER_SESSION_CHANNEL,	164	channel: IpcChannels.BOOTSTRAP_SSH_BEARER_SESSION_CHANNEL,
165	payload: DesktopSshBearerBootstrapInputSchema,	165	payload: DesktopSshBearerBootstrapInputSchema,
166	result: AuthAccessTokenResult,	166	result: AuthAccessTokenResult,
@@ -177,7 +177,7 @@ export const bootstrapSshBearerSession = makeIpcMethod({ · 10 unmodified lines
177	}),	177	}),
178	});	178	});
179		179
180	export const fetchSshSessionState = makeIpcMethod({	180	export const fetchSshSessionState = DesktopIpc.makeIpcMethod({
181	channel: IpcChannels.FETCH_SSH_SESSION_STATE_CHANNEL,	181	channel: IpcChannels.FETCH_SSH_SESSION_STATE_CHANNEL,
182	payload: DesktopSshBearerRequestInputSchema,	182	payload: DesktopSshBearerRequestInputSchema,
183	result: AuthSessionState,	183	result: AuthSessionState,
@@ -194,7 +194,7 @@ export const fetchSshSessionState = makeIpcMethod({ · 10 unmodified lines
194	}),	194	}),
195	});	195	});
196		196
197	export const issueSshWebSocketTicket = makeIpcMethod({	197	export const issueSshWebSocketTicket = DesktopIpc.makeIpcMethod({
198	channel: IpcChannels.ISSUE_SSH_WEBSOCKET_TOKEN_CHANNEL,	198	channel: IpcChannels.ISSUE_SSH_WEBSOCKET_TOKEN_CHANNEL,
199	payload: DesktopSshBearerRequestInputSchema,	199	payload: DesktopSshBearerRequestInputSchema,
200	result: AuthWebSocketTicketResult,	200	result: AuthWebSocketTicketResult,
@@ -211,7 +211,7 @@ export const issueSshWebSocketTicket = makeIpcMethod({ · 10 unmodified lines
211	}),	211	}),
212	});	212	});
213		213
214	export const resolveSshPasswordPrompt = makeIpcMethod({	214	export const resolveSshPasswordPrompt = DesktopIpc.makeIpcMethod({
215	channel: IpcChannels.RESOLVE_SSH_PASSWORD_PROMPT_CHANNEL,	215	channel: IpcChannels.RESOLVE_SSH_PASSWORD_PROMPT_CHANNEL,
216	payload: DesktopSshPasswordPromptResolutionInputSchema,	216	payload: DesktopSshPasswordPromptResolutionInputSchema,
217	result: Schema.Void,	217	result: Schema.Void,

@@ -4,7 +4,7 @@ import * as Layer from "effect/Layer"; · 3 unmodified lines
4	import { FetchHttpClient, HttpRouter, HttpServer } from "effect/unstable/http";	4	import { FetchHttpClient, HttpRouter, HttpServer } from "effect/unstable/http";
5	import * as HttpApiBuilder from "effect/unstable/httpapi/HttpApiBuilder";	5	import * as HttpApiBuilder from "effect/unstable/httpapi/HttpApiBuilder";
6		6
7	import { ServerConfig } from "./config.ts";	7	import * as ServerConfig from "./config.ts";
8	import {	8	import {
9	otlpTracesProxyRouteLayer,	9	otlpTracesProxyRouteLayer,
10	assetRouteLayer,	10	assetRouteLayer,
@@ -16,15 +16,15 @@ import { fixPath } from "./os-jank.ts"; · 5 unmodified lines
16	import { websocketRpcRouteLayer } from "./ws.ts";	16	import { websocketRpcRouteLayer } from "./ws.ts";
17	import * as ExternalLauncher from "./process/externalLauncher.ts";	17	import * as ExternalLauncher from "./process/externalLauncher.ts";
18	import { layerConfig as SqlitePersistenceLayerLive } from "./persistence/Layers/Sqlite.ts";	18	import { layerConfig as SqlitePersistenceLayerLive } from "./persistence/Layers/Sqlite.ts";
19	import { ServerLifecycleEventsLive } from "./serverLifecycleEvents.ts";	19	import * as ServerLifecycleEvents from "./serverLifecycleEvents.ts";
20	import { AnalyticsServiceLayerLive } from "./telemetry/Layers/AnalyticsService.ts";	20	import { AnalyticsServiceLayerLive } from "./telemetry/Layers/AnalyticsService.ts";
21	import { ProviderSessionDirectoryLive } from "./provider/Layers/ProviderSessionDirectory.ts";	21	import { ProviderSessionDirectoryLive } from "./provider/Layers/ProviderSessionDirectory.ts";
22	import { ProviderSessionRuntimeRepositoryLive } from "./persistence/Layers/ProviderSessionRuntime.ts";	22	import { ProviderSessionRuntimeRepositoryLive } from "./persistence/Layers/ProviderSessionRuntime.ts";
23	import { ProviderAdapterRegistryLive } from "./provider/Layers/ProviderAdapterRegistry.ts";	23	import { ProviderAdapterRegistryLive } from "./provider/Layers/ProviderAdapterRegistry.ts";
24	import { ProviderEventLoggersLive } from "./provider/Layers/ProviderEventLoggers.ts";	24	import * as ProviderEventLoggers from "./provider/Layers/ProviderEventLoggers.ts";
25	import { ProviderServiceLive } from "./provider/Layers/ProviderService.ts";	25	import { ProviderServiceLive } from "./provider/Layers/ProviderService.ts";
26	import { ProviderSessionReaperLive } from "./provider/Layers/ProviderSessionReaper.ts";	26	import { ProviderSessionReaperLive } from "./provider/Layers/ProviderSessionReaper.ts";
27	import { OpenCodeRuntimeLive } from "./provider/opencodeRuntime.ts";	27	import * as OpenCodeRuntime from "./provider/opencodeRuntime.ts";
28	import { CheckpointDiffQueryLive } from "./checkpointing/Layers/CheckpointDiffQuery.ts";	28	import { CheckpointDiffQueryLive } from "./checkpointing/Layers/CheckpointDiffQuery.ts";
29	import { CheckpointStoreLive } from "./checkpointing/Layers/CheckpointStore.ts";	29	import { CheckpointStoreLive } from "./checkpointing/Layers/CheckpointStore.ts";
30	import * as AzureDevOpsCli from "./sourceControl/AzureDevOpsCli.ts";	30	import * as AzureDevOpsCli from "./sourceControl/AzureDevOpsCli.ts";
@@ -40,8 +40,8 @@ import * as PreviewManager from "./preview/Manager.ts"; · 9 unmodified lines
40	import * as PortScanner from "./preview/PortScanner.ts";	40	import * as PortScanner from "./preview/PortScanner.ts";
41	import * as ProcessRunner from "./processRunner.ts";	41	import * as ProcessRunner from "./processRunner.ts";
42	import * as GitManager from "./git/GitManager.ts";	42	import * as GitManager from "./git/GitManager.ts";
43	import { KeybindingsLive } from "./keybindings.ts";	43	import * as Keybindings from "./keybindings.ts";
44	import { ServerRuntimeStartup, ServerRuntimeStartupLive } from "./serverRuntimeStartup.ts";	44	import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts";
45	import { OrchestrationReactorLive } from "./orchestration/Layers/OrchestrationReactor.ts";	45	import { OrchestrationReactorLive } from "./orchestration/Layers/OrchestrationReactor.ts";
46	import { RuntimeReceiptBusLive } from "./orchestration/Layers/RuntimeReceiptBus.ts";	46	import { RuntimeReceiptBusLive } from "./orchestration/Layers/RuntimeReceiptBus.ts";
47	import { ProviderRuntimeIngestionLive } from "./orchestration/Layers/ProviderRuntimeIngestion.ts";	47	import { ProviderRuntimeIngestionLive } from "./orchestration/Layers/ProviderRuntimeIngestion.ts";
@@ -51,7 +51,7 @@ import { ThreadDeletionReactorLive } from "./orchestration/Layers/ThreadDeletion · 3 unmodified lines
51	import * as AgentAwarenessRelay from "./relay/AgentAwarenessRelay.ts";	51	import * as AgentAwarenessRelay from "./relay/AgentAwarenessRelay.ts";
52	import { hasCloudPublicConfig } from "./cloud/publicConfig.ts";	52	import { hasCloudPublicConfig } from "./cloud/publicConfig.ts";
53	import { ProviderRegistryLive } from "./provider/Layers/ProviderRegistry.ts";	53	import { ProviderRegistryLive } from "./provider/Layers/ProviderRegistry.ts";
54	import { ServerSettingsLive } from "./serverSettings.ts";	54	import * as ServerSettings from "./serverSettings.ts";
55	import { ProjectFaviconResolverLive } from "./project/Layers/ProjectFaviconResolver.ts";	55	import { ProjectFaviconResolverLive } from "./project/Layers/ProjectFaviconResolver.ts";
56	import { RepositoryIdentityResolverLive } from "./project/Layers/RepositoryIdentityResolver.ts";	56	import { RepositoryIdentityResolverLive } from "./project/Layers/RepositoryIdentityResolver.ts";
57	import * as WorkspaceEntries from "./workspace/WorkspaceEntries.ts";	57	import * as WorkspaceEntries from "./workspace/WorkspaceEntries.ts";
@@ -112,14 +112,14 @@ const PtyAdapterLive = Layer.unwrap( · 54 unmodified lines
112		112
113	const RelayClientLive = Layer.unwrap(	113	const RelayClientLive = Layer.unwrap(
114	Effect.gen(function* () {	114	Effect.gen(function* () {
115	const config = yield* ServerConfig;	115	const config = yield* ServerConfig.ServerConfig;
116	return RelayClient.layerCloudflared({ baseDir: config.baseDir });	116	return RelayClient.layerCloudflared({ baseDir: config.baseDir });
117	}),	117	}),
118	);	118	);
119		119
120	const HttpServerLive = Layer.unwrap(	120	const HttpServerLive = Layer.unwrap(
121	Effect.gen(function* () {	121	Effect.gen(function* () {
122	const config = yield* ServerConfig;	122	const config = yield* ServerConfig.ServerConfig;
123	if (typeof Bun !== "undefined") {	123	if (typeof Bun !== "undefined") {
124	const BunHttpServer = yield* Effect.promise(	124	const BunHttpServer = yield* Effect.promise(
125	() => import("@effect/platform-bun/BunHttpServer"),	125	() => import("@effect/platform-bun/BunHttpServer"),
@@ -292,7 +292,7 @@ const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe( · 166 unmodified lines
292	Layer.provideMerge(ProviderRuntimeLayerLive),	292	Layer.provideMerge(ProviderRuntimeLayerLive),
293	Layer.provideMerge(Layer.mergeAll(TerminalLayerLive, PreviewLayerLive)),	293	Layer.provideMerge(Layer.mergeAll(TerminalLayerLive, PreviewLayerLive)),
294	Layer.provideMerge(PersistenceLayerLive),	294	Layer.provideMerge(PersistenceLayerLive),
295	Layer.provideMerge(KeybindingsLive),	295	Layer.provideMerge(Keybindings.layer),
296	Layer.provideMerge(ProviderRegistryLive),	296	Layer.provideMerge(ProviderRegistryLive),
297	// The instance registry is the new routing keystone — text generation,	297	// The instance registry is the new routing keystone — text generation,
298	// adapter lookup, and runtime ingestion all resolve `ProviderInstanceId`	298	// adapter lookup, and runtime ingestion all resolve `ProviderInstanceId`
@@ -305,14 +305,14 @@ const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe( · 6 unmodified lines
305	// `ProviderService` (canonical stream, written after event normalization).	305	// `ProviderService` (canonical stream, written after event normalization).
306	// Provided once at the runtime level so every consumer sees the same	306	// Provided once at the runtime level so every consumer sees the same
307	// logger instances.	307	// logger instances.
308	Layer.provideMerge(ProviderEventLoggersLive),	308	Layer.provideMerge(ProviderEventLoggers.ProviderEventLoggersLive),
309	// `OpenCodeDriver.create()` yields `OpenCodeRuntime`; previously the old	309	// `OpenCodeDriver.create()` yields `OpenCodeRuntime`; previously the old
310	// `ProviderRegistryLive` pulled `OpenCodeRuntimeLive` in for itself, but	310	// `ProviderRegistryLive` pulled `OpenCodeRuntimeLive` in for itself, but
311	// the rewritten registry reads snapshots off the instance registry and	311	// the rewritten registry reads snapshots off the instance registry and
312	// no longer transitively provides it. Exposing it at the runtime level	312	// no longer transitively provides it. Exposing it at the runtime level
313	// keeps a single Live for all opencode consumers.	313	// keeps a single Live for all opencode consumers.
314	Layer.provideMerge(OpenCodeRuntimeLive),	314	Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
315	Layer.provideMerge(ServerSettingsLive),	315	Layer.provideMerge(ServerSettings.layer.pipe(Layer.provide(ServerSecretStore.layer))),
316	Layer.provideMerge(WorkspaceLayerLive),	316	Layer.provideMerge(WorkspaceLayerLive),
317	Layer.provideMerge(ProjectFaviconResolverLayerLive),	317	Layer.provideMerge(ProjectFaviconResolverLayerLive),
318	Layer.provideMerge(RepositoryIdentityResolverLive),	318	Layer.provideMerge(RepositoryIdentityResolverLive),
@@ -334,11 +334,11 @@ const RuntimeDependenciesLive = RuntimeCoreDependenciesLive.pipe( · 15 unmodified lines
334	Layer.provideMerge(TraceDiagnostics.layer),	334	Layer.provideMerge(TraceDiagnostics.layer),
335	Layer.provideMerge(AnalyticsServiceLayerLive),	335	Layer.provideMerge(AnalyticsServiceLayerLive),
336	Layer.provideMerge(ExternalLauncher.layer),	336	Layer.provideMerge(ExternalLauncher.layer),
337	Layer.provideMerge(ServerLifecycleEventsLive),	337	Layer.provideMerge(ServerLifecycleEvents.layer),
338	Layer.provide(NetService.layer),	338	Layer.provide(NetService.layer),
339	);	339	);
340		340
341	const RuntimeServicesLive = ServerRuntimeStartupLive.pipe(	341	const RuntimeServicesLive = ServerRuntimeStartup.layer.pipe(
342	Layer.provideMerge(RuntimeDependenciesLive),	342	Layer.provideMerge(RuntimeDependenciesLive),
343	);	343	);
344		344
@@ -361,14 +361,14 @@ export const makeRoutesLayer = Layer.mergeAll( · 16 unmodified lines
361		361
362	export const makeServerLayer = Layer.unwrap(	362	export const makeServerLayer = Layer.unwrap(
363	Effect.gen(function* () {	363	Effect.gen(function* () {
364	const config = yield* ServerConfig;	364	const config = yield* ServerConfig.ServerConfig;
365		365
366	yield* fixPath();	366	yield* fixPath();
367		367
368	const httpListeningLayer = Layer.effectDiscard(	368	const httpListeningLayer = Layer.effectDiscard(
369	Effect.gen(function* () {	369	Effect.gen(function* () {
370	yield* HttpServer.HttpServer;	370	yield* HttpServer.HttpServer;
371	const startup = yield* ServerRuntimeStartup;	371	const startup = yield* ServerRuntimeStartup.ServerRuntimeStartup;
372	yield* startup.markHttpListening;	372	yield* startup.markHttpListening;
373	}),	373	}),
374	);	374	);

@@ -9,7 +9,7 @@ import * as Option from "effect/Option"; · 8 unmodified lines
9	import * as Redacted from "effect/Redacted";	9	import * as Redacted from "effect/Redacted";
10	import * as Schema from "effect/Schema";	10	import * as Schema from "effect/Schema";
11	import { Headers, HttpClient, HttpClientRequest } from "effect/unstable/http";	11	import { Headers, HttpClient, HttpClientRequest } from "effect/unstable/http";
12	import type { ApnsCredentials } from "../Config.ts";	12	import * as RelayConfiguration from "../Config.ts";
13	import type { ApnsNotificationPayload } from "./apnsDeliveryJobs.ts";	13	import type { ApnsNotificationPayload } from "./apnsDeliveryJobs.ts";
14		14
15	const LIVE_ACTIVITY_NAME = "AgentActivity";	15	const LIVE_ACTIVITY_NAME = "AgentActivity";
@@ -99,9 +99,9 @@ const encodeApnsJwtPayloadJson = Schema.encodeEffect( · 83 unmodified lines
99	);	99	);
100		100
101	const makeApnsJwt = Effect.fn("relay.apns.make_jwt")(function* (input: {	101	const makeApnsJwt = Effect.fn("relay.apns.make_jwt")(function* (input: {
102	readonly teamId: ApnsCredentials["teamId"];	102	readonly teamId: RelayConfiguration.ApnsCredentials["teamId"];
103	readonly keyId: ApnsCredentials["keyId"];	103	readonly keyId: RelayConfiguration.ApnsCredentials["keyId"];
104	readonly privateKey: ApnsCredentials["privateKey"];	104	readonly privateKey: RelayConfiguration.ApnsCredentials["privateKey"];
105	readonly issuedAtUnixSeconds: number;	105	readonly issuedAtUnixSeconds: number;
106	}) {	106	}) {
107	const headerJson = yield* encodeApnsJwtHeaderJson({ alg: "ES256", kid: input.keyId }).pipe(	107	const headerJson = yield* encodeApnsJwtHeaderJson({ alg: "ES256", kid: input.keyId }).pipe(
@@ -235,12 +235,12 @@ export interface ApnsClientShape { · 127 unmodified lines
235	readonly makeLiveActivityRequest: typeof makeLiveActivityRequest;	235	readonly makeLiveActivityRequest: typeof makeLiveActivityRequest;
236	readonly makePushNotificationRequest: typeof makePushNotificationRequest;	236	readonly makePushNotificationRequest: typeof makePushNotificationRequest;
237	readonly sendLiveActivityRequest: (input: {	237	readonly sendLiveActivityRequest: (input: {
238	readonly credentials: ApnsCredentials;	238	readonly credentials: RelayConfiguration.ApnsCredentials;
239	readonly request: ApnsLiveActivityRequest;	239	readonly request: ApnsLiveActivityRequest;
240	readonly issuedAtUnixSeconds: number;	240	readonly issuedAtUnixSeconds: number;
241	}) => Effect.Effect<ApnsDeliveryResult, ApnsError>;	241	}) => Effect.Effect<ApnsDeliveryResult, ApnsError>;
242	readonly sendPushNotificationRequest: (input: {	242	readonly sendPushNotificationRequest: (input: {
243	readonly credentials: ApnsCredentials;	243	readonly credentials: RelayConfiguration.ApnsCredentials;
244	readonly request: ApnsPushNotificationRequest;	244	readonly request: ApnsPushNotificationRequest;
245	readonly issuedAtUnixSeconds: number;	245	readonly issuedAtUnixSeconds: number;
246	}) => Effect.Effect<ApnsDeliveryResult, ApnsError>;	246	}) => Effect.Effect<ApnsDeliveryResult, ApnsError>;