@vercel/flags-core 1.9.0-da0b044-20260915081607 → 1.9.0

package/dist/{chunk-P6CH6LXX.js → chunk-TDZBUVBG.js}

@@ -1,5 +1,6 @@
 // src/index.next-js.ts
 import { cacheLife } from "next/cache";
+import { after } from "next/server";
 
 // src/evaluate.ts
 import { xxHash32 as hashInput } from "js-xxhash";
@@ -55,7 +56,7 @@ function getSplitBoundaries(outcome) {
 function getCompiledRegex(rhs) {
   const cached = compiledRegexCache.get(rhs);
   if (cached) return cached;
-  const compiled = new RegExp(rhs.pattern, rhs.flags.replace(/[gy]/, ""));
+  const compiled = new RegExp(rhs.pattern, rhs.flags.replace(/[gy]/g, ""));
   compiledRegexCache.set(rhs, compiled);
   return compiled;
 }
@@ -432,7 +433,7 @@ function resolveOutcome(params, outcome) {
           break;
         }
       }
-      if (exhausted) currentPromille = PROMILLE_SCALE;
+      if (exhausted) currentPromille = outcome.finalPromille ?? PROMILLE_SCALE;
       if (currentPromille <= 0) {
         return {
           ...rollFromVariant,
@@ -558,7 +559,7 @@ function bulkEvaluate(flags, shared) {
 }
 
 // package.json
-var version = "1.9.0-da0b044-20260915081607";
+var version = "1.9.0";
 
 // src/lib/report-value.ts
 function internalReportValue(key, value, data) {
@@ -777,7 +778,7 @@ async function bulkEvaluate2(id, flags, entities) {
 }
 
 // src/create-raw-client.ts
-import { waitUntil } from "@vercel/functions";
+import { waitUntil as defaultWaitUntil } from "@vercel/functions";
 import { dequal } from "dequal/lite";
 var idCount = 0;
 async function performInitialize(instance, initFn) {
@@ -793,9 +794,11 @@ function createCreateRawClient(fns) {
   return function createRawClient({
     controller,
     origin,
-    experimental_reportExposures
+    experimental_reportExposures,
+    waitUntil: waitUntil2 = defaultWaitUntil
   }) {
     const id = idCount++;
+    const pendingExposureReports = /* @__PURE__ */ new Set();
     controllerInstanceMap.set(id, {
       controller,
       initialized: false,
@@ -813,8 +816,10 @@ function createCreateRawClient(fns) {
           );
         }
       })();
+      pendingExposureReports.add(pending);
+      void pending.finally(() => pendingExposureReports.delete(pending));
       try {
-        waitUntil(pending);
+        waitUntil2(pending);
       } catch {
       }
     }
@@ -849,6 +854,9 @@ function createCreateRawClient(fns) {
       },
       shutdown: async () => {
         await fns.shutdown(id);
+        while (pendingExposureReports.size > 0) {
+          await Promise.all(pendingExposureReports);
+        }
         controllerInstanceMap.delete(id);
       },
       getDatafile: async () => {
@@ -1013,8 +1021,128 @@ async function readBundledDefinitions(auth) {
 }
 
 // src/utils/ingest.ts
+import { getVercelOidcToken as getVercelOidcToken2 } from "@vercel/oidc";
+
+// src/controller/auth.ts
 import { getVercelOidcToken } from "@vercel/oidc";
 
+// src/utils/sdk-keys.ts
+var SDK_KEY_REGEX = /^vf_(?:server|client)_/;
+function isValidSdkKey(value) {
+  return SDK_KEY_REGEX.test(value);
+}
+var PROJECT_ID_REGEX = /^[A-Za-z0-9_]{1,64}$/;
+function isValidProjectId(value) {
+  return PROJECT_ID_REGEX.test(value);
+}
+function parseFlagsConnectionString(text) {
+  if (SDK_KEY_REGEX.test(text)) return { sdkKey: text, projectId: null };
+  if (!text.startsWith("flags:")) return null;
+  try {
+    const params = new URLSearchParams(text.slice(6));
+    return {
+      sdkKey: params.get("sdkKey") || null,
+      projectId: params.get("projectId") || null
+    };
+  } catch {
+    return null;
+  }
+}
+
+// src/controller/auth.ts
+var SOURCE_PROJECT_HEADER = "X-Vercel-Flags-Project-Id";
+function authHeaders(token, sourceProjectId) {
+  return {
+    Authorization: `Bearer ${token}`,
+    ...sourceProjectId ? { [SOURCE_PROJECT_HEADER]: sourceProjectId } : null
+  };
+}
+function unauthorizedMessage(sourceProjectId) {
+  if (!sourceProjectId) return "unauthorized (401)";
+  return `unauthorized (401): this deployment is not allowed to read the flags of project "${sourceProjectId}". Check the connection string and that the project is connected.`;
+}
+async function getOidcToken() {
+  try {
+    return await getVercelOidcToken();
+  } catch {
+    throw new Error(
+      [
+        "@vercel/flags-core: Failed to get OIDC token.",
+        "Are you running in a Vercel Environment where OIDC tokens are available?",
+        "Did you mean to use an SDK Key instead? Use the environment variable FLAGS or pass it directly to the client."
+      ].join(" ")
+    );
+  }
+}
+function getProjectIdFromOidcToken(oidcToken) {
+  const tokenParts = oidcToken.split(".");
+  if (tokenParts.length !== 3 || !tokenParts[1]) {
+    throw new Error("@vercel/flags-core: Invalid OIDC token");
+  }
+  const payload = JSON.parse(
+    Buffer.from(tokenParts[1], "base64url").toString("utf8")
+  );
+  if (typeof payload.project_id !== "string" || !payload.project_id) {
+    throw new Error(
+      "@vercel/flags-core: Missing project_id claim in OIDC token"
+    );
+  }
+  return payload.project_id;
+}
+var Authentication = class {
+  sdkKey;
+  sourceProjectId;
+  constructor(sdkKeyOrConnectionString) {
+    if (sdkKeyOrConnectionString !== void 0) {
+      if (typeof sdkKeyOrConnectionString !== "string") {
+        throw new Error(
+          `@vercel/flags-core: Invalid sdkKey. Expected string, got ${typeof sdkKeyOrConnectionString}`
+        );
+      }
+      const parsed = parseFlagsConnectionString(sdkKeyOrConnectionString);
+      if (parsed?.sdkKey && parsed.projectId) {
+        throw new Error(
+          "@vercel/flags-core: A connection string must contain either sdkKey or projectId, not both"
+        );
+      }
+      if (parsed?.sdkKey) {
+        if (!isValidSdkKey(parsed.sdkKey)) {
+          throw new Error("@vercel/flags-core: Missing sdkKey");
+        }
+        this.sdkKey = parsed.sdkKey;
+      } else if (parsed?.projectId) {
+        if (!isValidProjectId(parsed.projectId)) {
+          throw new Error(
+            "@vercel/flags-core: Invalid projectId in connection string"
+          );
+        }
+        this.sourceProjectId = parsed.projectId;
+      } else {
+        throw new Error("@vercel/flags-core: Missing sdkKey");
+      }
+    }
+  }
+  async resolveToken() {
+    if (this.sdkKey) {
+      return this.sdkKey;
+    }
+    return await getOidcToken();
+  }
+  async resolveBundledDefinitionsLookup() {
+    if (this.sdkKey) {
+      return { type: "sdk-key", sdkKey: this.sdkKey };
+    }
+    if (this.sourceProjectId) {
+      return { type: "project-id", projectId: this.sourceProjectId };
+    }
+    const oidcToken = await this.resolveToken();
+    return {
+      type: "project-id",
+      projectId: getProjectIdFromOidcToken(oidcToken)
+    };
+  }
+};
+
 // src/utils/backoff.ts
 var DEFAULT_BASE_MS = 250;
 var DEFAULT_CAP_MS = 5e3;
@@ -1030,6 +1158,20 @@ function getJitteredWaitMs(baseMs, ratio) {
   return Math.floor(min + Math.random() * span);
 }
 
+// src/utils/runtime-ingest.ts
+var FLAGS_CONTEXT_SYMBOL = /* @__PURE__ */ Symbol.for("@vercel/flags-context");
+function getRuntimeIngestFor(auth) {
+  return auth.sourceProjectId ? void 0 : getRuntimeIngest();
+}
+function getRuntimeIngest() {
+  try {
+    const context = globalThis[FLAGS_CONTEXT_SYMBOL];
+    return typeof context?.ingest === "function" ? context.ingest : void 0;
+  } catch {
+    return void 0;
+  }
+}
+
 // src/utils/ingest.ts
 var MAX_RETRIES = 3;
 var MAX_EVENTS_PER_REQUEST = 2e3;
@@ -1043,7 +1185,7 @@ var debugLog = (...args) => {
 async function getEvaluatingOidcToken(auth) {
   if (!auth.sdkKey) return void 0;
   try {
-    return await getVercelOidcToken();
+    return await getVercelOidcToken2();
   } catch {
     return void 0;
   }
@@ -1053,7 +1195,7 @@ async function getIngestHeaders(options, flushReason) {
   const evaluatingOidcToken = await getEvaluatingOidcToken(options.auth);
   return {
     "Content-Type": "application/json",
-    Authorization: `Bearer ${token}`,
+    ...authHeaders(token, options.auth.sourceProjectId),
     "User-Agent": `VercelFlagsCore/${version}`,
     [FLUSH_REASON_HEADER]: flushReason,
     ...options.metricEnvironment ?? process.env.VERCEL_ENV ? {
@@ -1063,8 +1205,28 @@ async function getIngestHeaders(options, flushReason) {
     ...isDebugMode ? { "x-vercel-debug-ingest": "1" } : null
   };
 }
+function getRuntimeIngestHeaders(options, flushReason) {
+  return {
+    "Content-Type": "application/json",
+    ...options.auth.sdkKey ? { Authorization: `Bearer ${options.auth.sdkKey}` } : null,
+    "User-Agent": `VercelFlagsCore/${version}`,
+    [FLUSH_REASON_HEADER]: flushReason,
+    ...options.metricEnvironment ?? process.env.VERCEL_ENV ? {
+      "X-Vercel-Env": options.metricEnvironment ?? process.env.VERCEL_ENV
+    } : null,
+    ...isDebugMode ? { "x-vercel-debug-ingest": "1" } : null
+  };
+}
 async function sendIngestEvents(options, events, flushId, flushReason) {
-  const eventsToSend = events.map((event) => event.ingestEvent());
+  let eventsToSend = events.map((event) => event.ingestEvent());
+  const runtimeIngest = getRuntimeIngestFor(options.auth);
+  if (runtimeIngest) {
+    const headers = getRuntimeIngestHeaders(options, flushReason);
+    eventsToSend = eventsToSend.filter(
+      (event) => !runtimeIngest({ headers, body: [event] })
+    );
+    if (eventsToSend.length === 0) return;
+  }
   for (let i = 0; i < eventsToSend.length; i += MAX_EVENTS_PER_REQUEST) {
     await sendIngestChunk(
       options,
@@ -1128,15 +1290,17 @@ function getRequestContext() {
 }
 
 // src/utils/scheduler.ts
-import { waitUntil as waitUntil2 } from "@vercel/functions";
+import { waitUntil } from "@vercel/functions";
 var IDLE_FLUSH_WAIT_MS = 5e3;
 var IDLE_FLUSH_JITTER_RATIO = 0.2;
 var MAX_FLUSH_WAIT_MS = 6e4;
 var Scheduler = class {
-  constructor(onFlush) {
+  constructor(onFlush, scheduleTask = waitUntil) {
     this.onFlush = onFlush;
+    this.scheduleTask = scheduleTask;
   }
   onFlush;
+  scheduleTask;
   resolveWait = null;
   pending = null;
   idleTimeout = null;
@@ -1151,7 +1315,7 @@ var Scheduler = class {
         await this.onFlush(reason);
       })();
       try {
-        waitUntil2(this.pending);
+        this.scheduleTask(this.pending);
       } catch {
       }
       this.maxTimeout = setTimeout(
@@ -1298,12 +1462,18 @@ var UsageTracker = class {
   flushCount = 0;
   options;
   scheduler;
+  waitUntil;
+  inflightFlushes = /* @__PURE__ */ new Set();
   trackedRequests = /* @__PURE__ */ new WeakSet();
   readEvents = [];
   evaluationEvents = /* @__PURE__ */ new Map();
   constructor(options) {
     this.options = options;
-    this.scheduler = new Scheduler((reason) => this.flushEvents(reason));
+    this.waitUntil = options.waitUntil;
+    this.scheduler = new Scheduler(
+      (reason) => this.flushEvents(reason),
+      options.waitUntil
+    );
   }
   /**
    * Triggers an immediate flush of any pending events.
@@ -1312,6 +1482,7 @@ var UsageTracker = class {
   async shutdown() {
     await this.scheduler.shutdown();
     await this.flushEvents("shutdown");
+    await Promise.all([...this.inflightFlushes]);
   }
   /**
    * Tracks a config read event. Deduplicates by request context.
@@ -1323,7 +1494,7 @@ var UsageTracker = class {
       if (this.trackedRequests.has(ctx)) return;
       this.trackedRequests.add(ctx);
       this.readEvents.push(new FlagsConfigReadEvent(headers, options));
-      this.scheduler.scheduleFlush();
+      this.requestFlush();
     } catch (error) {
       console.error("@vercel/flags-core: Failed to record event:", error);
     }
@@ -1347,7 +1518,7 @@ var UsageTracker = class {
           new FlagsEvaluationEvent(bucketedOptions)
         );
       }
-      this.scheduler.scheduleFlush();
+      this.requestFlush();
     } catch (error) {
       console.error(
         "@vercel/flags-core: Failed to record evaluation event:",
@@ -1355,6 +1526,25 @@ var UsageTracker = class {
       );
     }
   }
+  /**
+   * Flushes immediately when the runtime provides an ingest transport,
+   * otherwise falls back to the time-based scheduler.
+   */
+  requestFlush() {
+    if (getRuntimeIngestFor(this.options.auth)) {
+      const flush = this.flushEvents("immediate").catch((error) => {
+        console.error("@vercel/flags-core: Failed to flush events:", error);
+      });
+      this.inflightFlushes.add(flush);
+      void flush.finally(() => this.inflightFlushes.delete(flush));
+      try {
+        this.waitUntil?.(flush);
+      } catch {
+      }
+    } else {
+      this.scheduler.scheduleFlush();
+    }
+  }
   /**
    * Send all events to the ingest service
    */
@@ -1442,169 +1632,94 @@ var BundledSource = class {
 
 // src/controller/fetch-datafile.ts
 var DEFAULT_FETCH_TIMEOUT_MS = 1e4;
+var DEFAULT_MAX_ATTEMPTS = 3;
+var DatafileHttpError = class extends Error {
+  constructor(status, statusText) {
+    super(`Failed to fetch data: ${statusText}`);
+    this.status = status;
+  }
+  status;
+  get retryable() {
+    return this.status === 408 || this.status === 429 || this.status >= 500;
+  }
+};
 async function fetchDatafile(options) {
-  const token = await options.auth.resolveToken();
+  options.signal?.throwIfAborted();
+  const maxAttempts = options.maxAttempts ?? DEFAULT_MAX_ATTEMPTS;
+  if (!Number.isInteger(maxAttempts) || maxAttempts < 1) {
+    throw new Error("maxAttempts must be a positive integer");
+  }
   const controller = new AbortController();
+  const { signal } = controller;
+  let rejectAbort;
+  const aborted = new Promise((_, reject) => {
+    rejectAbort = reject;
+  });
+  const onAbort = () => rejectAbort(signal.reason);
+  signal.addEventListener("abort", onAbort, { once: true });
+  const onExternalAbort = () => controller.abort(options.signal?.reason);
+  options.signal?.addEventListener("abort", onExternalAbort, { once: true });
   const timeoutId = setTimeout(
-    () => controller.abort(),
+    () => controller.abort(
+      new Error("@vercel/flags-core: Datafile fetch deadline exceeded")
+    ),
     DEFAULT_FETCH_TIMEOUT_MS
   );
-  const onExternalAbort = () => controller.abort();
-  if (options.signal) {
-    if (options.signal.aborted) {
-      clearTimeout(timeoutId);
-      throw new Error("Fetch aborted");
-    }
-    options.signal.addEventListener("abort", onExternalAbort, { once: true });
-  }
-  try {
+  let delay;
+  const fetchAttempt = async () => {
+    const token = await options.auth.resolveToken();
+    signal.throwIfAborted();
     const res = await options.fetch(`${options.host}/v1/datafile`, {
       headers: {
-        Authorization: `Bearer ${token}`,
+        ...authHeaders(token, options.auth.sourceProjectId),
         "User-Agent": `VercelFlagsCore/${version}`,
         ...process.env.VERCEL_ENV ? { "X-Vercel-Env": process.env.VERCEL_ENV } : null
       },
-      signal: controller.signal
+      signal
     });
-    clearTimeout(timeoutId);
-    options.signal?.removeEventListener("abort", onExternalAbort);
+    signal.throwIfAborted();
     if (!res.ok) {
-      throw new Error(`Failed to fetch data: ${res.statusText}`);
-    }
-    return res.json();
-  } catch (error) {
-    clearTimeout(timeoutId);
-    options.signal?.removeEventListener("abort", onExternalAbort);
-    throw error instanceof Error ? error : new Error("Unknown fetch error");
-  }
-}
-
-// src/controller/header-source.ts
-import { waitUntil as waitUntil3 } from "@vercel/functions";
-
-// src/controller/tagged-data.ts
-function tagData(data, origin) {
-  return Object.assign(data, { _origin: origin });
-}
-function originToMetricsSource(origin) {
-  switch (origin) {
-    case "stream":
-    case "poll":
-    case "provided":
-      return "in-memory";
-    case "fetched":
-      return "remote";
-    case "bundled":
-      return "embedded";
-  }
-}
-
-// src/controller/typed-emitter.ts
-var TypedEmitter = class {
-  handlers = /* @__PURE__ */ new Map();
-  on(event, handler) {
-    let set = this.handlers.get(event);
-    if (!set) {
-      set = /* @__PURE__ */ new Set();
-      this.handlers.set(event, set);
-    }
-    set.add(handler);
-  }
-  off(event, handler) {
-    this.handlers.get(event)?.delete(handler);
-  }
-  emit(event, ...args) {
-    const set = this.handlers.get(event);
-    if (set) {
-      for (const handler of set) {
-        handler(...args);
-      }
+      void res.body?.cancel().catch(() => {
+      });
+      throw new DatafileHttpError(
+        res.status,
+        res.status === 401 && options.auth.sourceProjectId ? unauthorizedMessage(options.auth.sourceProjectId) : res.statusText
+      );
     }
-  }
-};
-
-// src/controller/header-source.ts
-var HeaderSource = class extends TypedEmitter {
-  options;
-  abortController;
-  promise;
-  constructor(options) {
-    super();
-    this.options = options;
-  }
-  fetchDatafile() {
-    if (this.promise) return this.promise;
-    const abortController = new AbortController();
-    this.abortController = abortController;
-    this.promise = fetchDatafile({
-      ...this.options,
-      signal: abortController.signal
-    }).then((data) => {
-      abortController.signal.throwIfAborted();
-      this.emit("data", data);
-      return data;
-    }).finally(() => {
-      if (this.abortController === abortController) {
-        this.promise = void 0;
-        this.abortController = void 0;
+    const data = await res.json();
+    signal.throwIfAborted();
+    return data;
+  };
+  try {
+    for (let attempt = 0; ; attempt++) {
+      if (attempt > 0) {
+        await Promise.race([
+          new Promise((resolve) => {
+            delay = setTimeout(resolve, 100 * 2 ** (attempt - 1));
+          }),
+          aborted
+        ]);
       }
-    });
-    return this.promise;
-  }
-  getUpdatedAtHeader(projectId) {
-    const ctx = getRequestContext();
-    const header = ctx.headers?.["x-vercel-flags-config-versions"] ?? ctx.headers?.["flags-config-versions"];
-    if (!header) {
-      return;
-    }
-    const prefix = `flags_${projectId}=`;
-    const value = header.split(";").map((part) => part.trim()).find((part) => part.startsWith(prefix))?.slice(prefix.length);
-    const timestamp = Number(value);
-    return Number.isFinite(timestamp) && timestamp > 0 ? timestamp : void 0;
-  }
-  async resolveData(currentData) {
-    if (!currentData.configUpdatedAt) {
-      return;
-    }
-    const updatedAtHeader = this.getUpdatedAtHeader(currentData.projectId);
-    if (!updatedAtHeader) {
-      return;
-    }
-    const currentUpdatedAt = Number(currentData.configUpdatedAt);
-    if (updatedAtHeader <= currentUpdatedAt) {
-      return [currentData, "HIT"];
-    }
-    if (updatedAtHeader <= currentUpdatedAt + 1e4) {
-      const pending = this.fetchDatafile();
-      const signal = this.abortController?.signal;
-      const background = pending.catch((error) => {
-        if (!signal?.aborted) {
-          console.error("@vercel/flags-core: Header refresh failed:", error);
+      signal.throwIfAborted();
+      try {
+        return await Promise.race([fetchAttempt(), aborted]);
+      } catch (error) {
+        signal.throwIfAborted();
+        if (attempt === maxAttempts - 1 || error instanceof DatafileHttpError && !error.retryable) {
+          throw error instanceof Error ? error : new Error("Unknown fetch error");
         }
-      });
-      waitUntil3(background);
-      return [currentData, "STALE"];
+      }
     }
-    const data = await this.fetchDatafile();
-    return [tagData(data, "fetched"), "MISS"];
-  }
-  read(currentData) {
-    return this.resolveData(currentData);
-  }
-  isAvailable(projectId) {
-    return !!this.getUpdatedAtHeader(projectId);
-  }
-  /**
-   * Abort the current header-driven fetch and discard its pending work.
-   */
-  stop() {
-    this.abortController?.abort();
-    this.abortController = void 0;
-    this.promise = void 0;
+  } finally {
+    clearTimeout(timeoutId);
+    clearTimeout(delay);
+    signal.removeEventListener("abort", onAbort);
+    options.signal?.removeEventListener("abort", onExternalAbort);
   }
-};
+}
 
 // src/controller/normalized-options.ts
+import { waitUntil as defaultWaitUntil2 } from "@vercel/functions";
 var DEFAULT_STREAM_INIT_TIMEOUT_MS = 3e3;
 var DEFAULT_POLLING_INTERVAL_MS = 3e4;
 var MIN_POLLING_INTERVAL_MS = 3e4;
@@ -1648,6 +1763,7 @@ function normalizeOptions(options) {
     polling,
     buildStep,
     fetch: options.fetch ?? globalThis.fetch,
+    waitUntil: options.waitUntil ?? defaultWaitUntil2,
     host: "https://flags.vercel.com",
     metricEnvironment: options.metricEnvironment,
     clientName: options.clientName,
@@ -1655,6 +1771,35 @@ function normalizeOptions(options) {
   };
 }
 
+// src/controller/typed-emitter.ts
+var TypedEmitter = class {
+  handlers = /* @__PURE__ */ new Map();
+  on(event, handler) {
+    let set = this.handlers.get(event);
+    if (!set) {
+      set = /* @__PURE__ */ new Set();
+      this.handlers.set(event, set);
+    }
+    set.add(handler);
+  }
+  off(event, handler) {
+    const set = this.handlers.get(event);
+    if (!set) return;
+    set.delete(handler);
+    if (set.size === 0) {
+      this.handlers.delete(event);
+    }
+  }
+  emit(event, ...args) {
+    const set = this.handlers.get(event);
+    if (set) {
+      for (const handler of set) {
+        handler(...args);
+      }
+    }
+  }
+};
+
 // src/controller/polling-source.ts
 var PollingSource = class extends TypedEmitter {
   config;
@@ -1670,13 +1815,16 @@ var PollingSource = class extends TypedEmitter {
    */
   async poll() {
     if (this.abortController?.signal.aborted) return;
+    this.abortController ??= new AbortController();
+    const controller = this.abortController;
     try {
       const data = await fetchDatafile({
         ...this.config,
-        signal: this.abortController?.signal
+        signal: controller.signal
       });
       this.emit("data", data);
     } catch (error) {
+      controller.signal.throwIfAborted();
       const err = error instanceof Error ? error : new Error("Unknown poll error");
       this.emit("error", err);
     }
@@ -1688,9 +1836,9 @@ var PollingSource = class extends TypedEmitter {
    */
   startInterval() {
     if (this.intervalId) return;
-    this.abortController = new AbortController();
     this.intervalId = setInterval(
-      () => void this.poll(),
+      () => void this.poll().catch(() => {
+      }),
       this.config.polling.intervalMs
     );
   }
@@ -1731,8 +1879,8 @@ function backoff(retryCount) {
   return delay + Math.random() * 1e3;
 }
 var UnauthorizedError = class extends Error {
-  constructor() {
-    super("stream: unauthorized (401)");
+  constructor(sourceProjectId) {
+    super(`stream: ${unauthorizedMessage(sourceProjectId)}`);
     this.name = "UnauthorizedError";
   }
 };
@@ -1792,7 +1940,7 @@ async function connectStream(config, callbacks) {
           throw new TokenResolutionError(error);
         });
         const headers = {
-          Authorization: `Bearer ${token}`,
+          ...authHeaders(token, config.sourceProjectId),
           "User-Agent": `VercelFlagsCore/${version}`,
           "X-Retry-Attempt": String(retryCount)
         };
@@ -1814,7 +1962,7 @@ async function connectStream(config, callbacks) {
         if (!response.ok) {
           if (response.status === 401) {
             if (!initialDataReceived) {
-              rejectInit(new UnauthorizedError());
+              rejectInit(new UnauthorizedError(config.sourceProjectId));
             }
             abortController.abort();
             break;
@@ -1958,6 +2106,7 @@ var StreamSource = class extends TypedEmitter {
         {
           host: this.options.host,
           resolveToken: () => this.options.auth.resolveToken(),
+          sourceProjectId: this.options.auth.sourceProjectId,
           abortController,
           fetch: this.options.fetch,
           revision: this.revision
@@ -1994,6 +2143,23 @@ var StreamSource = class extends TypedEmitter {
   }
 };
 
+// src/controller/tagged-data.ts
+function tagData(data, origin) {
+  return Object.assign(data, { _origin: origin });
+}
+function originToMetricsSource(origin) {
+  switch (origin) {
+    case "stream":
+    case "poll":
+    case "provided":
+      return "in-memory";
+    case "fetched":
+      return "remote";
+    case "bundled":
+      return "embedded";
+  }
+}
+
 // src/controller/index.ts
 function parseConfigUpdatedAt(value) {
   if (typeof value === "number") return value;
@@ -2018,14 +2184,14 @@ var Controller = class {
   streamSource;
   pollingSource;
   bundledSource;
-  headerSource;
   // Usage tracking
   usageTracker;
   isFirstGetData = true;
   // Build-step deduplication
   buildDataPromise = null;
   buildReadTracked = false;
-  // Suppresses usage tracking when the SDK key is unauthorized
+  // Suppresses usage tracking while the credential is rejected. Set on a 401
+  // from any source, cleared as soon as a source delivers data again.
   unauthorized = false;
   constructor(options) {
     this.options = normalizeOptions(options);
@@ -2038,7 +2204,6 @@ var Controller = class {
       auth: this.options.auth,
       readBundledDefinitions
     });
-    this.headerSource = new HeaderSource(this.options);
     this.wireSourceEvents();
     if (this.options.datafile) {
       this.data = tagData(this.options.datafile, "provided");
@@ -2047,11 +2212,13 @@ var Controller = class {
   }
   // Source event handlers (stored for cleanup)
   onStreamData = (data) => {
+    this.unauthorized = false;
     if (this.isNewerData(data)) {
       this.data = tagData(data, "stream");
     }
   };
   onStreamPrimed = () => {
+    this.unauthorized = false;
     if (this.state === "degraded" || this.state === "initializing:stream") {
       this.transition("streaming");
     }
@@ -2067,18 +2234,15 @@ var Controller = class {
     }
   };
   onPollData = (data) => {
+    this.unauthorized = false;
     if (this.isNewerData(data)) {
       this.data = tagData(data, "poll");
     }
   };
   onPollError = (error) => {
+    this.noteUnauthorized(error);
     console.error("@vercel/flags-core: Poll failed:", error);
   };
-  onFetchedData = (data) => {
-    if (this.isNewerData(data)) {
-      this.data = tagData(data, "fetched");
-    }
-  };
   // ---------------------------------------------------------------------------
   // Source event wiring
   // ---------------------------------------------------------------------------
@@ -2089,7 +2253,6 @@ var Controller = class {
     this.streamSource.on("disconnected", this.onStreamDisconnected);
     this.pollingSource.on("data", this.onPollData);
     this.pollingSource.on("error", this.onPollError);
-    this.headerSource.on("data", this.onFetchedData);
   }
   unwireSourceEvents() {
     this.streamSource.off("data", this.onStreamData);
@@ -2098,7 +2261,6 @@ var Controller = class {
     this.streamSource.off("disconnected", this.onStreamDisconnected);
     this.pollingSource.off("data", this.onPollData);
     this.pollingSource.off("error", this.onPollError);
-    this.headerSource.off("data", this.onFetchedData);
   }
   // ---------------------------------------------------------------------------
   // State machine
@@ -2116,8 +2278,6 @@ var Controller = class {
         return "streaming";
       case "polling":
         return "polling";
-      case "vercel":
-        return "vercel";
       default:
         return "offline";
     }
@@ -2153,9 +2313,7 @@ var Controller = class {
       }
     }
     if (this.data) {
-      if (this.headerSource.isAvailable(this.data.projectId)) {
-        this.transition("vercel");
-      } else if (this.options.stream.enabled) {
+      if (this.options.stream.enabled) {
         this.transition("initializing:stream");
         await this.tryInitializeStream();
       } else if (this.options.polling.enabled) {
@@ -2218,7 +2376,6 @@ var Controller = class {
     this.unwireSourceEvents();
     this.streamSource.stop();
     this.pollingSource.stop();
-    this.headerSource.stop();
     this.data = this.options.datafile ? tagData(this.options.datafile, "provided") : void 0;
     this.transition("shutdown");
     await this.usageTracker.shutdown();
@@ -2254,9 +2411,10 @@ var Controller = class {
           this.data = tagData(fetched, "fetched");
           result = this.data;
           cacheStatus = "MISS";
-        } catch {
-          throw new Error(
-            "@vercel/flags-core: No flag definitions available. Initialize the client or provide a datafile."
+        } catch (error) {
+          this.noteUnauthorized(error);
+          throw this.noDefinitionsError(
+            ". Initialize the client or provide a datafile."
           );
         }
       }
@@ -2300,12 +2458,6 @@ var Controller = class {
       return this.resolveDataForBuildStep();
     }
     if (this.data) {
-      if (this.mode === "vercel") {
-        const data = await this.headerSource.read(this.data);
-        if (data) {
-          return data;
-        }
-      }
       const cacheStatus = this.isConnected ? "HIT" : "STALE";
       return [this.data, cacheStatus];
     }
@@ -2324,9 +2476,7 @@ var Controller = class {
         await this.streamSource.start();
         return true;
       } catch (error) {
-        if (error instanceof UnauthorizedError) {
-          this.unauthorized = true;
-        }
+        this.noteUnauthorized(error);
         return false;
       }
     }
@@ -2354,9 +2504,7 @@ var Controller = class {
       return true;
     } catch (error) {
       clearTimeout(timeoutId);
-      if (error instanceof Error && error.message.includes("401")) {
-        this.unauthorized = true;
-      }
+      this.noteUnauthorized(error);
       return false;
     }
   }
@@ -2409,6 +2557,11 @@ var Controller = class {
       return false;
     }
   }
+  noteUnauthorized(error) {
+    if (error instanceof UnauthorizedError || error instanceof Error && error.message.includes("401")) {
+      this.unauthorized = true;
+    }
+  }
   // ---------------------------------------------------------------------------
   // Build step helpers
   // ---------------------------------------------------------------------------
@@ -2454,10 +2607,11 @@ var Controller = class {
         fetch: this.options.fetch
       });
       return tagData(fetched, "fetched");
-    } catch {
+    } catch (error) {
+      this.noteUnauthorized(error);
     }
-    throw new Error(
-      "@vercel/flags-core: No flag definitions available during build. Provide a datafile or bundled definitions."
+    throw this.noDefinitionsError(
+      " during build. Provide a datafile or bundled definitions."
     );
   }
   // ---------------------------------------------------------------------------
@@ -2491,8 +2645,17 @@ var Controller = class {
       } catch {
       }
     }
-    throw new Error(
-      "@vercel/flags-core: No flag definitions available. Bundled definitions not found."
+    throw this.noDefinitionsError(". Bundled definitions not found.");
+  }
+  /**
+   * `detail` continues the sentence "No flag definitions available", so it
+   * starts with either "." or " during build.".
+   */
+  noDefinitionsError(detail) {
+    const { sourceProjectId } = this.options.auth;
+    const reason = this.unauthorized && sourceProjectId ? ` Request was ${unauthorizedMessage(sourceProjectId)}` : "";
+    return new Error(
+      `@vercel/flags-core: No flag definitions available${detail}${reason}`
     );
   }
   /**
@@ -2543,8 +2706,8 @@ var Controller = class {
       } catch {
       }
     }
-    throw new Error(
-      "@vercel/flags-core: No flag definitions available. Provide a datafile or bundled definitions."
+    throw this.noDefinitionsError(
+      ". Provide a datafile or bundled definitions."
     );
   }
   // ---------------------------------------------------------------------------
@@ -2617,90 +2780,8 @@ var Controller = class {
   }
 };
 
-// src/controller/auth.ts
-import { getVercelOidcToken as getVercelOidcToken2 } from "@vercel/oidc";
-
-// src/utils/sdk-keys.ts
-var SDK_KEY_REGEX = /^vf_(?:server|client)_/;
-function parseSdkKeyFromFlagsConnectionString(text) {
-  if (SDK_KEY_REGEX.test(text)) return text;
-  try {
-    if (!text.startsWith("flags:")) return null;
-    const params = new URLSearchParams(text.slice(6));
-    const sdkKey = params.get("sdkKey");
-    if (sdkKey && SDK_KEY_REGEX.test(sdkKey)) return sdkKey;
-  } catch {
-  }
-  return null;
-}
-
-// src/controller/auth.ts
-async function getOidcToken() {
-  try {
-    return await getVercelOidcToken2();
-  } catch {
-    throw new Error(
-      [
-        "@vercel/flags-core: Failed to get OIDC token.",
-        "Are you running in a Vercel Environment where OIDC tokens are available?",
-        "Did you mean to use an SDK Key instead? Use the environment variable FLAGS or pass it directly to the client."
-      ].join(" ")
-    );
-  }
-}
-function getProjectIdFromOidcToken(oidcToken) {
-  const tokenParts = oidcToken.split(".");
-  if (tokenParts.length !== 3 || !tokenParts[1]) {
-    throw new Error("@vercel/flags-core: Invalid OIDC token");
-  }
-  const payload = JSON.parse(
-    Buffer.from(tokenParts[1], "base64url").toString("utf8")
-  );
-  if (typeof payload.project_id !== "string" || !payload.project_id) {
-    throw new Error(
-      "@vercel/flags-core: Missing project_id claim in OIDC token"
-    );
-  }
-  return payload.project_id;
-}
-var Authentication = class {
-  sdkKey;
-  constructor(sdkKeyOrConnectionString) {
-    if (sdkKeyOrConnectionString !== void 0) {
-      if (typeof sdkKeyOrConnectionString !== "string") {
-        throw new Error(
-          `@vercel/flags-core: Invalid sdkKey. Expected string, got ${typeof sdkKeyOrConnectionString}`
-        );
-      }
-      const parsed = parseSdkKeyFromFlagsConnectionString(
-        sdkKeyOrConnectionString
-      );
-      if (!parsed) {
-        throw new Error("@vercel/flags-core: Missing sdkKey");
-      }
-      this.sdkKey = parsed;
-    }
-  }
-  async resolveToken() {
-    if (this.sdkKey) {
-      return this.sdkKey;
-    }
-    return await getOidcToken();
-  }
-  async resolveBundledDefinitionsLookup() {
-    if (this.sdkKey) {
-      return { type: "sdk-key", sdkKey: this.sdkKey };
-    }
-    const oidcToken = await this.resolveToken();
-    return {
-      type: "project-id",
-      projectId: getProjectIdFromOidcToken(oidcToken)
-    };
-  }
-};
-
 // src/index.make.ts
-function make(createRawClient) {
+function make(createRawClient, defaults) {
   let _defaultFlagsClient = null;
   function createClient2(sdkKeyOrConnectionStringOrOptions, options) {
     const optionsOnly = typeof sdkKeyOrConnectionStringOrOptions === "object" && sdkKeyOrConnectionStringOrOptions !== null;
@@ -2708,10 +2789,20 @@ function make(createRawClient) {
     const createClientOptions = optionsOnly ? sdkKeyOrConnectionStringOrOptions : options;
     const { experimental_reportExposures, ...controllerOptions } = createClientOptions ?? {};
     const auth = new Authentication(sdkKeyOrConnectionString);
-    const controller = new Controller({ auth, ...controllerOptions });
+    const waitUntil2 = controllerOptions.waitUntil ?? defaults.waitUntil;
+    const controller = new Controller({
+      auth,
+      ...controllerOptions,
+      waitUntil: waitUntil2
+    });
     return createRawClient({
       controller,
-      origin: { provider: "vercel", sdkKey: auth.sdkKey },
+      origin: {
+        provider: "vercel",
+        sdkKey: auth.sdkKey,
+        ...auth.sourceProjectId ? { projectId: auth.sourceProjectId } : null
+      },
+      waitUntil: waitUntil2,
       ...experimental_reportExposures ? { experimental_reportExposures } : {}
     });
   }
@@ -2774,7 +2865,8 @@ var cachedFns = {
   }
 };
 var { flagsClient, resetDefaultFlagsClient, createClient } = make(
-  createCreateRawClient(cachedFns)
+  createCreateRawClient(cachedFns),
+  { waitUntil: after }
 );
 
 export {
@@ -2787,4 +2879,4 @@ export {
   resetDefaultFlagsClient,
   createClient
 };
-//# sourceMappingURL=chunk-P6CH6LXX.js.map
+//# sourceMappingURL=chunk-TDZBUVBG.js.map