fix(webapp): fail-open entitlement lookup in migration mode, harden region fallback

Author: nicktrn

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

@@ -522,7 +522,7 @@ async function createCommonRunStructure(run: CommonRelatedRun, apiVersion: API_V
     batchId: run.batch?.friendlyId,
     metadata,
     region:
-      run.region || run.workerQueue ? run.region ?? baseWorkerQueue(run.workerQueue) : undefined,
+      run.region || run.workerQueue ? run.region || baseWorkerQueue(run.workerQueue) : undefined,
   };
 }
 

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

@@ -303,7 +303,7 @@ export class SpanPresenter extends BasePresenter {
           location: true,
         },
         where: {
-          masterQueue: run.region ?? baseWorkerQueue(run.workerQueue),
+          masterQueue: run.region || baseWorkerQueue(run.workerQueue),
         },
       });
 

apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts

@@ -215,7 +215,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
     region:
       environment.type === "DEVELOPMENT"
         ? undefined
-        : run.region ?? baseWorkerQueue(run.workerQueue),
+        : run.region || baseWorkerQueue(run.workerQueue),
     regions: regionsResult.regions,
     ttlSeconds: run.ttl ? parseDuration(run.ttl, "s") ?? undefined : undefined,
     idempotencyKey: run.idempotencyKey,

apps/webapp/app/v3/services/computeTemplateCreation.server.ts

@@ -173,16 +173,30 @@ export class ComputeTemplateCreationService {
     }
     const defaultQueue = project.defaultWorkerGroup?.masterQueue;
     if (defaultQueue && backingForQueue(defaultQueue, workerRegionRegistry.current() ?? [])) {
-      const planType = (await getEntitlement(project.organization.id))?.plan?.type;
       if (!globalFlagsRegistry.isLoaded) {
         await globalFlagsRegistry.waitUntilReady(env.GLOBAL_FLAGS_READY_TIMEOUT_MS);
       }
-      const migrated = isOrgMigrated({
-        planType,
+      const decision = {
         orgId: project.organization.id,
         orgFeatureFlags: project.organization.featureFlags as Record<string, unknown> | null,
         flags: globalFlagsRegistry.current(),
-      });
+      };
+      // Per-org override needs no plan; only the percentage path does. So skip the
+      // external entitlement lookup unless it could matter, and degrade gracefully
+      // if it throws - a shadow-template check must never fail a deploy.
+      let migrated = isOrgMigrated({ ...decision, planType: undefined });
+      if (!migrated && (decision.flags?.computeMigrationEnabled ?? false)) {
+        let planType: string | undefined;
+        try {
+          planType = (await getEntitlement(project.organization.id))?.plan?.type;
+        } catch (error) {
+          logger.warn("compute migration: entitlement lookup failed; skipping shadow template", {
+            organizationId: project.organization.id,
+            error: error instanceof Error ? error.message : String(error),
+          });
+        }
+        migrated = isOrgMigrated({ ...decision, planType });
+      }
       if (migrated) {
         return "shadow";
       }

apps/webapp/app/v3/services/replayTaskRun.server.ts

@@ -68,8 +68,8 @@ export class ReplayTaskRunService extends BaseService {
       authenticatedEnvironment.type === "DEVELOPMENT";
     const region = ignoreRegion
       ? undefined
-      : overrideOptions.region ??
-        existingTaskRun.region ??
+      : overrideOptions.region ||
+        existingTaskRun.region ||
         baseWorkerQueue(existingTaskRun.workerQueue);
 
     try {

internal-packages/clickhouse/src/taskRuns.test.ts

@@ -83,6 +83,7 @@ describe("Task Runs V2", () => {
       "concurrency_key_1234", // concurrency_key
       ["bulk_action_group_id_1234", "bulk_action_group_id_1235"], // bulk_action_group_ids
       "", // worker_queue
+      "", // region
       null, // max_duration_in_seconds
       "", // trigger_source
       "", // root_trigger_source
@@ -215,6 +216,7 @@ describe("Task Runs V2", () => {
       "", // concurrency_key
       [], // bulk_action_group_ids
       "", // worker_queue
+      "", // region
       null, // max_duration_in_seconds
       "", // trigger_source
       "", // root_trigger_source
@@ -270,6 +272,7 @@ describe("Task Runs V2", () => {
       "", // concurrency_key
       [], // bulk_action_group_ids
       "", // worker_queue
+      "", // region
       null, // max_duration_in_seconds
       "", // trigger_source
       "", // root_trigger_source
@@ -372,6 +375,7 @@ describe("Task Runs V2", () => {
         "", // concurrency_key
         [], // bulk_action_group_ids
         "", // worker_queue
+        "", // region
         null, // max_duration_in_seconds
         "", // trigger_source
         "", // root_trigger_source
@@ -482,6 +486,7 @@ describe("Task Runs V2", () => {
         "", // concurrency_key
         [], // bulk_action_group_ids
         "", // worker_queue
+        "", // region
         null, // max_duration_in_seconds
         "", // trigger_source
         "", // root_trigger_source
@@ -536,7 +541,8 @@ describe("Task Runs V2", () => {
         0,
         "",
         [],
-        "",
+        "", // worker_queue
+        "", // region
         null,
         "",
         "",
@@ -597,7 +603,8 @@ describe("Task Runs V2", () => {
         0,
         "",
         [],
-        "",
+        "", // worker_queue
+        "", // region
         null,
         "",
         "",
@@ -652,7 +659,8 @@ describe("Task Runs V2", () => {
         0,
         "",
         [],
-        "",
+        "", // worker_queue
+        "", // region
         null,
         "",
         "",