feat(webapp): read internal-api-origin global default from the flags registry

Resolve the global default from the cached DB feature-flags snapshot so the
admin global toggle takes effect, with INTERNAL_API_ORIGIN_ENABLED as the
fallback when unset. Load organization.featureFlags only when
INTERNAL_API_ORIGIN is configured.

Author: myftija

apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.ts

@@ -1,6 +1,7 @@
 import { type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
+import { env } from "~/env.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
 import { resolveVariablesForEnvironment } from "~/v3/environmentVariables/environmentVariablesRepository.server";
 
@@ -44,7 +45,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
     },
     include: {
       parentEnvironment: true,
-      organization: { select: { featureFlags: true } },
+      // Feeds resolveProdApiOrigin; only loaded when internal-origin routing is possible.
+      ...(env.INTERNAL_API_ORIGIN ? { organization: { select: { featureFlags: true } } } : {}),
     },
   });
 

apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts

@@ -7,7 +7,8 @@ import { env } from "~/env.server";
 import { getSecretStore } from "~/services/secrets/secretStore.server";
 import { deduplicateVariableArray } from "../deduplicateVariableArray.server";
 import { removeBlacklistedVariables } from "../environmentVariableRules.server";
-import { resolveInternalApiOriginEnabled } from "../featureFlags";
+import { FEATURE_FLAG, resolveInternalApiOriginEnabled } from "../featureFlags";
+import { globalFlagsRegistry } from "../globalFlagsRegistry.server";
 import { generateFriendlyId } from "../friendlyIdentifiers";
 import {
   type CreateEnvironmentVariables,
@@ -917,7 +918,6 @@ export const RuntimeEnvironmentForEnvRepoPayload = {
     organizationId: true,
     branchName: true,
     builtInEnvironmentVariableOverrides: true,
-    organization: { select: { featureFlags: true } },
   },
 } as const;
 
@@ -1151,8 +1151,9 @@ async function resolveOverridableOtelDevVariables(
 // Deployed runs normally get the public API origin. When INTERNAL_API_ORIGIN is
 // set and the org's internalApiOriginEnabled flag resolves on (org override wins
 // in both directions; INTERNAL_API_ORIGIN_ENABLED is the global default applied
-// only when the org has not set it), they get the internal origin instead. Reads
-// the in-memory org flags, so a flag change takes effect on the next attempt.
+// only when the org has not set it), they get the internal origin instead. The
+// global default is the cached DB flag with INTERNAL_API_ORIGIN_ENABLED as the
+// fallback; org flags are read in-memory, so a flip applies on the next attempt.
 function resolveProdApiOrigin(runtimeEnvironment: RuntimeEnvironmentForEnvRepo): string {
   const publicOrigin = env.API_ORIGIN ?? env.APP_ORIGIN;
 
@@ -1162,7 +1163,9 @@ function resolveProdApiOrigin(runtimeEnvironment: RuntimeEnvironmentForEnvRepo):
 
   const enabled = resolveInternalApiOriginEnabled({
     orgFeatureFlags: runtimeEnvironment.organization?.featureFlags,
-    globalDefault: env.INTERNAL_API_ORIGIN_ENABLED === "1",
+    globalDefault:
+      globalFlagsRegistry.current()?.[FEATURE_FLAG.internalApiOriginEnabled] ??
+      env.INTERNAL_API_ORIGIN_ENABLED === "1",
   });
 
   return enabled ? env.INTERNAL_API_ORIGIN : publicOrigin;

apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts

@@ -544,8 +544,8 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
       },
       include: {
         parentEnvironment: true,
-        // Feeds resolveProdApiOrigin (internal-api-origin flag) without a query.
-        organization: { select: { featureFlags: true } },
+        // Feeds resolveProdApiOrigin; only loaded when internal-origin routing is possible.
+        ...(env.INTERNAL_API_ORIGIN ? { organization: { select: { featureFlags: true } } } : {}),
       },
     });