@void/platform 0.21.1 → 0.21.3

package/dist/runtime/api/index.js

@@ -30346,6 +30346,7 @@ __export(cloudflare_api_exports, {
   deleteKVNamespace: () => deleteKVNamespace,
   deleteQueue: () => deleteQueue,
   deleteR2Bucket: () => deleteR2Bucket,
+  enableD1ReadReplication: () => enableD1ReadReplication,
   getCustomHostname: () => getCustomHostname,
   getCustomHostnameByHostname: () => getCustomHostnameByHostname,
   getD1DatabaseByName: () => getD1DatabaseByName,
@@ -30384,7 +30385,13 @@ async function cfFetch(url2, apiToken, init) {
 async function createD1Database(accountId, apiToken, name) {
   return cfFetch(`${CF_API_BASE}/${accountId}/d1/database`, apiToken, {
     method: "POST",
-    body: JSON.stringify({ name })
+    body: JSON.stringify({ name, read_replication: { mode: "auto" } })
+  });
+}
+async function enableD1ReadReplication(accountId, apiToken, databaseId) {
+  await cfFetch(`${CF_API_BASE}/${accountId}/d1/database/${databaseId}`, apiToken, {
+    method: "PUT",
+    body: JSON.stringify({ read_replication: { mode: "auto" } })
   });
 }
 async function createKVNamespace(accountId, apiToken, title) {
@@ -30730,6 +30737,7 @@ var init_cloudflare_api = __esm({
     };
     __name(cfFetch, "cfFetch");
     __name(createD1Database, "createD1Database");
+    __name(enableD1ReadReplication, "enableD1ReadReplication");
     __name(createKVNamespace, "createKVNamespace");
     __name(createR2Bucket, "createR2Bucket");
     __name(getD1DatabaseByName, "getD1DatabaseByName");
@@ -42022,6 +42030,7 @@ __export(schema_exports, {
   platformLoginTests: () => platformLoginTests,
   platformSettings: () => platformSettings,
   projectAccessEvents: () => projectAccessEvents,
+  projectCleanupJobs: () => projectCleanupJobs,
   projectDatabaseCredentials: () => projectDatabaseCredentials,
   projectDeployCredentials: () => projectDeployCredentials,
   projectInvitations: () => projectInvitations,
@@ -42034,7 +42043,7 @@ __export(schema_exports, {
   sandboxDrainCheckpoints: () => sandboxDrainCheckpoints,
   users: () => users
 });
-var users, oauthAccounts, platformAuthSettings, platformLoginConnections, platformLoginRevisions, platformLoginIdentities, platformHumanSessions, platformCompanyIdentities, platformLoginTests, platformAuthAttempts, platformAuthBootstrap, projects, projectDeployCredentials, projectMembers, projectInvitations, projectOwnershipPeriods, projectAccessEvents, deployments, projectSecrets, resources, domains, emailDestinations, emailDestinationCleanups, emailDomains, platformSettings, operatorSessions, operatorEvents, sandboxDrainCheckpoints, platformEvents, oauthNonces, authCodes, migrationRenames, projectMigrations, projectDatabaseCredentials, githubInstallations, githubConnections, githubInstallationMembers, githubInstallationRevocations, githubWebhookRedeliveries, builds, invitations;
+var users, oauthAccounts, platformAuthSettings, platformLoginConnections, platformLoginRevisions, platformLoginIdentities, platformHumanSessions, platformCompanyIdentities, platformLoginTests, platformAuthAttempts, platformAuthBootstrap, projects, projectDeployCredentials, projectMembers, projectInvitations, projectOwnershipPeriods, projectAccessEvents, deployments, projectCleanupJobs, projectSecrets, resources, domains, emailDestinations, emailDestinationCleanups, emailDomains, platformSettings, operatorSessions, operatorEvents, sandboxDrainCheckpoints, platformEvents, oauthNonces, authCodes, migrationRenames, projectMigrations, projectDatabaseCredentials, githubInstallations, githubConnections, githubInstallationMembers, githubInstallationRevocations, githubWebhookRedeliveries, builds, invitations;
 var init_schema2 = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/schema.ts"() {
     "use strict";
@@ -42415,6 +42424,20 @@ var init_schema2 = __esm({
         index("idx_deployments_created_id").on(table2.created_at, table2.id)
       ]
     );
+    projectCleanupJobs = pgTable(
+      "project_cleanup_jobs",
+      {
+        target: text("target").primaryKey(),
+        project_id: text("project_id").notNull(),
+        kind: text("kind").notNull().$type(),
+        payload: jsonb("payload").notNull().$type(),
+        attempts: integer("attempts").notNull().default(0),
+        last_error: text("last_error"),
+        next_attempt_at: timestamp("next_attempt_at", { mode: "string" }).notNull().defaultNow(),
+        created_at: timestamp("created_at", { mode: "string" }).notNull().defaultNow()
+      },
+      (table2) => [index("project_cleanup_jobs_due").on(table2.next_attempt_at, table2.created_at)]
+    );
     projectSecrets = pgTable(
       "project_secrets",
       {
@@ -47461,6 +47484,26 @@ var init_admission = __esm({
   }
 });
 
+// ../../home/runner/work/void/void/platform/packages/api/src/naming.ts
+function getLegacyProjectWorkerName(slug) {
+  return `user-${slug}`;
+}
+function getProjectDeploymentWorkerName(slug, deploymentId) {
+  return `user-${slug}-${deploymentId}`;
+}
+function getProjectQueueName(projectId, queueName) {
+  return `${projectId}-${queueName}`.toLowerCase().replaceAll("_", "-");
+}
+var init_naming = __esm({
+  "../../home/runner/work/void/void/platform/packages/api/src/naming.ts"() {
+    "use strict";
+    init_performance2();
+    __name(getLegacyProjectWorkerName, "getLegacyProjectWorkerName");
+    __name(getProjectDeploymentWorkerName, "getProjectDeploymentWorkerName");
+    __name(getProjectQueueName, "getProjectQueueName");
+  }
+});
+
 // ../../home/runner/work/void/void/platform/packages/api/src/tiers.ts
 function getPlanLimits(plan) {
   return PLAN_LIMITS[plan] ?? PLAN_LIMITS.free;
@@ -47626,6 +47669,7 @@ __export(db_exports, {
   cancelDeployment: () => cancelDeployment,
   cancelQueuedContainerBuildsForUsers: () => cancelQueuedContainerBuildsForUsers,
   claimBuildForStartWithinLimit: () => claimBuildForStartWithinLimit,
+  cleanupJobsForResource: () => cleanupJobsForResource,
   clearGitHubInstallationOwnerForUser: () => clearGitHubInstallationOwnerForUser,
   consumeAuthCode: () => consumeAuthCode,
   consumeCliAuthCode: () => consumeCliAuthCode,
@@ -47661,9 +47705,11 @@ __export(db_exports, {
   deleteProjectSecret: () => deleteProjectSecret,
   deleteRollbackLease: () => deleteRollbackLease,
   deleteUser: () => deleteUser,
+  enqueueProjectCleanupJobs: () => enqueueProjectCleanupJobs,
   failStaleActiveContainerBuilds: () => failStaleActiveContainerBuilds,
   failStaleActiveGithubActionsBuilds: () => failStaleActiveGithubActionsBuilds,
   failStaleDeployments: () => failStaleDeployments,
+  getAccessibleProjectBySlug: () => getAccessibleProjectBySlug,
   getAccessibleProjectsByUserId: () => getAccessibleProjectsByUserId,
   getActivatedDeployments: () => getActivatedDeployments,
   getActiveDeployment: () => getActiveDeployment,
@@ -47971,6 +48017,25 @@ async function getAccessibleProjectsByUserId(db, userId) {
     owner: row.owner
   }));
 }
+async function getAccessibleProjectBySlug(db, userId, slug) {
+  const [row] = await db.select({ project: projects, memberRole: projectMembers.role, owner: accessibleProjectOwner }).from(projects).innerJoin(accessibleProjectOwner, eq(projects.user_id, accessibleProjectOwner.id)).leftJoin(
+    projectMembers,
+    and(eq(projectMembers.project_id, projects.id), eq(projectMembers.user_id, userId))
+  ).where(
+    and(
+      eq(projects.slug, slug),
+      or(eq(projects.user_id, userId), eq(projectMembers.user_id, userId))
+    )
+  ).limit(1);
+  if (!row || isAdminSuspended(row.owner.suspended_reason)) {
+    return null;
+  }
+  return {
+    project: row.project,
+    role: row.project.user_id === userId ? "owner" : row.memberRole,
+    owner: row.owner
+  };
+}
 async function getProjectMember(db, projectId, userId) {
   const [row] = await db.select().from(projectMembers).where(and(eq(projectMembers.project_id, projectId), eq(projectMembers.user_id, userId))).limit(1);
   return row ?? null;
@@ -48434,7 +48499,7 @@ async function getLatestDeploymentsByProjectIds(db, projectIds) {
   if (projectIds.length === 0) {
     return /* @__PURE__ */ new Map();
   }
-  const rows = await db.select({
+  const rows = await db.selectDistinctOn([deployments.project_id], {
     id: deployments.id,
     project_id: deployments.project_id,
     status: deployments.status,
@@ -48442,14 +48507,8 @@ async function getLatestDeploymentsByProjectIds(db, projectIds) {
     commit: deployments.commit,
     created_at: deployments.created_at,
     deployed_at: deployments.deployed_at
-  }).from(deployments).where(inArray(deployments.project_id, projectIds)).orderBy(desc(deployments.created_at));
-  const latest = /* @__PURE__ */ new Map();
-  for (const row of rows) {
-    if (!latest.has(row.project_id)) {
-      latest.set(row.project_id, row);
-    }
-  }
-  return latest;
+  }).from(deployments).where(inArray(deployments.project_id, projectIds)).orderBy(deployments.project_id, desc(deployments.created_at), desc(deployments.id));
+  return new Map(rows.map((row) => [row.project_id, row]));
 }
 async function getProjectsByIds(db, ids) {
   if (ids.length === 0) {
@@ -49154,7 +49213,36 @@ async function promoteEmailDestinationWithOwnerAudit(db, projectId, id2, cfDesti
 async function deleteProject(db, id2) {
   await db.delete(projects).where(eq(projects.id, id2));
 }
-async function deleteProjectCascade(db, projectId) {
+function cleanupJobsForResource(projectId, resource) {
+  if (resource.type === "container") {
+    return [];
+  }
+  const jobs = [
+    {
+      target: `cf-resource:${projectId}:${resource.type}:${resource.cf_id}`,
+      project_id: projectId,
+      kind: "cf-resource",
+      payload: { type: resource.type, cfId: resource.cf_id }
+    }
+  ];
+  if (resource.type === "queue") {
+    const key = `queue:${getProjectQueueName(projectId, resource.binding_name)}`;
+    jobs.push({
+      target: `routing-key:${projectId}:${key}`,
+      project_id: projectId,
+      kind: "routing-key",
+      payload: { key }
+    });
+  }
+  return jobs;
+}
+async function enqueueProjectCleanupJobs(db, jobs) {
+  if (jobs.length === 0) {
+    return;
+  }
+  await db.insert(projectCleanupJobs).values([...jobs]).onConflictDoNothing();
+}
+async function deleteProjectCascade(db, projectId, processedResourceCfIds = /* @__PURE__ */ new Set()) {
   return await db.transaction(async (tx) => {
     const txDb = tx;
     await tx.execute(sql`SELECT id FROM ${projects} WHERE id = ${projectId} FOR UPDATE`);
@@ -49163,6 +49251,10 @@ async function deleteProjectCascade(db, projectId) {
     });
     await tx.delete(domains).where(eq(domains.project_id, projectId));
     const deletedResources = await tx.delete(resources).where(eq(resources.project_id, projectId)).returning();
+    await enqueueProjectCleanupJobs(
+      txDb,
+      deletedResources.filter((resource) => !processedResourceCfIds.has(resource.cf_id)).flatMap((resource) => cleanupJobsForResource(projectId, resource))
+    );
     await tx.delete(projectSecrets).where(eq(projectSecrets.project_id, projectId));
     await tx.delete(builds).where(eq(builds.project_id, projectId));
     await tx.delete(deployments).where(eq(deployments.project_id, projectId));
@@ -49337,7 +49429,13 @@ async function searchProjects(db, query) {
     last_deploy_id: lastDeploy.last_deploy_id,
     last_deploy_status: lastDeploy.last_deploy_status
   }).from(projects).leftJoin(users, eq(projects.user_id, users.id)).leftJoin(lastDeploy, eq(projects.id, lastDeploy.project_id)).where(
-    or(ilike(projects.slug, pattern), ilike(users.login, pattern), ilike(projects.id, pattern))
+    or(
+      ilike(projects.slug, pattern),
+      ilike(users.login, pattern),
+      ilike(projects.id, pattern),
+      ilike(projects.type, pattern),
+      ilike(lastDeploy.last_deploy_status, pattern)
+    )
   ).orderBy(desc(projects.created_at)).limit(50);
 }
 async function searchDeployments(db, query) {
@@ -49353,7 +49451,8 @@ async function searchDeployments(db, query) {
       ilike(deployments.status, pattern),
       ilike(deployments.commit, pattern),
       ilike(deployments.source, pattern),
-      ilike(deployments.cli_version, pattern)
+      ilike(deployments.cli_version, pattern),
+      ilike(deployments.error_message, pattern)
     )
   ).orderBy(desc(deployments.created_at)).limit(50);
 }
@@ -49709,15 +49808,18 @@ async function getQueuedBuilds(db, limit = 50, excludeUserIds = []) {
   return db.select().from(oldestPerProject).orderBy(asc(oldestPerProject.created_at)).limit(limit);
 }
 async function getUsersWithQueuedContainerBuilds(db) {
+  const activeBuilds = alias(builds, "active_builds");
   const rows = await db.select({
     userId: users.id,
     plan: users.plan,
     suspendedReason: users.suspended_reason,
-    // Correlated count of this user's in-flight builds (any executor). The
-    // FILTER over a LEFT JOIN keeps users whose only builds are queued
-    // (activeBuilds = 0) in the result.
-    activeBuilds: sql`count(${builds.id}) filter (
-        where ${inArray(builds.status, ACTIVE_BUILD_STATUSES)}
+    // Count only active rows through idx_builds_user_status. Joining the
+    // entire builds table here would touch every historical build belonging
+    // to each queued owner on every scheduler tick.
+    activeBuilds: sql`(
+        select count(*) from ${builds} as active_builds
+        where ${activeBuilds.user_id} = ${users.id}
+          and ${inArray(activeBuilds.status, ACTIVE_BUILD_STATUSES)}
       )`
   }).from(users).innerJoin(
     // Restrict to users who own at least one queued container build — the
@@ -49727,7 +49829,7 @@ async function getUsersWithQueuedContainerBuilds(db) {
         where ${builds.status} = 'queued' and ${builds.executor} = 'container'
       ) as queued_owners`,
     sql`queued_owners.user_id = ${users.id}`
-  ).leftJoin(builds, eq(builds.user_id, users.id)).groupBy(users.id, users.plan);
+  );
   return rows.map((r) => ({
     userId: r.userId,
     plan: r.plan,
@@ -50548,6 +50650,7 @@ var init_db2 = __esm({
     init_configuration();
     init_admission();
     init_id2();
+    init_naming();
     init_project_access();
     init_schema2();
     init_schema2();
@@ -50606,6 +50709,7 @@ var init_db2 = __esm({
     __name(getOwnedProjectsByUserId, "getOwnedProjectsByUserId");
     accessibleProjectOwner = alias(users, "accessible_project_owner");
     __name(getAccessibleProjectsByUserId, "getAccessibleProjectsByUserId");
+    __name(getAccessibleProjectBySlug, "getAccessibleProjectBySlug");
     __name(getProjectMember, "getProjectMember");
     __name(getProjectMembers, "getProjectMembers");
     ProjectTeamMutationError = class extends Error {
@@ -50715,6 +50819,8 @@ var init_db2 = __esm({
     __name(queueUnreferencedEmailDestinationCleanup, "queueUnreferencedEmailDestinationCleanup");
     __name(promoteEmailDestinationWithOwnerAudit, "promoteEmailDestinationWithOwnerAudit");
     __name(deleteProject, "deleteProject");
+    __name(cleanupJobsForResource, "cleanupJobsForResource");
+    __name(enqueueProjectCleanupJobs, "enqueueProjectCleanupJobs");
     __name(deleteProjectCascade, "deleteProjectCascade");
     __name(countUsers, "countUsers");
     __name(countProjects, "countProjects");
@@ -50841,6 +50947,28 @@ var init_env = __esm({
   }
 });
 
+// ../../home/runner/work/void/void/platform/packages/api/src/concurrency.ts
+async function uploadPool(items, concurrency, fn) {
+  let nextIndex = 0;
+  async function worker() {
+    while (nextIndex < items.length) {
+      const item = items[nextIndex++];
+      await fn(item);
+    }
+  }
+  __name(worker, "worker");
+  await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, () => worker()));
+}
+var R2_CONCURRENCY;
+var init_concurrency = __esm({
+  "../../home/runner/work/void/void/platform/packages/api/src/concurrency.ts"() {
+    "use strict";
+    init_performance2();
+    R2_CONCURRENCY = 6;
+    __name(uploadPool, "uploadPool");
+  }
+});
+
 // ../../home/runner/work/void/void/platform/packages/api/src/routes/project-access.ts
 async function requireProjectRouteCapability(context, projectId, capability, db = context.get("db")) {
   try {
@@ -50890,7 +51018,7 @@ async function queryProjectUsage(accountId, apiToken, requestsDataset, projectId
     }
   );
   if (!response.ok) {
-    return { requests: 0, bandwidthBytes: 0 };
+    throw new Error(`Usage query failed with HTTP ${response.status}`);
   }
   const result = await response.json();
   const row = result.data?.[0];
@@ -50936,7 +51064,7 @@ async function getAccountUsageProjectWindows(db, userId, since, until) {
 function analyticsStringLiteral(value) {
   return `'${value.replaceAll("\\", "\\\\").replaceAll("'", "\\'")}'`;
 }
-async function queryBatchProjectUsageWindows(accountId, apiToken, requestsDataset, windows) {
+async function queryBatchProjectUsageWindows(accountId, apiToken, requestsDataset, windows, failOnError = false) {
   if (windows.length === 0) {
     return /* @__PURE__ */ new Map();
   }
@@ -50945,39 +51073,63 @@ async function queryBatchProjectUsageWindows(accountId, apiToken, requestsDatase
       ({ start, end }) => `(blob1 = ${analyticsStringLiteral(project.id)} AND timestamp >= toDateTime64(${analyticsStringLiteral(formatAnalyticsDateMilliseconds(start))}, 3) AND timestamp < toDateTime64(${analyticsStringLiteral(formatAnalyticsDateMilliseconds(end))}, 3))`
     )
   );
-  const query = `
+  const usage = /* @__PURE__ */ new Map();
+  for (let offset = 0; offset < predicates.length; offset += 50) {
+    const query = `
     SELECT
       blob1,
       SUM(_sample_interval * double1) as requests,
       SUM(_sample_interval * double2) as bandwidth_bytes
     FROM ${requestsDataset}
-    WHERE ${predicates.join("\n      OR ")}
+    WHERE ${predicates.slice(offset, offset + 50).join("\n      OR ")}
     GROUP BY blob1
   `;
-  const response = await fetch(
-    `https://api.cloudflare.com/client/v4/accounts/${accountId}/analytics_engine/sql`,
-    {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${apiToken}`,
-        "Content-Type": "text/plain"
-      },
-      body: query
-    }
-  );
-  if (!response.ok) {
-    return /* @__PURE__ */ new Map();
-  }
-  const json3 = await response.json();
-  return new Map(
-    (json3.data ?? []).map((row) => [
-      row.blob1,
+    const response = await fetch(
+      `https://api.cloudflare.com/client/v4/accounts/${accountId}/analytics_engine/sql`,
       {
-        requests: Math.round(row.requests ?? 0),
-        bandwidthBytes: Math.round(row.bandwidth_bytes ?? 0)
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${apiToken}`,
+          "Content-Type": "text/plain"
+        },
+        body: query
       }
-    ])
+    );
+    if (!response.ok) {
+      if (failOnError) {
+        throw new Error(`Usage query failed with HTTP ${response.status}`);
+      }
+      return /* @__PURE__ */ new Map();
+    }
+    const json3 = await response.json();
+    for (const row of json3.data ?? []) {
+      const previous = usage.get(row.blob1) ?? ZERO_USAGE;
+      usage.set(row.blob1, {
+        requests: previous.requests + Math.round(row.requests ?? 0),
+        bandwidthBytes: previous.bandwidthBytes + Math.round(row.bandwidth_bytes ?? 0)
+      });
+    }
+  }
+  return usage;
+}
+async function sumAiUsageForWindows(accountId, apiToken, gatewayId, windows) {
+  const totals = windows.map(() => 0);
+  const tasks = windows.flatMap(
+    ({ projectId, intervals }, index2) => intervals.map((interval2) => ({ projectId, interval: interval2, index: index2 }))
   );
+  await uploadPool(tasks, 4, async ({ projectId, interval: interval2, index: index2 }) => {
+    const usage = await queryProjectAiUsage(
+      accountId,
+      apiToken,
+      gatewayId,
+      projectId,
+      interval2.start,
+      interval2.end,
+      true
+    );
+    totals[index2] += usage.neurons;
+  });
+  return totals;
 }
 async function queryTopProjectTraffic(accountId, apiToken, requestsDataset, since, limit) {
   if (limit <= 0) {
@@ -51217,6 +51369,7 @@ var init_usage = __esm({
     init_performance2();
     init_drizzle_orm();
     init_dist2();
+    init_concurrency();
     init_env();
     init_schema2();
     init_tiers();
@@ -51238,22 +51391,30 @@ var init_usage = __esm({
       }
       const since = getCurrentBillingPeriodStart(access.owner.billing_cycle_start);
       const requestsDataset = getRequestsDataset(context.env);
-      const [usage, aiUsage] = await Promise.all([
-        queryProjectUsage(
-          context.env.CF_ACCOUNT_ID,
-          context.env.CF_API_TOKEN,
-          requestsDataset,
-          projectId,
-          since
-        ),
-        queryProjectAiUsage(
-          context.env.CF_ACCOUNT_ID,
-          context.env.CF_API_TOKEN,
-          context.env.AI_GATEWAY_ID ?? "void",
-          projectId,
-          since
-        )
-      ]);
+      let usage;
+      let aiUsage;
+      try {
+        [usage, aiUsage] = await Promise.all([
+          queryProjectUsage(
+            context.env.CF_ACCOUNT_ID,
+            context.env.CF_API_TOKEN,
+            requestsDataset,
+            projectId,
+            since
+          ),
+          queryProjectAiUsage(
+            context.env.CF_ACCOUNT_ID,
+            context.env.CF_API_TOKEN,
+            context.env.AI_GATEWAY_ID ?? "void",
+            projectId,
+            since,
+            void 0,
+            true
+          )
+        ]);
+      } catch {
+        return context.json({ error: "usage unavailable" }, 503);
+      }
       return context.json({
         projectId,
         billingPeriodStart: since.toISOString(),
@@ -51289,38 +51450,32 @@ var init_usage = __esm({
         });
       }
       const requestsDataset = getRequestsDataset(context.env);
-      const [usageMap, ...aiUsages] = await Promise.all([
-        queryBatchProjectUsageWindows(
-          context.env.CF_ACCOUNT_ID,
-          context.env.CF_API_TOKEN,
-          requestsDataset,
-          projectWindows
-        ),
-        ...projectWindows.map(
-          async ({ project, intervals }) => intervals.reduce(
-            async (totalPromise, interval2) => {
-              const [total, usage] = await Promise.all([
-                totalPromise,
-                queryProjectAiUsage(
-                  context.env.CF_ACCOUNT_ID,
-                  context.env.CF_API_TOKEN,
-                  context.env.AI_GATEWAY_ID ?? "void",
-                  project.id,
-                  interval2.start,
-                  interval2.end
-                )
-              ]);
-              return { neurons: total.neurons + usage.neurons };
-            },
-            Promise.resolve({ neurons: 0 })
+      let usageMap;
+      let aiUsages;
+      try {
+        [usageMap, aiUsages] = await Promise.all([
+          queryBatchProjectUsageWindows(
+            context.env.CF_ACCOUNT_ID,
+            context.env.CF_API_TOKEN,
+            requestsDataset,
+            projectWindows,
+            true
+          ),
+          sumAiUsageForWindows(
+            context.env.CF_ACCOUNT_ID,
+            context.env.CF_API_TOKEN,
+            context.env.AI_GATEWAY_ID ?? "void",
+            projectWindows.map(({ project, intervals }) => ({ projectId: project.id, intervals }))
           )
-        )
-      ]);
+        ]);
+      } catch {
+        return context.json({ error: "usage unavailable" }, 503);
+      }
       const projectUsages = projectWindows.map(({ project }, i) => ({
         projectId: project.id,
         slug: project.slug,
         ...usageMap.get(project.id) ?? ZERO_USAGE,
-        aiNeurons: aiUsages[i].neurons
+        aiNeurons: aiUsages[i]
       }));
       const totals = projectUsages.reduce(
         (acc, u) => ({
@@ -51343,6 +51498,7 @@ var init_usage = __esm({
     __name(getAccountUsageProjectWindows, "getAccountUsageProjectWindows");
     __name(analyticsStringLiteral, "analyticsStringLiteral");
     __name(queryBatchProjectUsageWindows, "queryBatchProjectUsageWindows");
+    __name(sumAiUsageForWindows, "sumAiUsageForWindows");
     __name(queryTopProjectTraffic, "queryTopProjectTraffic");
     __name(formatAnalyticsDate, "formatAnalyticsDate");
     __name(formatAnalyticsDateMilliseconds, "formatAnalyticsDateMilliseconds");
@@ -56273,26 +56429,6 @@ var init_cron_scheduler_client = __esm({
   }
 });
 
-// ../../home/runner/work/void/void/platform/packages/api/src/naming.ts
-function getLegacyProjectWorkerName(slug) {
-  return `user-${slug}`;
-}
-function getProjectDeploymentWorkerName(slug, deploymentId) {
-  return `user-${slug}-${deploymentId}`;
-}
-function getProjectQueueName(projectId, queueName) {
-  return `${projectId}-${queueName}`.toLowerCase().replaceAll("_", "-");
-}
-var init_naming = __esm({
-  "../../home/runner/work/void/void/platform/packages/api/src/naming.ts"() {
-    "use strict";
-    init_performance2();
-    __name(getLegacyProjectWorkerName, "getLegacyProjectWorkerName");
-    __name(getProjectDeploymentWorkerName, "getProjectDeploymentWorkerName");
-    __name(getProjectQueueName, "getProjectQueueName");
-  }
-});
-
 // ../../home/runner/work/void/void/platform/packages/api/src/sandbox-drain.ts
 async function writeSandboxDrainMirror(routing, checkpoint) {
   const state = {
@@ -57048,6 +57184,97 @@ function deleteCloudflareResource(accountId, apiToken, resource) {
       throw new Error(`Unsupported resource type: ${resourceType}`);
   }
 }
+function cleanupJob(projectId, kind, target, payload) {
+  return { project_id: projectId, kind, target: `${kind}:${projectId}:${target}`, payload };
+}
+function jobValue(job, key) {
+  const value = job.payload[key];
+  if (!value) {
+    throw new Error(`Project cleanup job ${job.target} is missing ${key}`);
+  }
+  return value;
+}
+async function ignoreMissingProviderObject(operation) {
+  try {
+    await operation();
+  } catch (error63) {
+    if (error63 instanceof CloudflareApiError && error63.status === 404) {
+      return;
+    }
+    throw error63;
+  }
+}
+async function executeCleanupJob(env2, job) {
+  switch (job.kind) {
+    case "cf-resource":
+      await ignoreMissingProviderObject(
+        () => deleteCloudflareResource(env2.CF_ACCOUNT_ID, env2.CF_API_TOKEN, {
+          type: jobValue(job, "type"),
+          cf_id: jobValue(job, "cfId")
+        })
+      );
+      return;
+    case "worker": {
+      const namespace = jobValue(job, "namespace");
+      const name = jobValue(job, "name");
+      const response = await fetch(
+        `https://api.cloudflare.com/client/v4/accounts/${env2.CF_ACCOUNT_ID}/workers/dispatch/namespaces/${namespace}/scripts/${name}`,
+        { method: "DELETE", headers: { Authorization: `Bearer ${env2.CF_API_TOKEN}` } }
+      );
+      if (!response.ok && response.status !== 404) {
+        throw new Error(`Worker delete returned HTTP ${response.status}: ${await response.text()}`);
+      }
+      void response.body?.cancel().catch(() => {
+      });
+      return;
+    }
+    case "worker-bundle":
+      await deleteWorkerBundle(
+        env2.STATIC_ASSETS_R2,
+        jobValue(job, "projectId"),
+        jobValue(job, "deploymentId")
+      );
+      return;
+    case "project-assets":
+      await deleteProjectAssets(env2.STATIC_ASSETS_R2, jobValue(job, "projectId"));
+      return;
+    case "routing-key":
+      await env2.ROUTING.delete(jobValue(job, "key"));
+      return;
+    case "cron":
+      await clearCronScheduler(env2, jobValue(job, "projectId"));
+      return;
+    case "custom-hostname":
+      await ignoreMissingProviderObject(
+        () => deleteCustomHostname(
+          jobValue(job, "zoneId"),
+          env2.CF_API_TOKEN,
+          jobValue(job, "hostnameId")
+        )
+      );
+      return;
+  }
+}
+async function runCleanupBatch(env2, jobs) {
+  const warnings = [];
+  const failed = [];
+  let next = 0;
+  await Promise.all(
+    Array.from({ length: Math.min(5, jobs.length) }, async () => {
+      while (next < jobs.length) {
+        const job = jobs[next++];
+        try {
+          await executeCleanupJob(env2, job);
+        } catch (error63) {
+          const message2 = error63 instanceof Error ? error63.message : String(error63);
+          warnings.push(`Failed to delete ${job.target}: ${message2}`);
+          failed.push(job);
+        }
+      }
+    })
+  );
+  return { warnings, failed };
+}
 async function cleanupCriticalResources(context, projectId, _project) {
   const resources2 = await getProjectResources(context.get("db"), projectId);
   for (const resource of resources2) {
@@ -57118,8 +57345,10 @@ function parseDeploymentManifest(raw2) {
 }
 async function cleanupBestEffortResources(context, projectId, project) {
   const warnings = [];
-  const warn = /* @__PURE__ */ __name((msg) => (err) => {
+  const failedJobs = [];
+  const warn = /* @__PURE__ */ __name((msg, job) => (err) => {
     warnings.push(`${msg}: ${err instanceof Error ? err.message : String(err)}`);
+    failedJobs.push(job);
   }, "warn");
   const cleanedCfIds = /* @__PURE__ */ new Set();
   const [projectDeployments, resources2, projectDomains] = await Promise.all([
@@ -57134,28 +57363,37 @@ async function cleanupBestEffortResources(context, projectId, project) {
       (deployment) => getProjectDeploymentWorkerName(project.slug, deployment.id)
     )
   ]);
-  await Promise.all(
+  const workerResult = await runCleanupBatch(
+    context.env,
     Array.from(
       workerNames,
-      (workerName) => fetch(
-        `https://api.cloudflare.com/client/v4/accounts/${context.env.CF_ACCOUNT_ID}/workers/dispatch/namespaces/${dispatchNamespace}/scripts/${workerName}`,
-        { method: "DELETE", headers: { Authorization: `Bearer ${context.env.CF_API_TOKEN}` } }
-      ).then(async (cfRes) => {
-        if (!cfRes.ok && cfRes.status !== 404) {
-          warnings.push(`Failed to delete worker ${workerName}: ${await cfRes.text()}`);
-        }
-      }).catch(warn(`Failed to delete worker ${workerName}`))
+      (workerName) => cleanupJob(projectId, "worker", `${dispatchNamespace}:${workerName}`, {
+        namespace: dispatchNamespace,
+        name: workerName
+      })
     )
   );
-  await Promise.all(
+  warnings.push(...workerResult.warnings);
+  failedJobs.push(...workerResult.failed);
+  if (workerResult.failed.some((job) => job.payload.name === getLegacyProjectWorkerName(project.slug))) {
+    throw new Error("Could not remove the legacy project Worker; retry project deletion.");
+  }
+  const bundleResult = await runCleanupBatch(
+    context.env,
     projectDeployments.map(
-      (deployment) => deleteWorkerBundle(context.env.STATIC_ASSETS_R2, projectId, deployment.id).catch(
-        warn(`Failed to delete worker bundle for deployment ${deployment.id}`)
-      )
+      (deployment) => cleanupJob(projectId, "worker-bundle", `${projectId}:${deployment.id}`, {
+        projectId,
+        deploymentId: deployment.id
+      })
     )
   );
+  warnings.push(...bundleResult.warnings);
+  failedJobs.push(...bundleResult.failed);
   await deleteProjectAssets(context.env.STATIC_ASSETS_R2, projectId).catch(
-    warn(`Failed to delete static assets for project ${projectId}`)
+    warn(
+      `Failed to delete static assets for project ${projectId}`,
+      cleanupJob(projectId, "project-assets", projectId, { projectId })
+    )
   );
   const cleanup = [];
   for (const resource of resources2) {
@@ -57163,48 +57401,45 @@ async function cleanupBestEffortResources(context, projectId, project) {
       continue;
     }
     cleanedCfIds.add(resource.cf_id);
-    const del = deleteCloudflareResource(
-      context.env.CF_ACCOUNT_ID,
-      context.env.CF_API_TOKEN,
-      resource
+    cleanup.push(
+      ...cleanupJobsForResource(projectId, resource).filter((job) => job.kind === "cf-resource")
     );
-    cleanup.push(del.catch(warn(`Failed to delete ${resource.type} resource ${resource.cf_id}`)));
   }
+  cleanup.push(cleanupJob(projectId, "cron", projectId, { projectId }));
+  cleanup.push(cleanupJob(projectId, "routing-key", project.slug, { key: project.slug }));
   cleanup.push(
-    clearCronScheduler(context.env, projectId).catch(
-      warn(`Failed to clear cron scheduler for project ${projectId}`)
-    )
-  );
-  cleanup.push(
-    context.env.ROUTING.delete(project.slug).catch(warn("Failed to delete routing entry"))
-  );
-  cleanup.push(
-    context.env.ROUTING.delete(`ai-block:${projectId}`).catch(
-      warn("Failed to delete AI block entry")
-    )
+    cleanupJob(projectId, "routing-key", `ai-block:${projectId}`, { key: `ai-block:${projectId}` })
   );
   for (const q of resources2.filter((r) => r.type === "queue")) {
     cleanup.push(
-      context.env.ROUTING.delete(`queue:${getProjectQueueName(projectId, q.binding_name)}`).catch(
-        warn("Failed to delete queue routing entry")
-      )
+      ...cleanupJobsForResource(projectId, q).filter((job) => job.kind === "routing-key")
     );
   }
   for (const domain2 of projectDomains) {
     cleanup.push(
-      deleteCustomHostname(
-        context.env.CF_ZONE_ID,
-        context.env.CF_API_TOKEN,
-        domain2.cf_hostname_id
-      ).catch(warn(`Failed to delete custom hostname ${domain2.hostname}`))
-    );
-    cleanup.push(
-      context.env.ROUTING.delete(`domain:${domain2.hostname}`).catch(
-        warn("Failed to delete domain routing entry")
-      )
+      cleanupJob(
+        projectId,
+        "custom-hostname",
+        `${context.env.CF_ZONE_ID}:${domain2.cf_hostname_id}`,
+        {
+          zoneId: context.env.CF_ZONE_ID,
+          hostnameId: domain2.cf_hostname_id
+        }
+      ),
+      cleanupJob(projectId, "routing-key", `domain:${domain2.hostname}`, {
+        key: `domain:${domain2.hostname}`
+      })
     );
   }
-  await Promise.all(cleanup);
+  const remaining = await runCleanupBatch(context.env, cleanup);
+  warnings.push(...remaining.warnings);
+  failedJobs.push(...remaining.failed);
+  if (remaining.failed.some(
+    (job) => job.kind === "routing-key" && (job.payload.key === project.slug || job.payload.key?.startsWith("domain:"))
+  )) {
+    throw new Error("Could not remove project routing; retry project deletion.");
+  }
+  await enqueueProjectCleanupJobs(context.get("db"), failedJobs);
   return { warnings, cleanedCfIds };
 }
 async function lockAndMarkDeleting(db, projectId, actorUserId, expectedOwnerUserId) {
@@ -57310,31 +57545,48 @@ async function detachProjectUsage(context, projectId, options) {
   }
 }
 async function cleanupRaceWindowResourceOrphans(context, projectId, deletedResources, cleanedCfIds) {
-  const warnings = [];
-  const warn = /* @__PURE__ */ __name((msg) => (err) => {
-    warnings.push(`${msg}: ${err instanceof Error ? err.message : String(err)}`);
-  }, "warn");
   const orphans = deletedResources.filter(
     (r) => r.type !== "container" && !cleanedCfIds.has(r.cf_id)
   );
+  const jobs = orphans.flatMap((resource) => cleanupJobsForResource(projectId, resource));
+  const result = await runCleanupBatch(context.env, jobs);
+  const failedTargets = new Set(result.failed.map((job) => job.target));
+  const completedTargets = jobs.filter((job) => !failedTargets.has(job.target)).map((job) => job.target);
+  if (completedTargets.length > 0) {
+    await context.get("db").delete(projectCleanupJobs).where(inArray(projectCleanupJobs.target, completedTargets)).catch((error63) => console.error("[project-cleanup] completed job delete failed:", error63));
+  }
+  return result.warnings;
+}
+async function reconcileProjectCleanupJobs(db, env2) {
+  const due = await db.select().from(projectCleanupJobs).where(lte(projectCleanupJobs.next_attempt_at, sql`now()`)).orderBy(asc(projectCleanupJobs.created_at), asc(projectCleanupJobs.target)).limit(50);
+  let next = 0;
   await Promise.all(
-    orphans.flatMap((r) => {
-      const tasks = [
-        deleteCloudflareResource(context.env.CF_ACCOUNT_ID, context.env.CF_API_TOKEN, r).catch(
-          warn(`Failed to delete race-window ${r.type} resource ${r.cf_id}`)
-        )
-      ];
-      if (r.type === "queue") {
-        tasks.push(
-          context.env.ROUTING.delete(
-            `queue:${getProjectQueueName(projectId, r.binding_name)}`
-          ).catch(warn(`Failed to delete race-window queue routing entry for ${r.cf_id}`))
-        );
+    Array.from({ length: Math.min(5, due.length) }, async () => {
+      while (next < due.length) {
+        const job = due[next++];
+        const claimed = await db.update(projectCleanupJobs).set({
+          attempts: sql`${projectCleanupJobs.attempts} + 1`,
+          next_attempt_at: new Date(Date.now() + 15 * 6e4).toISOString()
+        }).where(
+          and(
+            eq(projectCleanupJobs.target, job.target),
+            lte(projectCleanupJobs.next_attempt_at, sql`now()`)
+          )
+        ).returning({ target: projectCleanupJobs.target });
+        if (claimed.length === 0) {
+          continue;
+        }
+        try {
+          await executeCleanupJob(env2, job);
+          await db.delete(projectCleanupJobs).where(eq(projectCleanupJobs.target, job.target));
+        } catch (error63) {
+          const message2 = (error63 instanceof Error ? error63.message : String(error63)).replaceAll(env2.CF_API_TOKEN, "[redacted]").slice(0, 500);
+          await db.update(projectCleanupJobs).set({ last_error: message2 }).where(eq(projectCleanupJobs.target, job.target));
+          console.warn(`[project-cleanup] retry failed for ${job.target}: ${message2}`);
+        }
       }
-      return tasks;
     })
   );
-  return warnings;
 }
 async function teardownProject(context, projectId, project, options = {}) {
   const deletion = await lockAndMarkDeleting(
@@ -57364,7 +57616,8 @@ async function teardownProject(context, projectId, project, options = {}) {
   await cleanupProjectEmailDestinations(context, projectId);
   const { cancelledBuilds, deletedResources } = await deleteProjectCascade(
     context.get("db"),
-    projectId
+    projectId,
+    cleanedCfIds
   );
   await cancelContainerBuildDos(context.env, cancelledBuilds, "project deleted");
   const orphanWarnings = await cleanupRaceWindowResourceOrphans(
@@ -57452,6 +57705,11 @@ var init_cleanup = __esm({
     init_email_destination_cleanup();
     init_sandbox_controller();
     __name(deleteCloudflareResource, "deleteCloudflareResource");
+    __name(cleanupJob, "cleanupJob");
+    __name(jobValue, "jobValue");
+    __name(ignoreMissingProviderObject, "ignoreMissingProviderObject");
+    __name(executeCleanupJob, "executeCleanupJob");
+    __name(runCleanupBatch, "runCleanupBatch");
     __name(cleanupCriticalResources, "cleanupCriticalResources");
     __name(sweepPerDeployContainerOrphans, "sweepPerDeployContainerOrphans");
     __name(parseDeploymentManifest, "parseDeploymentManifest");
@@ -57468,6 +57726,7 @@ var init_cleanup = __esm({
       }
     };
     __name(cleanupRaceWindowResourceOrphans, "cleanupRaceWindowResourceOrphans");
+    __name(reconcileProjectCleanupJobs, "reconcileProjectCleanupJobs");
     __name(teardownProject, "teardownProject");
     __name(cleanupProjectEmailDestinations, "cleanupProjectEmailDestinations");
     __name(cleanupProjectEmailAssignments, "cleanupProjectEmailAssignments");
@@ -69742,7 +70001,7 @@ A.finished.finally(function(){document.__reactViewTransition===A&&(document.__re
       return [workInProgressHook.memoizedState, reducer];
     }
     __name(useReducer, "useReducer");
-    function useMemo39(nextCreate, deps) {
+    function useMemo36(nextCreate, deps) {
       currentlyRenderingComponent = resolveCurrentlyRenderingComponent();
       workInProgressHook = createWorkInProgressHook();
       deps = void 0 === deps ? null : deps;
@@ -69766,7 +70025,7 @@ A.finished.finally(function(){document.__reactViewTransition===A&&(document.__re
       workInProgressHook.memoizedState = [nextCreate, deps];
       return nextCreate;
     }
-    __name(useMemo39, "useMemo");
+    __name(useMemo36, "useMemo");
     function dispatchAction(componentIdentity, queue, action2) {
       if (25 <= numberOfReRenders)
         throw Error(
@@ -69867,7 +70126,7 @@ A.finished.finally(function(){document.__reactViewTransition===A&&(document.__re
         resolveCurrentlyRenderingComponent();
         return context._currentValue;
       }, "useContext"),
-      useMemo: useMemo39,
+      useMemo: useMemo36,
       useReducer,
       useRef: /* @__PURE__ */ __name(function(initialValue) {
         currentlyRenderingComponent = resolveCurrentlyRenderingComponent();
@@ -69881,7 +70140,7 @@ A.finished.finally(function(){document.__reactViewTransition===A&&(document.__re
       useInsertionEffect: noop,
       useLayoutEffect: noop,
       useCallback: /* @__PURE__ */ __name(function(callback, deps) {
-        return useMemo39(function() {
+        return useMemo36(function() {
           return callback;
         }, deps);
       }, "useCallback"),
@@ -75507,7 +75766,7 @@ var require_react_dom_server_legacy_browser_production = __commonJS({
       return [workInProgressHook.memoizedState, reducer];
     }
     __name(useReducer, "useReducer");
-    function useMemo39(nextCreate, deps) {
+    function useMemo36(nextCreate, deps) {
       currentlyRenderingComponent = resolveCurrentlyRenderingComponent();
       workInProgressHook = createWorkInProgressHook();
       deps = void 0 === deps ? null : deps;
@@ -75531,7 +75790,7 @@ var require_react_dom_server_legacy_browser_production = __commonJS({
       workInProgressHook.memoizedState = [nextCreate, deps];
       return nextCreate;
     }
-    __name(useMemo39, "useMemo");
+    __name(useMemo36, "useMemo");
     function dispatchAction(componentIdentity, queue, action2) {
       if (25 <= numberOfReRenders) throw Error(formatProdErrorMessage(301));
       if (componentIdentity === currentlyRenderingComponent)
@@ -75628,7 +75887,7 @@ var require_react_dom_server_legacy_browser_production = __commonJS({
         resolveCurrentlyRenderingComponent();
         return context._currentValue2;
       }, "useContext"),
-      useMemo: useMemo39,
+      useMemo: useMemo36,
       useReducer,
       useRef: /* @__PURE__ */ __name(function(initialValue) {
         currentlyRenderingComponent = resolveCurrentlyRenderingComponent();
@@ -75642,7 +75901,7 @@ var require_react_dom_server_legacy_browser_production = __commonJS({
       useInsertionEffect: noop,
       useLayoutEffect: noop,
       useCallback: /* @__PURE__ */ __name(function(callback, deps) {
-        return useMemo39(function() {
+        return useMemo36(function() {
           return callback;
         }, deps);
       }, "useCallback"),
@@ -78469,13 +78728,130 @@ var init_context2 = __esm({
 });
 
 // ../../home/runner/work/void/void/packages/react/src/runtime/deferred-shell.ts
-var DEFERRED_SHELL_END_ID, DEFERRED_SHELL_END_MARKER;
+var DEFERRED_SHELL_END_ID, DEFERRED_SHELL_END_MARKER, DEFERRED_SHELL_CANCEL_REASON;
 var init_deferred_shell = __esm({
   "../../home/runner/work/void/void/packages/react/src/runtime/deferred-shell.ts"() {
     "use strict";
     init_performance2();
     DEFERRED_SHELL_END_ID = "__VOID_DEFERRED_SHELL_END__";
     DEFERRED_SHELL_END_MARKER = `<template id="${DEFERRED_SHELL_END_ID}"></template>`;
+    DEFERRED_SHELL_CANCEL_REASON = "Void deferred shell complete";
+  }
+});
+
+// ../../home/runner/work/void/void/packages/react/src/runtime/page-streams.ts
+function concatStreams(streams) {
+  let index2 = 0;
+  let reader;
+  let cancelled = false;
+  const cancelRemaining = /* @__PURE__ */ __name(async (reason) => {
+    const cancellations = [];
+    if (reader) {
+      cancellations.push(reader.cancel(reason));
+    }
+    for (let remaining = index2 + (reader ? 1 : 0); remaining < streams.length; remaining++) {
+      cancellations.push(streams[remaining].cancel(reason));
+    }
+    await Promise.allSettled(cancellations);
+  }, "cancelRemaining");
+  return new ReadableStream(
+    {
+      async pull(controller) {
+        try {
+          while (index2 < streams.length) {
+            reader ??= streams[index2].getReader();
+            const { done, value } = await reader.read();
+            if (cancelled) {
+              return;
+            }
+            if (done) {
+              reader.releaseLock();
+              reader = void 0;
+              index2++;
+              continue;
+            }
+            controller.enqueue(value);
+            return;
+          }
+          controller.close();
+        } catch (error63) {
+          if (!cancelled) {
+            controller.error(error63);
+            await cancelRemaining(error63);
+          }
+        }
+      },
+      async cancel(reason) {
+        cancelled = true;
+        await cancelRemaining(reason);
+      }
+    },
+    { highWaterMark: 0 }
+  );
+}
+function readDeferredShell(stream) {
+  const reader = stream.getReader();
+  const decoder5 = new TextDecoder();
+  const encoder12 = new TextEncoder();
+  const keepLength = DEFERRED_SHELL_END_MARKER.length - 1;
+  let buffer = "";
+  let cancelled = false;
+  return new ReadableStream(
+    {
+      async pull(controller) {
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (cancelled) {
+              return;
+            }
+            buffer += done ? decoder5.decode() : decoder5.decode(value, { stream: true });
+            const markerIndex = buffer.indexOf(DEFERRED_SHELL_END_MARKER);
+            if (markerIndex !== -1) {
+              const shell = buffer.slice(0, markerIndex + DEFERRED_SHELL_END_MARKER.length);
+              await reader.cancel(DEFERRED_SHELL_CANCEL_REASON);
+              if (!cancelled) {
+                controller.enqueue(encoder12.encode(shell));
+                controller.close();
+              }
+              return;
+            }
+            if (done) {
+              if (buffer) {
+                controller.enqueue(encoder12.encode(buffer));
+              }
+              controller.close();
+              return;
+            }
+            if (buffer.length > keepLength) {
+              controller.enqueue(encoder12.encode(buffer.slice(0, -keepLength)));
+              buffer = buffer.slice(-keepLength);
+              return;
+            }
+          }
+        } catch (error63) {
+          if (!cancelled) {
+            controller.error(error63);
+            await reader.cancel(error63).catch(() => {
+            });
+          }
+        }
+      },
+      async cancel(reason) {
+        cancelled = true;
+        await reader.cancel(reason);
+      }
+    },
+    { highWaterMark: 0 }
+  );
+}
+var init_page_streams = __esm({
+  "../../home/runner/work/void/void/packages/react/src/runtime/page-streams.ts"() {
+    "use strict";
+    init_performance2();
+    init_deferred_shell();
+    __name(concatStreams, "concatStreams");
+    __name(readDeferredShell, "readDeferredShell");
   }
 });
 
@@ -78503,67 +78879,6 @@ function textStream(text2) {
     }
   });
 }
-function concatStreams(streams) {
-  return new ReadableStream({
-    async start(controller) {
-      try {
-        for (const stream of streams) {
-          const reader = stream.getReader();
-          while (true) {
-            const { done, value } = await reader.read();
-            if (done) {
-              break;
-            }
-            controller.enqueue(value);
-          }
-        }
-        controller.close();
-      } catch (error63) {
-        controller.error(error63);
-      }
-    }
-  });
-}
-function readDeferredShell(stream) {
-  const encoder12 = new TextEncoder();
-  return new ReadableStream({
-    async start(controller) {
-      const reader = stream.getReader();
-      const decoder5 = new TextDecoder();
-      let buffer = "";
-      const keepLength = DEFERRED_SHELL_END_MARKER.length - 1;
-      const flush = /* @__PURE__ */ __name((text2) => {
-        if (text2) {
-          controller.enqueue(encoder12.encode(text2));
-        }
-      }, "flush");
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) {
-            buffer += decoder5.decode();
-            flush(buffer);
-            break;
-          }
-          buffer += decoder5.decode(value, { stream: true });
-          const markerIndex = buffer.indexOf(DEFERRED_SHELL_END_MARKER);
-          if (markerIndex !== -1) {
-            flush(buffer.slice(0, markerIndex + DEFERRED_SHELL_END_MARKER.length));
-            await reader.cancel(DEFERRED_SHELL_CANCEL_REASON);
-            break;
-          }
-          if (buffer.length > keepLength) {
-            flush(buffer.slice(0, -keepLength));
-            buffer = buffer.slice(-keepLength);
-          }
-        }
-        controller.close();
-      } catch (error63) {
-        controller.error(error63);
-      }
-    }
-  });
-}
 async function renderReactPage({
   pageObj,
   assetTags,
@@ -78635,7 +78950,7 @@ async function renderReactPage({
 </html>`)
   ]);
 }
-var import_react2, import_server, DEFERRED_SHELL_CANCEL_REASON;
+var import_react2, import_server;
 var init_pages_server = __esm({
   "../../home/runner/work/void/void/packages/react/src/runtime/pages-server.ts"() {
     init_performance2();
@@ -78646,12 +78961,10 @@ var init_pages_server = __esm({
     init_serialize();
     init_context2();
     init_deferred_shell();
-    DEFERRED_SHELL_CANCEL_REASON = "Void deferred shell complete";
+    init_page_streams();
     __name(createPendingDeferred, "createPendingDeferred");
     __name(propsForReactRender, "propsForReactRender");
     __name(textStream, "textStream");
-    __name(concatStreams, "concatStreams");
-    __name(readDeferredShell, "readDeferredShell");
     __name(renderReactPage, "renderReactPage");
   }
 });
@@ -121169,38 +121482,28 @@ var init_Typeahead2 = __esm({
 function SearchTypeahead({
   label,
   onChange,
-  suggestions,
+  onSelect,
+  onClear,
+  suggestions = noSuggestions,
+  remoteSearch,
   initialValue = "",
+  initialSelection,
   width = 320
 }) {
   const items = (0, import_react148.useMemo)(() => {
-    const byId = /* @__PURE__ */ new Map();
-    for (const suggestion of suggestions) {
-      if (!suggestion) {
-        continue;
-      }
-      const item = typeof suggestion === "string" ? { id: suggestion, label: suggestion, auxiliaryData: { keywords: [] } } : {
-        id: suggestion.id,
-        label: suggestion.label,
-        auxiliaryData: {
-          keywords: suggestion.keywords?.filter((value) => Boolean(value)) ?? [],
-          description: suggestion.description
-        }
-      };
-      if (item.id && item.label) {
-        byId.set(item.id, item);
-      }
-    }
-    return [...byId.values()];
+    return searchItems(suggestions);
   }, [suggestions]);
   const source = (0, import_react148.useMemo)(
-    () => createStaticSource(items, {
+    () => remoteSearch ? {
+      bootstrap: /* @__PURE__ */ __name(() => [], "bootstrap"),
+      search: /* @__PURE__ */ __name(async (query) => searchItems(await remoteSearch(query)), "search")
+    } : createStaticSource(items, {
       keywords: /* @__PURE__ */ __name((item) => item.auxiliaryData?.keywords ?? [], "keywords")
     }),
-    [items]
+    [items, remoteSearch]
   );
   const [selected, setSelected] = (0, import_react148.useState)(
-    () => initialValue ? items.find((item) => item.id === initialValue) ?? {
+    () => initialValue ? items.find((item) => item.id === initialValue) ?? (initialSelection?.id === initialValue ? searchItems([initialSelection])[0] : void 0) ?? {
       id: initialValue,
       label: initialValue
     } : null
@@ -121217,19 +121520,46 @@ function SearchTypeahead({
       onChange: (item) => {
         setSelected(item);
         onChange(item?.id ?? "");
+        if (item) {
+          onSelect?.(item.id);
+        } else {
+          onClear?.();
+        }
       },
       onChangeQuery: (query) => {
         setSelected(null);
         onChange(query);
       },
-      hasEntriesOnFocus: true,
-      debounceMs: 0,
+      hasEntriesOnFocus: !remoteSearch,
+      hasClear: true,
+      minQueryLength: remoteSearch ? 2 : 1,
+      debounceMs: remoteSearch ? 200 : 0,
       width,
-      emptySearchResultsText: "No suggestions. Search for any text."
+      emptySearchResultsText: remoteSearch ? "No matching results." : "No suggestions. Search for any text."
     }
   );
 }
-var import_react148, import_jsx_runtime103;
+function searchItems(suggestions) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const suggestion of suggestions) {
+    if (!suggestion) {
+      continue;
+    }
+    const item = typeof suggestion === "string" ? { id: suggestion, label: suggestion, auxiliaryData: { keywords: [] } } : {
+      id: suggestion.id,
+      label: suggestion.label,
+      auxiliaryData: {
+        keywords: suggestion.keywords?.filter((value) => Boolean(value)) ?? [],
+        description: suggestion.description
+      }
+    };
+    if (item.id && item.label) {
+      byId.set(item.id, item);
+    }
+  }
+  return [...byId.values()];
+}
+var import_react148, import_jsx_runtime103, noSuggestions;
 var init_SearchTypeahead = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/SearchTypeahead.tsx"() {
     "use strict";
@@ -121237,7 +121567,9 @@ var init_SearchTypeahead = __esm({
     init_Typeahead2();
     import_react148 = __toESM(require_react(), 1);
     import_jsx_runtime103 = __toESM(require_jsx_runtime(), 1);
+    noSuggestions = [];
     __name(SearchTypeahead, "SearchTypeahead");
+    __name(searchItems, "searchItems");
   }
 });
 
@@ -121631,13 +121963,61 @@ var init_Pagination = __esm({
 // ../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/SearchForm.tsx
 function SearchForm({
   action: action2,
+  kind,
   label,
   value,
   onChange,
-  suggestions,
   initialValue,
-  showClear
+  initialSelection
 }) {
+  const fate = useFateClient();
+  const router = useRouter();
+  const remoteSearch = (0, import_react151.useCallback)(
+    async (query) => {
+      const path = `${action2}?search=${encodeURIComponent(query)}`;
+      if (kind === "users") {
+        const { usersPage: ref2 } = await fate.request(usersPageRequest(path), {
+          mode: "network-only"
+        });
+        if (!ref2) {
+          return [];
+        }
+        const { data: data2 } = await fate.readView(UsersPageView, ref2);
+        return data2.users.map((user) => ({
+          id: user.id,
+          label: user.login,
+          description: [user.email, user.id].filter(Boolean).join(" \xB7 ")
+        }));
+      }
+      if (kind === "projects") {
+        const { projectsPage: ref2 } = await fate.request(projectsPageRequest(path), {
+          mode: "network-only"
+        });
+        if (!ref2) {
+          return [];
+        }
+        const { data: data2 } = await fate.readView(ProjectsPageView, ref2);
+        return data2.projects.map((project) => ({
+          id: project.id,
+          label: project.slug,
+          description: project.owner_login ?? void 0
+        }));
+      }
+      const { deploymentsPage: ref } = await fate.request(deploymentsPageRequest(path), {
+        mode: "network-only"
+      });
+      if (!ref) {
+        return [];
+      }
+      const { data } = await fate.readView(DeploymentsPageView, ref);
+      return data.deployments.map((deployment) => ({
+        id: deployment.id,
+        label: deployment.id,
+        description: [deployment.project_slug, deployment.status].filter(Boolean).join(" \xB7 ")
+      }));
+    },
+    [action2, fate, kind]
+  );
   return /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)("form", { method: "get", action: action2, className: "void-admin-search", children: [
     /* @__PURE__ */ (0, import_jsx_runtime107.jsx)("input", { type: "hidden", name: "search", value }),
     /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(
@@ -121645,22 +122025,31 @@ function SearchForm({
       {
         label,
         onChange,
-        suggestions,
-        initialValue
+        onSelect: (id2) => void router.visit(`${action2}/${encodeURIComponent(id2)}`),
+        onClear: () => {
+          if (initialValue) {
+            void router.visit(action2);
+          }
+        },
+        remoteSearch,
+        initialValue,
+        initialSelection
       },
       initialValue ?? ""
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Button, { type: "submit", label: "Search" }),
-    showClear && /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Link, { href: action2, children: "Clear" })
+    /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Button, { type: "submit", label: "Search" })
   ] });
 }
-var import_jsx_runtime107;
+var import_react151, import_jsx_runtime107;
 var init_SearchForm = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/SearchForm.tsx"() {
     "use strict";
     init_performance2();
     init_Button2();
-    init_Link2();
+    init_runtime();
+    import_react151 = __toESM(require_react(), 1);
+    init_lib2();
+    init_views();
     init_SearchTypeahead();
     import_jsx_runtime107 = __toESM(require_jsx_runtime(), 1);
     __name(SearchForm, "SearchForm");
@@ -121677,59 +122066,37 @@ function DeploymentsListPage({ path, platformName, username }) {
     throw new Error("Deployments page data is unavailable.");
   }
   const { deployments: deployments2, search, page, totalPages, tz } = pageData;
-  const [filter, setFilter] = (0, import_react150.useState)(search ?? "");
-  (0, import_react150.useEffect)(() => setFilter(search ?? ""), [search]);
-  const visibleDeployments = deployments2.filter(
-    (deployment) => [
-      deployment.id,
-      deployment.project_slug,
-      deployment.status,
-      deployment.source,
-      deployment.cli_version,
-      deployment.commit,
-      deployment.error_message
-    ].some((value) => value?.toLowerCase().includes(filter.toLowerCase()))
-  );
-  const suggestions = (0, import_react150.useMemo)(
-    () => deployments2.map((deployment) => ({
-      id: deployment.id,
-      label: deployment.id,
-      keywords: [
-        deployment.project_slug,
-        deployment.status,
-        deployment.source,
-        deployment.cli_version,
-        deployment.commit,
-        deployment.error_message
-      ],
-      description: [deployment.project_slug, deployment.status].filter(Boolean).join(" \xB7 ")
-    })),
-    [deployments2]
-  );
+  const [filter, setFilter] = (0, import_react152.useState)(search ?? "");
+  (0, import_react152.useEffect)(() => setFilter(search ?? ""), [search]);
+  const selectedDeployment = deployments2.find((deployment) => deployment.id === search);
   return /* @__PURE__ */ jsxs(Layout2, { platformName, title: "Deployments", username, children: [
     /* @__PURE__ */ jsx4("h1", { children: "Deployments" }),
     /* @__PURE__ */ jsx4(
       SearchForm,
       {
         action: "/admin/deployments",
+        kind: "deployments",
         label: "Search deployments",
         value: filter,
         onChange: setFilter,
-        suggestions,
         initialValue: search,
-        showClear: Boolean(search)
+        initialSelection: selectedDeployment ? {
+          id: selectedDeployment.id,
+          label: selectedDeployment.id,
+          description: [selectedDeployment.project_slug, selectedDeployment.status].filter(Boolean).join(" \xB7 ")
+        } : void 0
       }
     ),
-    /* @__PURE__ */ jsx4(DeploymentTable, { deployments: visibleDeployments, showProject: true, tz }),
+    /* @__PURE__ */ jsx4(DeploymentTable, { deployments: deployments2, showProject: true, tz }),
     page != null && totalPages != null && /* @__PURE__ */ jsx4(Pagination, { page, totalPages, baseUrl: "/admin/deployments" })
   ] });
 }
-var import_react150;
+var import_react152;
 var init_DeploymentsListPage = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/DeploymentsListPage.tsx"() {
     "use strict";
     init_performance2();
-    import_react150 = __toESM(require_react(), 1);
+    import_react152 = __toESM(require_react(), 1);
     init_lib2();
     init_views();
     init_DeploymentTable();
@@ -122099,13 +122466,13 @@ function RadioList({
   htmlName,
   children
 }) {
-  const autoName = (0, import_react151.useId)();
+  const autoName = (0, import_react153.useId)();
   const name = htmlName ?? autoName;
-  const inputID = (0, import_react151.useId)();
-  const labelID = (0, import_react151.useId)();
-  const descriptionID = (0, import_react151.useId)();
-  const statusMessageID = (0, import_react151.useId)();
-  const groupRef = (0, import_react151.useRef)(null);
+  const inputID = (0, import_react153.useId)();
+  const labelID = (0, import_react153.useId)();
+  const descriptionID = (0, import_react153.useId)();
+  const statusMessageID = (0, import_react153.useId)();
+  const groupRef = (0, import_react153.useRef)(null);
   const isEffectivelyRequired = useResolvedRequired({
     isRequired,
     isOptional
@@ -122118,7 +122485,7 @@ function RadioList({
     focusTrigger: "always",
     isEnabled: showsDisabledMessage
   });
-  const contextValue = (0, import_react151.useMemo)(() => ({
+  const contextValue = (0, import_react153.useMemo)(() => ({
     name,
     value,
     onChange,
@@ -122128,7 +122495,7 @@ function RadioList({
     size,
     status: status2
   }), [name, value, onChange, isDisabled, showsDisabledMessage, isRequired, size, status2]);
-  const handleFocus = (0, import_react151.useCallback)((e) => {
+  const handleFocus = (0, import_react153.useCallback)((e) => {
     if (value !== "") {
       return;
     }
@@ -122212,12 +122579,12 @@ function RadioList({
     }), showsDisabledMessage && disabledMessageTooltip.renderTooltip(disabledMessage)]
   });
 }
-var import_react151, import_jsx_runtime111, RadioListContext;
+var import_react153, import_jsx_runtime111, RadioListContext;
 var init_RadioList = __esm({
   "../../home/runner/work/void/void/node_modules/.pnpm/@astryxdesign+core@0.6.3_@stylexjs+stylex@0.19.1_react-dom@19.3.0_react@19.3.0__react@19.3.0/node_modules/@astryxdesign/core/dist/RadioList/RadioList.js"() {
     "use client";
     init_performance2();
-    import_react151 = __toESM(require_react(), 1);
+    import_react153 = __toESM(require_react(), 1);
     init_tokens_stylex();
     init_tokens_stylex();
     init_Field();
@@ -122226,7 +122593,7 @@ var init_RadioList = __esm({
     init_utils7();
     init_themeProps();
     import_jsx_runtime111 = __toESM(require_jsx_runtime(), 1);
-    RadioListContext = /* @__PURE__ */ (0, import_react151.createContext)(null);
+    RadioListContext = /* @__PURE__ */ (0, import_react153.createContext)(null);
     RadioListContext.displayName = "RadioListContext";
     __name(RadioList, "RadioList");
     RadioList.displayName = "RadioList";
@@ -122249,24 +122616,24 @@ function RadioListItem({
   onClick,
   ...rest
 }) {
-  const context = (0, import_react152.use)(RadioListContext);
+  const context = (0, import_react154.use)(RadioListContext);
   if (!context) {
     throw new Error("RadioListItem must be used within an RadioList");
   }
-  const id2 = (0, import_react152.useId)();
-  const labelID = (0, import_react152.useId)();
-  const descriptionID = (0, import_react152.useId)();
+  const id2 = (0, import_react154.useId)();
+  const labelID = (0, import_react154.useId)();
+  const descriptionID = (0, import_react154.useId)();
   const isDisabled = context.isDisabled || isItemDisabled;
   const keepsFocusableForMessage = context.hasDisabledMessage && !isItemDisabled;
   const isChecked = context.value === value;
   const hasDescription = isRenderable(description);
   const size = context.size;
   const RadioControl = useIndicator("radio");
-  const indicatorRef = (0, import_react152.useRef)(null);
+  const indicatorRef = (0, import_react154.useRef)(null);
   const {
     focusProps
   } = useIndicatorFocusRing(indicatorRef, isDisabled);
-  const radioRef = (0, import_react152.useRef)(null);
+  const radioRef = (0, import_react154.useRef)(null);
   const radioCircle = /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)("div", {
     ...props(styles56.radioWrapper, wrapperSizeStyles3[size], !isDisabled && styles56.indicatorPressOverlay),
     ...focusProps,
@@ -122356,12 +122723,12 @@ function RadioListItem({
     ...rest
   });
 }
-var import_react152, import_jsx_runtime112, styles56, wrapperSizeStyles3, rowStyles;
+var import_react154, import_jsx_runtime112, styles56, wrapperSizeStyles3, rowStyles;
 var init_RadioListItem = __esm({
   "../../home/runner/work/void/void/node_modules/.pnpm/@astryxdesign+core@0.6.3_@stylexjs+stylex@0.19.1_react-dom@19.3.0_react@19.3.0__react@19.3.0/node_modules/@astryxdesign/core/dist/RadioList/RadioListItem.js"() {
     "use client";
     init_performance2();
-    import_react152 = __toESM(require_react(), 1);
+    import_react154 = __toESM(require_react(), 1);
     init_stylex();
     init_RadioList();
     init_tokens_stylex();
@@ -122478,29 +122845,29 @@ function EnabledEmailSettingsPage({ path, platformName, username }) {
     throw new Error("Email settings are unavailable.");
   }
   const { policy, management, senderDomain } = pageData;
-  const [mode, setMode] = (0, import_react153.useState)(policy.mode);
-  const [domainManagement, setDomainManagement] = (0, import_react153.useState)(management);
+  const [mode, setMode] = (0, import_react155.useState)(policy.mode);
+  const [domainManagement, setDomainManagement] = (0, import_react155.useState)(management);
   return /* @__PURE__ */ jsxs(Layout2, { platformName, title: "Email", username, children: [
     /* @__PURE__ */ jsx4("h1", { children: "Email" }),
     /* @__PURE__ */ jsx4("p", { style: META2, children: "Installation-wide settings. Per-project usage, caps and domains live on each project's email page (Projects \u2192 project \u2192 Email)." }),
     /* @__PURE__ */ jsx4("h2", { children: "Recipient policy" }),
     /* @__PURE__ */ jsxs("p", { children: [
-      "Who mail from the shared sender",
+      "Choose which recipients can receive email sent from the shared sender",
       senderDomain ? /* @__PURE__ */ jsxs(import_jsx_runtime18.Fragment, { children: [
         " ",
         "(",
         /* @__PURE__ */ jsx4("code", { children: `<slug>+tag@${senderDomain}` }),
         ")"
       ] }) : null,
-      " ",
-      "may reach. Custom-domain sends are not affected."
+      ". This does not affect email sent from custom domains."
     ] }),
-    /* @__PURE__ */ jsxs("form", { method: "post", action: "/admin/email/policy", style: "margin-bottom: 8px", children: [
+    /* @__PURE__ */ jsxs("form", { method: "post", action: "/admin/email/policy", className: "void-admin-email-choice-form", children: [
       /* @__PURE__ */ jsxs(
         RadioList,
         {
           label: "Recipient policy",
           isLabelHidden: true,
+          size: "sm",
           htmlName: "mode",
           value: mode,
           onChange: (value) => setMode(value),
@@ -122556,12 +122923,13 @@ function EnabledEmailSettingsPage({ path, platformName, username }) {
     ] }),
     /* @__PURE__ */ jsx4("h2", { children: "Domain management" }),
     /* @__PURE__ */ jsx4("p", { children: "Who registers custom email domains for projects." }),
-    /* @__PURE__ */ jsxs("form", { method: "post", action: "/admin/email/settings", children: [
+    /* @__PURE__ */ jsxs("form", { method: "post", action: "/admin/email/settings", className: "void-admin-email-choice-form", children: [
       /* @__PURE__ */ jsxs(
         RadioList,
         {
           label: "Domain management",
           isLabelHidden: true,
+          size: "sm",
           htmlName: "domains",
           value: domainManagement,
           onChange: (value) => setDomainManagement(value),
@@ -122589,14 +122957,14 @@ function EnabledEmailSettingsPage({ path, platformName, username }) {
     ] })
   ] });
 }
-var import_react153, META2, EMAIL_SETUP_GUIDE;
+var import_react155, META2, EMAIL_SETUP_GUIDE;
 var init_EmailSettingsPage = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/EmailSettingsPage.tsx"() {
     "use strict";
     init_performance2();
     init_Button2();
     init_RadioList2();
-    import_react153 = __toESM(require_react(), 1);
+    import_react155 = __toESM(require_react(), 1);
     init_lib2();
     init_views();
     init_FormControls();
@@ -122819,7 +123187,7 @@ function AdminUserTypeahead({
   excludedUserIds = noExcludedUsers
 }) {
   const fate = useFateClient();
-  const source = (0, import_react154.useMemo)(
+  const source = (0, import_react156.useMemo)(
     () => ({
       bootstrap: /* @__PURE__ */ __name(() => [], "bootstrap"),
       search: /* @__PURE__ */ __name(async (query) => {
@@ -122862,13 +123230,13 @@ function AdminUserTypeahead({
     }
   );
 }
-var import_react154, import_jsx_runtime117, noExcludedUsers;
+var import_react156, import_jsx_runtime117, noExcludedUsers;
 var init_AdminUserTypeahead = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/AdminUserTypeahead.tsx"() {
     "use strict";
     init_performance2();
     init_Typeahead2();
-    import_react154 = __toESM(require_react(), 1);
+    import_react156 = __toESM(require_react(), 1);
     init_lib2();
     init_views();
     import_jsx_runtime117 = __toESM(require_jsx_runtime(), 1);
@@ -122879,7 +123247,7 @@ var init_AdminUserTypeahead = __esm({
 
 // ../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/ProjectOwnerTransferSection.tsx
 function ProjectOwnerTransferSection({ projectId }) {
-  const [selected, setSelected] = (0, import_react155.useState)(null);
+  const [selected, setSelected] = (0, import_react157.useState)(null);
   return /* @__PURE__ */ (0, import_jsx_runtime118.jsxs)("section", { id: "owner-transfer", className: "void-admin-owner-transfer", children: [
     /* @__PURE__ */ (0, import_jsx_runtime118.jsx)("h2", { children: "Transfer Ownership" }),
     /* @__PURE__ */ (0, import_jsx_runtime118.jsx)("p", { children: "Transfer this project to an existing Void Platform user. You will review the ownership, plan, suspension, active-work, routing, and usage-counter changes before applying them." }),
@@ -122898,13 +123266,13 @@ function ProjectOwnerTransferSection({ projectId }) {
     )
   ] });
 }
-var import_react155, import_jsx_runtime118;
+var import_react157, import_jsx_runtime118;
 var init_ProjectOwnerTransferSection = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/ProjectOwnerTransferSection.tsx"() {
     "use strict";
     init_performance2();
     init_Button2();
-    import_react155 = __toESM(require_react(), 1);
+    import_react157 = __toESM(require_react(), 1);
     init_AdminUserTypeahead();
     import_jsx_runtime118 = __toESM(require_jsx_runtime(), 1);
     __name(ProjectOwnerTransferSection, "ProjectOwnerTransferSection");
@@ -122919,8 +123287,8 @@ function ProjectTeamSection({
   invitations: invitations2,
   tz
 }) {
-  const [selected, setSelected] = (0, import_react156.useState)(null);
-  const excluded = (0, import_react156.useMemo)(
+  const [selected, setSelected] = (0, import_react158.useState)(null);
+  const excluded = (0, import_react158.useMemo)(
     () => /* @__PURE__ */ new Set([...owner ? [owner.id] : [], ...members2.map(({ user }) => user.id)]),
     [owner, members2]
   );
@@ -123057,14 +123425,14 @@ function ProjectTeamSection({
     ] })
   ] });
 }
-var import_react156, import_jsx_runtime119, roleOptions;
+var import_react158, import_jsx_runtime119, roleOptions;
 var init_ProjectTeamSection = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/ProjectTeamSection.tsx"() {
     "use strict";
     init_performance2();
     init_Button2();
     init_Table2();
-    import_react156 = __toESM(require_react(), 1);
+    import_react158 = __toESM(require_react(), 1);
     init_AdminUserTypeahead();
     init_format();
     init_FormControls();
@@ -123387,46 +123755,37 @@ function ProjectsListPage({ path, platformName, username }) {
     throw new Error("Projects page data is unavailable.");
   }
   const { projects: projects2, search, page, totalPages, siteDomain, tz } = pageData;
-  const [filter, setFilter] = (0, import_react157.useState)(search ?? "");
-  (0, import_react157.useEffect)(() => setFilter(search ?? ""), [search]);
-  const visibleProjects = projects2.filter(
-    (project) => [project.slug, project.owner_login, project.type, project.last_deploy_status].some(
-      (value) => value?.toLowerCase().includes(filter.toLowerCase())
-    )
-  );
-  const suggestions = (0, import_react157.useMemo)(
-    () => projects2.map((project) => ({
-      id: project.id,
-      label: project.slug,
-      keywords: [project.owner_login, project.id, project.type, project.last_deploy_status],
-      description: project.owner_login ?? void 0
-    })),
-    [projects2]
-  );
+  const [filter, setFilter] = (0, import_react159.useState)(search ?? "");
+  (0, import_react159.useEffect)(() => setFilter(search ?? ""), [search]);
+  const selectedProject = projects2.find((project) => project.id === search);
   return /* @__PURE__ */ jsxs(Layout2, { platformName, title: "Projects", username, children: [
     /* @__PURE__ */ jsx4("h1", { children: "Projects" }),
     /* @__PURE__ */ jsx4(
       SearchForm,
       {
         action: "/admin/projects",
+        kind: "projects",
         label: "Search projects",
         value: filter,
         onChange: setFilter,
-        suggestions,
         initialValue: search,
-        showClear: Boolean(search)
+        initialSelection: selectedProject ? {
+          id: selectedProject.id,
+          label: selectedProject.slug,
+          description: selectedProject.owner_login ?? void 0
+        } : void 0
       }
     ),
-    /* @__PURE__ */ jsx4(ProjectsTable, { projects: visibleProjects, siteDomain, tz }),
+    /* @__PURE__ */ jsx4(ProjectsTable, { projects: projects2, siteDomain, tz }),
     page != null && totalPages != null && /* @__PURE__ */ jsx4(Pagination, { page, totalPages, baseUrl: "/admin/projects" })
   ] });
 }
-var import_react157;
+var import_react159;
 var init_ProjectsListPage = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/ProjectsListPage.tsx"() {
     "use strict";
     init_performance2();
-    import_react157 = __toESM(require_react(), 1);
+    import_react159 = __toESM(require_react(), 1);
     init_lib2();
     init_views();
     init_Layout2();
@@ -123443,8 +123802,8 @@ function BooleanBadge({ value }) {
   return /* @__PURE__ */ jsx4(Badge, { label: value ? "Yes" : "No", variant: value ? "success" : "neutral" });
 }
 function CopyValue({ label, value }) {
-  const [copied, setCopied] = (0, import_react158.useState)(false);
-  const [failed, setFailed] = (0, import_react158.useState)(false);
+  const [copied, setCopied] = (0, import_react160.useState)(false);
+  const [failed, setFailed] = (0, import_react160.useState)(false);
   return /* @__PURE__ */ jsxs("div", { className: "void-admin-access-copy-value", children: [
     /* @__PURE__ */ jsxs("label", { children: [
       /* @__PURE__ */ jsx4("span", { children: label }),
@@ -123851,7 +124210,7 @@ function SignupControlPage({ path, platformName, username }) {
     ] }) })
   ] }) });
 }
-var import_react158;
+var import_react160;
 var init_SignupControlPage = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/SignupControlPage.tsx"() {
     "use strict";
@@ -123861,7 +124220,7 @@ var init_SignupControlPage = __esm({
     init_Card2();
     init_Table2();
     init_Text2();
-    import_react158 = __toESM(require_react(), 1);
+    import_react160 = __toESM(require_react(), 1);
     init_lib2();
     init_views();
     init_format();
@@ -124082,34 +124441,25 @@ function UsersListPage({ path, platformName, username }) {
     throw new Error("Users page data is unavailable.");
   }
   const { users: users2, search, page, totalPages, tz } = pageData;
-  const [filter, setFilter] = (0, import_react159.useState)(search ?? "");
-  (0, import_react159.useEffect)(() => setFilter(search ?? ""), [search]);
-  const visibleUsers = users2.filter(
-    (user) => [user.login, user.email, user.id].some(
-      (value) => value?.toLowerCase().includes(filter.toLowerCase())
-    )
-  );
-  const suggestions = (0, import_react159.useMemo)(
-    () => users2.map((user) => ({
-      id: user.id,
-      label: user.login,
-      keywords: [user.email, user.id],
-      description: [user.email, user.id].filter(Boolean).join(" \xB7 ")
-    })),
-    [users2]
-  );
+  const [filter, setFilter] = (0, import_react161.useState)(search ?? "");
+  (0, import_react161.useEffect)(() => setFilter(search ?? ""), [search]);
+  const selectedUser = users2.find((user) => user.id === search);
   return /* @__PURE__ */ jsxs(Layout2, { platformName, title: "Users", username, children: [
     /* @__PURE__ */ jsx4("h1", { children: "Users" }),
     /* @__PURE__ */ jsx4(
       SearchForm,
       {
         action: "/admin/users",
+        kind: "users",
         label: "Search users",
         value: filter,
         onChange: setFilter,
-        suggestions,
         initialValue: search,
-        showClear: Boolean(search)
+        initialSelection: selectedUser ? {
+          id: selectedUser.id,
+          label: selectedUser.login,
+          description: [selectedUser.email, selectedUser.id].filter(Boolean).join(" \xB7 ")
+        } : void 0
       }
     ),
     /* @__PURE__ */ jsxs(Table2, { hasHover: true, children: [
@@ -124123,7 +124473,7 @@ function UsersListPage({ path, platformName, username }) {
         /* @__PURE__ */ jsx4(TableHeaderCell, { children: "Created" }),
         /* @__PURE__ */ jsx4(TableHeaderCell, { children: "Actions" })
       ] }) }),
-      /* @__PURE__ */ jsx4(TableBody, { children: visibleUsers.map((user) => /* @__PURE__ */ jsxs(TableRow, { children: [
+      /* @__PURE__ */ jsx4(TableBody, { children: users2.map((user) => /* @__PURE__ */ jsxs(TableRow, { children: [
         /* @__PURE__ */ jsx4(TableCell, { children: /* @__PURE__ */ jsx4("a", { href: `/admin/users/${user.id}`, children: user.login }) }),
         /* @__PURE__ */ jsx4(TableCell, { children: user.provider }),
         /* @__PURE__ */ jsx4(TableCell, { children: user.email ?? "-" }),
@@ -124143,18 +124493,18 @@ function UsersListPage({ path, platformName, username }) {
         ) })
       ] }, user.id)) })
     ] }),
-    visibleUsers.length === 0 && /* @__PURE__ */ jsx4("p", { children: /* @__PURE__ */ jsx4("em", { children: "No users found." }) }),
+    users2.length === 0 && /* @__PURE__ */ jsx4("p", { children: /* @__PURE__ */ jsx4("em", { children: "No users found." }) }),
     page != null && totalPages != null && /* @__PURE__ */ jsx4(Pagination, { page, totalPages, baseUrl: "/admin/users" })
   ] });
 }
-var import_react159;
+var import_react161;
 var init_UsersListPage = __esm({
   "../../home/runner/work/void/void/platform/packages/api/src/admin/react/views/UsersListPage.tsx"() {
     "use strict";
     init_performance2();
     init_Button2();
     init_Table2();
-    import_react159 = __toESM(require_react(), 1);
+    import_react161 = __toESM(require_react(), 1);
     init_lib2();
     init_views();
     init_format();
@@ -144178,7 +144528,7 @@ var import_headless = __toESM(require_xterm_headless(), 1);
 // ../../home/runner/work/void/void/packages/void/package.json
 var package_default = {
   name: "void",
-  version: "0.21.1",
+  version: "0.21.3",
   repository: {
     type: "git",
     url: "git+https://github.com/voidzero-dev/void.git",
@@ -145762,7 +146112,9 @@ async function formatLogTailMarkdown(lines, totalCaptured) {
   if (groups.slice(0, selectedStart).some((group) => group.requiresTerminal)) {
     return null;
   }
-  const visibleLines = await renderTerminalGroups(selectedNewestFirst.reverse());
+  const visibleLines = (await renderTerminalGroups(selectedNewestFirst.reverse())).map(
+    (line2) => line2.replace(/^ {257,}/, " ".repeat(32))
+  );
   const keptNewestFirst = [];
   let joinedBytes = 0;
   for (let lineIndex = visibleLines.length - 1; lineIndex >= 0; lineIndex--) {
@@ -147383,9 +147735,15 @@ var BuildScheduler = class extends DurableObject2 {
       }
       return;
     }
+    const usersById = new Map(
+      (await getUsersByIds(db, [...new Set(queued.map((build) => build.user_id))])).map((user) => [
+        user.id,
+        user
+      ])
+    );
     const saturatedNamespaces = /* @__PURE__ */ new Set();
     for (const build of queued) {
-      const user = await getUser(db, build.user_id);
+      const user = usersById.get(build.user_id);
       if (!user) {
         await updateBuildStatus(db, build.id, "failed", {
           error: "owning user not found",
@@ -148155,6 +148513,8 @@ init_schema2();
 init_suspension();
 var DEPLOY_TOKEN_ALLOWLIST = [
   { method: "GET", segments: ["projects"] },
+  { method: "GET", segments: ["projects", "resolve"] },
+  { method: "GET", segments: ["projects", null] },
   { method: "GET", segments: ["projects", null, "resources"] },
   { method: "POST", segments: ["projects", null, "database"] },
   { method: "POST", segments: ["projects", null, "prerender-token"] },
@@ -149424,24 +149784,7 @@ init_dist2();
 
 // ../../home/runner/work/void/void/platform/packages/api/src/asset-inventory.ts
 init_performance2();
-
-// ../../home/runner/work/void/void/platform/packages/api/src/concurrency.ts
-init_performance2();
-var R2_CONCURRENCY = 6;
-async function uploadPool(items, concurrency, fn) {
-  let nextIndex = 0;
-  async function worker() {
-    while (nextIndex < items.length) {
-      const item = items[nextIndex++];
-      await fn(item);
-    }
-  }
-  __name(worker, "worker");
-  await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, () => worker()));
-}
-__name(uploadPool, "uploadPool");
-
-// ../../home/runner/work/void/void/platform/packages/api/src/asset-inventory.ts
+init_concurrency();
 async function findR2Assets(r2, projectId, requiredHashes) {
   const found = /* @__PURE__ */ new Map();
   if (requiredHashes.size === 0) {
@@ -149474,6 +149817,38 @@ async function findR2Assets(r2, projectId, requiredHashes) {
   return found;
 }
 __name(findR2Assets, "findR2Assets");
+function persistedR2AssetSizes(raw2) {
+  const sizes = /* @__PURE__ */ new Map();
+  const conflicting = /* @__PURE__ */ new Set();
+  if (!raw2) {
+    return sizes;
+  }
+  let manifest;
+  try {
+    manifest = JSON.parse(raw2);
+  } catch {
+    return sizes;
+  }
+  if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) {
+    return sizes;
+  }
+  for (const value of Object.values(manifest)) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+      continue;
+    }
+    const entry = value;
+    if (entry.store === "r2" && typeof entry.hash === "string" && /^[0-9a-f]{32}$/.test(entry.hash) && typeof entry.size === "number" && Number.isSafeInteger(entry.size) && entry.size >= 0) {
+      if (sizes.has(entry.hash) && sizes.get(entry.hash) !== entry.size) {
+        conflicting.add(entry.hash);
+        sizes.delete(entry.hash);
+      } else if (!conflicting.has(entry.hash)) {
+        sizes.set(entry.hash, entry.size);
+      }
+    }
+  }
+  return sizes;
+}
+__name(persistedR2AssetSizes, "persistedR2AssetSizes");
 async function findMissingR2Assets(r2, projectId, manifest) {
   const entries2 = Object.entries(manifest);
   const found = await findR2Assets(r2, projectId, new Set(entries2.map(([, entry]) => entry.hash)));
@@ -149486,6 +149861,7 @@ init_assets();
 init_hmac();
 init_capabilities();
 init_cf_api();
+init_concurrency();
 init_cron_scheduler_client();
 init_db2();
 init_email();
@@ -149867,6 +150243,9 @@ async function ensureResource(db, accountId, apiToken, projectId, type, bindingN
   const resourceName = `${projectId}-${bindingName}`.toLowerCase().replaceAll("_", "-");
   const found = existing.find((r) => r.type === type && r.binding_name === bindingName);
   if (found) {
+    if (type === "d1") {
+      await enableD1ReadReplication(accountId, apiToken, found.cf_id);
+    }
     if (type === "queue" && !UUID_RE.test(found.cf_id)) {
       const queueInfo = await getQueueByName(accountId, apiToken, resourceName);
       await db.update(resources).set({ cf_id: queueInfo.queue_id }).where(eq(resources.id, found.id));
@@ -149882,6 +150261,9 @@ async function ensureResource(db, accountId, apiToken, projectId, type, bindingN
   } catch (err) {
     if (isAlreadyExistsError3(err)) {
       cfId = await lookupCfResource(type, accountId, apiToken, resourceName);
+      if (type === "d1") {
+        await enableD1ReadReplication(accountId, apiToken, cfId);
+      }
     } else {
       throw err;
     }
@@ -152376,6 +152758,19 @@ async function handleManifestOnlyDeploy(context) {
       });
     }, "withProjectAssetGcFence");
     let remainingAssetGcHashBudget = ASSET_GC_MAX_HASHES_PER_DEPLOY;
+    let orphanSweepAfterResponse = null;
+    const finishOrphanSweep = /* @__PURE__ */ __name(async () => {
+      const sweep = orphanSweepAfterResponse;
+      if (!sweep) {
+        return;
+      }
+      const work = Promise.resolve().then(sweep);
+      try {
+        context.executionCtx.waitUntil(work);
+      } catch {
+        await work;
+      }
+    }, "finishOrphanSweep");
     const deleteAssetHashesWithProjectFence = /* @__PURE__ */ __name(async (knownRetainedHashes, hashes) => {
       let deleted = 0;
       const budgetedHashes = hashes.slice(0, remainingAssetGcHashBudget);
@@ -152519,6 +152914,15 @@ async function handleManifestOnlyDeploy(context) {
       const declaredHashes = Array.from(
         new Set(Object.values(incomingAssetManifest).map((e) => e.hash))
       );
+      const activeR2Sizes = currentLiveDeployment?.status === "live" && currentLiveDeployment.project_id === projectId ? persistedR2AssetSizes(currentLiveDeployment.asset_hashes) : /* @__PURE__ */ new Map();
+      const declaredSizeByHash = /* @__PURE__ */ new Map();
+      for (const entry of Object.values(incomingAssetManifest)) {
+        if (!declaredSizeByHash.has(entry.hash)) {
+          declaredSizeByHash.set(entry.hash, entry.size);
+        } else if (declaredSizeByHash.get(entry.hash) !== entry.size) {
+          declaredSizeByHash.set(entry.hash, null);
+        }
+      }
       let previousBackendIsStatic = false;
       if (currentLiveDeployment) {
         const routingRaw = await context.env.ROUTING.get(project.slug);
@@ -152530,7 +152934,7 @@ async function handleManifestOnlyDeploy(context) {
           }
         }
       }
-      const newHashes = hasWorkerFiles || !previousBackendIsStatic ? declaredHashes : declaredHashes.filter((hash4) => !carryForwardHashes.has(hash4));
+      const newHashes = hasWorkerFiles ? declaredHashes.filter((hash4) => activeR2Sizes.get(hash4) !== declaredSizeByHash.get(hash4)) : !previousBackendIsStatic ? declaredHashes : declaredHashes.filter((hash4) => !carryForwardHashes.has(hash4));
       const missingHashes = [];
       const r2HeadCache = /* @__PURE__ */ new Map();
       const foundNewAssets = await findR2Assets(
@@ -152995,16 +153399,18 @@ ${Date.now()}
               await context.env.ROUTING.delete(`manifest:${old.id}`);
             }
             if (assetCleanupSafe) {
-              try {
-                const orphans = await sweepAssetOrphansWithProjectFence(retainedHashes);
-                if (orphans > 0) {
-                  logger.info("retention_cleanup", "r2_orphans_swept", { count: orphans });
+              orphanSweepAfterResponse = /* @__PURE__ */ __name(async () => {
+                try {
+                  const orphans = await sweepAssetOrphansWithProjectFence(retainedHashes);
+                  if (orphans > 0) {
+                    logger.info("retention_cleanup", "r2_orphans_swept", { count: orphans });
+                  }
+                } catch (e) {
+                  logger.warn("retention_cleanup", "r2_orphan_sweep_failed", {
+                    err: e instanceof Error ? e.message : String(e)
+                  });
                 }
-              } catch (e) {
-                logger.warn("retention_cleanup", "r2_orphan_sweep_failed", {
-                  err: e instanceof Error ? e.message : String(e)
-                });
-              }
+              }, "orphanSweepAfterResponse");
             }
           }
           const application2 = readPlatformApplication(context.env);
@@ -153021,6 +153427,7 @@ ${Date.now()}
             assets: assetCount,
             workers: 0
           });
+          await finishOrphanSweep();
           return;
         }
         currentStep = "provisioning";
@@ -154065,16 +154472,18 @@ ${Date.now()}
             }
           }
           if (assetCleanupSafe) {
-            try {
-              const orphans = await sweepAssetOrphansWithProjectFence(retainedHashes);
-              if (orphans > 0) {
-                logger.info("retention_cleanup", "r2_orphans_swept", { count: orphans });
+            orphanSweepAfterResponse = /* @__PURE__ */ __name(async () => {
+              try {
+                const orphans = await sweepAssetOrphansWithProjectFence(retainedHashes);
+                if (orphans > 0) {
+                  logger.info("retention_cleanup", "r2_orphans_swept", { count: orphans });
+                }
+              } catch (e) {
+                logger.warn("retention_cleanup", "r2_orphan_sweep_failed", {
+                  err: e instanceof Error ? e.message : String(e)
+                });
               }
-            } catch (e) {
-              logger.warn("retention_cleanup", "r2_orphan_sweep_failed", {
-                err: e instanceof Error ? e.message : String(e)
-              });
-            }
+            }, "orphanSweepAfterResponse");
           }
         }
         const application = readPlatformApplication(context.env);
@@ -154092,6 +154501,7 @@ ${Date.now()}
           workers: workerFiles.length,
           ...migrationsApplied > 0 && { migrations: migrationsApplied }
         });
+        await finishOrphanSweep();
       } catch (err) {
         const raw2 = err instanceof ProjectAccessDeniedError ? err.userMessage : err instanceof Error ? err.message : String(err);
         const msg = sanitizeDeployErrorMessage(raw2);
@@ -154559,11 +154969,14 @@ app11.post("/:id/deploy/preflight", async (context) => {
     if (!valid) {
       return context.json({ needed: Object.keys(assetManifest), total, skipped: 0 });
     }
-    const needed2 = await findMissingR2Assets(
-      context.env.STATIC_ASSETS_R2,
-      projectId,
-      assetManifest
+    const active = project.active_deployment_id ? await getDeployment(context.get("db"), project.active_deployment_id) : null;
+    const activeR2Sizes = active?.status === "live" && active.project_id === projectId ? persistedR2AssetSizes(active.asset_hashes) : /* @__PURE__ */ new Map();
+    const unverified = Object.fromEntries(
+      Object.entries(assetManifest).filter(
+        ([, entry]) => activeR2Sizes.get(entry.hash) !== entry.size
+      )
     );
+    const needed2 = await findMissingR2Assets(context.env.STATIC_ASSETS_R2, projectId, unverified);
     return context.json({ needed: needed2, total, skipped: total - needed2.length });
   }
   let activeDeploymentId = project.active_deployment_id;
@@ -156323,6 +156736,7 @@ async function tryActivateDomain(env2, db, domain2, project, options) {
 __name(tryActivateDomain, "tryActivateDomain");
 
 // ../../home/runner/work/void/void/platform/packages/api/src/index.ts
+init_cleanup();
 init_cloudflare_api();
 init_email_destination_cleanup();
 init_sandbox_controller();
@@ -160739,6 +161153,7 @@ init_db2();
 // ../../home/runner/work/void/void/platform/packages/api/src/revalidate-core.ts
 init_performance2();
 init_dist();
+init_concurrency();
 init_db2();
 
 // ../../home/runner/work/void/void/platform/packages/api/src/isr-cache.ts
@@ -162403,6 +162818,35 @@ var app30 = new Hono2().get("/", async (context) => {
     };
   });
   return context.json(projectsWithSummaries.sort(sortProjectList));
+}).get("/choices", async (context) => {
+  const projects2 = await getAccessibleProjectsByUserId(context.get("db"), context.get("user").id);
+  return context.json(
+    projects2.map(({ project, role, owner }) => ({
+      ...projectWithUrl(project, context.env),
+      role,
+      owner: { id: owner.id, login: owner.login }
+    }))
+  );
+}).get("/resolve", async (context) => {
+  const slug = context.req.query("slug");
+  if (!slug || slug.length > MAX_SLUG_LENGTH || !/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/.test(slug)) {
+    return context.json({ error: "valid slug is required" }, 400);
+  }
+  const access = await getAccessibleProjectBySlug(
+    context.get("db"),
+    context.get("user").id,
+    slug
+  );
+  if (!access || context.get("deployScope") && context.get("deployScope") !== access.project.id) {
+    return context.json({ project: null });
+  }
+  return context.json({
+    project: {
+      ...projectWithUrl(access.project, context.env),
+      role: access.role,
+      owner: { id: access.owner.id, login: access.owner.login }
+    }
+  });
 }).post("/", async (context) => {
   const body = await context.req.json();
   if (!body.slug) {
@@ -166147,6 +166591,9 @@ async function scheduled(controller, env2, _ctx) {
   }
   const db = createDb(env2.HYPERDRIVE.connectionString);
   const capabilities = getPlatformCapabilities(env2);
+  await reconcileProjectCleanupJobs(db, env2).catch(
+    (error63) => console.error("[scheduled] project cleanup retry failed:", error63)
+  );
   if (capabilities.email) {
     await reconcileEmailDestinationCleanups(db, {
       accountId: env2.CF_ACCOUNT_ID,