@@ -10,10 +10,15 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 vi.mock('@/lib/uploads/core/setup.server', () => uploadsSetupMock)
 vi.mock('@/lib/uploads/config', () => uploadsConfigMock)
 vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock)
+vi.mock('@/lib/uploads/core/prefix-sweep', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/lib/uploads/core/prefix-sweep')>()
+  return { ...actual, listStorageKeyPage: vi.fn(actual.listStorageKeyPage) }
+})
 
 import type { OutboxEventContext } from '@/lib/core/outbox/service'
 import { PROJECT_FILE_PREFIX_CLEANUP_EVENT } from '@/lib/projects/files/outbox-events'
 import { projectFilePrefixCleanupOutboxHandlers } from '@/lib/projects/files/prefix-cleanup'
+import { listStorageKeyPage } from '@/lib/uploads/core/prefix-sweep'
 
 const cleanup = projectFilePrefixCleanupOutboxHandlers[PROJECT_FILE_PREFIX_CLEANUP_EVENT]
 
@@ -68,12 +73,56 @@ describe('Project prefix cleanup on local storage', () => {
     expect(await exists('project/p10/keep.txt')).toBe(true)
   })
 
-  it('spends an attempt when a full page holds only objects it cannot remove', async () => {
+  it('reaches objects behind a full page it cannot remove', async () => {
     for (let index = 0; index < 520; index++) await put(`project/p1/legacy file ${index}.txt`)
+    await put('project/p1/zz.txt')
+
+    await expect(
+      cleanup({ projectId: 'p1' }, outboxContext(Date.now() + 60_000))
+    ).resolves.toBeUndefined()
+
+    expect(await exists('project/p1/zz.txt')).toBe(false)
+  })
+
+  it('keeps sweeping after a short page that is not the last', async () => {
+    await put('project/p1/a.txt')
+    await put('project/p1/b.txt')
+    vi.mocked(listStorageKeyPage).mockResolvedValueOnce({
+      keys: ['project/p1/a.txt'],
+      done: false,
+      nextPageToken: 'next',
+    })
+
+    const result = await cleanup({ projectId: 'p1' }, outboxContext())
+
+    expect(result).toMatchObject({ outcome: 'deferred', consumeAttempt: false })
+    expect(await exists('project/p1/a.txt')).toBe(false)
+    expect(await exists('project/p1/b.txt')).toBe(true)
+  })
+
+  it('follows an empty page that is not the last to the objects after it', async () => {
+    await put('project/p1/a.txt')
+    vi.mocked(listStorageKeyPage)
+      .mockResolvedValueOnce({ keys: [], done: false, nextPageToken: 'next' })
+      .mockResolvedValueOnce({ keys: ['project/p1/a.txt'], done: true })
+
+    await expect(cleanup({ projectId: 'p1' }, outboxContext())).resolves.toBeUndefined()
+
+    expect(vi.mocked(listStorageKeyPage).mock.calls[1]?.[3]).toBe('next')
+    expect(await exists('project/p1/a.txt')).toBe(false)
+  })
+
+  it('spends an attempt when its listing stops advancing without removing anything', async () => {
+    vi.mocked(listStorageKeyPage).mockResolvedValue({
+      keys: [],
+      done: false,
+      nextPageToken: 'stuck',
+    })
 
-    const result = await cleanup({ projectId: 'p1' }, outboxContext(Date.now() + 60_000))
+    const result = await cleanup({ projectId: 'p1' }, outboxContext())
 
     expect(result).toMatchObject({ outcome: 'deferred' })
     expect(result).not.toMatchObject({ consumeAttempt: false })
+    expect(listStorageKeyPage).toHaveBeenCalledTimes(2)
   })
 })
@@ -21,7 +21,6 @@ import {
   deleteStorageKeysUnderPrefix,
   listStorageKeyPage,
   outboxDeadlineNear,
-  STORAGE_KEY_PAGE_SIZE,
   storageCleanupAvailableAt,
 } from '@/lib/uploads/core/prefix-sweep'
 import { abortProviderUpload } from '@/lib/uploads/upload-session/provider'
@@ -202,21 +201,33 @@ export async function queueRetiredProjectUploadCleanup(
   })
 }
 
-/** `stalled` when a page that must be re-listed removed nothing, so continuing cannot progress. */
+/**
+ * Deletes one listing page's objects per run, re-listing from the prefix start next time. A
+ * provider (Azure Blob, GCS, S3-compatibles) may return a short or empty page that is not the last,
+ * so only `page.done` ends the sweep; a non-final page that removes nothing is followed to the next
+ * one within the run, so objects behind it are still reached. `stalled` when no page removed
+ * anything before the listing stopped advancing or the deadline neared.
+ */
 async function sweepPrefix(
   projectId: string,
   context: OutboxEventContext
 ): Promise<'done' | 'continue' | 'stalled'> {
   const prefix = prefixFor(projectId)
-  const page = await listStorageKeyPage(prefix, 'project', context.signal)
-  const { deleted, complete } = await deleteStorageKeysUnderPrefix(
-    prefix,
-    'project',
-    page.keys,
-    context
-  )
-  if (complete && page.keys.length < STORAGE_KEY_PAGE_SIZE) return 'done'
-  return deleted > 0 ? 'continue' : 'stalled'
+  let pageToken: string | undefined
+  for (;;) {
+    const page = await listStorageKeyPage(prefix, 'project', context.signal, pageToken)
+    const { deleted, complete } = await deleteStorageKeysUnderPrefix(
+      prefix,
+      'project',
+      page.keys,
+      context
+    )
+    if (complete && page.done) return 'done'
+    if (deleted > 0) return 'continue'
+    const advanced = page.nextPageToken !== undefined && page.nextPageToken !== pageToken
+    if (!complete || !advanced || outboxDeadlineNear(context)) return 'stalled'
+    pageToken = page.nextPageToken
+  }
 }
 
 const cleanupPrefix: OutboxHandler<unknown> = async (raw, context) => {
@@ -259,7 +270,7 @@ const cleanupPrefix: OutboxHandler<unknown> = async (raw, context) => {
   const sweep = await sweepPrefix(payload.projectId, context)
   if (sweep === 'continue') return continueOutboxHandler('Continuing Project storage cleanup')
   if (sweep === 'stalled')
-    return deferOutboxHandler('Project storage cleanup removed nothing from a full listing page')
+    return deferOutboxHandler('Project storage cleanup removed nothing from its listing')
 }
 
 /**
 
@@ -16,7 +16,7 @@ import { deleteFile } from '@/lib/uploads/core/storage-service'
 import { UPLOAD_URL_TTL_MS } from '@/lib/uploads/upload-session/provider'
 
 /** Most keys one {@link listStorageKeyPage} call returns. */
-export const STORAGE_KEY_PAGE_SIZE = 500
+const STORAGE_KEY_PAGE_SIZE = 500
 const CLOCK_SKEW_MS = 60_000
 const DEADLINE_MARGIN_MS = 5000