@de-otio/trellis 0.9.0 → 0.10.1

package/dist/lib/services/media-upload-service.js

@@ -67,7 +67,7 @@ export class MediaUploadService {
             const fileBuffer = preReadBuffer ?? await file.arrayBuffer();
             const contentHash = await generateContentHash(fileBuffer);
             const ext = getExtensionFromMimeType(file.type);
-            const originalKey = `media/${contentHash}.${ext}`;
+            const originalKey = `originals/user-${userId}/${contentHash}.${ext}`;
             logger.info("[MediaUpload] Starting upload", {
                 contentHash,
                 mimeType: file.type,
@@ -155,7 +155,7 @@ export class MediaUploadService {
             const fileBuffer = await file.arrayBuffer();
             const contentHash = await generateContentHash(fileBuffer);
             const ext = getExtensionFromMimeType(file.type);
-            const originalKey = `media/${contentHash}.${ext}`;
+            const originalKey = `originals/user-${userId}/${contentHash}.${ext}`;
             const metadata = metadataArray?.[index];
             const r2Metadata = {
                 contentHash,

package/dist/lib/services/media-upload-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"media-upload-service.js","sourceRoot":"","sources":["../../../src/lib/services/media-upload-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"media-upload-service.js","sourceRoot":"","sources":["../../../src/lib/services/media-upload-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/user/derive-handle.d.ts

@@ -26,4 +26,26 @@ export declare function normalizeHandleBase(emailOrLocalPart: string | null | un
  *                 use by some other user. Inject the Prisma lookup here.
  */
 export declare function deriveHandle(email: string | null | undefined, exists: HandleExistsCheck): Promise<string>;
+/** Minimal Prisma surface needed to collision-check a handle. */
+type HandleCollisionDb = {
+    user: {
+        findFirst: (args: {
+            where: Record<string, unknown>;
+            select: {
+                id: true;
+            };
+        }) => Promise<{
+            id: string;
+        } | null>;
+    };
+};
+/**
+ * Convenience wrapper that wires {@link deriveHandle}'s collision check to a
+ * Prisma client, returning a globally-unique handle. Use this at every
+ * User-creation site so the non-null + unique `handle` invariant (S-CP2) holds
+ * regardless of which path provisions the user. Pass `excludeUserId` when
+ * back-filling a handle onto an existing row.
+ */
+export declare function deriveUniqueHandle(db: HandleCollisionDb, email: string | null | undefined, excludeUserId?: string): Promise<string>;
+export {};
 //# sourceMappingURL=derive-handle.d.ts.map

package/dist/lib/user/derive-handle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive-handle.d.ts","sourceRoot":"","sources":["../../../src/lib/user/derive-handle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAOH,MAAM,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAErE,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CASvF;AAMD;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,MAAM,CAAC,CAoBjB"}
+{"version":3,"file":"derive-handle.d.ts","sourceRoot":"","sources":["../../../src/lib/user/derive-handle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAOH,MAAM,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAErE,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CASvF;AAMD;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,MAAM,CAAC,CAoBjB;AAED,iEAAiE;AACjE,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE;QACJ,SAAS,EAAE,CAAC,IAAI,EAAE;YAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC/B,MAAM,EAAE;gBAAE,EAAE,EAAE,IAAI,CAAA;aAAE,CAAC;SACtB,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAC,CAAC;KACtC,CAAC;CACH,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,iBAAiB,EACrB,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAQjB"}

package/dist/lib/user/derive-handle.js

@@ -58,4 +58,20 @@ export async function deriveHandle(email, exists) {
     }
     return `${base.slice(0, HANDLE_TOTAL_MAX - 8)}${randomSuffix()}${randomSuffix().slice(0, 4)}`.slice(0, HANDLE_TOTAL_MAX);
 }
+/**
+ * Convenience wrapper that wires {@link deriveHandle}'s collision check to a
+ * Prisma client, returning a globally-unique handle. Use this at every
+ * User-creation site so the non-null + unique `handle` invariant (S-CP2) holds
+ * regardless of which path provisions the user. Pass `excludeUserId` when
+ * back-filling a handle onto an existing row.
+ */
+export async function deriveUniqueHandle(db, email, excludeUserId) {
+    return deriveHandle(email, async (h) => {
+        const where = excludeUserId
+            ? { handle: h, NOT: { id: excludeUserId } }
+            : { handle: h };
+        const found = await db.user.findFirst({ where, select: { id: true } });
+        return !!found;
+    });
+}
 //# sourceMappingURL=derive-handle.js.map

package/dist/lib/user/derive-handle.js.map

@@ -1 +1 @@
-{"version":3,"file":"derive-handle.js","sourceRoot":"","sources":["../../../src/lib/user/derive-handle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAClC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAC5B,MAAM,sBAAsB,GAAG,GAAG,CAAC;AACnC,MAAM,sBAAsB,GAAG,MAAM,CAAC;AAItC,MAAM,UAAU,mBAAmB,CAAC,gBAA2C;IAC7E,IAAI,CAAC,gBAAgB;QAAE,OAAO,EAAE,CAAC;IACjC,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC9C,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC,gBAAgB,CAAC;IACrB,MAAM,OAAO,GAAG,SAAS;SACtB,WAAW,EAAE;SACb,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC/B,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,YAAY;IACnB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC5D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAAgC,EAChC,MAAyB;IAEzB,IAAI,IAAI,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,GAAG,GAAG,sBAAsB,GAAG,YAAY,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;IACvF,CAAC;IAED,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAEvC,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,IAAI,sBAAsB,EAAE,MAAM,EAAE,EAAE,CAAC;QAChE,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,cAAc,GAAG,gBAAgB,GAAG,SAAS,CAAC,MAAM,CAAC;QAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,GAAG,aAAa,GAAG,SAAS,EAAE,CAAC;QACjD,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;YAAE,OAAO,SAAS,CAAC;IACnD,CAAC;IAED,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,GAAG,CAAC,CAAC,GAAG,YAAY,EAAE,GAAG,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CACjG,CAAC,EACD,gBAAgB,CACjB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"derive-handle.js","sourceRoot":"","sources":["../../../src/lib/user/derive-handle.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@de-otio/trellis",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "license": "AGPL-3.0-or-later",
   "type": "module",
   "main": "./dist/index.js",

package/prisma/migrations/20260606000000_handle_canonical_identity/migration.sql

@@ -0,0 +1,18 @@
+-- S-CP2: make `handle` the canonical, non-null, globally-unique identifier.
+-- Backfill NULL handles and de-duplicate any pre-existing collisions BEFORE
+-- adding the constraints, so the migration is safe against existing data
+-- (handle previously had no DB-level uniqueness; app-layer checks could race).
+
+-- 1. Backfill NULL handles deterministically from the row id (cuid; unique).
+UPDATE "users" SET "handle" = 'user_' || "id" WHERE "handle" IS NULL;
+
+-- 2. De-duplicate: any handle shared by >1 row gets suffixed with the row id
+--    (id is the PK, so the result is guaranteed unique). Non-colliding handles
+--    are left untouched.
+UPDATE "users" u
+SET "handle" = u."handle" || '_' || u."id"
+WHERE (SELECT count(*) FROM "users" u2 WHERE u2."handle" = u."handle") > 1;
+
+-- 3. Enforce the invariants: non-null + globally unique.
+ALTER TABLE "users" ALTER COLUMN "handle" SET NOT NULL;
+CREATE UNIQUE INDEX "users_handle_key" ON "users"("handle");

package/prisma/schema.prisma

@@ -43,7 +43,7 @@ model Entity {
 
   // Co-ownership (replaces single ownerId)
   owners EntityOwnership[]
-  // Relationships and follower counts live in the graph DB (AuraDB), not Prisma
+  // Relationships and follower counts live in the graph edge tables (served via graph-service.ts), not on this model
 
   subjectPosts PostSubject[]
   primaryPosts Post[]              @relation("PrimaryEntityPosts")
@@ -93,10 +93,9 @@ model PostGeoIndex {
   @@map("post_geo_index")
 }
 
-/// Entity geo-location for proximity discovery (C7). Neptune (the graph DB) has
-/// no spatial type, so geo-proximity lives here and is queried with PostGIS
-/// (ST_DWithin / KNN over a GiST index) via $queryRaw. Populated from the
-/// dual-write (syncEntity). Location is sensitive → own tenant_id for direct RLS
+/// Entity geo-location for proximity discovery (C7). Geo-proximity is queried
+/// with PostGIS (ST_DWithin / KNN over a GiST index) via $queryRaw. Populated from
+/// syncEntity. Location is sensitive → own tenant_id for direct RLS
 /// (mirrors post_geo_index). See plans/redesign/entity-location-subsystem.md.
 model EntityLocation {
   entityId  String                                @id @map("entity_id")
@@ -173,8 +172,15 @@ model User {
   id        String   @id @default(cuid())
   email     String   @unique
   role      UserRole @default(END_USER)
-  actorUri  String?  @unique @map("actor_uri") // ActivityPub actor URI (e.g., "https://example.com/users/{username}")
-  handle    String? // ActivityPub handle (e.g., "@user@example.com")
+  actorUri  String?  @unique @map("actor_uri") // ActivityPub actor URI (e.g., "https://example.com/users/{handle}")
+  // Canonical, portable, AP-actor-shaped identifier (S-CP2). The bare local
+  // label (e.g. "alice"); the addressable handle is `@{handle}@{domain}` and
+  // the actor URI is `{baseUrl}/users/{handle}`. Derived + collision-checked at
+  // provisioning; non-null + globally unique so federation is additive, never a
+  // migration. (WebFinger/AP still resolve on `username` until the federation
+  // repoint — that change is code-only, no data migration, since `handle` is the
+  // stable key.)
+  handle    String  @unique
   createdAt DateTime @default(now()) @map("created_at")
 
   // Cognito Auth integration
@@ -269,7 +275,7 @@ model User {
   ownedEntities   EntityOwnership[] @relation("EntityOwners")
   addedOwnerships EntityOwnership[] @relation("OwnershipAddedBy")
 
-  // Relationships and follower counts live in the graph DB (AuraDB), not Prisma
+  // Relationships and follower counts live in the graph edge tables (served via graph-service.ts), not on this model
 
   // Direct messages
   sentMessages     DirectMessage[] @relation("SentMessages")
@@ -1126,8 +1132,8 @@ model ProductTaxonomyTag {
 }
 
 // ============================================================================
-// Relationships (scored edges live in the graph DB — see graph-service.ts)
-// Follow and Friendship models removed — replaced by :RELATES_TO edges in graph DB
+// Relationships (scored edges; served via graph-service.ts over these tables)
+// Follow and Friendship models removed — replaced by the relationship edge tables below
 // ============================================================================
 
 // ============================================================================
@@ -1659,7 +1665,7 @@ model NotificationPreference {
 }
 
 // Out-of-band invite codes — users share codes privately; redemption establishes
-// a relationship in the graph DB. Entity-scoped codes can be created by entity owners.
+// a relationship edge. Entity-scoped codes can be created by entity owners.
 model ConnectionCode {
   id        String   @id @default(cuid())
   // Multi-tenancy (v0.7) — code's owning tenant (creator's active tenant at create time).
@@ -1927,8 +1933,8 @@ model TenantInvitation {
 // Graph edges in Postgres (graph-db revisit 2026-06: see
 // plans/redesign/graph-backend-contract.md)
 //
-// These two tables hold the edges that previously lived only in the graph DB
-// (RELATES_TO and typed entity-to-entity edges). OWNS (entity_ownerships) and
+// These two tables hold the relationship edges (user↔user and typed
+// entity-to-entity). OWNS (entity_ownerships) and
 // ABOUT (post_subjects) already existed in Postgres. Modeled as standalone
 // tables (no Prisma @relation) so the migration is self-contained and
 // non-breaking; targetId is polymorphic (user|entity) so it cannot carry a

package/src/lambda/delete-account-worker.ts

@@ -1,10 +1,9 @@
 import type { SQSHandler } from "aws-lambda";
-import { PrismaPg } from "@prisma/adapter-pg";
 import { PrismaClient } from "@prisma/client";
 import { S3Client, DeleteObjectsCommand, ListObjectsV2Command } from "@aws-sdk/client-s3";
 import { CognitoIdentityProviderClient, AdminDeleteUserCommand } from "@aws-sdk/client-cognito-identity-provider";
 import { Logger } from "@aws-lambda-powertools/logger";
-import { getSecret } from "@aws-lambda-powertools/parameters/secrets";
+import { getLambdaPrisma as getPrisma } from "../lib/lambda-prisma.js";
 
 const logger = new Logger({ serviceName: "delete-account-worker" });
 
@@ -12,20 +11,6 @@ const s3 = new S3Client({ region: process.env.AWS_REGION });
 
 const MAX_PAGES = 100;
 
-let prisma: PrismaClient | null = null;
-
-async function getPrisma(): Promise<PrismaClient> {
-  if (prisma) return prisma;
-  const { username, password, host, port, dbname } = (await getSecret(process.env.DB_SECRET_ARN!, { transform: "json" })) as unknown as { username: string; password: string; host: string; port: string | number; dbname: string };
-  // Prisma 7 removed the `datasources` constructor option; the connection URL
-  // is now supplied via a driver adapter.
-  const adapter = new PrismaPg({
-    connectionString: `postgresql://${username}:${encodeURIComponent(password)}@${host}:${port}/${dbname}?connection_limit=1`,
-  });
-  prisma = new PrismaClient({ adapter });
-  return prisma;
-}
-
 async function deleteUserMedia(userId: string, mediaBucket: string): Promise<void> {
   const prefix = `originals/user-${userId}/`;
   let continuationToken: string | undefined;

package/src/lambda/hourly-cron.ts

@@ -1,10 +1,9 @@
 import { Logger } from "@aws-lambda-powertools/logger";
 import { Metrics, MetricUnit } from "@aws-lambda-powertools/metrics";
-import { getSecret } from "@aws-lambda-powertools/parameters/secrets";
 import { DynamoDBClient, PutItemCommand } from "@aws-sdk/client-dynamodb";
 import { marshall } from "@aws-sdk/util-dynamodb";
-import { PrismaPg } from "@prisma/adapter-pg";
 import { PrismaClient } from "@prisma/client";
+import { getLambdaPrisma as getPrisma } from "../lib/lambda-prisma.js";
 import {
   batchedPruneExpired,
   resolveInteractionEventConfig,
@@ -23,32 +22,6 @@ const metrics = new Metrics({
 const dynamo = new DynamoDBClient({ region: process.env.AWS_REGION });
 const TABLE = process.env.DYNAMODB_TABLE!;
 
-let prisma: PrismaClient | null = null;
-
-interface DbSecret {
-  username: string;
-  password: string;
-  host: string;
-  port: string | number;
-  dbname: string;
-}
-
-async function getPrisma(): Promise<PrismaClient> {
-  if (prisma) return prisma;
-  // getSecret caches + KMS-decrypts; transform:"json" parses the secret value.
-  const { username, password, host, port, dbname } = (await getSecret(
-    process.env.DB_SECRET_ARN!,
-    { transform: "json" },
-  )) as unknown as DbSecret;
-  // Prisma 7 removed the `datasources` constructor option; the connection URL
-  // is now supplied via a driver adapter.
-  const adapter = new PrismaPg({
-    connectionString: `postgresql://${username}:${encodeURIComponent(password)}@${host}:${port}/${dbname}?connection_limit=1`,
-  });
-  prisma = new PrismaClient({ adapter });
-  return prisma;
-}
-
 export const handler = async (): Promise<void> => {
   const now = Math.floor(Date.now() / 1000);
 

package/src/lambda/maintenance-cron.ts

@@ -1,34 +1,14 @@
 import { DynamoDBClient, PutItemCommand } from "@aws-sdk/client-dynamodb";
 import { marshall } from "@aws-sdk/util-dynamodb";
-import { PrismaPg } from "@prisma/adapter-pg";
 import { PrismaClient } from "@prisma/client";
 import { Logger } from "@aws-lambda-powertools/logger";
-import { getSecret } from "@aws-lambda-powertools/parameters/secrets";
+import { getLambdaPrisma as getPrisma } from "../lib/lambda-prisma.js";
 
 const logger = new Logger({ serviceName: "maintenance-cron" });
 
 const dynamo = new DynamoDBClient({ region: process.env.AWS_REGION });
 const TABLE = process.env.DYNAMODB_TABLE!;
 
-let prisma: PrismaClient | null = null;
-
-async function getPrisma(): Promise<PrismaClient> {
-  if (prisma) return prisma;
-  const { username, password, host, port, dbname } = (await getSecret(process.env.DB_SECRET_ARN!, { transform: "json" })) as unknown as {
-    username: string;
-    password: string;
-    host: string;
-    port: string | number;
-    dbname: string;
-  };
-  // Prisma 7 removed the `datasources` constructor option; the connection URL
-  // is now supplied via a driver adapter.
-  const adapter = new PrismaPg({
-    connectionString: `postgresql://${username}:${encodeURIComponent(password)}@${host}:${port}/${dbname}?connection_limit=1`,
-  });
-  prisma = new PrismaClient({ adapter });
-  return prisma;
-}
 
 export const handler = async (): Promise<void> => {
   const now = Math.floor(Date.now() / 1000);

package/src/lambda/media-processing-worker.ts

@@ -32,7 +32,7 @@ export const handler: SQSHandler = async (event) => {
         // Process with Sharp (must be installed as ARM64 binary)
         // dynamic import to avoid bundling issues
         const sharp = (await import("sharp")).default;
-        const hash = key.replace("originals/", "").replace(/\.[^.]+$/, "");
+        const hash = key.split("/").pop()!.replace(/\.[^.]+$/, "");
 
         // Thumbnail: 300px WebP
         const thumbnail = await sharp(buffer)

package/src/lambda/nightly-cron.ts

@@ -3,11 +3,10 @@ import { S3Client, DeleteObjectsCommand, ListObjectsV2Command } from "@aws-sdk/c
 import { CognitoIdentityProviderClient, AdminDeleteUserCommand } from "@aws-sdk/client-cognito-identity-provider";
 import { SESClient, SendEmailCommand } from "@aws-sdk/client-ses";
 import { marshall } from "@aws-sdk/util-dynamodb";
-import { PrismaPg } from "@prisma/adapter-pg";
 import { PrismaClient } from "@prisma/client";
 import { Logger } from "@aws-lambda-powertools/logger";
 import { Metrics, MetricUnit } from "@aws-lambda-powertools/metrics";
-import { getSecret } from "@aws-lambda-powertools/parameters/secrets";
+import { getLambdaPrisma as getPrisma } from "../lib/lambda-prisma.js";
 
 const logger = new Logger({ serviceName: "nightly-cron" });
 const metrics = new Metrics({ namespace: "Trellis/Deletion", serviceName: "nightly-cron" });
@@ -17,26 +16,6 @@ const s3 = new S3Client({ region: process.env.AWS_REGION });
 const TABLE = process.env.DYNAMODB_TABLE!;
 const MEDIA_BUCKET = process.env.MEDIA_BUCKET_NAME!;
 
-let prisma: PrismaClient | null = null;
-
-async function getPrisma(): Promise<PrismaClient> {
-  if (prisma) return prisma;
-  const { username, password, host, port, dbname } = (await getSecret(process.env.DB_SECRET_ARN!, { transform: "json" })) as unknown as {
-    username: string;
-    password: string;
-    host: string;
-    port: string | number;
-    dbname: string;
-  };
-  // Prisma 7 removed the `datasources` constructor option; the connection URL
-  // is now supplied via a driver adapter.
-  const adapter = new PrismaPg({
-    connectionString: `postgresql://${username}:${encodeURIComponent(password)}@${host}:${port}/${dbname}?connection_limit=1`,
-  });
-  prisma = new PrismaClient({ adapter });
-  return prisma;
-}
-
 export const handler = async (): Promise<void> => {
   const now = Math.floor(Date.now() / 1000);
 
@@ -117,8 +96,7 @@ export const handler = async (): Promise<void> => {
     logger.error("Invitation cleanup failed", { error: err });
   }
 
-  // 3. Follower counts removed — relationships now live in graph DB (AuraDB)
-  // TODO: Add graph-side consistency check when reconciliation service is wired up
+  // 3. Follower counts removed — relationships now live in graph edge tables (see graph-service.ts)
 
   // 4. Process scheduled account deletions (GDPR Article 17 compliance)
   try {

package/src/lambda/post-confirmation.ts

@@ -34,12 +34,11 @@ import type {
   PostConfirmationTriggerHandler,
 } from "aws-lambda";
 import { Logger } from "@aws-lambda-powertools/logger";
-import { getSecret } from "@aws-lambda-powertools/parameters/secrets";
-import { PrismaPg } from "@prisma/adapter-pg";
+import { getLambdaPrisma as getPrisma } from "../lib/lambda-prisma.js";
 import {
   PrismaClient,
+  Prisma,
   type AgeTier,
-  type Prisma,
   type TenantRole,
   type UserRole,
 } from "@prisma/client";
@@ -55,30 +54,8 @@ import {
 import type { SignupMethod } from "@prisma/client";
 
 const logger = new Logger({ serviceName: "post-confirmation" });
-let prisma: PrismaClient | null = null;
 let cache: ClaimsCache | null = null;
 
-async function getPrisma(): Promise<PrismaClient> {
-  if (prisma) return prisma;
-  const { username, password, host, port, dbname } = (await getSecret(
-    process.env.DB_SECRET_ARN!,
-    { transform: "json" },
-  )) as unknown as {
-    username: string;
-    password: string;
-    host: string;
-    port: string | number;
-    dbname: string;
-  };
-  // Prisma 7 removed the `datasources` constructor option; the connection URL
-  // is now supplied via a driver adapter.
-  const adapter = new PrismaPg({
-    connectionString: `postgresql://${username}:${encodeURIComponent(password)}@${host}:${port}/${dbname}?connection_limit=1`,
-  });
-  prisma = new PrismaClient({ adapter });
-  return prisma;
-}
-
 function getCache(): ClaimsCache {
   if (!cache) cache = createClaimsCacheFromEnv();
   return cache;
@@ -199,20 +176,22 @@ export const handler: PostConfirmationTriggerHandler = async (event) => {
 
   const db = await getPrisma();
 
-  const result = await db.$transaction(
-    async (tx) => provisionUserAndTenancy(tx, {
-      cognitoSub,
-      email,
-      emailVerified: attrs.email_verified,
-      federated,
-      idpGroups,
-      dateOfBirth,
-      ageTier,
-      providedHandle: attrs["custom:handle"],
-      invitationCode,
-      requestedMethod,
-    }),
-    { timeout: 8000 },
+  const result = await withHandleConflictRetry(() =>
+    db.$transaction(
+      async (tx) => provisionUserAndTenancy(tx, {
+        cognitoSub,
+        email,
+        emailVerified: attrs.email_verified,
+        federated,
+        idpGroups,
+        dateOfBirth,
+        ageTier,
+        providedHandle: attrs["custom:handle"],
+        invitationCode,
+        requestedMethod,
+      }),
+      { timeout: 8000 },
+    ),
   );
 
   if (ageTier === "CHILD") {
@@ -280,6 +259,58 @@ interface ProvisioningInput {
   requestedMethod: SignupMethod | undefined;
 }
 
+/**
+ * S-CP2: the canonical ActivityPub actor URI for a user, derived from the
+ * stable, unique `handle` — `{baseUrl}/users/{handle}`. Returns null when no
+ * base domain is configured for this lambda; the actorUri column then stays
+ * null and the AP dispatcher derives it on demand. No hard dependency on the
+ * env var, so this is safe whether or not the deploy plumbs APP_DOMAIN in.
+ */
+function canonicalActorUri(handle: string): string | null {
+  const raw = process.env.ACTIVITYPUB_BASE_URL || process.env.APP_DOMAIN;
+  if (!raw) return null;
+  try {
+    // Accept both a full URL ("https://host") and a bare hostname ("host").
+    const withProtocol = /^https?:\/\//.test(raw) ? raw : `https://${raw}`;
+    const url = new URL(withProtocol);
+    return `${url.protocol}//${url.hostname}/users/${encodeURIComponent(handle)}`;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * S-CP2: retry the provisioning transaction when two concurrent signups race to
+ * the same derived handle. `handle` is DB-unique, so the loser of the race gets
+ * a P2002; re-running the transaction re-derives the handle (now seeing the
+ * committed conflict) and picks the next suffix. The transaction rolls back
+ * fully on failure, so retries have no partial-write side effects.
+ */
+async function withHandleConflictRetry<T>(
+  fn: () => Promise<T>,
+  maxAttempts = 3,
+): Promise<T> {
+  for (let attempt = 1; ; attempt++) {
+    try {
+      return await fn();
+    } catch (err) {
+      const isHandleConflict =
+        err instanceof Prisma.PrismaClientKnownRequestError &&
+        err.code === "P2002" &&
+        String(
+          (err.meta as { target?: unknown } | undefined)?.target ?? "",
+        ).includes("handle");
+      if (isHandleConflict && attempt < maxAttempts) {
+        logger.warn("Handle collision during provisioning; retrying", {
+          attempt,
+        });
+        continue;
+      }
+      throw err;
+    }
+  }
+}
+
 async function provisionUserAndTenancy(
   tx: Prisma.TransactionClient,
   input: ProvisioningInput,
@@ -334,6 +365,9 @@ async function provisionUserAndTenancy(
         cognitoSub,
         email,
         handle: initialHandle,
+        // S-CP2: lock in the AP-actor-shaped URI from the stable handle at
+        // creation (null when no base domain is configured for this lambda).
+        actorUri: canonicalActorUri(initialHandle),
         role: federated ? "B2B_PARTNER" : "END_USER",
         // Fail-CLOSED research age signal: a new account is NOT age-verified
         // until an explicit verification flow sets it. Distinct from `ageTier`
@@ -350,13 +384,16 @@ async function provisionUserAndTenancy(
     const updates: Prisma.UserUpdateInput = {};
     if (!user.cognitoSub) updates.cognitoSub = cognitoSub;
     if (!user.handle) {
-      updates.handle = await deriveHandle(email, async (h) => {
+      const backfilledHandle = await deriveHandle(email, async (h) => {
         const found = await tx.user.findFirst({
           where: { handle: h, NOT: { id: user!.id } },
           select: { id: true },
         });
         return !!found;
       });
+      updates.handle = backfilledHandle;
+      // S-CP2: derive the AP actor URI from the handle we just assigned.
+      if (!user.actorUri) updates.actorUri = canonicalActorUri(backfilledHandle);
     }
     if (Object.keys(updates).length > 0) {
       user = await tx.user.update({ where: { id: user.id }, data: updates });

package/src/lambda/pre-token-generation.ts

@@ -24,9 +24,8 @@ import type {
   PreTokenGenerationV2TriggerHandler,
 } from "aws-lambda";
 import { Logger } from "@aws-lambda-powertools/logger";
-import { getSecret } from "@aws-lambda-powertools/parameters/secrets";
-import { PrismaPg } from "@prisma/adapter-pg";
 import { PrismaClient, type TenantRole } from "@prisma/client";
+import { getLambdaPrisma as getPrisma } from "../lib/lambda-prisma.js";
 import {
   ClaimsCache,
   createClaimsCacheFromEnv,
@@ -36,30 +35,8 @@ import {
 import { resolveTenantRole, type RoleMappingInput } from "../lib/tenant/resolve-role.js";
 
 const logger = new Logger({ serviceName: "pre-token-generation" });
-let prisma: PrismaClient | null = null;
 let cache: ClaimsCache | null = null;
 
-async function getPrisma(): Promise<PrismaClient> {
-  if (prisma) return prisma;
-  const { username, password, host, port, dbname } = (await getSecret(
-    process.env.DB_SECRET_ARN!,
-    { transform: "json" },
-  )) as unknown as {
-    username: string;
-    password: string;
-    host: string;
-    port: string | number;
-    dbname: string;
-  };
-  // Prisma 7 removed the `datasources` constructor option; the connection URL
-  // is now supplied via a driver adapter.
-  const adapter = new PrismaPg({
-    connectionString: `postgresql://${username}:${encodeURIComponent(password)}@${host}:${port}/${dbname}?connection_limit=1`,
-  });
-  prisma = new PrismaClient({ adapter });
-  return prisma;
-}
-
 function getCache(): ClaimsCache {
   if (!cache) cache = createClaimsCacheFromEnv();
   return cache;