@yielded/auth-persistence-drizzle 0.1.0-beta.25 → 0.1.0-beta.27

package/src/Libsql.ts

@@ -1,16 +1,13 @@
-import { NativeDatabase, requireStandalone as standalone } from "@yielded/auth-persistence/Adapter";
-import { EmailUnavailable } from "@yielded/auth/Email";
-import { PasswordUnavailable } from "@yielded/auth/Password";
-import { ProofUnavailable } from "@yielded/auth/Proofs";
-import { SessionUnavailable } from "@yielded/auth/Sessions";
-export { OAuthProxyPersistence } from "./internal/drizzle-sqlite-oauth-proxy";
-
 import type { AnyRelations } from "drizzle-orm";
-import { type EffectLibsqlDatabase, makeWithDefaults } from "drizzle-orm/effect-libsql";
+import {
+  EffectLibsqlTransaction as PasskeyTransaction,
+  type EffectLibsqlDatabase,
+  makeWithDefaults,
+} from "drizzle-orm/effect-libsql";
 import type { AnySQLiteTable } from "drizzle-orm/sqlite-core";
 import { Context, Effect, Layer } from "effect";
 
-import { nativeDatabase } from "./drizzle/native-database";
+import { NativeDatabase, nativeDatabase } from "./drizzle/native-database";
 
 /** The application-owned Drizzle database used to construct persistence services. */
 export class Database extends Context.Service<Database, EffectLibsqlDatabase<AnyRelations>>()(
@@ -25,48 +22,39 @@ import type {
   IdentityTables,
   SubjectProvisioningTables,
 } from "./drizzle/model";
-import { makeSqliteEmailTarget, sqliteEmailConfiguration } from "./drizzle/sqlite-emails";
+import { makePasswordTarget } from "./drizzle/password-drivers";
+import { makeProofTarget } from "./drizzle/proof-drivers";
 import {
   makeSqliteExternalIdentityServices,
   makeSqliteIdentityServices,
   makeSqliteSubjectProvisioningServices,
 } from "./drizzle/sqlite-identity";
-import { makeSqlitePasswordTarget, sqlitePasswordConfiguration } from "./drizzle/sqlite-passwords";
-import { makeSqliteProofTarget, sqliteProofConfiguration } from "./drizzle/sqlite-proofs";
-import { makeSqliteSessionTarget, sqliteSessionConfiguration } from "./drizzle/sqlite-sessions";
 
-const requireStandaloneSession = standalone(() => SessionUnavailable.make({}));
-const requireStandaloneProof = standalone(() => ProofUnavailable.make({}));
-const requireStandalonePassword = standalone(() => PasswordUnavailable.make({}));
-const requireStandaloneEmail = standalone(() => EmailUnavailable.make({}));
-
-const sessionTarget = makeSqliteSessionTarget<Database, EffectLibsqlDatabase<AnyRelations>>(
-  Database,
-  sqliteSessionConfiguration("interactive", requireStandaloneSession),
-);
-
-const proofTarget = makeSqliteProofTarget<Database, EffectLibsqlDatabase<AnyRelations>>(
-  Database,
-  sqliteProofConfiguration("interactive", requireStandaloneProof),
-);
+const proofTarget = makeProofTarget(Database, {
+  mode: "native",
+  dialect: "sqlite",
+  transactionConstructor: PasskeyTransaction,
+});
 
-const passwordTarget = makeSqlitePasswordTarget<Database, EffectLibsqlDatabase<AnyRelations>>(
-  Database,
-  sqlitePasswordConfiguration("interactive", requireStandalonePassword, requireStandaloneProof),
-);
+const passwordTarget = makePasswordTarget(Database, {
+  mode: "native",
+  dialect: "sqlite",
+  transactionConstructor: PasskeyTransaction,
+});
 
-const emailTarget = makeSqliteEmailTarget<Database, EffectLibsqlDatabase<AnyRelations>>(
-  Database,
-  sqliteEmailConfiguration("interactive", requireStandaloneEmail, requireStandaloneProof),
-);
+import { makeEmailTarget } from "./drizzle/email-drivers";
 
 export const {
-  coordinateEmailAddress,
-  coordinateEmailRegistration,
+  makeEmailSignInServices,
   makeEmailAddressServices,
   makeEmailRegistrationServices,
-  makeEmailSignInServices,
-} = emailTarget;
+  coordinateEmailAddress,
+  coordinateEmailRegistration,
+} = makeEmailTarget(Database, {
+  mode: "native",
+  dialect: "sqlite",
+  transactionConstructor: PasskeyTransaction,
+});
 
 export const {
   coordinatePasswordPersistence,
@@ -77,21 +65,6 @@ export const {
 
 export const { coordinateProofPersistence, makeProofPersistenceServices } = proofTarget;
 
-export const {
-  coordinateAuthenticationAuthority,
-  coordinatePendingAuthentication,
-  coordinateSignedSessionValidity,
-  coordinateStatefulSessions,
-  makeAuthenticationAuthorityServices,
-  makePendingAuthenticationServices,
-  makeSessionStepUpServices,
-  coordinateSessionStepUp,
-  makeSignedSessionValidityServices,
-  makeStatefulSessionServices,
-} = sessionTarget;
-
-export const commitMode = "interactive" as const;
-
 export const makeIdentityServices = <
   Subject extends AnySQLiteTable,
   Identifier extends AnySQLiteTable,
@@ -128,33 +101,16 @@ export const makeExternalIdentityServices = <
     Effect.provideServiceEffect(NativeDatabase, nativeDatabase(Database)),
   );
 
-import { makeSqlitePasswordPreparedTarget } from "./drizzle/sqlite-password-prepared";
-
-const passwordPreparedTarget = makeSqlitePasswordPreparedTarget<
-  Database,
-  EffectLibsqlDatabase<AnyRelations>
->(
-  Database,
-  sqlitePasswordConfiguration("interactive", requireStandalonePassword, requireStandaloneProof),
-);
-
-export const { makePasswordPreparedPersistenceServices, coordinatePasswordPreparedPersistence } =
-  passwordPreparedTarget;
-
-export { passwordPreparedPersistenceLayer } from "./drizzle/password-prepared-target";
-
 import { makeOAuthTarget } from "./drizzle/oauth-drivers";
-import { sqlClientOAuthStandaloneGuard } from "./drizzle/oauth-target";
 
 const oauthTarget = makeOAuthTarget<
   Database,
   EffectLibsqlDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
 >(Database, {
-  mode: "interactive",
+  mode: "native",
   dialect: "sqlite",
-  locking: false,
-  standaloneGuard: sqlClientOAuthStandaloneGuard,
+  transactionConstructor: PasskeyTransaction,
 });
 
 export const {
@@ -173,23 +129,20 @@ export const {
 } = oauthTarget;
 
 import { makePasskeyTarget } from "./drizzle/passkey-drivers";
-import { sqlClientPasskeyStandaloneGuard } from "./drizzle/passkey-target";
 
 const passkeyTarget = makePasskeyTarget<
   Database,
   EffectLibsqlDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
 >(Database, {
-  mode: "interactive",
+  transactionConstructor: PasskeyTransaction,
+  mode: "native",
   dialect: "sqlite",
-  locking: false,
-  standaloneGuard: sqlClientPasskeyStandaloneGuard,
 });
 
 export const {
   makePasskeyCredentialServices,
   makePasskeyPersistenceServices,
-  makePasskeyEnrollmentContextServices,
   makePasskeyRegistrationCeremonyServices,
   coordinatePasskeyPersistence,
   coordinatePasskeyRegistrationCeremony,
@@ -199,35 +152,12 @@ export const {
   coordinatePasskeyRegistration,
 } = passkeyTarget;
 
-import { makeTotpTarget, sqlClientTotpStandaloneGuard } from "./drizzle/totp-target";
+import { makePhoneTarget } from "./drizzle/phone-drivers";
 
-const totpTarget = makeTotpTarget<
+export const { makePhonePersistenceServices, coordinatePhonePersistence } = makePhoneTarget(
   Database,
-  EffectLibsqlDatabase<AnyRelations>,
-  AnySQLiteTable<{ dialect: "sqlite" }>
->(Database, {
-  mode: "interactive",
-  dialect: "sqlite",
-  locking: false,
-  standaloneGuard: sqlClientTotpStandaloneGuard,
-});
-
-export const { makeTotpPersistenceServices, coordinateTotpPersistence } = totpTarget;
-
-import { makePhoneTarget, sqlClientPhoneStandaloneGuard } from "./drizzle/phone-target";
-
-const phoneTarget = makePhoneTarget<
-  Database,
-  EffectLibsqlDatabase<AnyRelations>,
-  AnySQLiteTable<{ dialect: "sqlite" }>
->(Database, {
-  mode: "interactive",
-  dialect: "sqlite",
-  locking: false,
-  standaloneGuard: sqlClientPhoneStandaloneGuard,
-});
-
-export const { makePhonePersistenceServices, coordinatePhonePersistence } = phoneTarget;
+  { mode: "native", dialect: "sqlite", transactionConstructor: PasskeyTransaction },
+);
 
 import { drizzleMigrationsLayer } from "./internal/drizzle-migrations";
 import { sqlitePersistence } from "./internal/drizzle-sqlite";
@@ -241,3 +171,33 @@ export const AuthPersistence = {
     ),
   ),
 };
+
+export { OAuthProxyPersistence } from "./internal/drizzle-sqlite-oauth-proxy";
+
+import { makeSessionTarget } from "./drizzle/session-drivers";
+
+export const {
+  coordinateAuthenticationAuthority,
+  coordinatePendingAuthentication,
+  coordinateSignedSessionValidity,
+  coordinateStatefulSessions,
+  makeAuthenticationAuthorityServices,
+  makePendingAuthenticationServices,
+  makeSignedSessionValidityServices,
+  makeStatefulSessionServices,
+  makeSessionStepUpServices,
+  coordinateSessionStepUp,
+  makeSessionCleanupServices,
+} = makeSessionTarget(Database, {
+  mode: "native",
+  dialect: "sqlite",
+  transactionConstructor: PasskeyTransaction,
+});
+
+import { makeTotpTarget } from "./drizzle/totp-target";
+
+export const { makeTotpPersistenceServices, coordinateTotpPersistence } = makeTotpTarget(Database, {
+  mode: "native",
+  dialect: "sqlite",
+  transactionConstructor: PasskeyTransaction,
+});

package/src/Mysql2.ts

@@ -17,36 +17,31 @@ import {
 
 export { Database } from "./drizzle/mysql-database";
 
-export {
-  coordinateMysqlAuthenticationAuthority as coordinateAuthenticationAuthority,
-  coordinateMysqlPendingAuthentication as coordinatePendingAuthentication,
-  coordinateMysqlSignedSessionValidity as coordinateSignedSessionValidity,
-  coordinateMysqlStatefulSessions as coordinateStatefulSessions,
-  makeMysqlAuthenticationAuthorityServices as makeAuthenticationAuthorityServices,
-  makeMysqlPendingAuthenticationServices as makePendingAuthenticationServices,
-  makeMysqlSignedSessionValidityServices as makeSignedSessionValidityServices,
-  makeMysqlStatefulSessionServices as makeStatefulSessionServices,
-} from "./drizzle/mysql-sessions";
-
-export {
-  coordinateMysqlProofPersistence as coordinateProofPersistence,
-  makeMysqlProofPersistenceServices as makeProofPersistenceServices,
-} from "./drizzle/mysql-proofs";
-
-export {
-  coordinateMysqlPasswordPersistence as coordinatePasswordPersistence,
-  coordinateMysqlPasswordRegistration as coordinatePasswordRegistration,
-  makeMysqlPasswordPersistenceServices as makePasswordPersistenceServices,
-  makeMysqlPasswordRegistrationServices as makePasswordRegistrationServices,
-} from "./drizzle/mysql-passwords";
-
-export {
-  coordinateMysqlEmailAddress as coordinateEmailAddress,
-  coordinateMysqlEmailRegistration as coordinateEmailRegistration,
-  makeMysqlEmailAddressServices as makeEmailAddressServices,
-  makeMysqlEmailRegistrationServices as makeEmailRegistrationServices,
-  makeMysqlEmailSignInServices as makeEmailSignInServices,
-} from "./drizzle/mysql-emails";
+import { makeProofTarget } from "./drizzle/proof-drivers";
+
+export const { coordinateProofPersistence, makeProofPersistenceServices } = makeProofTarget(
+  Database,
+  { mode: "native", dialect: "mysql" },
+);
+
+import { makePasswordTarget } from "./drizzle/password-drivers";
+
+export const {
+  coordinatePasswordPersistence,
+  coordinatePasswordRegistration,
+  makePasswordPersistenceServices,
+  makePasswordRegistrationServices,
+} = makePasswordTarget(Database, { mode: "native", dialect: "mysql" });
+
+import { makeEmailTarget } from "./drizzle/email-drivers";
+
+export const {
+  makeEmailSignInServices,
+  makeEmailAddressServices,
+  makeEmailRegistrationServices,
+  coordinateEmailAddress,
+  coordinateEmailRegistration,
+} = makeEmailTarget(Database, { mode: "native", dialect: "mysql" });
 
 export const makeSubjectProvisioningServices = <
   Subject extends AnyMySqlTable,
@@ -65,8 +60,6 @@ export const makeExternalIdentityServices = <
   mapping: ExternalIdentityTables<Subject, External, NativeId>,
 ) => makeMysqlExternalIdentityServices(mapping);
 
-export const commitMode = "interactive" as const;
-
 export const makeIdentityServices = <
   Subject extends AnyMySqlTable,
   Identifier extends AnyMySqlTable,
@@ -77,32 +70,15 @@ export const makeIdentityServices = <
   mapping: IdentityTables<Subject, Identifier, External, Request, NativeId>,
 ) => makeMysqlIdentityServices(mapping);
 
