@atproto/ozone 0.1.175 → 0.2.0

package/src/db/migrations/20260513T202941104Z-add-subject-convo-id.ts

@@ -0,0 +1,114 @@
+import { Kysely, sql } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  // moderation_event
+  await db.schema
+    .alterTable('moderation_event')
+    .addColumn('subjectConvoId', 'varchar')
+    .execute()
+  /// broad index to support conversation-based queries
+  /// Users is a convo is capped at 50 so volume of matching events should be low
+  /// subsequent ordering and filtering will be efficient
+  await sql`
+    CREATE INDEX "moderation_event_convo_idx"
+    ON moderation_event("subjectConvoId")
+    WHERE "subjectConvoId" IS NOT NULL
+  `.execute(db)
+
+  // moderation_subject_status
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('convoId', 'varchar', (col) => col.notNull().defaultTo(''))
+    .execute()
+  /// Update unique constraint: [did, recordPath] -> [did, recordPath, convoId]
+  /// Create new unique index, drop old constraint, rename new index
+  /// Avoids gap without any constraints
+  await sql`
+    CREATE UNIQUE INDEX "moderation_status_unique_idx_new"
+    ON moderation_subject_status(did, "recordPath", "convoId")
+  `.execute(db)
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropConstraint('moderation_status_unique_idx')
+    .execute()
+  await db.schema.dropIndex('moderation_status_unique_idx').ifExists().execute()
+  await sql`
+    ALTER INDEX "moderation_status_unique_idx_new"
+    RENAME TO "moderation_status_unique_idx"
+  `.execute(db)
+  await sql`
+    ALTER TABLE moderation_subject_status
+    ADD CONSTRAINT "moderation_status_unique_idx"
+    UNIQUE USING INDEX "moderation_status_unique_idx"
+  `.execute(db)
+
+  // expiring_tag
+  await db.schema
+    .alterTable('expiring_tag')
+    .addColumn('convoId', 'varchar', (col) => col.notNull().defaultTo(''))
+    .execute()
+  await db.schema
+    .createIndex('idx_expiring_tag_did_record_path_convo_id')
+    .on('expiring_tag')
+    .columns(['did', 'recordPath', 'convoId'])
+    .execute()
+
+  // report table
+  await db.schema
+    .alterTable('report')
+    .addColumn('subjectConvoId', 'varchar')
+    .execute()
+  await db.schema.dropIndex('idx_report_unassigned_id').execute()
+  await sql`CREATE INDEX idx_report_unassigned_id ON report
+    (id)
+    INCLUDE (status, "reportType", "recordPath", "subjectMessageId", "subjectConvoId")
+    WHERE ("queueId" IS NULL AND status != 'closed')`.execute(db)
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  // report
+  await db.schema.dropIndex('idx_report_unassigned_id').execute()
+  await sql`CREATE INDEX idx_report_unassigned_id ON report
+    (id)
+    INCLUDE (status, "reportType", "recordPath", "subjectMessageId")
+    WHERE ("queueId" IS NULL AND status != 'closed')`.execute(db)
+  await db.schema.alterTable('report').dropColumn('subjectConvoId').execute()
+
+  // expiring_tag
+  await db.schema
+    .dropIndex('idx_expiring_tag_did_record_path_convo_id')
+    .execute()
+  await db.schema.alterTable('expiring_tag').dropColumn('convoId').execute()
+
+  // moderation_subject_status
+  /// Reverse the unique constraint change: [did, recordPath, convoId] -> [did, recordPath]
+  await sql`
+    CREATE UNIQUE INDEX "moderation_status_unique_idx_old"
+    ON moderation_subject_status(did, "recordPath")
+  `.execute(db)
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropConstraint('moderation_status_unique_idx')
+    .execute()
+  await db.schema.dropIndex('moderation_status_unique_idx').ifExists().execute()
+  await sql`
+    ALTER INDEX "moderation_status_unique_idx_old"
+    RENAME TO "moderation_status_unique_idx"
+  `.execute(db)
+  await sql`
+    ALTER TABLE moderation_subject_status
+    ADD CONSTRAINT "moderation_status_unique_idx"
+    UNIQUE USING INDEX "moderation_status_unique_idx"
+  `.execute(db)
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('convoId')
+    .execute()
+
+  // moderation_event
+  await db.schema.dropIndex('moderation_event_convo_idx').execute()
+  await db.schema
+    .alterTable('moderation_event')
+    .dropColumn('subjectConvoId')
+    .execute()
+}

