refactor: cleaner feature flag server module split

nicktrn · nicktrn · commit fd422eaf10b3 · 2026-03-29T17:43:09.000+01:00
diff --git a/apps/webapp/app/components/admin/FeatureFlagsDialog.tsx b/apps/webapp/app/components/admin/FeatureFlagsDialog.tsx
@@ -11,8 +11,7 @@ import {
 import { Button } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
 import { cn } from "~/utils/cn";
-import { FEATURE_FLAG } from "~/v3/featureFlags";
-import type { FlagControlType } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG, type FlagControlType } from "~/v3/featureFlags";
 import { UNSET_VALUE, BooleanControl, EnumControl, StringControl } from "./FlagControls";
 
 const HIDDEN_FLAGS = [FEATURE_FLAG.defaultWorkerInstanceGroupId];
@@ -126,8 +125,7 @@ export function FeatureFlagsDialog({
                 const control = data.controlTypes[key];
                 const isOverridden = key in overrides;
                 const globalValue = data.globalFlags[key as keyof typeof data.globalFlags];
-                const globalDisplay =
-                  globalValue !== undefined ? String(globalValue) : "unset";
+                const globalDisplay = globalValue !== undefined ? String(globalValue) : "unset";
 
                 return (
                   <div
@@ -215,24 +213,17 @@ export function FeatureFlagsDialog({
           </details>
         )}
 
-        {saveError && (
-          <Callout variant="error">{saveError}</Callout>
-        )}
+        {saveError && <Callout variant="error">{saveError}</Callout>}
 
         <DialogFooter>
           <Button variant="tertiary/small" onClick={() => onOpenChange(false)}>
             Cancel
           </Button>
-          <Button
-            variant="primary/small"
-            onClick={handleSave}
-            disabled={!isDirty || isSaving}
-          >
+          <Button variant="primary/small" onClick={handleSave} disabled={!isDirty || isSaving}>
             {isSaving ? "Saving..." : "Save changes"}
           </Button>
         </DialogFooter>
       </DialogContent>
     </Dialog>
   );
 }
-
diff --git a/apps/webapp/app/presenters/OrganizationsPresenter.server.ts b/apps/webapp/app/presenters/OrganizationsPresenter.server.ts
@@ -10,7 +10,8 @@ import {
 } from "./SelectBestEnvironmentPresenter.server";
 import { sortEnvironments } from "~/utils/environmentSort";
 import { defaultAvatar, parseAvatar } from "~/components/primitives/Avatar";
-import { flags, validatePartialFeatureFlags } from "~/v3/featureFlags.server";
+import { flags } from "~/v3/featureFlags.server";
+import { validatePartialFeatureFlags } from "~/v3/featureFlags";
 
 export class OrganizationsPresenter {
   #prismaClient: PrismaClient;
diff --git a/apps/webapp/app/presenters/v3/RegionsPresenter.server.ts b/apps/webapp/app/presenters/v3/RegionsPresenter.server.ts
@@ -1,6 +1,7 @@
 import { type Project } from "~/models/project.server";
 import { type User } from "~/models/user.server";
-import { FEATURE_FLAG, makeFlag } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG } from "~/v3/featureFlags";
+import { makeFlag } from "~/v3/featureFlags.server";
 import { BasePresenter } from "./basePresenter.server";
 import { getCurrentPlan } from "~/services/platform.v3.server";
 
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs/route.tsx
@@ -37,7 +37,7 @@ import {
   ResizablePanelGroup,
 } from "~/components/primitives/Resizable";
 import { Button } from "~/components/primitives/Buttons";
-import { FEATURE_FLAG, validateFeatureFlagValue } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG, validateFeatureFlagValue } from "~/v3/featureFlags";
 
 // Valid log levels for filtering
 const validLevels: LogLevel[] = ["TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
diff --git a/apps/webapp/app/routes/admin.api.orgs.$orgId.feature-flags.ts b/apps/webapp/app/routes/admin.api.orgs.$orgId.feature-flags.ts
@@ -4,11 +4,8 @@ import { Prisma } from "@trigger.dev/database";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { requireUser } from "~/services/session.server";
-import {
-  flags as getGlobalFlags,
-  validatePartialFeatureFlags,
-  getAllFlagControlTypes,
-} from "~/v3/featureFlags.server";
+import { flags as getGlobalFlags } from "~/v3/featureFlags.server";
+import { validatePartialFeatureFlags, getAllFlagControlTypes } from "~/v3/featureFlags";
 
 const ParamsSchema = z.object({
   orgId: z.string(),
@@ -75,7 +72,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   let featureFlags: typeof Prisma.JsonNull | Record<string, unknown>;
 
-  if (body === null || (typeof body === "object" && !Array.isArray(body) && Object.keys(body).length === 0)) {
+  if (
+    body === null ||
+    (typeof body === "object" && !Array.isArray(body) && Object.keys(body).length === 0)
+  ) {
     featureFlags = Prisma.JsonNull;
   } else {
     const validationResult = validatePartialFeatureFlags(body as Record<string, unknown>);
diff --git a/apps/webapp/app/routes/admin.api.v1.feature-flags.ts b/apps/webapp/app/routes/admin.api.v1.feature-flags.ts
@@ -1,7 +1,8 @@
 import { ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { prisma } from "~/db.server";
 import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
-import { makeSetMultipleFlags, validatePartialFeatureFlags } from "~/v3/featureFlags.server";
+import { makeSetMultipleFlags } from "~/v3/featureFlags.server";
+import { validatePartialFeatureFlags } from "~/v3/featureFlags";
 
 export async function action({ request }: ActionFunctionArgs) {
   // Next authenticate the request
diff --git a/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.feature-flags.ts b/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.feature-flags.ts
@@ -2,7 +2,7 @@ import { ActionFunctionArgs, LoaderFunctionArgs, json } from "@remix-run/server-
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
-import { validatePartialFeatureFlags } from "~/v3/featureFlags.server";
+import { validatePartialFeatureFlags } from "~/v3/featureFlags";
 
 const ParamsSchema = z.object({
   organizationId: z.string(),
diff --git a/apps/webapp/app/routes/admin.feature-flags.tsx b/apps/webapp/app/routes/admin.feature-flags.tsx
@@ -7,13 +7,13 @@ import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { requireUser } from "~/services/session.server";
-import { FEATURE_FLAG } from "~/v3/featureFlags";
 import {
-  flags as getGlobalFlags,
+  FEATURE_FLAG,
+  type FlagControlType,
   getAllFlagControlTypes,
   validatePartialFeatureFlags,
-} from "~/v3/featureFlags.server";
-import type { FlagControlType } from "~/v3/featureFlags.server";
+} from "~/v3/featureFlags";
+import { flags as getGlobalFlags } from "~/v3/featureFlags.server";
 import { Button } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
 import {
@@ -157,9 +157,7 @@ export default function AdminFeatureFlagsRoute() {
     });
   };
 
-  const workerGroupMap = new Map(
-    (workerGroups as WorkerGroup[]).map((wg) => [wg.id, wg.name])
-  );
+  const workerGroupMap = new Map((workerGroups as WorkerGroup[]).map((wg) => [wg.id, wg.name]));
 
   const resolveWorkerGroupDisplay = (id: string) => {
     const name = workerGroupMap.get(id);
@@ -172,8 +170,8 @@ export default function AdminFeatureFlagsRoute() {
     <main className="flex h-full min-w-0 flex-1 flex-col overflow-y-auto px-4 pb-4 lg:order-last">
       <div className="max-w-2xl space-y-4">
         <p className="text-sm text-text-dimmed">
-          Global defaults for all organizations. Org-level overrides take precedence.
-          When not set, each consumer uses its own default.
+          Global defaults for all organizations. Org-level overrides take precedence. When not set,
+          each consumer uses its own default.
         </p>
 
         <div className="flex flex-col gap-1.5">
@@ -283,10 +281,7 @@ export default function AdminFeatureFlagsRoute() {
 
         <div className="flex justify-end gap-2">
           {isDirty && (
-            <Button
-              variant="tertiary/small"
-              onClick={() => setValues({ ...initialValues })}
-            >
+            <Button variant="tertiary/small" onClick={() => setValues({ ...initialValues })}>
               Discard
             </Button>
           )}
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.can-view-logs-page/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.can-view-logs-page/route.tsx
@@ -2,7 +2,7 @@ import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { typedjson } from "remix-typedjson";
 import { requireUser } from "~/services/session.server";
 import { prisma } from "~/db.server";
-import { FEATURE_FLAG, validateFeatureFlagValue } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG, validateFeatureFlagValue } from "~/v3/featureFlags";
 import { OrganizationParamsSchema } from "~/utils/pathBuilder";
 
 async function hasLogsPageAccess(
diff --git a/apps/webapp/app/services/runsRepository/runsRepository.server.ts b/apps/webapp/app/services/runsRepository/runsRepository.server.ts
@@ -8,7 +8,8 @@ import parseDuration from "parse-duration";
 import { z } from "zod";
 import { timeFilters } from "~/components/runs/v3/SharedFilters";
 import { type PrismaClient, type PrismaClientOrTransaction } from "~/db.server";
-import { FEATURE_FLAG, makeFlag } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG } from "~/v3/featureFlags";
+import { makeFlag } from "~/v3/featureFlags.server";
 import { startActiveSpan } from "~/v3/tracer.server";
 import { logger } from "../logger.server";
 import { ClickHouseRunsRepository } from "./clickhouseRunsRepository.server";
diff --git a/apps/webapp/app/v3/canAccessAi.server.ts b/apps/webapp/app/v3/canAccessAi.server.ts
@@ -1,6 +1,7 @@
 import { prisma } from "~/db.server";
 import { env } from "~/env.server";
-import { FEATURE_FLAG, makeFlag } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG } from "~/v3/featureFlags";
+import { makeFlag } from "~/v3/featureFlags.server";
 
 export async function canAccessAi(options: {
   userId: string;
diff --git a/apps/webapp/app/v3/canAccessAiModels.server.ts b/apps/webapp/app/v3/canAccessAiModels.server.ts
@@ -1,6 +1,7 @@
 import { prisma } from "~/db.server";
 import { env } from "~/env.server";
-import { FEATURE_FLAG, makeFlag } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG } from "~/v3/featureFlags";
+import { makeFlag } from "~/v3/featureFlags.server";
 
 export async function canAccessAiModels(options: {
   userId: string;
diff --git a/apps/webapp/app/v3/canAccessQuery.server.ts b/apps/webapp/app/v3/canAccessQuery.server.ts
@@ -1,6 +1,7 @@
 import { prisma } from "~/db.server";
 import { env } from "~/env.server";
-import { FEATURE_FLAG, makeFlag } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG } from "~/v3/featureFlags";
+import { makeFlag } from "~/v3/featureFlags.server";
 
 export async function canAccessQuery(options: {
   userId: string;
diff --git a/apps/webapp/app/v3/eventRepository/index.server.ts b/apps/webapp/app/v3/eventRepository/index.server.ts
@@ -7,7 +7,8 @@ import {
 import { IEventRepository, TraceEventOptions } from "./eventRepository.types";
 import { prisma } from "~/db.server";
 import { logger } from "~/services/logger.server";
-import { FEATURE_FLAG, flag } from "../featureFlags.server";
+import { FEATURE_FLAG } from "../featureFlags";
+import { flag } from "../featureFlags.server";
 import { getTaskEventStore } from "../taskEventStore.server";
 
 export function resolveEventRepositoryForStore(store: string | undefined): IEventRepository {
diff --git a/apps/webapp/app/v3/featureFlags.server.ts b/apps/webapp/app/v3/featureFlags.server.ts
@@ -1,19 +1,10 @@
-import { z } from "zod";
+import { type z } from "zod";
 import { prisma, type PrismaClientOrTransaction } from "~/db.server";
-export { FEATURE_FLAG } from "~/v3/featureFlags";
-import { FEATURE_FLAG } from "~/v3/featureFlags";
-
-const FeatureFlagCatalog = {
-  [FEATURE_FLAG.defaultWorkerInstanceGroupId]: z.string(),
-  [FEATURE_FLAG.runsListRepository]: z.enum(["clickhouse", "postgres"]),
-  [FEATURE_FLAG.taskEventRepository]: z.enum(["clickhouse", "clickhouse_v2", "postgres"]),
-  [FEATURE_FLAG.hasQueryAccess]: z.coerce.boolean(),
-  [FEATURE_FLAG.hasLogsPageAccess]: z.coerce.boolean(),
-  [FEATURE_FLAG.hasAiAccess]: z.coerce.boolean(),
-  [FEATURE_FLAG.hasAiModelsAccess]: z.coerce.boolean(),
-};
-
-type FeatureFlagKey = keyof typeof FeatureFlagCatalog;
+import {
+  type FeatureFlagKey,
+  FeatureFlagCatalog,
+  FeatureFlagCatalogSchema,
+} from "~/v3/featureFlags";
 
 export type FlagsOptions<T extends FeatureFlagKey> = {
   key: T;
@@ -132,56 +123,6 @@ export const flag = makeFlag();
 export const flags = makeFlags();
 export const setFlag = makeSetFlag();
 
-// Create a Zod schema from the existing catalog
-export const FeatureFlagCatalogSchema = z.object(FeatureFlagCatalog);
-export type FeatureFlagCatalog = z.infer<typeof FeatureFlagCatalogSchema>;
-
-// Utility function to validate a feature flag value
-export function validateFeatureFlagValue<T extends FeatureFlagKey>(
-  key: T,
-  value: unknown
-): z.SafeParseReturnType<unknown, z.infer<(typeof FeatureFlagCatalog)[T]>> {
-  return FeatureFlagCatalog[key].safeParse(value);
-}
-
-// Utility function to validate all feature flags at once
-export function validateAllFeatureFlags(values: Record<string, unknown>) {
-  return FeatureFlagCatalogSchema.safeParse(values);
-}
-
-// Utility function to validate partial feature flags (all keys optional)
-export function validatePartialFeatureFlags(values: Record<string, unknown>) {
-  return FeatureFlagCatalogSchema.partial().safeParse(values);
-}
-
-// Utility types for catalog-driven UI rendering
-export type FlagControlType =
-  | { type: "boolean" }
-  | { type: "enum"; options: string[] }
-  | { type: "string" };
-
-export function getFlagControlType(schema: z.ZodTypeAny): FlagControlType {
-  const typeName = schema._def.typeName;
-
-  if (typeName === "ZodBoolean") {
-    return { type: "boolean" };
-  }
-
-  if (typeName === "ZodEnum") {
-    return { type: "enum", options: schema._def.values as string[] };
-  }
-
-  return { type: "string" };
-}
-
-export function getAllFlagControlTypes(): Record<string, FlagControlType> {
-  const result: Record<string, FlagControlType> = {};
-  for (const [key, schema] of Object.entries(FeatureFlagCatalog)) {
-    result[key] = getFlagControlType(schema);
-  }
-  return result;
-}
-
 // Utility function to set multiple feature flags at once
 export function makeSetMultipleFlags(_prisma: PrismaClientOrTransaction = prisma) {
   return async function setMultipleFlags(
diff --git a/apps/webapp/app/v3/featureFlags.ts b/apps/webapp/app/v3/featureFlags.ts
@@ -1,3 +1,5 @@
+import { z } from "zod";
+
 export const FEATURE_FLAG = {
   defaultWorkerInstanceGroupId: "defaultWorkerInstanceGroupId",
   runsListRepository: "runsListRepository",
@@ -7,3 +9,65 @@ export const FEATURE_FLAG = {
   hasAiAccess: "hasAiAccess",
   hasAiModelsAccess: "hasAiModelsAccess",
 } as const;
+
+export const FeatureFlagCatalog = {
+  [FEATURE_FLAG.defaultWorkerInstanceGroupId]: z.string(),
+  [FEATURE_FLAG.runsListRepository]: z.enum(["clickhouse", "postgres"]),
+  [FEATURE_FLAG.taskEventRepository]: z.enum(["clickhouse", "clickhouse_v2", "postgres"]),
+  [FEATURE_FLAG.hasQueryAccess]: z.coerce.boolean(),
+  [FEATURE_FLAG.hasLogsPageAccess]: z.coerce.boolean(),
+  [FEATURE_FLAG.hasAiAccess]: z.coerce.boolean(),
+  [FEATURE_FLAG.hasAiModelsAccess]: z.coerce.boolean(),
+};
+
+export type FeatureFlagKey = keyof typeof FeatureFlagCatalog;
+
+// Create a Zod schema from the existing catalog
+export const FeatureFlagCatalogSchema = z.object(FeatureFlagCatalog);
+export type FeatureFlagCatalog = z.infer<typeof FeatureFlagCatalogSchema>;
+
+// Utility function to validate a feature flag value
+export function validateFeatureFlagValue<T extends FeatureFlagKey>(
+  key: T,
+  value: unknown
+): z.SafeParseReturnType<unknown, z.infer<(typeof FeatureFlagCatalog)[T]>> {
+  return FeatureFlagCatalog[key].safeParse(value);
+}
+
+// Utility function to validate all feature flags at once
+export function validateAllFeatureFlags(values: Record<string, unknown>) {
+  return FeatureFlagCatalogSchema.safeParse(values);
+}
+
+// Utility function to validate partial feature flags (all keys optional)
+export function validatePartialFeatureFlags(values: Record<string, unknown>) {
+  return FeatureFlagCatalogSchema.partial().safeParse(values);
+}
+
+// Utility types for catalog-driven UI rendering
+export type FlagControlType =
+  | { type: "boolean" }
+  | { type: "enum"; options: string[] }
+  | { type: "string" };
+
+export function getFlagControlType(schema: z.ZodTypeAny): FlagControlType {
+  const typeName = schema._def.typeName;
+
+  if (typeName === "ZodBoolean") {
+    return { type: "boolean" };
+  }
+
+  if (typeName === "ZodEnum") {
+    return { type: "enum", options: schema._def.values as string[] };
+  }
+
+  return { type: "string" };
+}
+
+export function getAllFlagControlTypes(): Record<string, FlagControlType> {
+  const result: Record<string, FlagControlType> = {};
+  for (const [key, schema] of Object.entries(FeatureFlagCatalog)) {
+    result[key] = getFlagControlType(schema);
+  }
+  return result;
+}
diff --git a/apps/webapp/app/v3/services/worker/workerGroupService.server.ts b/apps/webapp/app/v3/services/worker/workerGroupService.server.ts
@@ -2,7 +2,8 @@ import { WorkerInstanceGroup, WorkerInstanceGroupType } from "@trigger.dev/datab
 import { WithRunEngine } from "../baseService.server";
 import { WorkerGroupTokenService } from "./workerGroupTokenService.server";
 import { logger } from "~/services/logger.server";
-import { FEATURE_FLAG, makeFlag, makeSetFlag } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG } from "~/v3/featureFlags";
+import { makeFlag, makeSetFlag } from "~/v3/featureFlags.server";
 
 export class WorkerGroupService extends WithRunEngine {
   private readonly defaultNamePrefix = "worker_group";
