@atproto/ozone 0.2.5 → 0.2.6

package/dist/report/activity.d.ts

@@ -1,4 +1,6 @@
 import { Database } from '../db/index.js';
+import { ReportView } from '../lexicon/types/tools/ozone/report/defs.js';
+import { QueryParams as QueryActivitiesParams } from '../lexicon/types/tools/ozone/report/queryActivities.js';
 import { Member } from '../lexicon/types/tools/ozone/team/defs.js';
 export type ActivityType = 'queueActivity' | 'assignmentActivity' | 'escalationActivity' | 'closeActivity' | 'reopenActivity' | 'noteActivity';
 export type CreateActivityParams = {
@@ -59,6 +61,21 @@ export declare function listReportActivities(db: Database, params: ListActivitie
     }[];
     cursor: string | undefined;
 }>;
+export declare function queryReportActivities(db: Database, params: QueryActivitiesParams): Promise<{
+    activities: {
+        activityType: string;
+        createdAt: string;
+        createdBy: string;
+        id: number;
+        internalNote: string | null;
+        isAutomated: boolean;
+        meta: unknown;
+        previousStatus: string | null;
+        publicNote: string | null;
+        reportId: number;
+    }[];
+    cursor: string | undefined;
+}>;
 export declare function formatActivityView(activity: {
     id: number;
     reportId: number;
@@ -70,7 +87,7 @@ export declare function formatActivityView(activity: {
     isAutomated: boolean;
     createdBy: string;
     createdAt: string;
-}, memberViews?: Map<string, Member>): {
+}, memberViews?: Map<string, Member>, reportViews?: Map<number, ReportView>): {
     id: number;
     reportId: number;
     activity: {
@@ -83,6 +100,7 @@ export declare function formatActivityView(activity: {
     isAutomated: boolean;
     createdBy: string;
     moderator: Member | undefined;
+    report: ReportView | undefined;
     createdAt: string;
 };
 //# sourceMappingURL=activity.d.ts.map

package/dist/report/activity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../src/report/activity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAOlE,MAAM,MAAM,YAAY,GACpB,eAAe,GACf,oBAAoB,GACpB,oBAAoB,GACpB,eAAe,GACf,gBAAgB,GAChB,cAAc,CAAA;AAElB,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,kFAAkF;IAClF,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,oBAAoB;;;;;;;;;;;GAkF7B;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,EAAE,EAAE,QAAQ,EACZ,UAAU,EAAE,kBAAkB,EAAE,iBAmBjC;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,oBAAoB;;;;;;;;;;;;;;GA6B7B;AAaD,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE;IACR,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB,EACD,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAG/B,EAAE;IACF,QAAQ;IACR,QAAQ;;eA1BA,MAAM;;IA8Bd,YAAY;IACZ,UAAU;IACV,IAAI;IACJ,WAAW;IACX,SAAS;IACT,SAAS;IACT,SAAS;EAEZ"}
+{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../src/report/activity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAA;AACxE,OAAO,EAAE,WAAW,IAAI,qBAAqB,EAAE,MAAM,wDAAwD,CAAA;AAC7G,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAOlE,MAAM,MAAM,YAAY,GACpB,eAAe,GACf,oBAAoB,GACpB,oBAAoB,GACpB,eAAe,GACf,gBAAgB,GAChB,cAAc,CAAA;AAElB,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,kFAAkF;IAClF,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,oBAAoB;;;;;;;;;;;GAkF7B;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,EAAE,EAAE,QAAQ,EACZ,UAAU,EAAE,kBAAkB,EAAE,iBAmBjC;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,oBAAoB;;;;;;;;;;;;;;GA6B7B;AAED,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,qBAAqB;;;;;;;;;;;;;;GAsC9B;AAaD,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE;IACR,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB,EACD,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IAGnC,EAAE;IACF,QAAQ;IACR,QAAQ;;eA3BA,MAAM;;IA+Bd,YAAY;IACZ,UAAU;IACV,IAAI;IACJ,WAAW;IACX,SAAS;IACT,SAAS;IACT,MAAM;IACN,SAAS;EAEZ"}

package/dist/report/activity.js

@@ -1,4 +1,5 @@
 import { InvalidRequestError } from '@atproto/xrpc-server';
+import { TimeIdKeyset, paginate } from '../db/pagination.js';
 import { AlreadyInTargetState, InvalidStateTransition, handleReportUpdate, } from './handle-report-update.js';
 export async function createReportActivity(db, params) {
     const { reportId, activityType, internalNote, publicNote, meta, isAutomated = false, createdBy, } = params;
@@ -111,6 +112,30 @@ export async function listReportActivities(db, params) {
         : undefined;
     return { activities, cursor: nextCursor };
 }
+export async function queryReportActivities(db, params) {
+    const { activityTypes, createdAfter, createdBefore, sortDirection, limit, cursor, } = params;
+    const { ref } = db.db.dynamic;
+    let builder = db.db.selectFrom('report_activity').selectAll();
+    if (activityTypes && activityTypes.length > 0) {
+        builder = builder.where('activityType', 'in', activityTypes);
+    }
+    if (createdAfter) {
+        builder = builder.where('createdAt', '>=', createdAfter);
+    }
+    if (createdBefore) {
+        builder = builder.where('createdAt', '<=', createdBefore);
+    }
+    const keyset = new TimeIdKeyset(ref('report_activity.createdAt'), ref('report_activity.id'));
+    const paginatedBuilder = paginate(builder, {
+        limit,
+        cursor,
+        keyset,
+        direction: sortDirection,
+        tryIndex: true,
+    });
+    const activities = await paginatedBuilder.execute();
+    return { activities, cursor: keyset.packFromResult(activities) };
+}
 function buildActivityObject(activityType, previousStatus) {
     const $type = `tools.ozone.report.defs#${activityType}`;
     if (previousStatus !== null) {
@@ -118,7 +143,7 @@ function buildActivityObject(activityType, previousStatus) {
     }
     return { $type };
 }
-export function formatActivityView(activity, memberViews) {
+export function formatActivityView(activity, memberViews, reportViews) {
     return {
         id: activity.id,
         reportId: activity.reportId,
@@ -129,6 +154,7 @@ export function formatActivityView(activity, memberViews) {
         isAutomated: activity.isAutomated,
         createdBy: activity.createdBy,
         moderator: memberViews?.get(activity.createdBy),
+        report: reportViews?.get(activity.reportId),
         createdAt: activity.createdAt,
     };
 }

package/dist/report/activity.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../src/report/activity.ts"],"names":[],"mappings":"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","sourcesContent":["import { InvalidRequestError } from '@atproto/xrpc-server'\nimport { Database } from '../db/index.js'\nimport { Member } from '../lexicon/types/tools/ozone/team/defs.js'\nimport {\n  AlreadyInTargetState,\n  InvalidStateTransition,\n  handleReportUpdate,\n} from './handle-report-update.js'\n\nexport type ActivityType =\n  | 'queueActivity'\n  | 'assignmentActivity'\n  | 'escalationActivity'\n  | 'closeActivity'\n  | 'reopenActivity'\n  | 'noteActivity'\n\nexport type CreateActivityParams = {\n  reportId: number\n  activityType: ActivityType\n  internalNote?: string\n  publicNote?: string\n  meta?: Record<string, unknown>\n  /** Set true for activities created by automated processes (e.g. queue router). */\n  isAutomated?: boolean\n  createdBy: string\n}\n\nexport async function createReportActivity(\n  db: Database,\n  params: CreateActivityParams,\n) {\n  const {\n    reportId,\n    activityType,\n    internalNote,\n    publicNote,\n    meta,\n    isAutomated = false,\n    createdBy,\n  } = params\n\n  return db.transaction(async (dbTxn) => {\n    // Lock the report row for the duration of the transaction to prevent\n    // concurrent writes from racing on status validation + update.\n    const report = await dbTxn.db\n      .selectFrom('report')\n      .select(['id', 'status'])\n      .where('id', '=', reportId)\n      .forUpdate()\n      .executeTakeFirst()\n\n    if (!report) {\n      throw new InvalidRequestError(\n        `Report ${reportId} not found`,\n        'ReportNotFound',\n      )\n    }\n\n    let result\n    try {\n      result = handleReportUpdate(report.status, {\n        type: 'activity',\n        activityType,\n      })\n    } catch (err) {\n      if (err instanceof AlreadyInTargetState) {\n        throw new InvalidRequestError(err.message, 'AlreadyInTargetState')\n      }\n      if (err instanceof InvalidStateTransition) {\n        throw new InvalidRequestError(err.message, 'InvalidStateTransition')\n      }\n      throw err\n    }\n\n    const now = new Date().toISOString()\n\n    if (result.nextStatus !== null) {\n      const updateSet: Record<string, string | null> = {\n        status: result.nextStatus,\n        updatedAt: now,\n      }\n      if (result.nextStatus === 'closed') {\n        updateSet.closedAt = now\n      } else if (result.nextStatus === 'open') {\n        updateSet.closedAt = null\n      }\n      await dbTxn.db\n        .updateTable('report')\n        .set(updateSet)\n        .where('id', '=', reportId)\n        .execute()\n    }\n\n    const [activity] = await dbTxn.db\n      .insertInto('report_activity')\n      .values({\n        reportId,\n        activityType,\n        previousStatus: result.activity?.previousStatus ?? null,\n        internalNote: internalNote ?? null,\n        publicNote: publicNote ?? null,\n        meta: meta ?? null,\n        isAutomated,\n        createdBy,\n        createdAt: now,\n      })\n      .returningAll()\n      .execute()\n\n    return activity\n  })\n}\n\nexport type BulkActivityInsert = {\n  reportId: number\n  activityType: string\n  previousStatus: string | null\n  internalNote?: string\n  publicNote?: string\n  meta?: unknown\n  isAutomated: boolean\n  createdBy: string\n  createdAt: string\n}\n\n/**\n * Insert multiple activity rows in a single query. No validation — caller is\n * responsible for correctness and for being inside an appropriate transaction.\n */\nexport async function bulkInsertReportActivities(\n  db: Database,\n  activities: BulkActivityInsert[],\n) {\n  if (!activities.length) return\n  await db.db\n    .insertInto('report_activity')\n    .values(\n      activities.map((a) => ({\n        reportId: a.reportId,\n        activityType: a.activityType,\n        previousStatus: a.previousStatus,\n        internalNote: a.internalNote ?? null,\n        publicNote: a.publicNote ?? null,\n        meta: a.meta ?? null,\n        isAutomated: a.isAutomated,\n        createdBy: a.createdBy,\n        createdAt: a.createdAt,\n      })),\n    )\n    .execute()\n}\n\nexport type ListActivitiesParams = {\n  reportId: number\n  limit?: number\n  cursor?: string\n}\n\nexport async function listReportActivities(\n  db: Database,\n  params: ListActivitiesParams,\n) {\n  const { reportId, limit = 50, cursor } = params\n\n  let builder = db.db\n    .selectFrom('report_activity')\n    .selectAll()\n    .where('reportId', '=', reportId)\n    .orderBy('createdAt', 'desc')\n    .orderBy('id', 'desc')\n    .limit(limit + 1)\n\n  if (cursor) {\n    const cursorId = parseInt(cursor, 10)\n    if (!isNaN(cursorId)) {\n      builder = builder.where('id', '<', cursorId)\n    }\n  }\n\n  const rows = await builder.execute()\n  const hasMore = rows.length > limit\n  const activities = hasMore ? rows.slice(0, limit) : rows\n\n  const nextCursor =\n    hasMore && activities.length > 0\n      ? String(activities[activities.length - 1].id)\n      : undefined\n\n  return { activities, cursor: nextCursor }\n}\n\nfunction buildActivityObject(\n  activityType: string,\n  previousStatus: string | null,\n): { $type: string; [k: string]: unknown } {\n  const $type = `tools.ozone.report.defs#${activityType}`\n  if (previousStatus !== null) {\n    return { $type, previousStatus }\n  }\n  return { $type }\n}\n\nexport function formatActivityView(\n  activity: {\n    id: number\n    reportId: number\n    activityType: string\n    previousStatus: string | null\n    internalNote: string | null\n    publicNote: string | null\n    meta: unknown\n    isAutomated: boolean\n    createdBy: string\n    createdAt: string\n  },\n  memberViews?: Map<string, Member>,\n) {\n  return {\n    id: activity.id,\n    reportId: activity.reportId,\n    activity: buildActivityObject(\n      activity.activityType,\n      activity.previousStatus,\n    ),\n    internalNote: activity.internalNote ?? undefined,\n    publicNote: activity.publicNote ?? undefined,\n    meta: (activity.meta as Record<string, unknown>) ?? undefined,\n    isAutomated: activity.isAutomated,\n    createdBy: activity.createdBy,\n    moderator: memberViews?.get(activity.createdBy),\n    createdAt: activity.createdAt,\n  }\n}\n"]}
+{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../src/report/activity.ts"],"names":[],"mappings":"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","sourcesContent":["import { InvalidRequestError } from '@atproto/xrpc-server'\nimport { Database } from '../db/index.js'\nimport { TimeIdKeyset, paginate } from '../db/pagination.js'\nimport { ReportView } from '../lexicon/types/tools/ozone/report/defs.js'\nimport { QueryParams as QueryActivitiesParams } from '../lexicon/types/tools/ozone/report/queryActivities.js'\nimport { Member } from '../lexicon/types/tools/ozone/team/defs.js'\nimport {\n  AlreadyInTargetState,\n  InvalidStateTransition,\n  handleReportUpdate,\n} from './handle-report-update.js'\n\nexport type ActivityType =\n  | 'queueActivity'\n  | 'assignmentActivity'\n  | 'escalationActivity'\n  | 'closeActivity'\n  | 'reopenActivity'\n  | 'noteActivity'\n\nexport type CreateActivityParams = {\n  reportId: number\n  activityType: ActivityType\n  internalNote?: string\n  publicNote?: string\n  meta?: Record<string, unknown>\n  /** Set true for activities created by automated processes (e.g. queue router). */\n  isAutomated?: boolean\n  createdBy: string\n}\n\nexport async function createReportActivity(\n  db: Database,\n  params: CreateActivityParams,\n) {\n  const {\n    reportId,\n    activityType,\n    internalNote,\n    publicNote,\n    meta,\n    isAutomated = false,\n    createdBy,\n  } = params\n\n  return db.transaction(async (dbTxn) => {\n    // Lock the report row for the duration of the transaction to prevent\n    // concurrent writes from racing on status validation + update.\n    const report = await dbTxn.db\n      .selectFrom('report')\n      .select(['id', 'status'])\n      .where('id', '=', reportId)\n      .forUpdate()\n      .executeTakeFirst()\n\n    if (!report) {\n      throw new InvalidRequestError(\n        `Report ${reportId} not found`,\n        'ReportNotFound',\n      )\n    }\n\n    let result\n    try {\n      result = handleReportUpdate(report.status, {\n        type: 'activity',\n        activityType,\n      })\n    } catch (err) {\n      if (err instanceof AlreadyInTargetState) {\n        throw new InvalidRequestError(err.message, 'AlreadyInTargetState')\n      }\n      if (err instanceof InvalidStateTransition) {\n        throw new InvalidRequestError(err.message, 'InvalidStateTransition')\n      }\n      throw err\n    }\n\n    const now = new Date().toISOString()\n\n    if (result.nextStatus !== null) {\n      const updateSet: Record<string, string | null> = {\n        status: result.nextStatus,\n        updatedAt: now,\n      }\n      if (result.nextStatus === 'closed') {\n        updateSet.closedAt = now\n      } else if (result.nextStatus === 'open') {\n        updateSet.closedAt = null\n      }\n      await dbTxn.db\n        .updateTable('report')\n        .set(updateSet)\n        .where('id', '=', reportId)\n        .execute()\n    }\n\n    const [activity] = await dbTxn.db\n      .insertInto('report_activity')\n      .values({\n        reportId,\n        activityType,\n        previousStatus: result.activity?.previousStatus ?? null,\n        internalNote: internalNote ?? null,\n        publicNote: publicNote ?? null,\n        meta: meta ?? null,\n        isAutomated,\n        createdBy,\n        createdAt: now,\n      })\n      .returningAll()\n      .execute()\n\n    return activity\n  })\n}\n\nexport type BulkActivityInsert = {\n  reportId: number\n  activityType: string\n  previousStatus: string | null\n  internalNote?: string\n  publicNote?: string\n  meta?: unknown\n  isAutomated: boolean\n  createdBy: string\n  createdAt: string\n}\n\n/**\n * Insert multiple activity rows in a single query. No validation — caller is\n * responsible for correctness and for being inside an appropriate transaction.\n */\nexport async function bulkInsertReportActivities(\n  db: Database,\n  activities: BulkActivityInsert[],\n) {\n  if (!activities.length) return\n  await db.db\n    .insertInto('report_activity')\n    .values(\n      activities.map((a) => ({\n        reportId: a.reportId,\n        activityType: a.activityType,\n        previousStatus: a.previousStatus,\n        internalNote: a.internalNote ?? null,\n        publicNote: a.publicNote ?? null,\n        meta: a.meta ?? null,\n        isAutomated: a.isAutomated,\n        createdBy: a.createdBy,\n        createdAt: a.createdAt,\n      })),\n    )\n    .execute()\n}\n\nexport type ListActivitiesParams = {\n  reportId: number\n  limit?: number\n  cursor?: string\n}\n\nexport async function listReportActivities(\n  db: Database,\n  params: ListActivitiesParams,\n) {\n  const { reportId, limit = 50, cursor } = params\n\n  let builder = db.db\n    .selectFrom('report_activity')\n    .selectAll()\n    .where('reportId', '=', reportId)\n    .orderBy('createdAt', 'desc')\n    .orderBy('id', 'desc')\n    .limit(limit + 1)\n\n  if (cursor) {\n    const cursorId = parseInt(cursor, 10)\n    if (!isNaN(cursorId)) {\n      builder = builder.where('id', '<', cursorId)\n    }\n  }\n\n  const rows = await builder.execute()\n  const hasMore = rows.length > limit\n  const activities = hasMore ? rows.slice(0, limit) : rows\n\n  const nextCursor =\n    hasMore && activities.length > 0\n      ? String(activities[activities.length - 1].id)\n      : undefined\n\n  return { activities, cursor: nextCursor }\n}\n\nexport async function queryReportActivities(\n  db: Database,\n  params: QueryActivitiesParams,\n) {\n  const {\n    activityTypes,\n    createdAfter,\n    createdBefore,\n    sortDirection,\n    limit,\n    cursor,\n  } = params\n  const { ref } = db.db.dynamic\n\n  let builder = db.db.selectFrom('report_activity').selectAll()\n\n  if (activityTypes && activityTypes.length > 0) {\n    builder = builder.where('activityType', 'in', activityTypes)\n  }\n  if (createdAfter) {\n    builder = builder.where('createdAt', '>=', createdAfter)\n  }\n  if (createdBefore) {\n    builder = builder.where('createdAt', '<=', createdBefore)\n  }\n\n  const keyset = new TimeIdKeyset(\n    ref('report_activity.createdAt'),\n    ref('report_activity.id'),\n  )\n  const paginatedBuilder = paginate(builder, {\n    limit,\n    cursor,\n    keyset,\n    direction: sortDirection,\n    tryIndex: true,\n  })\n\n  const activities = await paginatedBuilder.execute()\n  return { activities, cursor: keyset.packFromResult(activities) }\n}\n\nfunction buildActivityObject(\n  activityType: string,\n  previousStatus: string | null,\n): { $type: string; [k: string]: unknown } {\n  const $type = `tools.ozone.report.defs#${activityType}`\n  if (previousStatus !== null) {\n    return { $type, previousStatus }\n  }\n  return { $type }\n}\n\nexport function formatActivityView(\n  activity: {\n    id: number\n    reportId: number\n    activityType: string\n    previousStatus: string | null\n    internalNote: string | null\n    publicNote: string | null\n    meta: unknown\n    isAutomated: boolean\n    createdBy: string\n    createdAt: string\n  },\n  memberViews?: Map<string, Member>,\n  reportViews?: Map<number, ReportView>,\n) {\n  return {\n    id: activity.id,\n    reportId: activity.reportId,\n    activity: buildActivityObject(\n      activity.activityType,\n      activity.previousStatus,\n    ),\n    internalNote: activity.internalNote ?? undefined,\n    publicNote: activity.publicNote ?? undefined,\n    meta: (activity.meta as Record<string, unknown>) ?? undefined,\n    isAutomated: activity.isAutomated,\n    createdBy: activity.createdBy,\n    moderator: memberViews?.get(activity.createdBy),\n    report: reportViews?.get(activity.reportId),\n    createdAt: activity.createdAt,\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -31,16 +31,16 @@
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "^5.0.0",
-    "undici": "^6.14.1",
+    "undici": "^8.5.0",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.20.16",
-    "@atproto/common": "^0.6.3",
-    "@atproto/identity": "^0.5.1",
+    "@atproto/api": "^0.20.17",
     "@atproto/crypto": "^0.5.1",
-    "@atproto/lexicon": "^0.7.2",
+    "@atproto/identity": "^0.5.1",
     "@atproto/syntax": "^0.6.2",
-    "@atproto/ws-client": "^0.1.1",
+    "@atproto/ws-client": "^0.1.2",
     "@atproto/xrpc": "^0.8.1",
+    "@atproto/common": "^0.6.3",
+    "@atproto/lexicon": "^0.7.2",
     "@atproto/xrpc-server": "^0.11.2"
   },
   "devDependencies": {
@@ -51,10 +51,11 @@
     "@types/express-serve-static-core": "^4.17.36",
     "@types/pg": "^8.15.5",
     "@types/qs": "^6.9.7",
+    "@types/ws": "^8.18.1",
     "jest": "^30.0.0",
     "ts-node": "^10.8.2",
     "@atproto/lex-cli": "^0.10.1",
-    "@atproto/pds": "^0.5.6"
+    "@atproto/pds": "^0.5.7"
   },
   "type": "module",
   "exports": {

package/src/api/index.ts

@@ -41,6 +41,7 @@ import getLatestReport from './report/getLatestReport.js'
 import getLiveStats from './report/getLiveStats.js'
 import getReport from './report/getReport.js'
 import listActivities from './report/listActivities.js'
+import queryActivities from './report/queryActivities.js'
 import queryReports from './report/queryReports.js'
 import reassignQueue from './report/reassignQueue.js'
 import refreshStats from './report/refreshStats.js'
@@ -139,6 +140,7 @@ export default function (server: Server, ctx: AppContext) {
   getReportAssignments(server, ctx)
   createActivity(server, ctx)
   listActivities(server, ctx)
+  queryActivities(server, ctx)
   reassignQueue(server, ctx)
   return server
 }

package/src/api/report/queryActivities.ts

@@ -0,0 +1,64 @@
+import { AppContext } from '../../context.js'
+import { Server } from '../../lexicon/index.js'
+import { ReportView } from '../../lexicon/types/tools/ozone/report/defs.js'
+import { getReportsByIds } from '../../mod-service/report.js'
+import {
+  formatActivityView,
+  queryReportActivities,
+} from '../../report/activity.js'
+import { buildReportView, hydrateReportInfo } from '../../report/views.js'
+import { getPdsAccountInfos } from '../util.js'
+
+export default function (server: Server, ctx: AppContext) {
+  server.tools.ozone.report.queryActivities({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ params, auth, req }) => {
+      const db = ctx.db
+      const modService = ctx.modService(db)
+      const labelers = ctx.reqLabelers(req)
+
+      const { activities, cursor: nextCursor } = await queryReportActivities(
+        db,
+        params,
+      )
+
+      // Dedupe report IDs across the page. Many activities can share the
+      // same report so we want one bulk fetch + hydrate rather than N.
+      const reportIds = Array.from(new Set(activities.map((a) => a.reportId)))
+
+      const queueService = ctx.queueService(db)
+      const teamService = ctx.teamService(db)
+      const reports = await getReportsByIds(db, reportIds)
+      const hydrated = await hydrateReportInfo(
+        reports,
+        modService.views,
+        (dids) => getPdsAccountInfos(ctx, dids),
+        (queueIds) => queueService.getViewsByIds(queueIds),
+        (dids) => teamService.viewByDids(dids),
+        labelers,
+      )
+      const reportViews = new Map<number, ReportView>()
+      for (const report of reports) {
+        reportViews.set(
+          report.id,
+          buildReportView(report, hydrated, auth.credentials.isModerator),
+        )
+      }
+
+      const createdByDids = Array.from(
+        new Set(activities.map((a) => a.createdBy)),
+      )
+      const memberViews = await teamService.viewByDids(createdByDids)
+
+      return {
+        encoding: 'application/json',
+        body: {
+          activities: activities.map((activity) =>
+            formatActivityView(activity, memberViews, reportViews),
+          ),
+          cursor: nextCursor,
+        },
+      }
+    },
+  })
+}

package/src/background.ts

@@ -9,9 +9,19 @@ import {
 
 type Task = (db: Database, signal: AbortSignal) => Promise<void>
 
+export type BackgroundQueueOptions = NonNullable<
+  ConstructorParameters<typeof PQueue>[0]
+> & {
+  concurrency: number
+}
+
 /**
  * A simple queue for in-process, out-of-band/backgrounded work
  */
+// @NOTE Keep this in sync with the BackgroundQueue in
+// - packages/bsky/src/data-plane/server/background.ts
+// - packages/ozone/src/background.ts
+// - packages/pds/src/background.ts
 export class BackgroundQueue {
   private abortController = new AbortController()
   private queue: PQueue
@@ -26,9 +36,9 @@ export class BackgroundQueue {
 
   constructor(
     protected db: Database,
-    queueOpts?: { concurrency?: number },
+    options: BackgroundQueueOptions,
   ) {
-    this.queue = new PQueue(queueOpts ?? { concurrency: 20 })
+    this.queue = new PQueue(options)
   }
 
   getStats() {
@@ -76,7 +86,8 @@ export class BackgroundQueue {
   }
 
   async processAll() {
-    await this.queue.onIdle()
+    const { queue } = this
+    while (queue.size || queue.pending) await queue.onIdle()
   }
 
   /**
@@ -86,8 +97,12 @@ export class BackgroundQueue {
    * only once http connections have drained (tasks no longer being added).
    */
   async destroy() {
+    if (this.destroyed) {
+      dbLogger.warn('BackgroundQueue.destroy() called multiple times')
+    }
+
     this.abortController.abort()
-    await this.queue.onIdle()
+    return this.processAll()
   }
 }
 

package/src/context.ts

@@ -135,7 +135,7 @@ export class AppContext {
         keypair: signingKey,
       })
 
-    const backgroundQueue = new BackgroundQueue(db)
+    const backgroundQueue = new BackgroundQueue(db, { concurrency: 20 })
     const blobDiverter = cfg.blobDivert
       ? new BlobDiverter(db, {
           idResolver,

package/src/daemon/context.ts

@@ -73,7 +73,7 @@ export class DaemonContext {
       pds: cfg.pds ?? undefined,
     })
 
-    const backgroundQueue = new BackgroundQueue(db)
+    const backgroundQueue = new BackgroundQueue(db, { concurrency: 20 })
 
     const settingService = SettingService.creator()
     const strikeService = StrikeService.creator()

package/src/daemon/verification-listener.ts

@@ -156,9 +156,14 @@ export class VerificationListener {
     })
   }
 
-  stop() {
-    this.jetstream?.close()
-    this.backgroundQueue.destroy()
-    this.destroyed = true
+  async stop() {
+    if (!this.destroyed) {
+      this.destroyed = true
+      try {
+        await this.jetstream?.close()
+      } finally {
+        await this.backgroundQueue.destroy()
+      }
+    }
   }
 }

package/src/db/migrations/20260602T120000000Z-add-report-activity-created-index.ts

@@ -0,0 +1,17 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  // Supports time-ordered scans across all reports for downstream pollers
+  // (e.g. Nimbus' report-activity watcher). The existing indexes are all
+  // leading-`reportId`, which would force a sequential scan for global
+  // ordered queries.
+  await db.schema
+    .createIndex('idx_report_activity_created')
+    .on('report_activity')
+    .columns(['createdAt', 'id'])
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropIndex('idx_report_activity_created').execute()
+}

package/src/db/migrations/index.ts

@@ -41,3 +41,4 @@ export * as _20260313T000000000Z from './20260313T000000000Z-add-report-activity
 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'
+export * as _20260602T120000000Z from './20260602T120000000Z-add-report-activity-created-index.js'

package/src/index.ts

@@ -4,11 +4,8 @@ import { AddressInfo } from 'node:net'
 import compression from 'compression'
 import cors from 'cors'
 import express from 'express'
-// eslint-disable-next-line import/default, import/no-named-as-default-member
+// eslint-disable-next-line import/default
 import httpTerminator from 'http-terminator'
-// eslint-disable-next-line import/no-named-as-default-member
-const { createHttpTerminator } = httpTerminator
-type HttpTerminator = ReturnType<typeof createHttpTerminator>
 import { DAY, SECOND } from '@atproto/common'
 import API, { health, wellKnown } from './api/index.js'
 import { OzoneConfig, OzoneSecrets } from './config/index.js'
@@ -29,7 +26,7 @@ export class OzoneService {
   public ctx: AppContext
   public app: express.Application
   public server?: http.Server
-  private terminator?: HttpTerminator
+  private terminator?: httpTerminator.HttpTerminator
   private dbStatsInterval?: NodeJS.Timeout
 
   constructor(opts: { ctx: AppContext; app: express.Application }) {
@@ -108,23 +105,25 @@ export class OzoneService {
     // so we need to sync them from env var to the database
     await this.seedInitialMembers()
 
-    const { db, backgroundQueue } = this.ctx
     this.dbStatsInterval = setInterval(() => {
       dbLogger.info(
         {
-          idleCount: db.pool.idleCount,
-          totalCount: db.pool.totalCount,
-          waitingCount: db.pool.waitingCount,
+          idleCount: this.ctx.db.pool.idleCount,
+          totalCount: this.ctx.db.pool.totalCount,
+          waitingCount: this.ctx.db.pool.waitingCount,
         },
         'db pool stats',
       )
-      dbLogger.info(backgroundQueue.getStats(), 'background queue stats')
+      dbLogger.info(
+        this.ctx.backgroundQueue.getStats(),
+        'background queue stats',
+      )
     }, 10000)
     await this.ctx.sequencer.start()
     const server = this.app.listen(this.ctx.cfg.service.port)
     this.server = server
     server.keepAliveTimeout = 90000
-    this.terminator = createHttpTerminator({ server })
+    this.terminator = httpTerminator.createHttpTerminator({ server })
     await events.once(server, 'listening')
     const { port } = server.address() as AddressInfo
     this.ctx.assignPort(port)
@@ -132,12 +131,23 @@ export class OzoneService {
   }
 
   async destroy(): Promise<void> {
-    await this.terminator?.terminate()
-    await this.ctx.backgroundQueue.destroy()
-    await this.ctx.sequencer.destroy()
-    await this.ctx.db.close()
     clearInterval(this.dbStatsInterval)
     this.dbStatsInterval = undefined
+
+    // @TODO Use a disposable stack when Node24 becomes the min supported version
+    try {
+      await this.terminator?.terminate()
+    } finally {
+      try {
+        await this.ctx.backgroundQueue.destroy()
+      } finally {
+        try {
+          await this.ctx.sequencer.destroy()
+        } finally {
+          await this.ctx.db.close()
+        }
+      }
+    }
   }
 }
 

package/src/jetstream/service.ts

@@ -99,7 +99,9 @@ export class Jetstream {
   /**
    * Closes the WebSocket connection.
    */
-  close() {
+  async close() {
+    // @TODO This should return a promise that fulfills when the connection is
+    // fully closed.
     this.ws?.ws?.close()
   }
 }

package/src/mod-service/report.ts

@@ -175,6 +175,25 @@ export async function getReportById(
     .executeTakeFirst()
 }
 
+export async function getReportsByIds(
+  db: Database,
+  ids: number[],
+): Promise<ReportWithEvent[]> {
+  if (!ids.length) return []
+  return reportQuery(db)
+    .where('r.id', 'in', ids)
+    .selectAll('r')
+    .select([
+      'me.subjectDid',
+      'me.subjectUri',
+      'me.subjectCid',
+      'me.createdBy as reportedBy',
+      'me.comment',
+      'me.meta',
+    ])
+    .execute()
+}
+
 export async function getLatestReport(
   db: Database,
 ): Promise<ReportWithEvent | undefined> {

package/src/report/activity.ts

@@ -1,5 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Database } from '../db/index.js'
+import { TimeIdKeyset, paginate } from '../db/pagination.js'
+import { ReportView } from '../lexicon/types/tools/ozone/report/defs.js'
+import { QueryParams as QueryActivitiesParams } from '../lexicon/types/tools/ozone/report/queryActivities.js'
 import { Member } from '../lexicon/types/tools/ozone/team/defs.js'
 import {
   AlreadyInTargetState,
@@ -190,6 +193,48 @@ export async function listReportActivities(
   return { activities, cursor: nextCursor }
 }
 
+export async function queryReportActivities(
+  db: Database,
+  params: QueryActivitiesParams,
+) {
+  const {
+    activityTypes,
+    createdAfter,
+    createdBefore,
+    sortDirection,
+    limit,
+    cursor,
+  } = params
+  const { ref } = db.db.dynamic
+
+  let builder = db.db.selectFrom('report_activity').selectAll()
+
+  if (activityTypes && activityTypes.length > 0) {
+    builder = builder.where('activityType', 'in', activityTypes)
+  }
+  if (createdAfter) {
+    builder = builder.where('createdAt', '>=', createdAfter)
+  }
+  if (createdBefore) {
+    builder = builder.where('createdAt', '<=', createdBefore)
+  }
+
+  const keyset = new TimeIdKeyset(
+    ref('report_activity.createdAt'),
+    ref('report_activity.id'),
+  )
+  const paginatedBuilder = paginate(builder, {
+    limit,
+    cursor,
+    keyset,
+    direction: sortDirection,
+    tryIndex: true,
+  })
+
+  const activities = await paginatedBuilder.execute()
+  return { activities, cursor: keyset.packFromResult(activities) }
+}
+
 function buildActivityObject(
   activityType: string,
   previousStatus: string | null,
@@ -215,6 +260,7 @@ export function formatActivityView(
     createdAt: string
   },
   memberViews?: Map<string, Member>,
+  reportViews?: Map<number, ReportView>,
 ) {
   return {
     id: activity.id,
@@ -229,6 +275,7 @@ export function formatActivityView(
     isAutomated: activity.isAutomated,
     createdBy: activity.createdBy,
     moderator: memberViews?.get(activity.createdBy),
+    report: reportViews?.get(activity.reportId),
     createdAt: activity.createdAt,
   }
 }

package/tests/3p-labeler.test.ts

@@ -53,8 +53,8 @@ describe('labels from 3p labelers', () => {
   })
 
   afterAll(async () => {
-    await network.close()
-    await thirdPartyLabeler.close()
+    await network?.close()
+    await thirdPartyLabeler?.close()
   })
 
   const getPostSubject = () => ({