-export {
-  makeMysqlSessionStepUpServices as makeSessionStepUpServices,
-  coordinateMysqlSessionStepUp as coordinateSessionStepUp,
-} from "./drizzle/mysql-sessions";
-
-export {
-  makeMySqlPasswordPreparedPersistenceServices as makePasswordPreparedPersistenceServices,
-  coordinateMySqlPasswordPreparedPersistence as coordinatePasswordPreparedPersistence,
-} from "./drizzle/mysql-password-prepared";
-
-export { passwordPreparedPersistenceLayer } from "./drizzle/password-prepared-target";
-
 import { makeOAuthTarget } from "./drizzle/oauth-drivers";
-import { mysqlOAuthTransaction } from "./drizzle/oauth-mysql";
-import { sqlClientOAuthStandaloneGuard } from "./drizzle/oauth-target";
 
 const oauthTarget = makeOAuthTarget<
   Database,
   EffectMysql2Database<AnyRelations>,
   AnyMySqlTable<{ dialect: "mysql" }>
 >(Database, {
-  mode: "interactive",
+  mode: "native",
   dialect: "mysql",
-  locking: true,
-  transaction: mysqlOAuthTransaction,
-  standaloneGuard: sqlClientOAuthStandaloneGuard,
 });
 
 export const {
@@ -121,26 +97,19 @@ export const {
 } = oauthTarget;
 
 import { makePasskeyTarget } from "./drizzle/passkey-drivers";
-import { unavailable as passkeyUnavailable } from "./drizzle/passkey-state";
-import { sqlClientPasskeyStandaloneGuard } from "./drizzle/passkey-target";
-import { mysqlTransaction } from "./drizzle/transaction-mysql";
 
 const passkeyTarget = makePasskeyTarget<
   Database,
   EffectMysql2Database<AnyRelations>,
   AnyMySqlTable<{ dialect: "mysql" }>
 >(Database, {
-  mode: "interactive",
+  mode: "native",
   dialect: "mysql",
-  locking: true,
-  standaloneGuard: sqlClientPasskeyStandaloneGuard,
-  transaction: (database, body) => mysqlTransaction(passkeyUnavailable, database, body),
 });
 
 export const {
   makePasskeyCredentialServices,
   makePasskeyPersistenceServices,
-  makePasskeyEnrollmentContextServices,
   makePasskeyRegistrationCeremonyServices,
   coordinatePasskeyPersistence,
   coordinatePasskeyRegistrationCeremony,
@@ -150,39 +119,35 @@ export const {
   coordinatePasskeyRegistration,
 } = passkeyTarget;
 
-import { unavailable as totpUnavailable } from "./drizzle/totp-state";
-import { makeTotpTarget, sqlClientTotpStandaloneGuard } from "./drizzle/totp-target";
+import { makePhoneTarget } from "./drizzle/phone-drivers";
 
-const totpTarget = makeTotpTarget<
+export const { makePhonePersistenceServices, coordinatePhonePersistence } = makePhoneTarget(
   Database,
-  EffectMysql2Database<AnyRelations>,
-  AnyMySqlTable<{ dialect: "mysql" }>
->(Database, {
-  mode: "interactive",
-  dialect: "mysql",
-  locking: true,
-  standaloneGuard: sqlClientTotpStandaloneGuard,
-  transaction: (database, body) => mysqlTransaction(totpUnavailable, database, body),
-});
+  { mode: "native", dialect: "mysql" },
+);
 
-export const { makeTotpPersistenceServices, coordinateTotpPersistence } = totpTarget;
+/** Construct Drizzle from the driver's SQL-client Layer. */
+export const databaseLayer = Layer.effect(Database, makeWithDefaults({}));
 
-import { unavailable as phoneUnavailable } from "./drizzle/phone-state";
-import { makePhoneTarget, sqlClientPhoneStandaloneGuard } from "./drizzle/phone-target";
+import { makeSessionTarget } from "./drizzle/session-drivers";
 
-const phoneTarget = makePhoneTarget<
-  Database,
-  EffectMysql2Database<AnyRelations>,
-  AnyMySqlTable<{ dialect: "mysql" }>
->(Database, {
-  mode: "interactive",
+export const {
+  coordinateAuthenticationAuthority,
+  coordinatePendingAuthentication,
+  coordinateSignedSessionValidity,
+  coordinateStatefulSessions,
+  makeAuthenticationAuthorityServices,
+  makePendingAuthenticationServices,
+  makeSignedSessionValidityServices,
+  makeStatefulSessionServices,
+  makeSessionStepUpServices,
+  coordinateSessionStepUp,
+  makeSessionCleanupServices,
+} = makeSessionTarget(Database, { mode: "native", dialect: "mysql" });
+
+import { makeTotpTarget } from "./drizzle/totp-target";
+
+export const { makeTotpPersistenceServices, coordinateTotpPersistence } = makeTotpTarget(Database, {
+  mode: "native",
   dialect: "mysql",
-  locking: true,
-  standaloneGuard: sqlClientPhoneStandaloneGuard,
-  transaction: (database, body) => mysqlTransaction(phoneUnavailable, database, body),
 });
-
-export const { makePhonePersistenceServices, coordinatePhonePersistence } = phoneTarget;
-
-/** Construct Drizzle from the driver's SQL-client Layer. */
-export const databaseLayer = Layer.effect(Database, makeWithDefaults({}));

package/src/Pglite.ts

@@ -1,7 +1,11 @@
 export { OAuthProxyPersistence } from "./internal/drizzle-postgres-oauth-proxy";
 
 import type { AnyRelations } from "drizzle-orm";
-import { type EffectPgDatabase, makeWithDefaults } from "drizzle-orm/effect-pglite";
+import {
+  EffectPgTransaction as PasskeyTransaction,
+  type EffectPgDatabase,
+  makeWithDefaults,
+} from "drizzle-orm/effect-pglite";
 import type { AnyPgTable } from "drizzle-orm/pg-core";
 import { Effect, Layer } from "effect";
 
@@ -19,36 +23,39 @@ import {
 
 export { Database } from "./drizzle/pg-database";
 
-export {
-  coordinatePgAuthenticationAuthority as coordinateAuthenticationAuthority,
-  coordinatePgPendingAuthentication as coordinatePendingAuthentication,
-  coordinatePgSignedSessionValidity as coordinateSignedSessionValidity,
-  coordinatePgStatefulSessions as coordinateStatefulSessions,
-  makePgAuthenticationAuthorityServices as makeAuthenticationAuthorityServices,
-  makePgPendingAuthenticationServices as makePendingAuthenticationServices,
-  makePgSignedSessionValidityServices as makeSignedSessionValidityServices,
-  makePgStatefulSessionServices as makeStatefulSessionServices,
-} from "./drizzle/pg-sessions";
-
-export {
-  coordinatePgProofPersistence as coordinateProofPersistence,
-  makePgProofPersistenceServices as makeProofPersistenceServices,
-} from "./drizzle/pg-proofs";
-
-export {
-  coordinatePgPasswordPersistence as coordinatePasswordPersistence,
-  coordinatePgPasswordRegistration as coordinatePasswordRegistration,
-  makePgPasswordPersistenceServices as makePasswordPersistenceServices,
-  makePgPasswordRegistrationServices as makePasswordRegistrationServices,
-} from "./drizzle/pg-passwords";
-
-export {
-  coordinatePgEmailAddress as coordinateEmailAddress,
-  coordinatePgEmailRegistration as coordinateEmailRegistration,
-  makePgEmailAddressServices as makeEmailAddressServices,
-  makePgEmailRegistrationServices as makeEmailRegistrationServices,
-  makePgEmailSignInServices as makeEmailSignInServices,
-} from "./drizzle/pg-emails";
+import { makeProofTarget } from "./drizzle/proof-drivers";
+
+export const { coordinateProofPersistence, makeProofPersistenceServices } = makeProofTarget(
+  Database,
+  { mode: "native", dialect: "pg", transactionConstructor: PasskeyTransaction },
+);
+
+import { makePasswordTarget } from "./drizzle/password-drivers";
+
+export const {
+  coordinatePasswordPersistence,
+  coordinatePasswordRegistration,
+  makePasswordPersistenceServices,
+  makePasswordRegistrationServices,
+} = makePasswordTarget(Database, {
+  mode: "native",
+  dialect: "pg",
+  transactionConstructor: PasskeyTransaction,
+});
+
+import { makeEmailTarget } from "./drizzle/email-drivers";
+
+export const {
+  makeEmailSignInServices,
+  makeEmailAddressServices,
+  makeEmailRegistrationServices,
+  coordinateEmailAddress,
+  coordinateEmailRegistration,
+} = makeEmailTarget(Database, {
+  mode: "native",
+  dialect: "pg",
+  transactionConstructor: PasskeyTransaction,
+});
 
 export const makeSubjectProvisioningServices = <
   Subject extends AnyPgTable,
@@ -67,8 +74,6 @@ export const makeExternalIdentityServices = <
   mapping: ExternalIdentityTables<Subject, External, NativeId>,
 ) => makePgExternalIdentityServices(mapping);
 
-export const commitMode = "interactive" as const;
-
 export const makeIdentityServices = <
   Subject extends AnyPgTable,
   Identifier extends AnyPgTable,
@@ -79,30 +84,16 @@ export const makeIdentityServices = <
   mapping: IdentityTables<Subject, Identifier, External, Request, NativeId>,
 ) => makePgIdentityServices(mapping);
 
-export {
-  makePgSessionStepUpServices as makeSessionStepUpServices,
-  coordinatePgSessionStepUp as coordinateSessionStepUp,
-} from "./drizzle/pg-sessions";
-
-export {
-  makePgPasswordPreparedPersistenceServices as makePasswordPreparedPersistenceServices,
-  coordinatePgPasswordPreparedPersistence as coordinatePasswordPreparedPersistence,
-} from "./drizzle/pg-password-prepared";
-
-export { passwordPreparedPersistenceLayer } from "./drizzle/password-prepared-target";
-
 import { makeOAuthTarget } from "./drizzle/oauth-drivers";
-import { sqlClientOAuthStandaloneGuard } from "./drizzle/oauth-target";
 
 const oauthTarget = makeOAuthTarget<
   Database,
   EffectPgDatabase<AnyRelations>,
   AnyPgTable<{ dialect: "pg" }>
 >(Database, {
-  mode: "interactive",
+  mode: "native",
   dialect: "pg",
-  locking: true,
-  standaloneGuard: sqlClientOAuthStandaloneGuard,
+  transactionConstructor: PasskeyTransaction,
 });
 
 export const {
@@ -121,23 +112,20 @@ export const {
 } = oauthTarget;
 
 import { makePasskeyTarget } from "./drizzle/passkey-drivers";
-import { sqlClientPasskeyStandaloneGuard } from "./drizzle/passkey-target";
 
 const passkeyTarget = makePasskeyTarget<
   Database,
   EffectPgDatabase<AnyRelations>,
   AnyPgTable<{ dialect: "pg" }>
 >(Database, {
-  mode: "interactive",
+  transactionConstructor: PasskeyTransaction,
+  mode: "native",
   dialect: "pg",
-  locking: true,
-  standaloneGuard: sqlClientPasskeyStandaloneGuard,
 });
 
 export const {
   makePasskeyCredentialServices,
   makePasskeyPersistenceServices,
-  makePasskeyEnrollmentContextServices,
   makePasskeyRegistrationCeremonyServices,
   coordinatePasskeyPersistence,
   coordinatePasskeyRegistrationCeremony,
@@ -147,35 +135,12 @@ export const {
   coordinatePasskeyRegistration,
 } = passkeyTarget;
 
-import { makeTotpTarget, sqlClientTotpStandaloneGuard } from "./drizzle/totp-target";
+import { makePhoneTarget } from "./drizzle/phone-drivers";
 
-const totpTarget = makeTotpTarget<
+export const { makePhonePersistenceServices, coordinatePhonePersistence } = makePhoneTarget(
   Database,
-  EffectPgDatabase<AnyRelations>,
-  AnyPgTable<{ dialect: "pg" }>
->(Database, {
-  mode: "interactive",
-  dialect: "pg",
-  locking: true,
-  standaloneGuard: sqlClientTotpStandaloneGuard,
-});
-
-export const { makeTotpPersistenceServices, coordinateTotpPersistence } = totpTarget;
-
-import { makePhoneTarget, sqlClientPhoneStandaloneGuard } from "./drizzle/phone-target";
-
-const phoneTarget = makePhoneTarget<
-  Database,
-  EffectPgDatabase<AnyRelations>,
-  AnyPgTable<{ dialect: "pg" }>
->(Database, {
-  mode: "interactive",
-  dialect: "pg",
-  locking: true,
-  standaloneGuard: sqlClientPhoneStandaloneGuard,
-});
-
-export const { makePhonePersistenceServices, coordinatePhonePersistence } = phoneTarget;
+  { mode: "native", dialect: "pg", transactionConstructor: PasskeyTransaction },
+);
 
 import { drizzleMigrationsLayer } from "./internal/drizzle-migrations";
 import { postgresPersistence } from "./internal/drizzle-postgres";
@@ -192,3 +157,31 @@ export const AuthPersistence = {
 
 /** Construct Drizzle from the driver's SQL-client Layer. */
 export const databaseLayer = Layer.effect(Database, makeWithDefaults({}));
+
+import { makeSessionTarget } from "./drizzle/session-drivers";
+
+export const {
+  coordinateAuthenticationAuthority,
+  coordinatePendingAuthentication,
+  coordinateSignedSessionValidity,
+  coordinateStatefulSessions,
+  makeAuthenticationAuthorityServices,
+  makePendingAuthenticationServices,
+  makeSignedSessionValidityServices,
+  makeStatefulSessionServices,
+  makeSessionStepUpServices,
+  coordinateSessionStepUp,
+  makeSessionCleanupServices,
+} = makeSessionTarget(Database, {
+  mode: "native",
+  dialect: "pg",
+  transactionConstructor: PasskeyTransaction,
+});
+
+import { makeTotpTarget } from "./drizzle/totp-target";
+
+export const { makeTotpPersistenceServices, coordinateTotpPersistence } = makeTotpTarget(Database, {
+  mode: "native",
+  dialect: "pg",
+  transactionConstructor: PasskeyTransaction,
+});