package/src/db/migrations/index.ts

@@ -40,3 +40,4 @@ export * as _20260225T000000000Z from './20260225T000000000Z-add-report-queue-ta
 export * as _20260313T000000000Z from './20260313T000000000Z-add-report-activity-table.js'
 export * as _20260318T152058935Z from './20260318T152058935Z-add-report-stat.js'
 export * as _20260428T000000000Z from './20260428T000000000Z-add-expiring-tag-table.js'
+export * as _20260513T202941104Z from './20260513T202941104Z-add-subject-convo-id.js'

package/src/db/schema/expiring_tag.ts

@@ -7,6 +7,7 @@ export interface ExpiringTag {
   eventId: number
   did: string
   recordPath: string
+  convoId: string
   tag: string
   expiresAt: string
   createdBy: string

package/src/db/schema/moderation_event.ts

@@ -31,10 +31,12 @@ export interface ModerationEvent {
     | 'com.atproto.admin.defs#repoRef'
     | 'com.atproto.repo.strongRef'
     | 'chat.bsky.convo.defs#messageRef'
+    | 'chat.bsky.convo.defs#convoRef'
   subjectDid: string
   subjectUri: string | null
   subjectCid: string | null
   subjectBlobCids: string[] | null
+  subjectConvoId: string | null
   subjectMessageId: string | null
   createLabelVals: string | null
   negateLabelVals: string | null

package/src/db/schema/moderation_subject_status.ts

@@ -10,8 +10,12 @@ export const subjectStatusTableName = 'moderation_subject_status'
 
 export interface ModerationSubjectStatus {
   id: Generated<number>
+
+  // unique columns
   did: string
   recordPath: string
+  convoId: string
+
   recordCid: string | null
   blobCids: string[] | null
   reviewState:

package/src/db/schema/report.ts

@@ -13,8 +13,9 @@ export interface Report {
   status: string // 'open', 'closed', 'escalated', 'queued', 'assigned'
   reportType: string // Denormalized from moderation_event.meta.reportType
   did: string // Denormalized from moderation_event.subjectDid
-  recordPath: string // '' = account/message, 'collection/rkey' = record
+  recordPath: string // '' = account/message/conversation, 'collection/rkey' = record
   subjectMessageId: string | null // Denormalized from moderation_event.subjectMessageId
+  subjectConvoId: string | null // Denormalized from moderation_event.subjectConvoId
   createdAt: string
   updatedAt: string
   assignedTo: string | null // DID of permanently assigned moderator, null if unassigned

package/src/mod-service/expiring-tags.ts

@@ -7,6 +7,7 @@ export type ExpiringTagRow = Selectable<ExpiringTag>
 export type ExpiringTagGroup = {
   did: string
   recordPath: string
+  convoId: string
   createdBy: string
   tags: string[]
   ids: number[]
@@ -18,6 +19,7 @@ export async function insertExpiringTags(
     eventId: number
     did: string
     recordPath: string
+    convoId: string
     tags: string[]
     expiresAt: string
     createdBy: string
@@ -30,6 +32,7 @@ export async function insertExpiringTags(
         eventId: params.eventId,
         did: params.did,
         recordPath: params.recordPath,
+        convoId: params.convoId,
         tag,
         expiresAt: params.expiresAt,
         createdBy: params.createdBy,
@@ -43,6 +46,7 @@ export async function removeExpiringTags(
   params: {
     did: string
     recordPath: string
+    convoId: string
     tags: string[]
   },
 ): Promise<void> {
@@ -50,6 +54,7 @@ export async function removeExpiringTags(
     .deleteFrom('expiring_tag')
     .where('did', '=', params.did)
     .where('recordPath', '=', params.recordPath)
+    .where('convoId', '=', params.convoId)
     .where('tag', 'in', params.tags)
     .execute()
 }
@@ -73,15 +78,16 @@ export async function getExpiredTags(
 
   if (!rows.length) return []
 
-  // Group by (did, recordPath, createdBy) so each reversal event has the correct author
+  // Group by (did, recordPath, convoId, createdBy) so each reversal event has the correct author
   const grouped = new Map<string, ExpiringTagGroup>()
   for (const row of rows) {
-    const key = `${row.did}|${row.recordPath}|${row.createdBy}`
+    const key = `${row.did}|${row.recordPath}|${row.convoId}|${row.createdBy}`
     let group = grouped.get(key)
     if (!group) {
       group = {
         did: row.did,
         recordPath: row.recordPath,
+        convoId: row.convoId,
         createdBy: row.createdBy,
         tags: [],
         ids: [],

package/src/mod-service/index.ts

@@ -235,21 +235,34 @@ export class ModerationService {
 
     if (subject) {
       const isSubjectAtUri = subject.startsWith('at://')
+      const subjectAtUri = isSubjectAtUri ? new AtUri(subject) : null
       const subjectDid = isSubjectAtUri ? new AtUri(subject).hostname : subject
       const subjectUri = isSubjectAtUri ? subject : null
       // regardless of subjectUri check, we always want to query against subjectDid column since that's indexed
       builder = builder.where('subjectDid', '=', subjectDid)
 
-      // if requester wants to include all user records, let's ignore matching on subjectUri
+      // subjectUri or subjectConvoId
       if (!includeAllUserRecords) {
-        builder = builder
-          .if(!subjectUri, (q) => q.where('subjectUri', 'is', null))
-          .if(!!subjectUri, (q) => q.where('subjectUri', '=', subjectUri))
+        if (subjectAtUri?.collection === 'chat.bsky.convo') {
+          builder = builder.where('subjectConvoId', '=', subjectAtUri.rkey)
+        } else if (subjectUri) {
+          builder = builder.where('subjectUri', '=', subjectUri)
+        } else {
+          // Account-level: subjectUri IS NULL also matches conversation events,
+          // so explicitly exclude them.
+          builder = builder
+            .where('subjectUri', 'is', null)
+            .where('subjectConvoId', 'is', null)
+        }
       }
     } else if (subjectType === 'account') {
-      builder = builder.where('subjectUri', 'is', null)
+      builder = builder
+        .where('subjectUri', 'is', null)
+        .where('subjectConvoId', 'is', null)
     } else if (subjectType === 'record') {
       builder = builder.where('subjectUri', 'is not', null)
+    } else if (subjectType === 'conversation') {
+      builder = builder.where('subjectConvoId', 'is not', null)
     }
 
     // If subjectType is set to 'account' let that take priority and ignore collections filter
@@ -433,7 +446,9 @@ export class ModerationService {
     const subjectsToBeResolved = await this.db.db
       .selectFrom('moderation_subject_status')
       .where('did', '=', did)
-      .where('recordPath', '!=', '')
+      .where((qb) =>
+        qb.where('recordPath', '!=', '').orWhere('convoId', '!=', ''),
+      )
       .where('reviewState', 'in', [REVIEWESCALATED, REVIEWOPEN])
       .selectAll()
       .execute()
@@ -686,6 +701,7 @@ export class ModerationService {
         subjectCid: subjectInfo.subjectCid,
         subjectBlobCids: jsonb(subjectInfo.subjectBlobCids),
         subjectMessageId: subjectInfo.subjectMessageId,
+        subjectConvoId: subjectInfo.subjectConvoId,
         modTool: modTool ? jsonb(modTool) : null,
         externalId: externalId ?? null,
         severityLevel,
@@ -712,6 +728,7 @@ export class ModerationService {
           eventId: modEvent.id,
           did: subjectInfo.subjectDid,
           recordPath: subjectInfo.subjectUri ?? '',
+          convoId: subjectInfo.subjectConvoId ?? '',
           tags: event.add,
           expiresAt,
           createdBy,
@@ -721,6 +738,7 @@ export class ModerationService {
         await removeExpiringTags(this.db, {
           did: subjectInfo.subjectDid,
           recordPath: subjectInfo.subjectUri ?? '',
+          convoId: subjectInfo.subjectConvoId ?? '',
           tags: event.remove,
         })
       }
@@ -815,6 +833,7 @@ export class ModerationService {
       .selectFrom('moderation_subject_status')
       .where('did', '=', did)
       .where('recordPath', '=', '')
+      .where('convoId', '=', '')
       .where('suspendUntil', '>', new Date().toISOString())
       .select('did')
       .limit(1)
@@ -1135,20 +1154,34 @@ export class ModerationService {
       )
 
       if (!includeAllUserRecords) {
-        builder = builder.where((qb) =>
-          subjectInfo.recordPath
-            ? qb.where(
-                'moderation_subject_status.recordPath',
-                '=',
-                subjectInfo.recordPath,
-              )
-            : qb.where('moderation_subject_status.recordPath', '=', ''),
-        )
+        if (subjectInfo.convoId) {
+          builder = builder.where(
+            'moderation_subject_status.convoId',
+            '=',
+            subjectInfo.convoId,
+          )
+        } else if (subjectInfo.recordPath) {
+          builder = builder.where(
+            'moderation_subject_status.recordPath',
+            '=',
+            subjectInfo.recordPath,
+          )
+        } else {
+          // Account-level: recordPath = '' also matches conversation statuses,
+          // so explicitly exclude them.
+          builder = builder
+            .where('moderation_subject_status.recordPath', '=', '')
+            .where('moderation_subject_status.convoId', '=', '')
+        }
       }
     } else if (subjectType === 'account') {
-      builder = builder.where('moderation_subject_status.recordPath', '=', '')
+      builder = builder
+        .where('moderation_subject_status.recordPath', '=', '')
+        .where('moderation_subject_status.convoId', '=', '')
     } else if (subjectType === 'record') {
       builder = builder.where('moderation_subject_status.recordPath', '!=', '')
+    } else if (subjectType === 'conversation') {
+      builder = builder.where('moderation_subject_status.convoId', '!=', '')
     }
 
     // Only fetch items that belongs to the specified queue when specified
@@ -1438,6 +1471,7 @@ export class ModerationService {
       .selectFrom('moderation_subject_status')
       .where('did', '=', subject.did)
       .where('recordPath', '=', subject.recordPath ?? '')
+      .where('convoId', '=', subject.convoId ?? '')
       .selectAll()
       .executeTakeFirst()
     return result ?? null
@@ -1450,6 +1484,7 @@ export class ModerationService {
       .selectFrom('moderation_subject_status')
       .where('did', '=', did)
       .where('recordPath', '=', '')
+      .where('convoId', '=', '')
       .where('muteReportingUntil', '>', new Date().toISOString())
       .select(sql`true`.as('status'))
       .executeTakeFirst()
@@ -1463,6 +1498,7 @@ export class ModerationService {
       .selectFrom('moderation_subject_status')
       .where('did', '=', did)
       .where('recordPath', '=', '')
+      .where('convoId', '=', '')
       .where('muteUntil', '>', new Date().toISOString())
       .select(sql`true`.as('status'))
       .executeTakeFirst()

package/src/mod-service/status.ts

@@ -283,6 +283,7 @@ export const adjustModerationSubjectStatus = async (
     subjectDid,
     subjectUri,
     subjectCid,
+    subjectConvoId,
     createdBy,
     meta,
     addedTags,
@@ -292,7 +293,10 @@ export const adjustModerationSubjectStatus = async (
   } = moderationEvent
 
   // If subjectUri exists, it's not a repoRef so pass along the uri to get identifier back
-  const identifier = getStatusIdentifierFromSubject(subjectUri || subjectDid)
+  const identifier = getStatusIdentifierFromSubject(
+    subjectUri || subjectDid,
+    subjectConvoId,
+  )
 
   db.assertTransaction()
 
@@ -301,6 +305,7 @@ export const adjustModerationSubjectStatus = async (
     .selectFrom('moderation_subject_status')
     .where('did', '=', identifier.did)
     .where('recordPath', '=', identifier.recordPath)
+    .where('convoId', '=', identifier.convoId)
     // Make sure we respect other updates that may be happening at the same time
     .forUpdate()
     .selectAll()
@@ -504,14 +509,20 @@ export const adjustModerationSubjectStatus = async (
   return status || null
 }
 
+/**
+ * Get moderation_subject_status identifier (did, recordPath, convoId).
+ * @note Supports addressing conversations explicitly (via convoId) and implicitly (via properly formed at-uri)
+ */
 export const getStatusIdentifierFromSubject = (
   subject: string | AtUri,
-): { did: string; recordPath: string } => {
+  convoId?: string | null,
+): { did: string; recordPath: string; convoId: string } => {
   const isSubjectString = typeof subject === 'string'
   if (isSubjectString && subject.startsWith('did:')) {
     return {
       did: subject,
       recordPath: '',
+      convoId: convoId || '',
     }
   }
 
@@ -520,8 +531,19 @@ export const getStatusIdentifierFromSubject = (
   }
 
   const uri = isSubjectString ? new AtUri(subject) : subject
+
+  // Handle conversation URIs
+  if (uri.collection === 'chat.bsky.convo') {
+    return {
+      did: uri.host,
+      recordPath: '',
+      convoId: uri.rkey,
+    }
+  }
+
   return {
     did: uri.host,
     recordPath: `${uri.collection}/${uri.rkey}`,
+    convoId: '',
   }
 }

package/src/mod-service/subject.ts

@@ -16,6 +16,9 @@ const isStrongRef = asPredicate(ComAtprotoRepoStrongRef.validateMain)
 type MessageRef = ChatBskyConvoDefs.MessageRef
 const isValidMessageRef = asPredicate(ChatBskyConvoDefs.validateMessageRef)
 
+type ConvoRef = ChatBskyConvoDefs.ConvoRef
+const isValidConvoRef = asPredicate(ChatBskyConvoDefs.validateConvoRef)
+
 const isMessageRefWithoutConvoId = (
   subject: unknown,
 ): subject is $Typed<Omit<MessageRef, 'convoId'> & { convoId?: string }> =>
@@ -41,6 +44,11 @@ export const subjectFromInput = (
   if (isValidMessageRef(subject)) {
     return new MessageSubject(subject.did, subject.convoId, subject.messageId)
   }
+  // @NOTE #convoRef is a new type for reporting entire conversations.
+  // Similar to messageRef, we take advantage of the open union to support this.
+  if (isValidConvoRef(subject)) {
+    return new ConvoSubject(subject.did, subject.convoId)
+  }
   // @TODO we should start to require subject.convoId is a string in order to properly validate
   // the #messageRef. temporarily allowing it to be optional as a stopgap for rollout.
   // The next "if" can be removed once convoId is consistently provided.
@@ -73,6 +81,11 @@ export const subjectFromEventRow = (row: ModerationEventRow): ModSubject => {
     const convoId =
       typeof row.meta?.['convoId'] === 'string' ? row.meta['convoId'] : ''
     return new MessageSubject(row.subjectDid, convoId, row.subjectMessageId)
+  } else if (
+    row.subjectType === 'chat.bsky.convo.defs#convoRef' &&
+    row.subjectConvoId
+  ) {
+    return new ConvoSubject(row.subjectDid, row.subjectConvoId)
   } else {
     return new RepoSubject(row.subjectDid)
   }
@@ -86,6 +99,9 @@ export const subjectFromStatusRow = (
     // which is what the last 2 params of .make() arguments are
     const uri = AtUri.make(row.did, ...row.recordPath.split('/')).toString()
     return new RecordSubject(uri.toString(), row.recordCid, row.blobCids ?? [])
+  } else if (row.convoId) {
+    // Conversation subject - restore from subject status row
+    return new ConvoSubject(row.did, row.convoId)
   } else {
     return new RepoSubject(row.did)
   }
@@ -96,28 +112,37 @@ type SubjectInfo = {
     | 'com.atproto.admin.defs#repoRef'
     | 'com.atproto.repo.strongRef'
     | 'chat.bsky.convo.defs#messageRef'
+    | 'chat.bsky.convo.defs#convoRef'
   subjectDid: string
   subjectUri: string | null
   subjectCid: string | null
   subjectBlobCids: string[] | null
   subjectMessageId: string | null
+  subjectConvoId: string | null
   meta: Record<string, string | undefined> | null
 }
 
 export interface ModSubject {
   did: string
   recordPath: string | undefined
+  convoId: string | undefined
   blobCids?: string[]
   isRepo(): this is RepoSubject
   isRecord(): this is RecordSubject
   isMessage(): this is MessageSubject
+  isConvo(): this is ConvoSubject
   info(): SubjectInfo
-  lex(): $Typed<RepoRef> | $Typed<StrongRef> | $Typed<MessageRef>
+  lex():
+    | $Typed<RepoRef>
+    | $Typed<StrongRef>
+    | $Typed<MessageRef>
+    | $Typed<ConvoRef>
 }
 
 export class RepoSubject implements ModSubject {
   blobCids = undefined
   recordPath = undefined
+  convoId = undefined
   constructor(public did: string) {}
   isRepo(): this is RepoSubject {
     return true
@@ -128,6 +153,9 @@ export class RepoSubject implements ModSubject {
   isMessage(): this is MessageSubject {
     return false
   }
+  isConvo(): this is ConvoSubject {
+    return false
+  }
   info() {
     return {
       subjectType: 'com.atproto.admin.defs#repoRef' as const,
@@ -136,6 +164,7 @@ export class RepoSubject implements ModSubject {
       subjectCid: null,
       subjectBlobCids: null,
       subjectMessageId: null,
+      subjectConvoId: null,
       meta: null,
     }
   }
@@ -151,6 +180,7 @@ export class RecordSubject implements ModSubject {
   parsedUri: AtUri
   did: string
   recordPath: string
+  convoId = undefined
   constructor(
     public uri: string,
     public cid: string,
@@ -169,6 +199,9 @@ export class RecordSubject implements ModSubject {
   isMessage(): this is MessageSubject {
     return false
   }
+  isConvo(): this is ConvoSubject {
+    return false
+  }
   info() {
     return {
       subjectType: 'com.atproto.repo.strongRef' as const,
@@ -177,6 +210,7 @@ export class RecordSubject implements ModSubject {
       subjectCid: this.cid,
       subjectBlobCids: this.blobCids ?? [],
       subjectMessageId: null,
+      subjectConvoId: null,
       meta: null,
     }
   }
@@ -206,6 +240,9 @@ export class MessageSubject implements ModSubject {
   isMessage(): this is MessageSubject {
     return true
   }
+  isConvo(): this is ConvoSubject {
+    return false
+  }
   info() {
     return {
       subjectType: 'chat.bsky.convo.defs#messageRef' as const,
@@ -214,6 +251,7 @@ export class MessageSubject implements ModSubject {
       subjectCid: null,
       subjectBlobCids: null,
       subjectMessageId: this.messageId,
+      subjectConvoId: this.convoId,
       meta: { convoId: this.convoId || undefined },
     }
   }
@@ -226,3 +264,43 @@ export class MessageSubject implements ModSubject {
     }
   }
 }
+
+export class ConvoSubject implements ModSubject {
+  blobCids = undefined
+  recordPath = undefined
+  constructor(
+    public did: string,
+    public convoId: string,
+  ) {}
+  isRepo(): this is RepoSubject {
+    return false
+  }
+  isRecord(): this is RecordSubject {
+    return false
+  }
+  isMessage(): this is MessageSubject {
+    return false
+  }
+  isConvo(): this is ConvoSubject {
+    return true
+  }
+  info() {
+    return {
+      subjectType: 'chat.bsky.convo.defs#convoRef' as const,
+      subjectDid: this.did,
+      subjectUri: null,
+      subjectCid: null,
+      subjectBlobCids: null,
+      subjectMessageId: null,
+      subjectConvoId: this.convoId,
+      meta: { convoId: this.convoId || undefined },
+    }
+  }
+  lex(): $Typed<ConvoRef> {
+    return {
+      $type: 'chat.bsky.convo.defs#convoRef',
+      did: this.did,
+      convoId: this.convoId,
+    }
+  }
+}