fix(api): continue package ban batches during in-flight bans

Author: vyctorbrzezowski

convex/packages.public.test.ts

@@ -536,6 +536,7 @@ const applyBanToOwnedPackagesBatchInternalHandler = (
       deletedBy: string;
       deletedByRole: "admin" | "moderator" | "user";
       cursor?: string;
+      allowActiveOwnerBeforeCommit?: boolean;
     },
     { deletedCount: number; revokedTokenCount: number; scheduled: boolean }
   >
@@ -6952,6 +6953,7 @@ describe("owned package sanction batches", () => {
       bannedAt: 1_000,
       deletedBy: "users:moderator",
       deletedByRole: "moderator",
+      allowActiveOwnerBeforeCommit: true,
     });
 
     expect(result).toMatchObject({ deletedCount: 1, revokedTokenCount: 1, scheduled: false });
@@ -6988,6 +6990,82 @@ describe("owned package sanction batches", () => {
     expect(patch).not.toHaveBeenCalledWith("packagePublishTokens:demo", expect.anything());
   });
 
+  it("continues in-flight package ban pages before the user ban commit is visible", async () => {
+    const firstPage = makeOwnedPackageBatchCtx({
+      owner: { _id: "users:owner", deletedAt: undefined, deactivatedAt: undefined },
+      pkg: makePackageDoc({ _id: "packages:first", ownerUserId: "users:owner" }),
+      packageTokens: [
+        {
+          _id: "packagePublishTokens:first",
+          packageId: "packages:first",
+          version: "1.0.1",
+          revokedAt: undefined,
+        },
+      ],
+      isDone: false,
+      continueCursor: "next-page",
+    });
+
+    const firstResult = await applyBanToOwnedPackagesBatchInternalHandler(firstPage.ctx as never, {
+      ownerUserId: "users:owner",
+      bannedAt: 1_000,
+      deletedBy: "users:moderator",
+      deletedByRole: "moderator",
+      allowActiveOwnerBeforeCommit: true,
+    });
+
+    expect(firstResult).toMatchObject({ deletedCount: 1, revokedTokenCount: 1, scheduled: true });
+    expect(firstPage.patch).toHaveBeenCalledWith(
+      "packages:first",
+      expect.objectContaining({ softDeletedAt: 1_000, softDeletedReason: "user.banned" }),
+    );
+    expect(firstPage.patch).toHaveBeenCalledWith("packagePublishTokens:first", {
+      revokedAt: 1_000,
+    });
+    expect(firstPage.runAfter).toHaveBeenCalledWith(
+      0,
+      expect.anything(),
+      expect.objectContaining({
+        cursor: "next-page",
+        allowActiveOwnerBeforeCommit: true,
+      }),
+    );
+
+    const secondPage = makeOwnedPackageBatchCtx({
+      owner: { _id: "users:owner", deletedAt: undefined, deactivatedAt: undefined },
+      pkg: makePackageDoc({ _id: "packages:second", ownerUserId: "users:owner" }),
+      packageTokens: [
+        {
+          _id: "packagePublishTokens:second",
+          packageId: "packages:second",
+          version: "1.0.1",
+          revokedAt: undefined,
+        },
+      ],
+    });
+
+    const secondResult = await applyBanToOwnedPackagesBatchInternalHandler(
+      secondPage.ctx as never,
+      {
+        ownerUserId: "users:owner",
+        bannedAt: 1_000,
+        deletedBy: "users:moderator",
+        deletedByRole: "moderator",
+        cursor: "next-page",
+        allowActiveOwnerBeforeCommit: true,
+      },
+    );
+
+    expect(secondResult).toMatchObject({ deletedCount: 1, revokedTokenCount: 1, scheduled: false });
+    expect(secondPage.patch).toHaveBeenCalledWith(
+      "packages:second",
+      expect.objectContaining({ softDeletedAt: 1_000, softDeletedReason: "user.banned" }),
+    );
+    expect(secondPage.patch).toHaveBeenCalledWith("packagePublishTokens:second", {
+      revokedAt: 1_000,
+    });
+  });
+
   it("retimestamps earlier ban-hidden packages during a later ban", async () => {
     const { ctx, patch } = makeOwnedPackageBatchCtx({
       owner: { _id: "users:owner", deletedAt: 2_000, deactivatedAt: undefined },

convex/packages.ts

@@ -2941,13 +2941,17 @@ export const applyBanToOwnedPackagesBatchInternal = internalMutation({
     deletedBy: v.id("users"),
     deletedByRole: v.union(v.literal("admin"), v.literal("moderator"), v.literal("user")),
     cursor: v.optional(v.string()),
+    allowActiveOwnerBeforeCommit: v.optional(v.boolean()),
   },
   handler: async (ctx, args) => {
     const owner = await ctx.db.get(args.ownerUserId);
-    const isInitialPage = args.cursor === undefined;
     const ownerMatchesCurrentBan = owner?.deletedAt === args.bannedAt;
+    // Ban callers run this before users.deletedAt is visible; keep the allow flag
+    // through scheduled pages so multi-page batches do not stale-stop mid-ban.
     const ownerIsActiveBeforeBanCommit =
-      isInitialPage && owner?.deletedAt === undefined && !owner?.deactivatedAt;
+      args.allowActiveOwnerBeforeCommit === true &&
+      owner?.deletedAt === undefined &&
+      !owner?.deactivatedAt;
     if (
       !owner ||
       owner.deactivatedAt ||

convex/users.ts

@@ -1646,6 +1646,7 @@ async function banUserWithActor(
       deletedBy: actor._id,
       deletedByRole: actor.role === "admin" ? "admin" : "moderator",
       cursor: undefined,
+      allowActiveOwnerBeforeCommit: true,
     },
   )) ?? {}) as { deletedCount?: number; revokedTokenCount?: number; scheduled?: boolean };
   const deletedPackageCount = banPackagesResult.deletedCount ?? 0;
@@ -2106,6 +2107,7 @@ export const autobanMalwareAuthorInternal = internalMutation({
         deletedBy: args.ownerUserId,
         deletedByRole: "user",
         cursor: undefined,
+        allowActiveOwnerBeforeCommit: true,
       },
     )) ?? {}) as { deletedCount?: number; revokedTokenCount?: number; scheduled?: boolean };
     const deletedPackageCount = banPackagesResult.deletedCount ?? 0;