chore(webapp): remove the preview auto-archive flag

Preview branch auto-archiving is now always on. The `previewAutoArchiveEnabled` feature flag is removed, along with the code paths that ran when it was off.

Mono-RevId: de133ebb080e199c8dc4b13defe146c3e4db276b

Author: d-cs

.server-changes/preview-auto-archive-always-on.md

@@ -0,0 +1,6 @@
+---
+area: webapp
+type: improvement
+---
+
+Preview branch auto-archiving is now always available, with no feature flag to enable first.

apps/webapp/app/presenters/v3/BranchesPresenter.server.ts

@@ -1,8 +1,5 @@
 import { classifyPreviewBranch } from "~/utils/previewAutoArchive";
-import {
-  previewBranchActivity,
-  isPreviewAutoArchiveEnabled,
-} from "~/services/previewAutoArchive.server";
+import { previewBranchActivity } from "~/services/previewAutoArchive.server";
 import { GitMeta } from "@trigger.dev/core/v3";
 import { DEFAULT_DEV_BRANCH } from "@trigger.dev/core/v3/utils/gitBranch";
 import { type RuntimeEnvironmentType } from "@trigger.dev/database";
@@ -113,7 +110,6 @@ export class BranchesPresenter {
       select: {
         id: true,
         organizationId: true,
-        ...(envType === "PREVIEW" ? { organization: { select: { featureFlags: true } } } : {}),
       },
       where: {
         slug: projectSlug,
@@ -131,12 +127,7 @@ export class BranchesPresenter {
       throw new Error("Project not found");
     }
 
-    const autoArchiveAvailable =
-      envType === "PREVIEW" &&
-      (await isPreviewAutoArchiveEnabled(
-        this.#prismaClient,
-        project.organization?.featureFlags ?? null
-      ));
+    const autoArchiveAvailable = envType === "PREVIEW";
 
     const branchableEnvironment = await this.#prismaClient.runtimeEnvironment.findFirst({
       select: {

apps/webapp/app/routes/resources.branches.auto-archive.tsx

@@ -10,7 +10,6 @@ import { rbac } from "~/services/rbac.server";
 import {
   previewAutoArchiveCount,
   savePreviewAutoArchivePolicy,
-  isPreviewAutoArchiveEnabled,
 } from "~/services/previewAutoArchive.server";
 import { PreviewAutoArchivePolicy } from "~/utils/previewAutoArchive";
 import { Button } from "~/components/primitives/Buttons";
@@ -81,17 +80,10 @@ export async function action({ request }: ActionFunctionArgs) {
       id: true,
       organizationId: true,
       projectId: true,
-      organization: { select: { featureFlags: true } },
     },
   });
   if (!parent)
     return json({ ok: false, error: "Preview environment not found" } as const, { status: 404 });
-  if (!(await isPreviewAutoArchiveEnabled(prisma, parent.organization.featureFlags))) {
-    return json(
-      { ok: false, error: "Preview auto-archive is not enabled for this organization." } as const,
-      { status: 403 }
-    );
-  }
   const auth = await rbac.authenticateSession(request, {
     userId,
     organizationId: parent.organizationId,

apps/webapp/app/services/previewAutoArchive.server.test.ts

@@ -8,7 +8,6 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { $transaction } from "~/db.server";
-import { FeatureFlagCatalog, FEATURE_FLAG } from "~/v3/featureFlags";
 import { createDeploymentWithNextVersion } from "~/v3/services/initializeDeployment/createDeploymentWithNextVersion.server";
 import {
   PreviewAutoArchivePolicy,
@@ -23,82 +22,9 @@ import {
   processPreviewAutoArchivePage,
   previewAutoArchiveCount,
   savePreviewAutoArchivePolicy,
-  isPreviewAutoArchiveEnabled,
   previewBranchActivity,
 } from "./previewAutoArchive.server";
 
-postgresTest(
-  "rollout defaults off with organization overrides over the global flag",
-  async ({ prisma }) => {
-    const key = FEATURE_FLAG.previewAutoArchiveEnabled;
-    expect(FeatureFlagCatalog[key].safeParse("false").success).toBe(false);
-    expect(await isPreviewAutoArchiveEnabled(prisma, null)).toBe(false);
-    expect(await isPreviewAutoArchiveEnabled(prisma, { [key]: true })).toBe(true);
-    await prisma.featureFlag.create({ data: { key, value: true } });
-    expect(await isPreviewAutoArchiveEnabled(prisma, null)).toBe(true);
-    expect(await isPreviewAutoArchiveEnabled(prisma, { [key]: false })).toBe(false);
-    await prisma.featureFlag.update({ where: { key }, data: { value: false } });
-    expect(await isPreviewAutoArchiveEnabled(prisma, null)).toBe(false);
-    expect(await isPreviewAutoArchiveEnabled(prisma, { [key]: true })).toBe(true);
-  }
-);
-
-postgresTest(
-  "disabled rollout preserves configured policies and resumes when globally enabled",
-  async ({ prisma }) => {
-    const { parent, branch } = await seed(prisma, false);
-    const candidate = await branch();
-    const page = await processPreviewAutoArchivePage(prisma, 0, now);
-    expect(page).toMatchObject({ scanned: 0, archived: [] });
-    const paused = await prisma.runtimeEnvironment.findFirstOrThrow({ where: { id: parent.id } });
-    expect(paused.previewAutoArchiveAfterDays).toBe(14);
-    expect(paused.previewAutoArchiveNextCheckAt).toEqual(new Date(now.getTime() + 3_600_000));
-    await prisma.featureFlag.create({
-      data: { key: FEATURE_FLAG.previewAutoArchiveEnabled, value: true },
-    });
-    const resumed = await processPreviewAutoArchivePage(
-      prisma,
-      0,
-      paused.previewAutoArchiveNextCheckAt!
-    );
-    expect(resumed?.archived.map(({ id }) => id)).toEqual([candidate.id]);
-  }
-);
-
-postgresTest(
-  "revoking rollout between pages pauses without losing the cursor",
-  async ({ prisma }) => {
-    const { parent, organization, branch } = await seed(prisma);
-    for (let i = 0; i < 101; i++) await branch();
-    expect((await processPreviewAutoArchivePage(prisma, 0, now))?.archived).toHaveLength(100);
-    const before = await prisma.runtimeEnvironment.findFirstOrThrow({ where: { id: parent.id } });
-    await prisma.organization.update({
-      where: { id: organization.id },
-      data: { featureFlags: { previewAutoArchiveEnabled: false } },
-    });
-    await prisma.featureFlag.create({
-      data: { key: FEATURE_FLAG.previewAutoArchiveEnabled, value: true },
-    });
-    expect(await processPreviewAutoArchivePage(prisma, 0, now)).toMatchObject({
-      scanned: 0,
-      archived: [],
-    });
-    const paused = await prisma.runtimeEnvironment.findFirstOrThrow({ where: { id: parent.id } });
-    expect(paused.previewAutoArchiveCursorId).toBe(before.previewAutoArchiveCursorId);
-    expect(paused.previewAutoArchiveCursorCreatedAt).toEqual(
-      before.previewAutoArchiveCursorCreatedAt
-    );
-    await prisma.organization.update({
-      where: { id: organization.id },
-      data: { featureFlags: {} },
-    });
-    expect(
-      (await processPreviewAutoArchivePage(prisma, 0, paused.previewAutoArchiveNextCheckAt!))
-        ?.archived
-    ).toHaveLength(1);
-  }
-);
-
 const archiveGuard = {
   archiveGuard: {
     type: "PREVIEW" as const,
@@ -373,43 +299,6 @@ postgresTest(
   }
 );
 
-postgresTest(
-  "flag enabled during deployment preparation cannot bypass the archive lock",
-  async ({ prisma }) => {
-    const { branch, deployData, project } = await seed(prisma, false);
-    await prisma.organization.update({
-      where: { id: project.organizationId },
-      data: { featureFlags: { previewAutoArchiveEnabled: false } },
-    });
-    const candidate = await branch();
-    const preparing = barrier();
-    const resume = barrier();
-    const deploying = createDeploymentWithNextVersion(
-      prisma,
-      candidate.id,
-      async () => {
-        preparing.release();
-        await resume.promise;
-        return deployData();
-      },
-      archiveGuard
-    );
-    const rejected = expect(deploying).rejects.toMatchObject({ status: 409 });
-    await preparing.promise;
-    try {
-      await prisma.organization.update({
-        where: { id: project.organizationId },
-        data: { featureFlags: { previewAutoArchiveEnabled: true } },
-      });
-      expect((await processPreviewAutoArchivePage(prisma, 0, now))?.archived).toHaveLength(1);
-    } finally {
-      resume.release();
-    }
-    await rejected;
-    expect(await prisma.workerDeployment.count({ where: { environmentId: candidate.id } })).toBe(0);
-  }
-);
-
 postgresTest(
   "a policy update owns the root and prevents cleanup using an outdated policy",
   async ({ prisma }) => {

apps/webapp/app/services/previewAutoArchive.server.ts

@@ -13,8 +13,6 @@ import {
 } from "~/utils/previewAutoArchive";
 import { archiveBranchesMutation } from "./branchArchiveMutation.server";
 import { logger } from "./logger.server";
-import { FEATURE_FLAG } from "~/v3/featureFlags";
-import { makeFlag } from "~/v3/featureFlags.server";
 import { trail } from "agentcrumbs"; // @crumbs
 
 const crumb = trail("webapp"); // @crumbs
@@ -48,22 +46,6 @@ export async function previewBranchActivity(prisma: PrismaClientOrTransaction, i
   return new Map(rows.map((row) => [row.id, row]));
 }
 
-export function isPreviewAutoArchiveEnabled(
-  prisma: PrismaClientOrTransaction,
-  organizationFlags: unknown
-) {
-  return makeFlag(prisma)({
-    key: FEATURE_FLAG.previewAutoArchiveEnabled,
-    defaultValue: false,
-    overrides:
-      organizationFlags &&
-      typeof organizationFlags === "object" &&
-      !Array.isArray(organizationFlags)
-        ? (organizationFlags as Record<string, unknown>)
-        : undefined,
-  });
-}
-
 type DuePolicy = {
   id: string;
   previewAutoArchiveAfterDays: number;
@@ -73,7 +55,6 @@ type DuePolicy = {
   previewAutoArchiveCursorId: string | null;
   projectDeletedAt: Date | null;
   organizationDeletedAt: Date | null;
-  organizationFlags: Prisma.JsonValue;
 };
 
 type ArchiveBranch = Pick<RuntimeEnvironment, "id" | "slug" | "branchName" | "createdAt">;
@@ -82,12 +63,11 @@ type ArchiveBranch = Pick<RuntimeEnvironment, "id" | "slug" | "branchName" | "cr
 function previewArchiveDueQuery(now: Date) {
   // Prisma cannot express FOR UPDATE SKIP LOCKED. Claim and read the next due policy
   // together so concurrent workers take different roots. OF e locks only the environment,
-  // while the joins provide tenant deletion and rollout state without extra lookups.
+  // while the joins provide tenant deletion state without extra lookups.
   return Prisma.sql`
     SELECT e.id, e."previewAutoArchiveAfterDays", e."previewAutoArchiveExcludedBranches",
       e."previewAutoArchiveNextCheckAt", e."previewAutoArchiveCursorCreatedAt", e."previewAutoArchiveCursorId",
-      p."deletedAt" AS "projectDeletedAt", o."deletedAt" AS "organizationDeletedAt",
-      o."featureFlags" AS "organizationFlags"
+      p."deletedAt" AS "projectDeletedAt", o."deletedAt" AS "organizationDeletedAt"
     FROM "RuntimeEnvironment" e
     JOIN "Project" p ON p.id = e."projectId"
     JOIN "Organization" o ON o.id = e."organizationId"
@@ -232,16 +212,6 @@ export async function processPreviewAutoArchivePage(
           });
           return { parentId: parent.id, scanned: 0, candidates: 0, archived: [], complete: true };
         }
-        if (!(await isPreviewAutoArchiveEnabled(tx, parent.organizationFlags))) {
-          crumb("preview archive rollout disabled", { parentId: parent.id }); // @crumbs
-          // Keep durable progress and policy for re-enablement, without rescanning a
-          // disabled organization on every tick or starving other due projects.
-          await tx.runtimeEnvironment.update({
-            where: { id: parent.id },
-            data: { previewAutoArchiveNextCheckAt: new Date(now.getTime() + HOUR_MS) },
-          });
-          return { parentId: parent.id, scanned: 0, candidates: 0, archived: [], complete: true };
-        }
         const cutoff = new Date(
           now.getTime() - parent.previewAutoArchiveAfterDays * PREVIEW_AUTO_ARCHIVE_DAY_MS
         );

apps/webapp/app/v3/featureFlags.ts

@@ -9,7 +9,6 @@ export const FEATURE_FLAG = {
   hasQueryAccess: "hasQueryAccess",
   hasLogsPageAccess: "hasLogsPageAccess",
   hasWebhooksAccess: "hasWebhooksAccess",
-  previewAutoArchiveEnabled: "previewAutoArchiveEnabled",
   hasAiAccess: "hasAiAccess",
   hasDashboardAgentAccess: "hasDashboardAgentAccess",
   dashboardAgentTurnEvalsEnabled: "dashboardAgentTurnEvalsEnabled",
@@ -70,8 +69,6 @@ export const FeatureFlagCatalog = {
   [FEATURE_FLAG.hasQueryAccess]: z.coerce.boolean(),
   [FEATURE_FLAG.hasLogsPageAccess]: z.coerce.boolean(),
   [FEATURE_FLAG.hasWebhooksAccess]: z.coerce.boolean(),
-  // Opt-in rollout; organization overrides the global default. Unset means off.
-  [FEATURE_FLAG.previewAutoArchiveEnabled]: z.boolean(),
   /**
    * Opts an organization into API rate limit metrics while the webapp runs with
    * API_RATE_LIMIT_METRICS_ENABLED=allowlist. Read from the organization override only, on the

apps/webapp/app/v3/services/initializeDeployment/createDeploymentWithNextVersion.server.ts

@@ -71,12 +71,12 @@ export async function createDeploymentWithNextVersion(
     const data = await buildData(version);
 
     try {
-      // Non-preview deployments keep the original query path, including no flag lookup.
+      // Non-preview deployments keep the original query path.
       if (options.archiveGuard?.type !== "PREVIEW") {
         return await prisma.workerDeployment.create({ data: { ...data, environmentId, version } });
       }
-      // All previews lock, even with rollout disabled: flags can change during preparation.
-      // Build data (including registry calls) above, outside the short lock. The archive
+      // Every preview locks, whether or not its parent has an auto-archive policy, because the
+      // policy can change during preparation. Build data (including registry calls) above, outside the short lock. The archive
       // sweep takes this same lock before checking deployment activity.
       const deployment = await $transaction(
         prisma,

apps/webapp/test/fixtures/previewAutoArchive.ts

@@ -4,14 +4,8 @@ export const archiveTestNow = new Date("2026-09-16T12:00:00Z");
 export const archiveTestOld = new Date(archiveTestNow.getTime() - 20 * 24 * 60 * 60 * 1000);
 const now = archiveTestNow;
 const old = archiveTestOld;
-export async function seedPreviewArchive(prisma: PrismaClient, rolloutEnabled = true) {
+export async function seedPreviewArchive(prisma: PrismaClient) {
   const { project, organization } = await createTestOrgProjectWithMember(prisma);
-  if (rolloutEnabled) {
-    await prisma.organization.update({
-      where: { id: organization.id },
-      data: { featureFlags: { previewAutoArchiveEnabled: true } },
-    });
-  }
   const base = { projectId: project.id, organizationId: organization.id, type: "PREVIEW" as const };
   const parent = await prisma.runtimeEnvironment.create({
     data: {