@omnicross/daemon 0.3.1 → 0.4.0

package/dist/index.js

@@ -18,14 +18,14 @@ import { setSubscriptionRegistryForOutbound } from "@omnicross/core/outbound-api
 import { getSharedAccountHealth as getSharedAccountHealth4 } from "@omnicross/core/pipeline/SubscriptionAccountHealth";
 import {
   __resetSharedAccountAllowanceStoreForTests,
-  AccountAllowanceStore as AccountAllowanceStore6,
+  AccountAllowanceStore as AccountAllowanceStore8,
   setSharedAccountAllowanceStore
 } from "@omnicross/core/pipeline/AccountAllowanceStore";
 import {
   __resetSharedAccountAllowanceSchedulingForTests,
   getSharedAccountAllowanceScheduling as getSharedAccountAllowanceScheduling5
 } from "@omnicross/core/pipeline/AccountAllowanceScheduling";
-import { fetchUpstream as fetchUpstream11, setUpstreamProxyResolver } from "@omnicross/core/pipeline/upstreamFetch";
+import { fetchUpstream as fetchUpstream13, setUpstreamProxyResolver } from "@omnicross/core/pipeline/upstreamFetch";
 import { __resetSharedIdentityStoreForTests } from "@omnicross/core/provider-proxy/identity/SubscriptionIdentityStore";
 import { setGeminiCodeAssistResolver } from "@omnicross/core/ports/gemini-code-assist-resolver";
 import {
@@ -230,9 +230,188 @@ function handleKimiOAuthStatus(sessionId, deps) {
   return { status: 200, body: { state: s.status, ...s.error ? { message: s.error } : {} } };
 }
 
+// src/admin/accountsGrokOAuth.ts
+import { grokOAuth } from "@omnicross/subscriptions";
+function err3(status, message) {
+  return { status, body: { error: { type: "admin_api_error", message } } };
+}
+var DEFAULT_GROK_OAUTH_TTL_MS = 15 * 6e4;
+async function handleGrokOAuthStart(deps) {
+  if (deps.grokSessions.isBusy()) {
+    return err3(409, "a grok sign-in is already in progress \u2014 finish it in the browser or cancel it");
+  }
+  const fetchImpl = deps.oauthExchangeFetch("grok");
+  let tokenEndpoint;
+  try {
+    tokenEndpoint = await grokOAuth.resolveGrokTokenEndpoint(fetchImpl);
+  } catch (e) {
+    const reason = e instanceof Error ? e.message : "OIDC discovery failed";
+    return err3(502, `grok token-endpoint discovery failed: ${reason}`);
+  }
+  let authorization;
+  try {
+    authorization = await grokOAuth.requestGrokDeviceAuthorization(fetchImpl);
+  } catch (e) {
+    const reason = e instanceof Error ? e.message : "device authorization failed";
+    return err3(502, `grok device authorization failed: ${reason}`);
+  }
+  const { sessionId, signal } = deps.grokSessions.begin();
+  void runGrokDevicePoll(sessionId, tokenEndpoint, authorization.deviceCode, signal, deps).catch((e) => {
+    const reason = e instanceof Error ? e.message : "grok sign-in failed";
+    deps.grokSessions.settle(sessionId, "error", reason);
+  });
+  return {
+    status: 200,
+    body: {
+      authUrl: authorization.verificationUriComplete ?? authorization.verificationUri,
+      userCode: authorization.userCode,
+      sessionId
+    }
+  };
+}
+async function runGrokDevicePoll(sessionId, tokenEndpoint, deviceCode, signal, deps) {
+  const fetchImpl = deps.oauthExchangeFetch("grok");
+  const result = await grokOAuth.awaitGrokDeviceToken(
+    { userCode: "", deviceCode, verificationUri: "" },
+    tokenEndpoint,
+    fetchImpl,
+    {
+      deadlineMs: DEFAULT_GROK_OAUTH_TTL_MS,
+      sleep: (ms) => new Promise((resolve10, reject) => {
+        const onAbort = () => {
+          clearTimeout(timer);
+          reject(new Error("login: cancelled"));
+        };
+        const timer = setTimeout(() => {
+          signal.removeEventListener("abort", onAbort);
+          resolve10();
+        }, ms);
+        signal.addEventListener("abort", onAbort, { once: true });
+      })
+    }
+  );
+  const block = {
+    authMethod: "oauth",
+    status: "authorized",
+    accessToken: result.accessToken,
+    refreshToken: result.refreshToken,
+    expiresAt: new Date(Date.now() + result.expiresIn * 1e3).toISOString(),
+    accountId: grokOAuth.grokAccountIdFromAccessToken(result.accessToken),
+    lastRefreshedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  await deps.subscriptionAccountAppender.appendProviderAccount("grok", block);
+  deps.grokSessions.settle(sessionId, "done");
+}
+function handleGrokOAuthCancel(sessionId, deps) {
+  if (!deps.grokSessions.cancel(sessionId)) return err3(404, "unknown or expired grok sign-in session");
+  return { status: 200, body: { ok: true } };
+}
+function handleGrokOAuthStatus(sessionId, deps) {
+  const s = deps.grokSessions.get(sessionId);
+  if (!s) return err3(404, "unknown or expired grok sign-in session");
+  return { status: 200, body: { state: s.status, ...s.error ? { message: s.error } : {} } };
+}
+
+// src/admin/accountsCopilotOAuth.ts
+import { copilotOAuth } from "@omnicross/subscriptions";
+function err4(status, message) {
+  return { status, body: { error: { type: "admin_api_error", message } } };
+}
+var DEFAULT_COPILOT_OAUTH_TTL_MS = 15 * 6e4;
+async function handleCopilotOAuthStart(deps, enterpriseUrlInput) {
+  if (deps.copilotSessions.isBusy()) {
+    return err4(409, "a copilot sign-in is already in progress \u2014 finish it in the browser or cancel it");
+  }
+  let enterpriseUrl;
+  if (typeof enterpriseUrlInput === "string" && enterpriseUrlInput.trim()) {
+    try {
+      enterpriseUrl = copilotOAuth.normalizeCopilotEnterpriseDomain(enterpriseUrlInput);
+    } catch (e) {
+      const reason = e instanceof Error ? e.message : "invalid GitHub Enterprise domain";
+      return err4(400, `copilot ${reason}`);
+    }
+  }
+  const fetchImpl = deps.oauthExchangeFetch("copilot");
+  let authorization;
+  try {
+    authorization = await copilotOAuth.requestCopilotDeviceAuthorization(fetchImpl, enterpriseUrl);
+  } catch (e) {
+    const reason = e instanceof Error ? e.message : "device authorization failed";
+    return err4(502, `copilot device authorization failed: ${reason}`);
+  }
+  const { sessionId, signal } = deps.copilotSessions.begin();
+  void runCopilotDevicePoll(sessionId, authorization.deviceCode, signal, deps, enterpriseUrl).catch((e) => {
+    const reason = e instanceof Error ? e.message : "copilot sign-in failed";
+    deps.copilotSessions.settle(sessionId, "error", reason);
+  });
+  return {
+    status: 200,
+    body: {
+      authUrl: authorization.verificationUri,
+      userCode: authorization.userCode,
+      sessionId,
+      ...enterpriseUrl ? { enterpriseUrl } : {}
+    }
+  };
+}
+async function runCopilotDevicePoll(sessionId, deviceCode, signal, deps, enterpriseUrl) {
+  const fetchImpl = deps.oauthExchangeFetch("copilot");
+  const result = await copilotOAuth.awaitCopilotDeviceToken(
+    { userCode: "", deviceCode, verificationUri: "", interval: 5, expiresIn: 900 },
+    fetchImpl,
+    {
+      deadlineMs: DEFAULT_COPILOT_OAUTH_TTL_MS,
+      ...enterpriseUrl ? { enterpriseUrl } : {},
+      sleep: (ms) => new Promise((resolve10, reject) => {
+        const onAbort = () => {
+          clearTimeout(timer);
+          reject(new Error("login: cancelled"));
+        };
+        const timer = setTimeout(() => {
+          signal.removeEventListener("abort", onAbort);
+          resolve10();
+        }, ms);
+        signal.addEventListener("abort", onAbort, { once: true });
+      })
+    }
+  );
+  const identity = await copilotOAuth.fetchCopilotIdentity(result.accessToken, fetchImpl, enterpriseUrl);
+  const apiEndpoint = await copilotOAuth.discoverCopilotApiEndpoint(result.accessToken, fetchImpl, enterpriseUrl);
+  await copilotOAuth.enableAllCopilotModels(
+    result.accessToken,
+    { apiEndpoint, ...enterpriseUrl ? { enterpriseUrl } : {} },
+    fetchImpl
+  );
+  const block = {
+    authMethod: "oauth",
+    status: "authorized",
+    accessToken: result.accessToken,
+    refreshToken: result.accessToken,
+    expiresAt: new Date(Date.now() + copilotOAuth.COPILOT_FAR_FUTURE_MS).toISOString(),
+    ...identity.accountId ? { accountId: identity.accountId } : {},
+    ...identity.email ? { email: identity.email } : {},
+    ...apiEndpoint ? { apiEndpoint } : {},
+    ...enterpriseUrl ? { enterpriseUrl } : {},
+    lastRefreshedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  await deps.subscriptionAccountAppender.appendProviderAccount("copilot", block);
+  deps.copilotSessions.settle(sessionId, "done");
+}
+function handleCopilotOAuthCancel(sessionId, deps) {
+  if (!deps.copilotSessions.cancel(sessionId)) {
+    return err4(404, "unknown or expired copilot sign-in session");
+  }
+  return { status: 200, body: { ok: true } };
+}
+function handleCopilotOAuthStatus(sessionId, deps) {
+  const s = deps.copilotSessions.get(sessionId);
+  if (!s) return err4(404, "unknown or expired copilot sign-in session");
+  return { status: 200, body: { state: s.status, ...s.error ? { message: s.error } : {} } };
+}
+
 // src/allowance/AccountAllowanceService.ts
 import {
-  getSharedAccountAllowanceStore as getSharedAccountAllowanceStore5
+  getSharedAccountAllowanceStore as getSharedAccountAllowanceStore7
 } from "@omnicross/core/pipeline/AccountAllowanceStore";
 import {
   getSharedAccountAllowanceScheduling
@@ -763,67 +942,548 @@ function secondsUntil3(instant, now) {
   if (!instant) return void 0;
   return Math.max(0, Math.floor((Date.parse(instant) - now) / 1e3));
 }
-function windowFromRow(row, fallback, now) {
-  const usedPercent = row?.limit !== void 0 && row.limit > 0 && row.used !== void 0 ? Math.round(Math.min(100, row.used / row.limit * 100) * 10) / 10 : null;
-  const resetsAt = row?.resetsAtMs !== void 0 ? new Date(row.resetsAtMs).toISOString() : void 0;
-  return {
-    id: fallback.id,
-    label: fallback.label,
-    scope: "all",
-    usedPercent,
-    windowMinutes: fallback.minutes,
-    ...resetsAt !== void 0 ? { resetsAt } : {},
-    remainingSeconds: secondsUntil3(resetsAt, now),
-    state: usedPercent !== null || resetsAt ? "fresh" : "unavailable"
-  };
-}
-function parseKimiUsagePayload(payload, now) {
-  if (!isRecord(payload)) return [];
-  const byId = /* @__PURE__ */ new Map();
-  const rowFrom = (data) => {
-    const limit = finiteNumber2(data["limit"]);
-    let used = finiteNumber2(data["used"]);
-    const remaining = finiteNumber2(data["remaining"]);
-    if (used === void 0 && remaining !== void 0 && limit !== void 0) {
-      used = limit - remaining;
-    }
-    let windowDurationMs;
-    const windowData = isRecord(data["window"]) ? data["window"] : void 0;
-    const duration = finiteNumber2(windowData?.["duration"]);
-    const timeUnit = typeof windowData?.["timeUnit"] === "string" ? windowData["timeUnit"].toUpperCase() : "";
-    if (duration !== void 0) {
-      if (timeUnit.includes("MINUTE")) windowDurationMs = duration * MINUTE_MS;
-      else if (timeUnit.includes("HOUR")) windowDurationMs = duration * HOUR_MS;
-      else if (timeUnit.includes("DAY")) windowDurationMs = duration * DAY_MS;
-      else if (timeUnit.includes("WEEK")) windowDurationMs = duration * 7 * DAY_MS;
-      else if (timeUnit.includes("SECOND")) windowDurationMs = duration * 1e3;
+function windowFromRow(row, fallback, now) {
+  const usedPercent = row?.limit !== void 0 && row.limit > 0 && row.used !== void 0 ? Math.round(Math.min(100, row.used / row.limit * 100) * 10) / 10 : null;
+  const resetsAt = row?.resetsAtMs !== void 0 ? new Date(row.resetsAtMs).toISOString() : void 0;
+  return {
+    id: fallback.id,
+    label: fallback.label,
+    scope: "all",
+    usedPercent,
+    windowMinutes: fallback.minutes,
+    ...resetsAt !== void 0 ? { resetsAt } : {},
+    remainingSeconds: secondsUntil3(resetsAt, now),
+    state: usedPercent !== null || resetsAt ? "fresh" : "unavailable"
+  };
+}
+function parseKimiUsagePayload(payload, now) {
+  if (!isRecord(payload)) return [];
+  const byId = /* @__PURE__ */ new Map();
+  const rowFrom = (data) => {
+    const limit = finiteNumber2(data["limit"]);
+    let used = finiteNumber2(data["used"]);
+    const remaining = finiteNumber2(data["remaining"]);
+    if (used === void 0 && remaining !== void 0 && limit !== void 0) {
+      used = limit - remaining;
+    }
+    let windowDurationMs;
+    const windowData = isRecord(data["window"]) ? data["window"] : void 0;
+    const duration = finiteNumber2(windowData?.["duration"]);
+    const timeUnit = typeof windowData?.["timeUnit"] === "string" ? windowData["timeUnit"].toUpperCase() : "";
+    if (duration !== void 0) {
+      if (timeUnit.includes("MINUTE")) windowDurationMs = duration * MINUTE_MS;
+      else if (timeUnit.includes("HOUR")) windowDurationMs = duration * HOUR_MS;
+      else if (timeUnit.includes("DAY")) windowDurationMs = duration * DAY_MS;
+      else if (timeUnit.includes("WEEK")) windowDurationMs = duration * 7 * DAY_MS;
+      else if (timeUnit.includes("SECOND")) windowDurationMs = duration * 1e3;
+    }
+    const resetsAtMs = parseResetMs(windowData && parseResetMs(windowData, now) !== void 0 ? windowData : data, now);
+    return { used, limit, remaining, ...resetsAtMs !== void 0 ? { resetsAtMs } : {}, ...windowDurationMs !== void 0 ? { windowDurationMs } : {} };
+  };
+  if (isRecord(payload["usage"])) {
+    const row = rowFrom(payload["usage"]);
+    const window = windowFromRow({ ...row, resetsAtMs: row.resetsAtMs }, { id: "seven-day", label: "7 days", minutes: 10080 }, now);
+    byId.set("seven-day", window);
+  }
+  if (Array.isArray(payload["limits"])) {
+    for (const item of payload["limits"]) {
+      if (!isRecord(item)) continue;
+      const detail = isRecord(item["detail"]) ? item["detail"] : item;
+      const row = rowFrom(detail);
+      const canonical = row.windowDurationMs !== void 0 ? canonicalWindow(row.windowDurationMs) : void 0;
+      if (!canonical) continue;
+      const window = windowFromRow(row, canonical, now);
+      const existing = byId.get(canonical.id);
+      if (!existing || (window.usedPercent ?? 0) > (existing.usedPercent ?? 0)) {
+        byId.set(canonical.id, window);
+      }
+    }
+  }
+  return [...byId.values()].sort((a, b) => (a.windowMinutes ?? Infinity) - (b.windowMinutes ?? Infinity)).slice(0, 4);
+}
+var KimiAllowanceCollector = class {
+  constructor(credentials, store = getSharedAccountAllowanceStore3(), fetchImpl = (url, init, accountId) => fetchUpstream3(url, init, { providerId: "kimi", accountId, redactBodies: true }), now = Date.now) {
+    this.credentials = credentials;
+    this.store = store;
+    this.fetchImpl = fetchImpl;
+    this.now = now;
+  }
+  credentials;
+  store;
+  fetchImpl;
+  now;
+  inFlight = /* @__PURE__ */ new Map();
+  async collectMany(accounts, options = {}) {
+    const settled = await Promise.allSettled(accounts.map((account) => this.collect(account, options)));
+    return settled.flatMap((result) => result.status === "fulfilled" ? [result.value] : []);
+  }
+  collect(account, options = {}) {
+    const now = this.now();
+    if (account.tokens.authMethod !== "oauth") {
+      const existing = this.store.get("kimi", account.id, now);
+      if (existing?.windows.every((window) => window.state === "unsupported")) {
+        return Promise.resolve(existing);
+      }
+      const snapshot = this.unsupportedSnapshot(account.id, now);
+      this.store.set(snapshot);
+      return Promise.resolve(snapshot);
+    }
+    const cached = this.store.get("kimi", account.id, now);
+    if (!options.force && cached && this.isCacheValid(cached, now, options.refreshAheadMs)) {
+      return Promise.resolve(cached);
+    }
+    const running = this.inFlight.get(account.id);
+    if (running) return running;
+    const promise = this.fetchAccount(account.id, account.tokens).catch(() => this.failureSnapshot(account.id, "kimi_usage_request_failed", this.now())).finally(() => this.inFlight.delete(account.id));
+    this.inFlight.set(account.id, promise);
+    return promise;
+  }
+  isCacheValid(snapshot, now, refreshAheadMs) {
+    if (snapshot.windows.every((window) => window.state === "unsupported")) return true;
+    const expiresAt = snapshot.expiresAt ? Date.parse(snapshot.expiresAt) : 0;
+    const ahead = typeof refreshAheadMs === "number" && Number.isFinite(refreshAheadMs) ? Math.max(0, refreshAheadMs) : 0;
+    return Number.isFinite(expiresAt) && expiresAt > now + ahead;
+  }
+  async fetchAccount(accountId, tokens) {
+    let accessToken = await this.credentials.getAccessTokenForAccount("kimi", accountId);
+    if (!accessToken) return this.failureSnapshot(accountId, "kimi_usage_token_unavailable", this.now());
+    let response = await this.request(accountId, accessToken, tokens);
+    if (response.status === 401) {
+      const refreshed = await this.credentials.refreshAccountToken("kimi", accountId);
+      if (!refreshed) return this.failureSnapshot(accountId, "kimi_usage_unauthorized", this.now());
+      accessToken = await this.credentials.getAccessTokenForAccount("kimi", accountId);
+      if (!accessToken) return this.failureSnapshot(accountId, "kimi_usage_token_unavailable", this.now());
+      response = await this.request(accountId, accessToken, tokens);
+    }
+    if (response.status === 403) {
+      const snapshot2 = this.unsupportedSnapshot(accountId, this.now(), "kimi_usage_unsupported");
+      this.store.set(snapshot2);
+      return snapshot2;
+    }
+    if (!response.ok) return this.failureSnapshot(accountId, "kimi_usage_http_error", this.now());
+    let payload;
+    try {
+      payload = await response.json();
+    } catch {
+      return this.failureSnapshot(accountId, "kimi_usage_invalid_response", this.now());
+    }
+    const now = this.now();
+    const windows = parseKimiUsagePayload(payload, now);
+    const snapshot = {
+      providerId: "kimi",
+      accountId,
+      source: "oauth-usage-api",
+      observedAt: new Date(now).toISOString(),
+      expiresAt: new Date(now + KIMI_ALLOWANCE_CACHE_MS).toISOString(),
+      windows: windows.length > 0 ? windows : [
+        { id: "five-hour", label: "5 hours", scope: "all", usedPercent: null, state: "unavailable" },
+        { id: "seven-day", label: "7 days", scope: "all", usedPercent: null, state: "unavailable" }
+      ],
+      ...windows.length > 0 ? {} : { lastErrorCode: "kimi_usage_invalid_response" }
+    };
+    this.store.set(snapshot);
+    return snapshot;
+  }
+  request(accountId, accessToken, tokens) {
+    return this.fetchImpl(KIMI_USAGE_URL, {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: "application/json",
+        ...kimiFingerprintHeaders(tokens.deviceId)
+      },
+      signal: AbortSignal.timeout(15e3)
+    }, accountId);
+  }
+  failureSnapshot(accountId, code, now) {
+    const existing = this.store.get("kimi", accountId, now);
+    const snapshot = existing ? {
+      ...existing,
+      expiresAt: new Date(now + KIMI_ALLOWANCE_CACHE_MS).toISOString(),
+      windows: existing.windows.map((window) => ({
+        ...window,
+        state: window.state === "unsupported" ? "unsupported" : window.usedPercent !== null || window.resetsAt ? "stale" : "unavailable"
+      })),
+      lastErrorCode: code
+    } : {
+      providerId: "kimi",
+      accountId,
+      source: "oauth-usage-api",
+      observedAt: new Date(now).toISOString(),
+      expiresAt: new Date(now + KIMI_ALLOWANCE_CACHE_MS).toISOString(),
+      windows: [
+        { id: "five-hour", label: "5 hours", scope: "all", usedPercent: null, state: "unavailable" },
+        { id: "seven-day", label: "7 days", scope: "all", usedPercent: null, state: "unavailable" }
+      ],
+      lastErrorCode: code
+    };
+    this.store.set(snapshot);
+    return snapshot;
+  }
+  unsupportedSnapshot(accountId, now, code = "kimi_usage_unsupported_auth") {
+    return {
+      providerId: "kimi",
+      accountId,
+      source: "oauth-usage-api",
+      observedAt: new Date(now).toISOString(),
+      windows: [
+        { id: "five-hour", label: "5 hours", scope: "all", usedPercent: null, state: "unsupported" },
+        { id: "seven-day", label: "7 days", scope: "all", usedPercent: null, state: "unsupported" }
+      ],
+      lastErrorCode: code
+    };
+  }
+};
+
+// src/allowance/GrokAllowanceCollector.ts
+import {
+  getSharedAccountAllowanceStore as getSharedAccountAllowanceStore4
+} from "@omnicross/core/pipeline/AccountAllowanceStore";
+import { fetchUpstream as fetchUpstream4 } from "@omnicross/core/pipeline/upstreamFetch";
+var GROK_ALLOWANCE_CACHE_MS = 5 * 6e4;
+var GROK_BILLING_BASE = "https://cli-chat-proxy.grok.com";
+var GROK_BILLING_CREDITS_URL = `${GROK_BILLING_BASE}/v1/billing?format=credits`;
+var GROK_BILLING_MONTHLY_URL = `${GROK_BILLING_BASE}/v1/billing`;
+function isRecord2(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function finiteNumber3(value) {
+  if (value === null || value === void 0 || value === "") return void 0;
+  const parsed = typeof value === "number" ? value : Number(value);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : void 0;
+}
+function percent(value) {
+  const parsed = finiteNumber3(value);
+  return parsed !== void 0 && parsed <= 100 ? parsed : void 0;
+}
+function onDemandAmount(value) {
+  return isRecord2(value) ? finiteNumber3(value["val"]) : void 0;
+}
+function confirmsNoMonthlyQuota(raw) {
+  const limit = onDemandAmount(raw["monthlyLimit"]);
+  if (limit !== void 0) return limit === 0;
+  return parseWeeklyConfig(raw)?.inferredPercent === true;
+}
+function parseWeeklyConfig(raw) {
+  const period = isRecord2(raw["currentPeriod"]) ? raw["currentPeriod"] : void 0;
+  if (!period) return null;
+  const start = typeof period["start"] === "string" ? Date.parse(period["start"]) : Number.NaN;
+  const end = typeof period["end"] === "string" ? Date.parse(period["end"]) : Number.NaN;
+  const type = typeof period["type"] === "string" ? period["type"] : "";
+  if (!Number.isFinite(start) || !Number.isFinite(end) || end <= start) return null;
+  if (!type.toUpperCase().includes("WEEK")) return null;
+  const inferred = raw["creditUsagePercent"] === void 0 || raw["creditUsagePercent"] === null;
+  let creditUsagePercent;
+  if (inferred) {
+    creditUsagePercent = end > Date.now() ? 0 : void 0;
+  } else {
+    creditUsagePercent = percent(raw["creditUsagePercent"]);
+  }
+  if (creditUsagePercent === void 0) return null;
+  return {
+    creditUsagePercent,
+    inferredPercent: inferred,
+    resetsAtMs: end,
+    unified: raw["isUnifiedBillingUser"] === true
+  };
+}
+function parseMonthlyConfig(raw) {
+  const start = typeof raw["billingPeriodStart"] === "string" ? Date.parse(raw["billingPeriodStart"]) : Number.NaN;
+  const end = typeof raw["billingPeriodEnd"] === "string" ? Date.parse(raw["billingPeriodEnd"]) : Number.NaN;
+  if (!Number.isFinite(start) || !Number.isFinite(end) || end <= start) return null;
+  const limit = onDemandAmount(raw["monthlyLimit"]);
+  const used = onDemandAmount(raw["used"]);
+  if (limit === void 0 || limit <= 0 || used === void 0) return null;
+  return { used, limit, periodStartMs: start, periodEndMs: end };
+}
+function secondsUntil4(instant, now) {
+  if (!instant) return void 0;
+  return Math.max(0, Math.floor((Date.parse(instant) - now) / 1e3));
+}
+var MINUTE_MS2 = 6e4;
+var DAY_MS2 = 864e5;
+var WEEK_MINUTES = 7 * 24 * 60;
+function weeklyWindow(config, now) {
+  const resetsAt = new Date(config.resetsAtMs).toISOString();
+  return {
+    id: "seven-day",
+    label: "7 days",
+    scope: "all",
+    usedPercent: config.creditUsagePercent,
+    windowMinutes: WEEK_MINUTES,
+    resetsAt,
+    remainingSeconds: secondsUntil4(resetsAt, now),
+    state: "fresh"
+  };
+}
+function monthlyWindow(config, now) {
+  const resetsAt = new Date(config.periodEndMs).toISOString();
+  const days = Math.max(1, Math.round((config.periodEndMs - config.periodStartMs) / DAY_MS2));
+  return {
+    id: "thirty-day",
+    label: days === 30 || days === 31 ? "30 days" : `${days} days`,
+    scope: "all",
+    usedPercent: Math.round(Math.min(100, config.used / config.limit * 100) * 10) / 10,
+    windowMinutes: Math.round((config.periodEndMs - config.periodStartMs) / MINUTE_MS2),
+    resetsAt,
+    remainingSeconds: secondsUntil4(resetsAt, now),
+    state: "fresh"
+  };
+}
+function onDemandWindow(raw) {
+  const cap = onDemandAmount(raw["onDemandCap"]);
+  const used = onDemandAmount(raw["onDemandUsed"]);
+  if (cap === void 0 || cap <= 0 || used === void 0) return null;
+  return {
+    id: "on-demand",
+    label: "On-demand",
+    scope: "all",
+    usedPercent: Math.round(Math.min(100, used / cap * 100) * 10) / 10,
+    state: "fresh"
+  };
+}
+async function probeBilling(url, accessToken, accountId, fetchImpl) {
+  try {
+    const response = await fetchImpl(url, {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: "application/json",
+        "X-XAI-Token-Auth": "xai-grok-cli"
+      },
+      redirect: "error",
+      signal: AbortSignal.timeout(15e3)
+    }, accountId);
+    if (!response.ok) return { status: response.status, payload: null };
+    const payload = await response.json();
+    return { status: response.status, payload: isRecord2(payload) ? payload : null };
+  } catch {
+    return { status: 0, payload: null };
+  }
+}
+function parseGrokBillingPayloads(creditsPayload, monthlyPayload, now) {
+  const creditsConfig = isRecord2(creditsPayload?.["config"]) ? creditsPayload["config"] : null;
+  const monthlyConfig = isRecord2(monthlyPayload?.["config"]) ? monthlyPayload["config"] : null;
+  let weekly = creditsConfig ? parseWeeklyConfig(creditsConfig) : null;
+  const unifiedFlag = creditsConfig?.["isUnifiedBillingUser"] === true;
+  let monthly = monthlyConfig ? parseMonthlyConfig(monthlyConfig) : null;
+  if (weekly?.inferredPercent && unifiedFlag) {
+    if (monthly) {
+      weekly = null;
+    } else if (!monthlyConfig || !confirmsNoMonthlyQuota(monthlyConfig)) {
+      weekly = null;
+    }
+  }
+  const windows = [];
+  if (weekly) windows.push(weeklyWindow(weekly, now));
+  if (monthly) windows.push(monthlyWindow(monthly, now));
+  const onDemandSource = monthly && monthlyConfig ? monthlyConfig : creditsConfig;
+  const onDemand = onDemandSource ? onDemandWindow(onDemandSource) : null;
+  if (onDemand) windows.push(onDemand);
+  return windows.length > 0 ? windows : null;
+}
+var GrokAllowanceCollector = class {
+  constructor(credentials, store = getSharedAccountAllowanceStore4(), fetchImpl = (url, init, accountId) => fetchUpstream4(url, init, { providerId: "grok", accountId, redactBodies: true }), now = Date.now) {
+    this.credentials = credentials;
+    this.store = store;
+    this.fetchImpl = fetchImpl;
+    this.now = now;
+  }
+  credentials;
+  store;
+  fetchImpl;
+  now;
+  inFlight = /* @__PURE__ */ new Map();
+  async collectMany(accounts, options = {}) {
+    const settled = await Promise.allSettled(accounts.map((account) => this.collect(account, options)));
+    return settled.flatMap((result) => result.status === "fulfilled" ? [result.value] : []);
+  }
+  collect(account, options = {}) {
+    const now = this.now();
+    if (account.tokens.authMethod !== "oauth") {
+      const existing = this.store.get("grok", account.id, now);
+      if (existing?.windows.every((window) => window.state === "unsupported")) {
+        return Promise.resolve(existing);
+      }
+      const snapshot = this.unsupportedSnapshot(account.id, now);
+      this.store.set(snapshot);
+      return Promise.resolve(snapshot);
+    }
+    const cached = this.store.get("grok", account.id, now);
+    if (!options.force && cached && this.isCacheValid(cached, now, options.refreshAheadMs)) {
+      return Promise.resolve(cached);
+    }
+    const running = this.inFlight.get(account.id);
+    if (running) return running;
+    const promise = this.fetchAccount(account.id).catch(() => this.failureSnapshot(account.id, "grok_usage_request_failed", this.now())).finally(() => this.inFlight.delete(account.id));
+    this.inFlight.set(account.id, promise);
+    return promise;
+  }
+  isCacheValid(snapshot, now, refreshAheadMs) {
+    if (snapshot.windows.every((window) => window.state === "unsupported")) return true;
+    const expiresAt = snapshot.expiresAt ? Date.parse(snapshot.expiresAt) : 0;
+    const ahead = typeof refreshAheadMs === "number" && Number.isFinite(refreshAheadMs) ? Math.max(0, refreshAheadMs) : 0;
+    return Number.isFinite(expiresAt) && expiresAt > now + ahead;
+  }
+  async fetchAccount(accountId) {
+    const probe = async () => {
+      const accessToken = await this.credentials.getAccessTokenForAccount("grok", accountId);
+      if (!accessToken) return { unauthorized: true, windows: null };
+      const credits = await probeBilling(GROK_BILLING_CREDITS_URL, accessToken, accountId, this.fetchImpl);
+      if (credits.status === 401 || credits.status === 403) return { unauthorized: true, windows: null };
+      const creditsConfig = isRecord2(credits.payload?.["config"]) ? credits.payload["config"] : null;
+      const weekly = creditsConfig ? parseWeeklyConfig(creditsConfig) : null;
+      const monthly = !weekly || creditsConfig?.["isUnifiedBillingUser"] === true ? await probeBilling(GROK_BILLING_MONTHLY_URL, accessToken, accountId, this.fetchImpl) : { status: 200, payload: null };
+      if (monthly.status === 401 || monthly.status === 403) return { unauthorized: true, windows: null };
+      return {
+        unauthorized: false,
+        windows: parseGrokBillingPayloads(credits.payload, monthly.payload, this.now())
+      };
+    };
+    let result = await probe();
+    if (result.unauthorized) {
+      const refreshed = await this.credentials.refreshAccountToken("grok", accountId);
+      if (!refreshed) return this.failureSnapshot(accountId, "grok_usage_unauthorized", this.now());
+      result = await probe();
+      if (result.unauthorized) {
+        return this.failureSnapshot(accountId, "grok_usage_unauthorized", this.now());
+      }
+    }
+    const now = this.now();
+    if (result.windows && result.windows.length > 0) {
+      const snapshot = {
+        providerId: "grok",
+        accountId,
+        source: "oauth-usage-api",
+        observedAt: new Date(now).toISOString(),
+        expiresAt: new Date(now + GROK_ALLOWANCE_CACHE_MS).toISOString(),
+        windows: result.windows
+      };
+      this.store.set(snapshot);
+      return snapshot;
+    }
+    return this.failureSnapshot(accountId, "grok_usage_invalid_response", now);
+  }
+  failureSnapshot(accountId, code, now) {
+    const existing = this.store.get("grok", accountId, now);
+    const snapshot = existing ? {
+      ...existing,
+      expiresAt: new Date(now + GROK_ALLOWANCE_CACHE_MS).toISOString(),
+      windows: existing.windows.map((window) => ({
+        ...window,
+        state: window.state === "unsupported" ? "unsupported" : window.usedPercent !== null || window.resetsAt ? "stale" : "unavailable"
+      })),
+      lastErrorCode: code
+    } : {
+      providerId: "grok",
+      accountId,
+      source: "oauth-usage-api",
+      observedAt: new Date(now).toISOString(),
+      expiresAt: new Date(now + GROK_ALLOWANCE_CACHE_MS).toISOString(),
+      windows: [
+        { id: "seven-day", label: "7 days", scope: "all", usedPercent: null, state: "unavailable" },
+        { id: "thirty-day", label: "30 days", scope: "all", usedPercent: null, state: "unavailable" }
+      ],
+      lastErrorCode: code
+    };
+    this.store.set(snapshot);
+    return snapshot;
+  }
+  unsupportedSnapshot(accountId, now) {
+    return {
+      providerId: "grok",
+      accountId,
+      source: "oauth-usage-api",
+      observedAt: new Date(now).toISOString(),
+      windows: [
+        { id: "seven-day", label: "7 days", scope: "all", usedPercent: null, state: "unsupported" },
+        { id: "thirty-day", label: "30 days", scope: "all", usedPercent: null, state: "unsupported" }
+      ],
+      lastErrorCode: "grok_usage_unsupported_auth"
+    };
+  }
+};
+
+// src/allowance/CopilotAllowanceCollector.ts
+import {
+  getSharedAccountAllowanceStore as getSharedAccountAllowanceStore5
+} from "@omnicross/core/pipeline/AccountAllowanceStore";
+import { fetchUpstream as fetchUpstream5 } from "@omnicross/core/pipeline/upstreamFetch";
+import { COPILOT_GITHUB_HEADERS, copilotGitHubApiBase } from "@omnicross/subscriptions";
+var COPILOT_ALLOWANCE_CACHE_MS = 5 * 6e4;
+function isRecord3(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function finiteNumber4(value) {
+  if (value === null || value === void 0 || value === "") return void 0;
+  const parsed = typeof value === "number" ? value : Number(value);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : void 0;
+}
+function booleanValue(value) {
+  if (typeof value === "boolean") return value;
+  if (value === "true") return true;
+  if (value === "false") return false;
+  return void 0;
+}
+function parseQuotaDetail(value) {
+  if (!isRecord3(value)) return null;
+  const entitlement = finiteNumber4(value["entitlement"]);
+  const remaining = finiteNumber4(value["remaining"]);
+  const percentRemaining = finiteNumber4(value["percent_remaining"]);
+  const unlimited = booleanValue(value["unlimited"]);
+  if (entitlement === void 0 || remaining === void 0 || percentRemaining === void 0 || unlimited === void 0) {
+    return null;
+  }
+  return { entitlement, remaining, percentRemaining, unlimited };
+}
+function secondsUntil5(instant, now) {
+  if (!instant) return void 0;
+  return Math.max(0, Math.floor((Date.parse(instant) - now) / 1e3));
+}
+function parseCopilotUserPayload(payload, now) {
+  if (!isRecord3(payload)) return null;
+  const snapshots = isRecord3(payload["quota_snapshots"]) ? payload["quota_snapshots"] : void 0;
+  if (!snapshots) return null;
+  const resetRaw = payload["quota_reset_date"];
+  const resetsAt = typeof resetRaw === "string" && resetRaw.trim() && Number.isFinite(Date.parse(resetRaw)) ? new Date(Date.parse(resetRaw)).toISOString() : void 0;
+  const windows = [];
+  const premium = parseQuotaDetail(snapshots["premium_interactions"]);
+  if (premium) {
+    const usedPercent = premium.unlimited ? 0 : premium.entitlement > 0 ? Math.round(Math.min(100, (premium.entitlement - premium.remaining) / premium.entitlement * 100) * 10) / 10 : finiteNumber4(premium.percentRemaining) !== void 0 ? Math.round(Math.min(100, Math.max(0, 100 - premium.percentRemaining)) * 10) / 10 : null;
+    if (usedPercent !== null) {
+      windows.push({
+        id: "thirty-day",
+        label: "Monthly",
+        scope: "all",
+        usedPercent,
+        windowMinutes: 30 * 24 * 60,
+        ...resetsAt !== void 0 ? { resetsAt } : {},
+        remainingSeconds: secondsUntil5(resetsAt, now),
+        state: "fresh"
+      });
     }
-    const resetsAtMs = parseResetMs(windowData && parseResetMs(windowData, now) !== void 0 ? windowData : data, now);
-    return { used, limit, remaining, ...resetsAtMs !== void 0 ? { resetsAtMs } : {}, ...windowDurationMs !== void 0 ? { windowDurationMs } : {} };
-  };
-  if (isRecord(payload["usage"])) {
-    const row = rowFrom(payload["usage"]);
-    const window = windowFromRow({ ...row, resetsAtMs: row.resetsAtMs }, { id: "seven-day", label: "7 days", minutes: 10080 }, now);
-    byId.set("seven-day", window);
   }
-  if (Array.isArray(payload["limits"])) {
-    for (const item of payload["limits"]) {
-      if (!isRecord(item)) continue;
-      const detail = isRecord(item["detail"]) ? item["detail"] : item;
-      const row = rowFrom(detail);
-      const canonical = row.windowDurationMs !== void 0 ? canonicalWindow(row.windowDurationMs) : void 0;
-      if (!canonical) continue;
-      const window = windowFromRow(row, canonical, now);
-      const existing = byId.get(canonical.id);
-      if (!existing || (window.usedPercent ?? 0) > (existing.usedPercent ?? 0)) {
-        byId.set(canonical.id, window);
-      }
-    }
+  const chat = parseQuotaDetail(snapshots["chat"]);
+  if (chat && !chat.unlimited && chat.entitlement > 0) {
+    const usedPercent = Math.round(Math.min(100, (chat.entitlement - chat.remaining) / chat.entitlement * 100) * 10) / 10;
+    windows.push({
+      id: "chat-monthly",
+      label: "Chat (monthly)",
+      scope: "all",
+      usedPercent,
+      windowMinutes: 30 * 24 * 60,
+      ...resetsAt !== void 0 ? { resetsAt } : {},
+      remainingSeconds: secondsUntil5(resetsAt, now),
+      state: "fresh"
+    });
   }
-  return [...byId.values()].sort((a, b) => (a.windowMinutes ?? Infinity) - (b.windowMinutes ?? Infinity)).slice(0, 4);
+  return windows.length > 0 ? windows : null;
 }
-var KimiAllowanceCollector = class {
-  constructor(credentials, store = getSharedAccountAllowanceStore3(), fetchImpl = (url, init, accountId) => fetchUpstream3(url, init, { providerId: "kimi", accountId, redactBodies: true }), now = Date.now) {
+function githubApiBase(tokens) {
+  return copilotGitHubApiBase(tokens.enterpriseUrl);
+}
+var CopilotAllowanceCollector = class {
+  constructor(credentials, store = getSharedAccountAllowanceStore5(), fetchImpl = (url, init, accountId) => fetchUpstream5(url, init, { providerId: "copilot", accountId, redactBodies: true }), now = Date.now) {
     this.credentials = credentials;
     this.store = store;
     this.fetchImpl = fetchImpl;
@@ -835,13 +1495,15 @@ var KimiAllowanceCollector = class {
   now;
   inFlight = /* @__PURE__ */ new Map();
   async collectMany(accounts, options = {}) {
-    const settled = await Promise.allSettled(accounts.map((account) => this.collect(account, options)));
+    const settled = await Promise.allSettled(
+      accounts.map((account) => this.collect(account, options))
+    );
     return settled.flatMap((result) => result.status === "fulfilled" ? [result.value] : []);
   }
   collect(account, options = {}) {
     const now = this.now();
     if (account.tokens.authMethod !== "oauth") {
-      const existing = this.store.get("kimi", account.id, now);
+      const existing = this.store.get("copilot", account.id, now);
       if (existing?.windows.every((window) => window.state === "unsupported")) {
         return Promise.resolve(existing);
       }
@@ -849,13 +1511,13 @@ var KimiAllowanceCollector = class {
       this.store.set(snapshot);
       return Promise.resolve(snapshot);
     }
-    const cached = this.store.get("kimi", account.id, now);
+    const cached = this.store.get("copilot", account.id, now);
     if (!options.force && cached && this.isCacheValid(cached, now, options.refreshAheadMs)) {
       return Promise.resolve(cached);
     }
     const running = this.inFlight.get(account.id);
     if (running) return running;
-    const promise = this.fetchAccount(account.id, account.tokens).catch(() => this.failureSnapshot(account.id, "kimi_usage_request_failed", this.now())).finally(() => this.inFlight.delete(account.id));
+    const promise = this.fetchAccount(account.id, account.tokens).catch(() => this.failureSnapshot(account.id, "copilot_usage_request_failed", this.now())).finally(() => this.inFlight.delete(account.id));
     this.inFlight.set(account.id, promise);
     return promise;
   }
@@ -866,101 +1528,97 @@ var KimiAllowanceCollector = class {
     return Number.isFinite(expiresAt) && expiresAt > now + ahead;
   }
   async fetchAccount(accountId, tokens) {
-    let accessToken = await this.credentials.getAccessTokenForAccount("kimi", accountId);
-    if (!accessToken) return this.failureSnapshot(accountId, "kimi_usage_token_unavailable", this.now());
+    let accessToken = await this.credentials.getAccessTokenForAccount("copilot", accountId);
+    if (!accessToken) return this.failureSnapshot(accountId, "copilot_usage_token_unavailable", this.now());
     let response = await this.request(accountId, accessToken, tokens);
-    if (response.status === 401) {
-      const refreshed = await this.credentials.refreshAccountToken("kimi", accountId);
-      if (!refreshed) return this.failureSnapshot(accountId, "kimi_usage_unauthorized", this.now());
-      accessToken = await this.credentials.getAccessTokenForAccount("kimi", accountId);
-      if (!accessToken) return this.failureSnapshot(accountId, "kimi_usage_token_unavailable", this.now());
+    if (response.status === 401 || response.status === 403) {
+      const refreshed = await this.credentials.refreshAccountToken("copilot", accountId);
+      if (!refreshed) return this.failureSnapshot(accountId, "copilot_usage_unauthorized", this.now());
+      accessToken = await this.credentials.getAccessTokenForAccount("copilot", accountId);
+      if (!accessToken) return this.failureSnapshot(accountId, "copilot_usage_token_unavailable", this.now());
       response = await this.request(accountId, accessToken, tokens);
+      if (response.status === 401 || response.status === 403) {
+        return this.failureSnapshot(accountId, "copilot_usage_unauthorized", this.now());
+      }
     }
-    if (response.status === 403) {
-      const snapshot2 = this.unsupportedSnapshot(accountId, this.now(), "kimi_usage_unsupported");
-      this.store.set(snapshot2);
-      return snapshot2;
-    }
-    if (!response.ok) return this.failureSnapshot(accountId, "kimi_usage_http_error", this.now());
+    if (!response.ok) return this.failureSnapshot(accountId, "copilot_usage_http_error", this.now());
     let payload;
     try {
       payload = await response.json();
     } catch {
-      return this.failureSnapshot(accountId, "kimi_usage_invalid_response", this.now());
+      return this.failureSnapshot(accountId, "copilot_usage_invalid_response", this.now());
     }
     const now = this.now();
-    const windows = parseKimiUsagePayload(payload, now);
+    const windows = parseCopilotUserPayload(payload, now);
     const snapshot = {
-      providerId: "kimi",
+      providerId: "copilot",
       accountId,
       source: "oauth-usage-api",
       observedAt: new Date(now).toISOString(),
-      expiresAt: new Date(now + KIMI_ALLOWANCE_CACHE_MS).toISOString(),
-      windows: windows.length > 0 ? windows : [
-        { id: "five-hour", label: "5 hours", scope: "all", usedPercent: null, state: "unavailable" },
-        { id: "seven-day", label: "7 days", scope: "all", usedPercent: null, state: "unavailable" }
+      expiresAt: new Date(now + COPILOT_ALLOWANCE_CACHE_MS).toISOString(),
+      windows: windows ?? [
+        { id: "thirty-day", label: "Monthly", scope: "all", usedPercent: null, state: "unavailable" }
       ],
-      ...windows.length > 0 ? {} : { lastErrorCode: "kimi_usage_invalid_response" }
+      ...windows ? {} : { lastErrorCode: "copilot_usage_invalid_response" }
     };
     this.store.set(snapshot);
     return snapshot;
   }
   request(accountId, accessToken, tokens) {
-    return this.fetchImpl(KIMI_USAGE_URL, {
+    return this.fetchImpl(`${githubApiBase(tokens)}/copilot_internal/user`, {
       method: "GET",
       headers: {
         Authorization: `Bearer ${accessToken}`,
         Accept: "application/json",
-        ...kimiFingerprintHeaders(tokens.deviceId)
+        "Content-Type": "application/json",
+        ...COPILOT_GITHUB_HEADERS
       },
       signal: AbortSignal.timeout(15e3)
     }, accountId);
   }
   failureSnapshot(accountId, code, now) {
-    const existing = this.store.get("kimi", accountId, now);
+    const existing = this.store.get("copilot", accountId, now);
     const snapshot = existing ? {
       ...existing,
-      expiresAt: new Date(now + KIMI_ALLOWANCE_CACHE_MS).toISOString(),
+      expiresAt: new Date(now + COPILOT_ALLOWANCE_CACHE_MS).toISOString(),
       windows: existing.windows.map((window) => ({
         ...window,
         state: window.state === "unsupported" ? "unsupported" : window.usedPercent !== null || window.resetsAt ? "stale" : "unavailable"
       })),
       lastErrorCode: code
     } : {
-      providerId: "kimi",
+      providerId: "copilot",
       accountId,
       source: "oauth-usage-api",
       observedAt: new Date(now).toISOString(),
-      expiresAt: new Date(now + KIMI_ALLOWANCE_CACHE_MS).toISOString(),
+      expiresAt: new Date(now + COPILOT_ALLOWANCE_CACHE_MS).toISOString(),
       windows: [
-        { id: "five-hour", label: "5 hours", scope: "all", usedPercent: null, state: "unavailable" },
-        { id: "seven-day", label: "7 days", scope: "all", usedPercent: null, state: "unavailable" }
+        { id: "thirty-day", label: "Monthly", scope: "all", usedPercent: null, state: "unavailable" }
       ],
       lastErrorCode: code
     };
     this.store.set(snapshot);
     return snapshot;
   }
-  unsupportedSnapshot(accountId, now, code = "kimi_usage_unsupported_auth") {
+  unsupportedSnapshot(accountId, now) {
     return {
-      providerId: "kimi",
+      providerId: "copilot",
       accountId,
       source: "oauth-usage-api",
       observedAt: new Date(now).toISOString(),
       windows: [
-        { id: "five-hour", label: "5 hours", scope: "all", usedPercent: null, state: "unsupported" },
-        { id: "seven-day", label: "7 days", scope: "all", usedPercent: null, state: "unsupported" }
+        { id: "thirty-day", label: "Monthly", scope: "all", usedPercent: null, state: "unsupported" }
       ],
-      lastErrorCode: code
+      lastErrorCode: "copilot_usage_unsupported_auth"
     };
   }
 };
 
 // src/allowance/OpenCodeGoAllowanceCollector.ts
 import {
-  getSharedAccountAllowanceStore as getSharedAccountAllowanceStore4
+  getSharedAccountAllowanceStore as getSharedAccountAllowanceStore6
 } from "@omnicross/core/pipeline/AccountAllowanceStore";
-import { fetchUpstream as fetchUpstream4 } from "@omnicross/core/pipeline/upstreamFetch";
+import { fetchUpstream as fetchUpstream6 } from "@omnicross/core/pipeline/upstreamFetch";
 import { normalizeOpenCodeGoBaseUrl } from "@omnicross/subscriptions";
 var OPENCODEGO_ALLOWANCE_CACHE_MS = 5 * 6e4;
 var OPENCODEGO_DEFAULT_GO_BASE = "https://opencode.ai/zen/go";
@@ -974,7 +1632,7 @@ function isoInstant2(value) {
   const time = Date.parse(value);
   return Number.isFinite(time) ? new Date(time).toISOString() : void 0;
 }
-function secondsUntil4(instant, now) {
+function secondsUntil6(instant, now) {
   if (!instant) return void 0;
   return Math.max(0, Math.floor((Date.parse(instant) - now) / 1e3));
 }
@@ -989,12 +1647,12 @@ function windowFromPayload3(id, label, minutes, payload, now) {
     usedPercent,
     windowMinutes: minutes,
     ...resetsAt !== void 0 ? { resetsAt } : {},
-    remainingSeconds: secondsUntil4(resetsAt, now),
+    remainingSeconds: secondsUntil6(resetsAt, now),
     state: usedPercent !== null || resetsAt ? "fresh" : "unavailable"
   };
 }
 var OpenCodeGoAllowanceCollector = class {
-  constructor(credentials, store = getSharedAccountAllowanceStore4(), fetchImpl = (url, init, accountId) => fetchUpstream4(url, init, { providerId: "opencodego", accountId, redactBodies: true }), now = Date.now) {
+  constructor(credentials, store = getSharedAccountAllowanceStore6(), fetchImpl = (url, init, accountId) => fetchUpstream6(url, init, { providerId: "opencodego", accountId, redactBodies: true }), now = Date.now) {
     this.credentials = credentials;
     this.store = store;
     this.fetchImpl = fetchImpl;
@@ -1099,7 +1757,7 @@ function codexUnavailable(accountId, now) {
   };
 }
 var AccountAllowanceService = class {
-  constructor(credentials, store = getSharedAccountAllowanceStore5(), collector, codexCollector, kimiCollector, opencodegoCollector, now = Date.now) {
+  constructor(credentials, store = getSharedAccountAllowanceStore7(), collector, codexCollector, kimiCollector, opencodegoCollector, grokCollector, copilotCollector, now = Date.now) {
     this.credentials = credentials;
     this.store = store;
     this.now = now;
@@ -1107,6 +1765,8 @@ var AccountAllowanceService = class {
     this.codexCollector = codexCollector ?? new CodexAllowanceCollector(credentials, store);
     this.kimiCollector = kimiCollector ?? new KimiAllowanceCollector(credentials, store);
     this.opencodegoCollector = opencodegoCollector ?? new OpenCodeGoAllowanceCollector(credentials, store);
+    this.grokCollector = grokCollector ?? new GrokAllowanceCollector(credentials, store);
+    this.copilotCollector = copilotCollector ?? new CopilotAllowanceCollector(credentials, store);
   }
   credentials;
   store;
@@ -1114,6 +1774,8 @@ var AccountAllowanceService = class {
   claudeCollector;
   codexCollector;
   kimiCollector;
+  grokCollector;
+  copilotCollector;
   opencodegoCollector;
   /**
    * Read all/filtered snapshots. Claude's and Codex's five-minute caches are
@@ -1148,11 +1810,23 @@ var AccountAllowanceService = class {
       (account) => !filter.accountId || account.id === filter.accountId
     );
     if (wantsOpenCodeGo) await this.opencodegoCollector.collectMany(opencodegoAccounts);
+    const wantsGrok = !filter.providerId || filter.providerId === "grok";
+    const grokAccounts = (config.grokAccounts ?? []).filter(
+      (account) => !filter.accountId || account.id === filter.accountId
+    );
+    if (wantsGrok) await this.grokCollector.collectMany(grokAccounts);
+    const wantsCopilot = !filter.providerId || filter.providerId === "copilot";
+    const copilotAccounts = (config.copilotAccounts ?? []).filter(
+      (account) => !filter.accountId || account.id === filter.accountId
+    );
+    if (wantsCopilot) await this.copilotCollector.collectMany(copilotAccounts);
     const known = /* @__PURE__ */ new Set();
     if (wantsClaude) for (const account of claudeAccounts) known.add(`claude\0${account.id}`);
     if (wantsCodex) for (const account of codexAccounts) known.add(`codex\0${account.id}`);
     if (wantsKimi) for (const account of kimiAccounts) known.add(`kimi\0${account.id}`);
     if (wantsOpenCodeGo) for (const account of opencodegoAccounts) known.add(`opencodego\0${account.id}`);
+    if (wantsGrok) for (const account of grokAccounts) known.add(`grok\0${account.id}`);
+    if (wantsCopilot) for (const account of copilotAccounts) known.add(`copilot\0${account.id}`);
     return this.store.list(filter).filter((snapshot) => known.has(`${snapshot.providerId}\0${snapshot.accountId}`));
   }
   knownAccounts(config) {
@@ -1160,7 +1834,9 @@ var AccountAllowanceService = class {
       ...(config.claudeAccounts ?? []).map((account) => ({ providerId: "claude", accountId: account.id })),
       ...(config.codexAccounts ?? []).map((account) => ({ providerId: "codex", accountId: account.id })),
       ...(config.kimiAccounts ?? []).map((account) => ({ providerId: "kimi", accountId: account.id })),
-      ...(config.opencodegoAccounts ?? []).map((account) => ({ providerId: "opencodego", accountId: account.id }))
+      ...(config.opencodegoAccounts ?? []).map((account) => ({ providerId: "opencodego", accountId: account.id })),
+      ...(config.grokAccounts ?? []).map((account) => ({ providerId: "grok", accountId: account.id })),
+      ...(config.copilotAccounts ?? []).map((account) => ({ providerId: "copilot", accountId: account.id }))
     ];
   }
   /** Force-refresh Claude usage for one account or every stored Claude account. */
@@ -1203,6 +1879,24 @@ var AccountAllowanceService = class {
     );
     return this.kimiCollector.collectMany(accounts, { force: true });
   }
+  /** Force-refresh Copilot usage (copilot_internal/user) for one/all accounts. */
+  async refreshCopilot(accountId) {
+    const config = await this.credentials.getFullConfig();
+    this.store.pruneToKnownAccounts(this.knownAccounts(config));
+    const accounts = (config.copilotAccounts ?? []).filter(
+      (account) => !accountId || account.id === accountId
+    );
+    return this.copilotCollector.collectMany(accounts, { force: true });
+  }
+  /** Force-refresh Grok usage (CLI billing proxy) for one/all accounts. */
+  async refreshGrok(accountId) {
+    const config = await this.credentials.getFullConfig();
+    this.store.pruneToKnownAccounts(this.knownAccounts(config));
+    const accounts = (config.grokAccounts ?? []).filter(
+      (account) => !accountId || account.id === accountId
+    );
+    return this.grokCollector.collectMany(accounts, { force: true });
+  }
   /**
    * Keep Claude + Codex + Kimi snapshots warm for allowance-aware routing. All
    * collectors preserve their cache + per-account in-flight coalescing; a tick
@@ -1217,6 +1911,8 @@ var AccountAllowanceService = class {
     await this.codexCollector.collectMany(config.codexAccounts ?? [], { refreshAheadMs });
     await this.kimiCollector.collectMany(config.kimiAccounts ?? [], { refreshAheadMs });
     await this.opencodegoCollector.collectMany(config.opencodegoAccounts ?? [], { refreshAheadMs });
+    await this.grokCollector.collectMany(config.grokAccounts ?? [], { refreshAheadMs });
+    await this.copilotCollector.collectMany(config.copilotAccounts ?? [], { refreshAheadMs });
   }
   /** Remove a cache row as soon as an account is deleted by the admin path. */
   removeAccountSnapshot(providerId, accountId) {
@@ -1653,7 +2349,8 @@ import {
 } from "@omnicross/contracts/image-generation-types";
 import { getSharedAccountAllowanceScheduling as getSharedAccountAllowanceScheduling2 } from "@omnicross/core/pipeline/AccountAllowanceScheduling";
 import { getSharedAccountHealth } from "@omnicross/core/pipeline/SubscriptionAccountHealth";
-import { fetchUpstream as fetchUpstream5 } from "@omnicross/core/pipeline/upstreamFetch";
+import { fetchUpstream as fetchUpstream7 } from "@omnicross/core/pipeline/upstreamFetch";
+import { mergeExtraHeaders } from "@omnicross/core";
 
 // src/image-generation/imagesConfigValidation.ts
 import { validateImagesServerConfig } from "@omnicross/core/outbound-api";
@@ -1966,6 +2663,7 @@ async function applyServerConfigTransaction(current, next, deps) {
 
 // src/config.ts
 import { readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
+import { EXTRA_HEADER_RESERVED_NAMES } from "@omnicross/core";
 
 // src/secrets/envelope.ts
 import { createCipheriv, createDecipheriv, randomBytes as randomBytes2 } from "crypto";
@@ -2377,6 +3075,18 @@ var FORMAT_AXIS_TRANSFORMERS = [
   "openai-response",
   "gemini-code-assist"
 ];
+function validateExtraHeaders(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const reserved = EXTRA_HEADER_RESERVED_NAMES;
+  const out = {};
+  for (const [name, value] of Object.entries(raw)) {
+    if (!name.trim()) continue;
+    if (typeof value !== "string") continue;
+    if (reserved.has(name.toLowerCase())) continue;
+    out[name] = value;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function validateApiKeys(raw) {
   if (!Array.isArray(raw)) return void 0;
   const out = [];
@@ -2590,6 +3300,9 @@ function validateProvider(raw, index) {
     apiVersion,
     maxConcurrency,
     modelsEndpoint,
+    // Static extra headers: load-guard (reserved names dropped), collapse-to-
+    // undefined; enforced by the outbound header funnel + admin probes.
+    extraHeaders: validateExtraHeaders(p["extraHeaders"]),
     // Provider transformer config (app-parity child 5): load-guard, collapse-to-
     // undefined; non-secret; ENFORCED via resolveTransformerChain (parity-2 child 2).
     // Format-axis entries are stripped by `migrateFormatAxis` — `use[]` is the
@@ -3559,7 +4272,8 @@ function listMappablePresets() {
       description: preset.description,
       features: preset.features,
       website: preset.website,
-      modelsEndpoint: preset.modelsEndpoint
+      modelsEndpoint: preset.modelsEndpoint,
+      extraHeaders: preset.extraHeaders
     });
   }
   return { mappable, excluded };
@@ -3731,7 +4445,9 @@ var VALID_PROVIDER_IDS = [
   "codex",
   "gemini",
   "opencodego",
-  "kimi"
+  "kimi",
+  "grok",
+  "copilot"
 ];
 function asSubscriptionProviderId(id) {
   return VALID_PROVIDER_IDS.includes(id) ? id : null;
@@ -3879,6 +4595,40 @@ function validateKimi(body) {
   copyOptional(out, body, ["accessToken", "refreshToken", "expiresAt", "accountId", "deviceId", "lastRefreshedAt", "errorMessage"]);
   return out;
 }
+function validateGrok(body) {
+  const authMethod = str(body["authMethod"]);
+  const status = str(body["status"]);
+  if (!authMethod || !OAUTH_AUTH_METHODS.has(authMethod)) return null;
+  if (!status || !TOKEN_STATUSES.has(status)) return null;
+  const out = {
+    authMethod,
+    status
+  };
+  copyOptional(out, body, ["accessToken", "refreshToken", "expiresAt", "accountId", "lastRefreshedAt", "errorMessage"]);
+  return out;
+}
+function validateCopilot(body) {
+  const authMethod = str(body["authMethod"]);
+  const status = str(body["status"]);
+  if (!authMethod || !OAUTH_AUTH_METHODS.has(authMethod)) return null;
+  if (!status || !TOKEN_STATUSES.has(status)) return null;
+  const out = {
+    authMethod,
+    status
+  };
+  copyOptional(out, body, [
+    "accessToken",
+    "refreshToken",
+    "expiresAt",
+    "accountId",
+    "email",
+    "apiEndpoint",
+    "enterpriseUrl",
+    "lastRefreshedAt",
+    "errorMessage"
+  ]);
+  return out;
+}
 function validateOpenCodeGo(body) {
   const authMethod = str(body["authMethod"]);
   const status = str(body["status"]);
@@ -3916,6 +4666,10 @@ function validateTokenBody(providerId, body) {
       return validateOpenCodeGo(body);
     case "kimi":
       return validateKimi(body);
+    case "grok":
+      return validateGrok(body);
+    case "copilot":
+      return validateCopilot(body);
     default:
       return null;
   }
@@ -3945,12 +4699,12 @@ async function statusEntryFor(reader, providerId) {
 
 // src/admin/accountsOAuth.ts
 var OAUTH_HTTP_PROVIDERS = /* @__PURE__ */ new Set(["claude", "gemini"]);
-function err3(status, message) {
+function err5(status, message) {
   return { status, body: { error: { type: "admin_api_error", message } } };
 }
 function handleOAuthStart(providerId, deps) {
   if (!OAUTH_HTTP_PROVIDERS.has(providerId)) {
-    return err3(400, `oauth not available for provider '${providerId}'`);
+    return err5(400, `oauth not available for provider '${providerId}'`);
   }
   const flow = providerId === "claude" ? claudeOAuth : geminiOAuth;
   const { authUrl, codeVerifier, state } = flow.generateAuthParams();
@@ -3959,23 +4713,23 @@ function handleOAuthStart(providerId, deps) {
 }
 async function handleOAuthComplete(providerId, body, deps) {
   if (!OAUTH_HTTP_PROVIDERS.has(providerId)) {
-    return err3(400, `oauth not available for provider '${providerId}'`);
+    return err5(400, `oauth not available for provider '${providerId}'`);
   }
   const sessionId = typeof body["sessionId"] === "string" ? body["sessionId"] : "";
   const rawCode = typeof body["code"] === "string" ? body["code"] : "";
-  if (!sessionId) return err3(400, "oauth complete requires { sessionId }");
-  if (!rawCode) return err3(400, "oauth complete requires { code }");
+  if (!sessionId) return err5(400, "oauth complete requires { sessionId }");
+  if (!rawCode) return err5(400, "oauth complete requires { code }");
   const session = deps.oauthSessions.peek(sessionId);
-  if (!session) return err3(410, "oauth session is unknown, expired, or already used");
+  if (!session) return err5(410, "oauth session is unknown, expired, or already used");
   if (session.providerId !== providerId) {
-    return err3(400, `oauth session does not match provider '${providerId}'`);
+    return err5(400, `oauth session does not match provider '${providerId}'`);
   }
   let code = rawCode.trim();
   if (providerId === "claude") {
     const [splitCode, pastedState] = code.split("#");
-    if (!splitCode) return err3(400, "no authorization code was provided");
+    if (!splitCode) return err5(400, "no authorization code was provided");
     if (pastedState && pastedState !== session.state) {
-      return err3(400, "oauth state did not match (possible CSRF) \u2014 aborting");
+      return err5(400, "oauth state did not match (possible CSRF) \u2014 aborting");
     }
     code = splitCode;
   }
@@ -3985,7 +4739,7 @@ async function handleOAuthComplete(providerId, body, deps) {
     block = providerId === "claude" ? await exchangeClaude(code, session.codeVerifier, session.state, exchangeFetch) : await exchangeGemini(code, session.codeVerifier, exchangeFetch);
   } catch (exchangeError) {
     const reason = exchangeError instanceof Error ? exchangeError.message : "token exchange failed";
-    return err3(502, `oauth token exchange failed for '${providerId}': ${reason}`);
+    return err5(502, `oauth token exchange failed for '${providerId}': ${reason}`);
   }
   deps.oauthSessions.consume(sessionId);
   const label = typeof body["label"] === "string" && body["label"].trim() ? body["label"].trim() : void 0;
@@ -4323,8 +5077,8 @@ function errBody(message) {
   return { error: { type: "admin_api_error", message } };
 }
 var defaultCommandRunner = (command) => new Promise((resolve10) => {
-  exec(command, { timeout: 18e4 }, (err6, _stdout, stderr) => {
-    if (err6) resolve10({ ok: false, error: stderr.trim() || err6.message });
+  exec(command, { timeout: 18e4 }, (err8, _stdout, stderr) => {
+    if (err8) resolve10({ ok: false, error: stderr.trim() || err8.message });
     else resolve10({ ok: true });
   });
 });
@@ -4370,8 +5124,8 @@ async function handleCliLaunch(cli, body, ctx) {
       providerId: typeof body["providerId"] === "string" ? body["providerId"] : void 0,
       model: typeof body["model"] === "string" ? body["model"] : void 0
     });
-  } catch (err6) {
-    return { status: 400, body: errBody(err6 instanceof Error ? err6.message : "no launch target") };
+  } catch (err8) {
+    return { status: 400, body: errBody(err8 instanceof Error ? err8.message : "no launch target") };
   }
   const id = randomUUID2();
   let leaseId2;
@@ -4399,9 +5153,9 @@ async function handleCliLaunch(cli, body, ctx) {
     } else {
       launch = await buildLaunchEnv(cli, ctx.llmConfig, target);
     }
-  } catch (err6) {
-    const status = err6 instanceof RouteLeaseError2 ? err6.status : 400;
-    return { status, body: errBody(err6 instanceof Error ? err6.message : "failed to build launch env") };
+  } catch (err8) {
+    const status = err8 instanceof RouteLeaseError2 ? err8.status : 400;
+    return { status, body: errBody(err8 instanceof Error ? err8.message : "failed to build launch env") };
   }
   const cwd = typeof body["cwd"] === "string" && body["cwd"].trim() ? body["cwd"].trim() : void 0;
   const opener = ctx.opener ?? defaultTerminalOpener;
@@ -4429,9 +5183,9 @@ async function handleCliLaunch(cli, body, ctx) {
       onFailure: onSessionEnd
     });
     if (cleanup) openerCleanup = cleanup;
-  } catch (err6) {
+  } catch (err8) {
     onSessionEnd();
-    return { status: 500, body: errBody(err6 instanceof Error ? err6.message : "failed to open terminal") };
+    return { status: 500, body: errBody(err8 instanceof Error ? err8.message : "failed to open terminal") };
   }
   if (ended) {
     openerCleanup?.();
@@ -4980,7 +5734,7 @@ async function handleSearchQuery(req, res, deps) {
 // src/admin/searchAdminView.ts
 var API_KEY_PROVIDERS = /* @__PURE__ */ new Set(["tavily", "jina", "zhipu", "z.ai"]);
 var BASIC_AUTH_PROVIDERS = /* @__PURE__ */ new Set(["searxng"]);
-function isRecord2(value) {
+function isRecord4(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function redactSearchServerConfig(search) {
@@ -5030,13 +5784,13 @@ function resolveSecretField(entry, field, stored) {
   else delete entry[field];
 }
 function preserveSearchSecrets(incoming, current) {
-  if (!isRecord2(incoming)) return incoming;
+  if (!isRecord4(incoming)) return incoming;
   const section = { ...incoming };
   const providersValue = section["providers"];
-  if (!isRecord2(providersValue)) return section;
+  if (!isRecord4(providersValue)) return section;
   const providers = {};
   for (const [id, entryValue] of Object.entries(providersValue)) {
-    if (!isRecord2(entryValue)) {
+    if (!isRecord4(entryValue)) {
       providers[id] = entryValue;
       continue;
     }
@@ -5114,7 +5868,7 @@ function parseKeyPolicyBody(body) {
 var ENDPOINTS = /* @__PURE__ */ new Set(["chat", "responses", "messages", "gemini"]);
 var TARGET_KINDS = /* @__PURE__ */ new Set(["account", "account-group", "account-pool", "provider"]);
 var FALLBACKS = /* @__PURE__ */ new Set(["next", "fail", "global"]);
-function isRecord3(value) {
+function isRecord5(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function nonBlank(value) {
@@ -5134,7 +5888,7 @@ function validateGatewayBindingsSegment(patch) {
   const ids = /* @__PURE__ */ new Set();
   raw.forEach((entry, index) => {
     const path2 = `bindings[${index}]`;
-    if (!isRecord3(entry)) {
+    if (!isRecord5(entry)) {
       errors.push(`${path2} must be an object`);
       return;
     }
@@ -5163,12 +5917,12 @@ function validateGatewayBindingsSegment(patch) {
       } else if (entry.modelMappings.length > 100) {
         errors.push(`${path2}.modelMappings cannot contain more than 100 entries`);
       } else if (entry.modelMappings.some(
-        (mapping) => !isRecord3(mapping) || !nonBlank(mapping.source) || !nonBlank(mapping.target)
+        (mapping) => !isRecord5(mapping) || !nonBlank(mapping.source) || !nonBlank(mapping.target)
       )) {
         errors.push(`${path2}.modelMappings must contain non-empty source and target strings`);
       }
     }
-    if (!isRecord3(entry.target) || !TARGET_KINDS.has(String(entry.target.kind))) {
+    if (!isRecord5(entry.target) || !TARGET_KINDS.has(String(entry.target.kind))) {
       errors.push(`${path2}.target is invalid`);
     } else {
       if (!nonBlank(entry.target.providerId)) errors.push(`${path2}.target.providerId is required`);
@@ -5183,7 +5937,7 @@ function validateGatewayBindingsSegment(patch) {
       }
     }
     if (entry.modelMap !== void 0) {
-      if (!isRecord3(entry.modelMap) || Object.values(entry.modelMap).some((value) => typeof value !== "string")) {
+      if (!isRecord5(entry.modelMap) || Object.values(entry.modelMap).some((value) => typeof value !== "string")) {
         errors.push(`${path2}.modelMap must contain string values`);
       }
     }
@@ -5494,7 +6248,9 @@ var PROVIDER_KEYS = {
     accounts: "opencodegoAccounts",
     active: "activeOpencodegoAccountId"
   },
-  kimi: { block: "kimi", accounts: "kimiAccounts", active: "activeKimiAccountId" }
+  kimi: { block: "kimi", accounts: "kimiAccounts", active: "activeKimiAccountId" },
+  grok: { block: "grok", accounts: "grokAccounts", active: "activeGrokAccountId" },
+  copilot: { block: "copilot", accounts: "copilotAccounts", active: "activeCopilotAccountId" }
 };
 function clone(value) {
   return JSON.parse(JSON.stringify(value));
@@ -6016,7 +6772,7 @@ async function applyImport(packString, passphrase, mode, deps, parseProviderInpu
 }
 
 // src/admin/adminMigration.ts
-function err4(status, message) {
+function err6(status, message) {
   return { status, body: { error: { type: "admin_api_error", message } } };
 }
 async function handleExport(body, deps) {
@@ -6026,30 +6782,30 @@ async function handleExport(body, deps) {
     return { status: 200, body: { pack, version: BUNDLE_VERSION } };
   } catch (error) {
     if (error instanceof WeakPassphraseError) {
-      return err4(400, error.message);
+      return err6(400, error.message);
     }
-    return err4(500, "failed to build the migration pack");
+    return err6(500, "failed to build the migration pack");
   }
 }
 async function handleImport(body, deps) {
   const blob = typeof body["blob"] === "string" ? body["blob"] : "";
   const passphrase = typeof body["passphrase"] === "string" ? body["passphrase"] : "";
   const mode = body["mode"] === "overwrite" ? "overwrite" : "merge";
-  if (!blob) return err4(400, "import requires { blob }");
+  if (!blob) return err6(400, "import requires { blob }");
   try {
     const counts = await applyImport(blob, passphrase, mode, deps, deps.parseProviderInput);
     return { status: 200, body: counts };
   } catch (error) {
     if (error instanceof WeakPassphraseError) {
-      return err4(400, error.message);
+      return err6(400, error.message);
     }
-    return err4(400, error instanceof Error ? error.message : "import failed");
+    return err6(400, error instanceof Error ? error.message : "import failed");
   }
 }
 
 // src/admin/usagePricing.ts
 import { getSharedUsageThroughputTracker } from "@omnicross/core/usage";
-var err5 = (status, message) => ({
+var err7 = (status, message) => ({
   status,
   body: { error: { type: "admin_api_error", message } }
 });
@@ -6062,7 +6818,7 @@ function parseRange(query2) {
   const startTs = parseFiniteInt(query2.get("startTs"));
   const endTs = parseFiniteInt(query2.get("endTs"));
   if (startTs === null || endTs === null) {
-    return err5(400, "startTs and endTs are required finite-integer unix-millis query params");
+    return err7(400, "startTs and endTs are required finite-integer unix-millis query params");
   }
   return { startTs, endTs };
 }
@@ -6087,14 +6843,14 @@ async function handleUsageGet(view, query2, deps) {
     case "timeseries": {
       const bucket = query2.get("bucket");
       if (bucket !== "hour" && bucket !== "day" && bucket !== "month") {
-        return err5(400, "bucket must be one of 'hour', 'day', 'month'");
+        return err7(400, "bucket must be one of 'hour', 'day', 'month'");
       }
       const now = Date.now();
       const clamped = { startTs: range.startTs, endTs: Math.min(range.endTs, now) };
       if (clamped.startTs < clamped.endTs) {
         const projected = Math.ceil((clamped.endTs - clamped.startTs) / BUCKET_SPAN_MS[bucket]) + 1;
         if (projected > MAX_TIMESERIES_BUCKETS) {
-          return err5(
+          return err7(
             400,
             `requested range projects ~${projected} '${bucket}' buckets (max ${MAX_TIMESERIES_BUCKETS}); narrow the range or use a coarser bucket`
           );
@@ -6117,7 +6873,7 @@ async function handleUsageGet(view, query2, deps) {
       };
     }
     default:
-      return err5(404, `unknown usage view '${view ?? ""}'`);
+      return err7(404, `unknown usage view '${view ?? ""}'`);
   }
 }
 function poolKeyLabels(cfg) {
@@ -6166,7 +6922,7 @@ async function handlePricingList(deps) {
 async function handlePricingUpsert(body, deps) {
   const input = parsePricingEntryInput(body);
   if (!input) {
-    return err5(400, "invalid pricing entry (providerId, modelId, finite numeric inputPricePer1m/outputPricePer1m required)");
+    return err7(400, "invalid pricing entry (providerId, modelId, finite numeric inputPricePer1m/outputPricePer1m required)");
   }
   const entry = await deps.pricingEngine.upsertManual(input);
   return { status: 200, body: { entry } };
@@ -6175,7 +6931,7 @@ async function handlePricingDelete(query2, deps) {
   const providerId = query2.get("providerId")?.trim() ?? "";
   const modelId = query2.get("modelId")?.trim() ?? "";
   if (!providerId || !modelId) {
-    return err5(400, "delete requires providerId and modelId query params");
+    return err7(400, "delete requires providerId and modelId query params");
   }
   const deleted = await deps.pricingStore.delete(providerId, modelId);
   if (deleted) await deps.pricingEngine.invalidateCache();
@@ -6195,13 +6951,13 @@ async function handlePricingFetchLatest(deps) {
       }
     };
   } catch (e) {
-    return err5(502, `pricing-source fetch failed: ${e instanceof Error ? e.message : String(e)}`);
+    return err7(502, `pricing-source fetch failed: ${e instanceof Error ? e.message : String(e)}`);
   }
 }
 async function handlePricingResolveConflicts(body, deps) {
   const raw = body["resolutions"];
   if (!Array.isArray(raw)) {
-    return err5(400, "resolve-conflicts requires { resolutions: [...] }");
+    return err7(400, "resolve-conflicts requires { resolutions: [...] }");
   }
   const currentRows = await deps.pricingStore.getAll();
   const userEditedKeys = new Set(
@@ -6211,21 +6967,21 @@ async function handlePricingResolveConflicts(body, deps) {
   const pendingIncoming = /* @__PURE__ */ new Map();
   let staleCount = 0;
   for (const item of raw) {
-    if (!item || typeof item !== "object") return err5(400, "invalid resolution entry");
+    if (!item || typeof item !== "object") return err7(400, "invalid resolution entry");
     const r = item;
     const action = r["action"];
     if (action !== "overwrite" && action !== "skip") {
-      return err5(400, "resolution action must be 'overwrite' or 'skip'");
+      return err7(400, "resolution action must be 'overwrite' or 'skip'");
     }
     const providerId = typeof r["providerId"] === "string" && r["providerId"].trim() ? r["providerId"].trim() : "";
     const modelId = typeof r["modelId"] === "string" && r["modelId"].trim() ? r["modelId"].trim() : "";
     if (!providerId || !modelId) {
-      return err5(400, "each resolution requires top-level providerId and modelId");
+      return err7(400, "each resolution requires top-level providerId and modelId");
     }
     const incoming = parsePricingEntryInput(r["incoming"]);
-    if (!incoming) return err5(400, "each resolution must echo a valid incoming pricing entry");
+    if (!incoming) return err7(400, "each resolution must echo a valid incoming pricing entry");
     if (incoming.providerId !== providerId || incoming.modelId !== modelId) {
-      return err5(400, "resolution providerId/modelId must match the echoed incoming entry");
+      return err7(400, "resolution providerId/modelId must match the echoed incoming entry");
     }
     const key = `${providerId}::${modelId}`;
     if (action === "overwrite" && !userEditedKeys.has(key)) {
@@ -6270,7 +7026,7 @@ function query(req) {
 }
 function allowanceProvider(value) {
   if (!value) return void 0;
-  return value === "claude" || value === "codex" || value === "kimi" || value === "opencodego" ? value : null;
+  return value === "claude" || value === "codex" || value === "kimi" || value === "opencodego" || value === "grok" || value === "copilot" ? value : null;
 }
 async function handleAccountAllowanceApi(req, res, method, rest, service) {
   if (!service) return writeError2(res, 501, "account allowance service is not available");
@@ -6285,7 +7041,7 @@ async function handleAccountAllowanceApi(req, res, method, rest, service) {
     const pathProvider = rest.length >= 2 ? rest[0] : null;
     const providerId = allowanceProvider(pathProvider ?? params.get("providerId") ?? params.get("provider"));
     if (providerId === null) {
-      return writeError2(res, 400, "providerId must be claude, codex, kimi, or opencodego");
+      return writeError2(res, 400, "providerId must be claude, codex, kimi, opencodego, grok, or copilot");
     }
     const accountId = rest.length >= 2 ? rest[1] : params.get("accountId") ?? void 0;
     const allowances = await service.list({ providerId, accountId });
@@ -6327,6 +7083,26 @@ async function handleAccountAllowanceApi(req, res, method, rest, service) {
       }
       return writeJson3(res, 200, { allowances: allowances2 });
     }
+    if (requestedProvider === "copilot") {
+      if (!service.refreshCopilot) {
+        return writeError2(res, 501, "copilot allowance refresh is not available");
+      }
+      const allowances2 = await service.refreshCopilot(accountId);
+      if (accountId && allowances2.length === 0) {
+        return writeError2(res, 404, `Copilot account '${accountId}' not found`);
+      }
+      return writeJson3(res, 200, { allowances: allowances2 });
+    }
+    if (requestedProvider === "grok") {
+      if (!service.refreshGrok) {
+        return writeError2(res, 501, "grok allowance refresh is not available");
+      }
+      const allowances2 = await service.refreshGrok(accountId);
+      if (accountId && allowances2.length === 0) {
+        return writeError2(res, 404, `Grok account '${accountId}' not found`);
+      }
+      return writeJson3(res, 200, { allowances: allowances2 });
+    }
     const allowances = await service.refreshClaude(accountId);
     if (accountId && allowances.length === 0) {
       return writeError2(res, 404, `Claude account '${accountId}' not found`);
@@ -6428,6 +7204,9 @@ function toProviderView(row) {
     apiVersion: row.apiVersion,
     maxConcurrency: row.maxConcurrency,
     modelsEndpoint: row.modelsEndpoint,
+    // Static extra headers round-trip VERBATIM (non-secret identity values;
+    // auth/content names were already dropped at the write/load gate).
+    extraHeaders: row.extraHeaders,
     // app-parity child 5: transformer config round-trips VERBATIM (non-secret —
     // transform-rule names + options, no key material; absent stays absent).
     transformer: row.transformer,
@@ -6497,8 +7276,8 @@ async function handleAdminApi(req, res, path2, deps) {
       default:
         return writeJsonError(res, 404, `unknown admin resource '${resource}'`);
     }
-  } catch (err6) {
-    writeJsonError(res, 500, err6 instanceof Error ? err6.message : String(err6));
+  } catch (err8) {
+    writeJsonError(res, 500, err8 instanceof Error ? err8.message : String(err8));
   }
 }
 function requestQuery(req) {
@@ -6656,6 +7435,9 @@ async function handleProviderReorder(req, res, cfg, deps) {
   persistProviders(cfg, deps);
   return writeJson4(res, 200, { ok: true, providers: cfg.providers.map(toProviderView) });
 }
+function expandRowExtraHeaders(row) {
+  return mergeExtraHeaders({}, row.extraHeaders);
+}
 async function handleDiscoverModels(res, id, cfg) {
   if (!id) return writeJsonError(res, 400, "provider id required in path");
   const row = cfg.providers.find((p) => p.id === id);
@@ -6669,7 +7451,8 @@ async function handleDiscoverModels(res, id, cfg) {
   try {
     const headers = { Accept: "application/json" };
     if (resolvedKey) headers["Authorization"] = `Bearer ${resolvedKey}`;
-    const response = await fetchUpstream5(url, { method: "GET", headers }, { providerId: "byo" });
+    Object.assign(headers, expandRowExtraHeaders(row));
+    const response = await fetchUpstream7(url, { method: "GET", headers }, { providerId: "byo" });
     if (!response.ok) {
       const text = await response.text().catch(() => "");
       let message = text.slice(0, 300);
@@ -6686,8 +7469,8 @@ async function handleDiscoverModels(res, id, cfg) {
     const data = await response.json();
     const models = Array.isArray(data?.data) ? data.data.map((m) => typeof m?.id === "string" ? m.id : "").filter((m) => m.length > 0) : [];
     return writeJson4(res, 200, { models });
-  } catch (err6) {
-    const message = err6 instanceof Error ? err6.message : String(err6);
+  } catch (err8) {
+    const message = err8 instanceof Error ? err8.message : String(err8);
     return writeJson4(res, 200, { models: [], error: `discovery failed: ${message}` });
   }
 }
@@ -6726,9 +7509,10 @@ async function handleTestModel(req, res, id, cfg) {
       messages: [{ role: "user", content: prompt }]
     };
   }
+  Object.assign(headers, expandRowExtraHeaders(row));
   const startedAt = Date.now();
   try {
-    const response = await fetchUpstream5(
+    const response = await fetchUpstream7(
       url,
       { method: "POST", headers, body: JSON.stringify(payload) },
       { providerId: "byo" }
@@ -6750,8 +7534,8 @@ async function handleTestModel(req, res, id, cfg) {
       latencyMs,
       sample: extractSampleText(text, row.apiFormat)
     });
-  } catch (err6) {
-    const message = err6 instanceof Error ? err6.message : String(err6);
+  } catch (err8) {
+    const message = err8 instanceof Error ? err8.message : String(err8);
     return writeJson4(res, 200, { ok: false, latencyMs: Date.now() - startedAt, message });
   }
 }
@@ -7033,6 +7817,7 @@ function parseProviderInput(body, existing) {
   const apiVersion = typeof body["apiVersion"] === "string" && body["apiVersion"].length > 0 ? body["apiVersion"] : body["apiVersion"] === null ? void 0 : existing?.apiVersion;
   const modelsEndpoint = typeof body["modelsEndpoint"] === "string" && body["modelsEndpoint"].length > 0 ? body["modelsEndpoint"] : body["modelsEndpoint"] === null ? void 0 : existing?.modelsEndpoint;
   const maxConcurrency = typeof body["maxConcurrency"] === "number" && Number.isFinite(body["maxConcurrency"]) ? body["maxConcurrency"] : body["maxConcurrency"] === null ? void 0 : existing?.maxConcurrency;
+  const extraHeaders = body["extraHeaders"] === null ? void 0 : body["extraHeaders"] === void 0 ? existing?.extraHeaders : validateExtraHeaders(body["extraHeaders"]);
   const transformer = body["transformer"] === null ? void 0 : parseTransformerInput(body["transformer"], existing?.transformer);
   const codingPlan = body["codingPlan"] === null ? void 0 : body["codingPlan"] === void 0 ? existing?.codingPlan : body["codingPlan"] && typeof body["codingPlan"] === "object" && !Array.isArray(body["codingPlan"]) ? parseCodingPlanInput(body["codingPlan"], existing?.codingPlan) : existing?.codingPlan;
   const apiModes = body["apiModes"] === null ? void 0 : parseApiModesInput(body["apiModes"], existing?.apiModes);
@@ -7058,6 +7843,7 @@ function parseProviderInput(body, existing) {
     apiVersion,
     maxConcurrency,
     modelsEndpoint,
+    extraHeaders,
     transformer: migrated.transformer,
     codingPlan,
     apiModes,
@@ -7079,7 +7865,10 @@ function handlePresets(res, method) {
     description: p.description,
     features: p.features,
     website: p.website,
-    modelsEndpoint: p.modelsEndpoint
+    modelsEndpoint: p.modelsEndpoint,
+    // Static extra headers ride along so `addFromPreset` can seed them onto the
+    // row (the write gateway re-validates via the shared allowlist).
+    extraHeaders: p.extraHeaders
   }));
   return writeJson4(res, 200, { presets, excluded });
 }
@@ -7561,12 +8350,12 @@ async function handleAccounts(req, res, method, rest, deps) {
     }
     return writeJson4(res, 200, { ok: true, affected: result.affected });
   }
-  if (method === "GET" && (rest[0] === "codex" || rest[0] === "kimi") && rest[1] === "oauth" && rest[3] === "status") {
-    const result = rest[0] === "codex" ? handleCodexOAuthStatus(rest[2], deps) : handleKimiOAuthStatus(rest[2], deps);
+  if (method === "GET" && (rest[0] === "codex" || rest[0] === "kimi" || rest[0] === "grok" || rest[0] === "copilot") && rest[1] === "oauth" && rest[3] === "status") {
+    const result = rest[0] === "codex" ? handleCodexOAuthStatus(rest[2], deps) : rest[0] === "kimi" ? handleKimiOAuthStatus(rest[2], deps) : rest[0] === "grok" ? handleGrokOAuthStatus(rest[2], deps) : handleCopilotOAuthStatus(rest[2], deps);
     return writeJson4(res, result.status, result.body);
   }
-  if (method === "DELETE" && (rest[0] === "codex" || rest[0] === "kimi") && rest[1] === "oauth" && rest[2]) {
-    const result = rest[0] === "codex" ? handleCodexOAuthCancel(rest[2], deps) : handleKimiOAuthCancel(rest[2], deps);
+  if (method === "DELETE" && (rest[0] === "codex" || rest[0] === "kimi" || rest[0] === "grok" || rest[0] === "copilot") && rest[1] === "oauth" && rest[2]) {
+    const result = rest[0] === "codex" ? handleCodexOAuthCancel(rest[2], deps) : rest[0] === "kimi" ? handleKimiOAuthCancel(rest[2], deps) : rest[0] === "grok" ? handleGrokOAuthCancel(rest[2], deps) : handleCopilotOAuthCancel(rest[2], deps);
     return writeJson4(res, result.status, result.body);
   }
   if (method === "GET" && rest.length === 3 && rest[2] === "diagnostics") {
@@ -7627,6 +8416,15 @@ async function handleAccounts(req, res, method, rest, deps) {
         const result2 = await handleKimiOAuthStart(deps);
         return writeJson4(res, result2.status, result2.body);
       }
+      if (providerId === "grok") {
+        const result2 = await handleGrokOAuthStart(deps);
+        return writeJson4(res, result2.status, result2.body);
+      }
+      if (providerId === "copilot") {
+        const body2 = await readJsonBody4(req);
+        const result2 = await handleCopilotOAuthStart(deps, body2["enterpriseUrl"]);
+        return writeJson4(res, result2.status, result2.body);
+      }
       const result = handleOAuthStart(providerId, deps);
       return writeJson4(res, result.status, result.body);
     }
@@ -8121,12 +8919,12 @@ async function handlePlayground(req, res, method, deps) {
   const payload = body["body"];
   const status = deps.outboundApiServer.getStatus();
   if (!status.running || !status.port) return writeJsonError(res, 503, "outbound server not running");
-  const path2 = resolvePlaygroundPath(endpoint, isRecord4(payload) ? payload : {});
+  const path2 = resolvePlaygroundPath(endpoint, isRecord6(payload) ? payload : {});
   if (!path2) return writeJsonError(res, 400, `unknown endpoint '${endpoint}'`);
   const upstreamBody = typeof payload === "string" ? payload : JSON.stringify(payload ?? {});
   await proxyToOutbound(res, status.port, path2, key, upstreamBody);
 }
-function isRecord4(v) {
+function isRecord6(v) {
   return !!v && typeof v === "object" && !Array.isArray(v);
 }
 function proxyToOutbound(res, outboundPort, path2, key, body) {
@@ -8155,8 +8953,8 @@ function proxyToOutbound(res, outboundPort, path2, key, body) {
         });
       }
     );
-    upstream.on("error", (err6) => {
-      if (!res.headersSent) writeJsonError(res, 502, `playground proxy failed: ${err6.message}`);
+    upstream.on("error", (err8) => {
+      if (!res.headersSent) writeJsonError(res, 502, `playground proxy failed: ${err8.message}`);
       else res.end();
       resolve10();
     });
@@ -8261,7 +9059,7 @@ async function handleUiStatic(req, res, urlPath, uiDist) {
 }
 
 // src/admin/version.ts
-var DAEMON_VERSION = true ? "0.3.1" : "0.0.0-dev";
+var DAEMON_VERSION = true ? "0.4.0" : "0.0.0-dev";
 
 // src/admin/AdminServer.ts
 var LOOPBACK_ADDR = "127.0.0.1";
@@ -8304,13 +9102,13 @@ var AdminServer = class {
       const server = http2.createServer((req, res) => {
         this.onRequest(req, res);
       });
-      const onError = (err6) => {
-        if (err6.code === "EADDRINUSE" && port !== 0) {
+      const onError = (err8) => {
+        if (err8.code === "EADDRINUSE" && port !== 0) {
           server.removeListener("error", onError);
           this.listen(bindAddr, 0).then(resolve10, reject);
           return;
         }
-        reject(err6);
+        reject(err8);
       };
       server.on("error", onError);
       server.listen(port, bindAddr, () => {
@@ -8328,8 +9126,8 @@ var AdminServer = class {
   }
   /** Per-request handler: auth gate (when a token is set) → routing. */
   onRequest(req, res) {
-    void this.dispatch(req, res).catch((err6) => {
-      const message = err6 instanceof Error ? err6.message : String(err6);
+    void this.dispatch(req, res).catch((err8) => {
+      const message = err8 instanceof Error ? err8.message : String(err8);
       this.deps.logger.error("[AdminServer] unhandled error:", message);
       if (!res.headersSent) {
         res.writeHead(500, { "Content-Type": "application/json" });
@@ -8593,18 +9391,18 @@ function awaitLoopbackCode(expectedState, timeoutMs = DEFAULT_TIMEOUT_MS, signal
       return;
     }
     signal?.addEventListener("abort", abort, { once: true });
-    server.on("error", (err6) => {
+    server.on("error", (err8) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      if (err6.code === "EADDRINUSE") {
+      if (err8.code === "EADDRINUSE") {
         reject(
           new Error(
             `login: cannot bind ${LOOPBACK_HOST}:${LOOPBACK_PORT} (address in use) \u2014 another codex login or process is holding the port`
           )
         );
       } else {
-        reject(err6);
+        reject(err8);
       }
     });
     const timer = setTimeout(() => {
@@ -8680,21 +9478,22 @@ function createPoolKeysLoader(getProviderRow, autoDisabled) {
 }
 
 // src/allowance/ProviderKeyQuotaService.ts
-import { fetchUpstream as fetchUpstream6 } from "@omnicross/core/pipeline/upstreamFetch";
+import { mergeExtraHeaders as mergeExtraHeaders2 } from "@omnicross/core";
+import { fetchUpstream as fetchUpstream8 } from "@omnicross/core/pipeline/upstreamFetch";
 
 // src/allowance/ProviderKeyQuota.ts
-var MINUTE_MS2 = 6e4;
-var HOUR_MS2 = 60 * MINUTE_MS2;
-var DAY_MS2 = 24 * HOUR_MS2;
-var WEEK_MS = 7 * DAY_MS2;
-var MONTH_MS = 30 * DAY_MS2;
-function finiteNumber3(value) {
+var MINUTE_MS3 = 6e4;
+var HOUR_MS2 = 60 * MINUTE_MS3;
+var DAY_MS3 = 24 * HOUR_MS2;
+var WEEK_MS = 7 * DAY_MS3;
+var MONTH_MS = 30 * DAY_MS3;
+function finiteNumber5(value) {
   if (value === null || value === void 0 || value === "") return void 0;
   const parsed = typeof value === "number" ? value : Number(value);
   return Number.isFinite(parsed) && parsed >= 0 ? parsed : void 0;
 }
 function finitePercent4(value) {
-  const parsed = finiteNumber3(value);
+  const parsed = finiteNumber5(value);
   return parsed !== void 0 && parsed <= 100 ? parsed : null;
 }
 function isoInstant3(value) {
@@ -8702,18 +9501,18 @@ function isoInstant3(value) {
     const time = Date.parse(value);
     if (Number.isFinite(time)) return new Date(time).toISOString();
   }
-  const numeric = finiteNumber3(value);
+  const numeric = finiteNumber5(value);
   if (numeric !== void 0 && numeric > 1e9) {
     const ms = numeric > 1e12 ? numeric : numeric * 1e3;
     return new Date(ms).toISOString();
   }
   return void 0;
 }
-function secondsUntil5(instant, now) {
+function secondsUntil7(instant, now) {
   if (!instant) return void 0;
   return Math.max(0, Math.floor((Date.parse(instant) - now) / 1e3));
 }
-function isRecord5(value) {
+function isRecord7(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function detectProviderKeyQuotaAdapter(baseUrl) {
@@ -8736,6 +9535,7 @@ function detectProviderKeyQuotaAdapter(baseUrl) {
   }
   if (host === "api.code.umans.ai") return "umans";
   if (host === "api.synthetic.new") return "synthetic";
+  if (host === "api.cline.bot") return "cline-pass";
   return null;
 }
 function providerKeyQuotaUrl(adapter, baseUrl) {
@@ -8743,6 +9543,7 @@ function providerKeyQuotaUrl(adapter, baseUrl) {
   if (adapter === "zai") return `${origin}/api/monitor/usage/quota/limit`;
   if (adapter === "minimax-token-plan") return `${origin}/v1/token_plan/remains`;
   if (adapter === "umans") return `${origin}/v1/usage`;
+  if (adapter === "cline-pass") return `${origin}/api/v1/users/me/plan/usage-limits`;
   return `${origin}/v2/quotas`;
 }
 function providerKeyQuotaAuthHeader(adapter, key) {
@@ -8754,7 +9555,7 @@ function zaiWindowDurationMs(item) {
     case 3:
       return count * HOUR_MS2;
     case 4:
-      return count * DAY_MS2;
+      return count * DAY_MS3;
     case 5:
       return count * MONTH_MS;
     case 6:
@@ -8767,8 +9568,8 @@ function zaiWindowIdLabel(durationMs) {
   if (durationMs === WEEK_MS) return { id: "seven-day", label: "7 days" };
   if (durationMs === 5 * HOUR_MS2) return { id: "five-hour", label: "5 hours" };
   if (durationMs === MONTH_MS) return { id: "thirty-day", label: "30 days" };
-  if (durationMs !== void 0 && durationMs % DAY_MS2 === 0) {
-    const days = durationMs / DAY_MS2;
+  if (durationMs !== void 0 && durationMs % DAY_MS3 === 0) {
+    const days = durationMs / DAY_MS3;
     return { id: `${days}d`, label: `${days} day${days === 1 ? "" : "s"}` };
   }
   if (durationMs !== void 0 && durationMs % HOUR_MS2 === 0) {
@@ -8778,23 +9579,23 @@ function zaiWindowIdLabel(durationMs) {
   return { id: "quota", label: "Quota" };
 }
 function parseZaiQuotaPayload(payload, now) {
-  if (!isRecord5(payload)) return null;
-  const data = isRecord5(payload["data"]) ? payload["data"] : payload;
+  if (!isRecord7(payload)) return null;
+  const data = isRecord7(payload["data"]) ? payload["data"] : payload;
   if (payload["success"] === false) return null;
   const limits = Array.isArray(data["limits"]) ? data["limits"] : [];
   const byWindow = /* @__PURE__ */ new Map();
   for (const raw of limits) {
-    if (!isRecord5(raw)) continue;
+    if (!isRecord7(raw)) continue;
     const item = raw;
     if (item.type === void 0) continue;
     const details = raw["usageDetails"];
-    if (Array.isArray(details) && details.some((d) => isRecord5(d) && d["modelCode"] === "zread")) {
+    if (Array.isArray(details) && details.some((d) => isRecord7(d) && d["modelCode"] === "zread")) {
       continue;
     }
     const durationMs = zaiWindowDurationMs(item);
     const { id, label } = zaiWindowIdLabel(durationMs);
-    const limit = finiteNumber3(item.usage);
-    const used = finiteNumber3(item.currentValue);
+    const limit = finiteNumber5(item.usage);
+    const used = finiteNumber5(item.currentValue);
     const fromAbsolute = limit !== void 0 && used !== void 0 && limit > 0 ? Math.min(100, used / limit * 100) : void 0;
     const fromPercentage = finitePercent4(item.percentage) ?? void 0;
     const usedPercent = fromAbsolute !== void 0 ? Math.round(fromAbsolute * 10) / 10 : fromPercentage;
@@ -8805,9 +9606,9 @@ function parseZaiQuotaPayload(payload, now) {
       label,
       scope: "all",
       usedPercent,
-      ...durationMs !== void 0 ? { windowMinutes: Math.round(durationMs / MINUTE_MS2) } : {},
+      ...durationMs !== void 0 ? { windowMinutes: Math.round(durationMs / MINUTE_MS3) } : {},
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil5(resetsAt, now),
+      remainingSeconds: secondsUntil7(resetsAt, now),
       state: "fresh"
     };
     const existing = byWindow.get(id);
@@ -8821,21 +9622,21 @@ function parseZaiQuotaPayload(payload, now) {
 var MINIMAX_STATUS_EXHAUSTED = 2;
 var MINIMAX_SHARED_BUCKET = "general";
 function parseMiniMaxBucket(value) {
-  if (!isRecord5(value)) return null;
+  if (!isRecord7(value)) return null;
   const modelName = typeof value["model_name"] === "string" ? value["model_name"].trim() : "";
   if (!modelName) return null;
   const instant = (v) => {
-    const n = finiteNumber3(v);
+    const n = finiteNumber5(v);
     return n !== void 0 && n > 1e9 ? n > 1e12 ? n : n * 1e3 : void 0;
   };
   return {
     modelName,
     intervalEnd: instant(value["end_time"]),
-    intervalRemainingPercent: finiteNumber3(value["current_interval_remaining_percent"]),
-    intervalStatus: finiteNumber3(value["current_interval_status"]),
+    intervalRemainingPercent: finiteNumber5(value["current_interval_remaining_percent"]),
+    intervalStatus: finiteNumber5(value["current_interval_status"]),
     weeklyEnd: instant(value["weekly_end_time"]),
-    weeklyRemainingPercent: finiteNumber3(value["current_weekly_remaining_percent"]),
-    weeklyStatus: finiteNumber3(value["current_weekly_status"])
+    weeklyRemainingPercent: finiteNumber5(value["current_weekly_remaining_percent"]),
+    weeklyStatus: finiteNumber5(value["current_weekly_status"])
   };
 }
 function minimaxWindow(id, label, windowMinutes, resetsAtMs, remainingPercent, status, now) {
@@ -8848,14 +9649,14 @@ function minimaxWindow(id, label, windowMinutes, resetsAtMs, remainingPercent, s
     usedPercent,
     ...windowMinutes !== void 0 ? { windowMinutes } : {},
     ...resetsAt !== void 0 ? { resetsAt } : {},
-    remainingSeconds: secondsUntil5(resetsAt, now),
+    remainingSeconds: secondsUntil7(resetsAt, now),
     state: usedPercent !== null ? "fresh" : "unavailable"
   };
 }
 function parseMiniMaxTokenPlanPayload(payload, now) {
-  if (!isRecord5(payload)) return null;
+  if (!isRecord7(payload)) return null;
   const baseResp = payload["base_resp"];
-  if (!isRecord5(baseResp) || baseResp["status_code"] !== 0) return null;
+  if (!isRecord7(baseResp) || baseResp["status_code"] !== 0) return null;
   const buckets = Array.isArray(payload["model_remains"]) ? payload["model_remains"] : [];
   let general = null;
   for (const raw of buckets) {
@@ -8879,7 +9680,7 @@ function parseMiniMaxTokenPlanPayload(payload, now) {
     minimaxWindow(
       "seven-day",
       "7 days",
-      Math.round(WEEK_MS / MINUTE_MS2),
+      Math.round(WEEK_MS / MINUTE_MS3),
       general.weeklyEnd,
       general.weeklyRemainingPercent,
       general.weeklyStatus,
@@ -8888,15 +9689,15 @@ function parseMiniMaxTokenPlanPayload(payload, now) {
   ];
 }
 function parseUmansUsagePayload(payload, now) {
-  if (!isRecord5(payload)) return null;
-  const limits = isRecord5(payload["limits"]) ? payload["limits"] : void 0;
-  const requests = limits && isRecord5(limits["requests"]) ? limits["requests"] : void 0;
-  const usage = isRecord5(payload["usage"]) ? payload["usage"] : void 0;
-  const window = isRecord5(payload["window"]) ? payload["window"] : void 0;
-  const hardCap = finiteNumber3(requests?.["hard_cap"]);
-  const softLimit = finiteNumber3(requests?.["limit"]);
-  const requestsInWindow = finiteNumber3(usage?.["requests_in_window"]);
-  const weightedInWindow = finiteNumber3(usage?.["weighted_in_window"]);
+  if (!isRecord7(payload)) return null;
+  const limits = isRecord7(payload["limits"]) ? payload["limits"] : void 0;
+  const requests = limits && isRecord7(limits["requests"]) ? limits["requests"] : void 0;
+  const usage = isRecord7(payload["usage"]) ? payload["usage"] : void 0;
+  const window = isRecord7(payload["window"]) ? payload["window"] : void 0;
+  const hardCap = finiteNumber5(requests?.["hard_cap"]);
+  const softLimit = finiteNumber5(requests?.["limit"]);
+  const requestsInWindow = finiteNumber5(usage?.["requests_in_window"]);
+  const weightedInWindow = finiteNumber5(usage?.["weighted_in_window"]);
   const resetsAt = isoInstant3(window?.["resets_at"]);
   let usedPercent = null;
   if (hardCap !== void 0 && hardCap > 0 && requestsInWindow !== void 0) {
@@ -8913,19 +9714,19 @@ function parseUmansUsagePayload(payload, now) {
       usedPercent,
       windowMinutes: 5 * 60,
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil5(resetsAt, now),
+      remainingSeconds: secondsUntil7(resetsAt, now),
       state: "fresh"
     }
   ];
 }
 function parseSyntheticQuotasPayload(payload, now) {
-  if (!isRecord5(payload)) return null;
-  const fiveHour = isRecord5(payload["rollingFiveHourLimit"]) ? payload["rollingFiveHourLimit"] : void 0;
-  const weekly = isRecord5(payload["weeklyTokenLimit"]) ? payload["weeklyTokenLimit"] : void 0;
+  if (!isRecord7(payload)) return null;
+  const fiveHour = isRecord7(payload["rollingFiveHourLimit"]) ? payload["rollingFiveHourLimit"] : void 0;
+  const weekly = isRecord7(payload["weeklyTokenLimit"]) ? payload["weeklyTokenLimit"] : void 0;
   const windows = [];
   if (fiveHour) {
-    const max = finiteNumber3(fiveHour["max"]);
-    const remaining = finiteNumber3(fiveHour["remaining"]);
+    const max = finiteNumber5(fiveHour["max"]);
+    const remaining = finiteNumber5(fiveHour["remaining"]);
     const usedPercent = max !== void 0 && max > 0 && remaining !== void 0 ? Math.round(Math.min(100, (max - remaining) / max * 100) * 10) / 10 : null;
     const resetsAt = isoInstant3(fiveHour["nextTickAt"]);
     windows.push({
@@ -8935,12 +9736,12 @@ function parseSyntheticQuotasPayload(payload, now) {
       usedPercent,
       windowMinutes: 5 * 60,
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil5(resetsAt, now),
+      remainingSeconds: secondsUntil7(resetsAt, now),
       state: usedPercent !== null || resetsAt ? "fresh" : "unavailable"
     });
   }
   if (weekly) {
-    const percentRemaining = finiteNumber3(weekly["percentRemaining"]);
+    const percentRemaining = finiteNumber5(weekly["percentRemaining"]);
     const usedPercent = percentRemaining !== void 0 ? Math.round(Math.min(100, Math.max(0, 100 - percentRemaining)) * 10) / 10 : null;
     const resetsAt = isoInstant3(weekly["nextRegenAt"]);
     windows.push({
@@ -8950,12 +9751,42 @@ function parseSyntheticQuotasPayload(payload, now) {
       usedPercent,
       windowMinutes: 7 * 24 * 60,
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil5(resetsAt, now),
+      remainingSeconds: secondsUntil7(resetsAt, now),
       state: usedPercent !== null || resetsAt ? "fresh" : "unavailable"
     });
   }
   return windows.length > 0 ? windows : null;
 }
+var CLINE_WINDOW_CONFIG = {
+  five_hour: { id: "five-hour", label: "5 hours", minutes: 5 * 60 },
+  weekly: { id: "seven-day", label: "7 days", minutes: 7 * 24 * 60 },
+  monthly: { id: "thirty-day", label: "30 days", minutes: 30 * 24 * 60 }
+};
+function parseClinePassUsageLimitsPayload(payload, now) {
+  if (!isRecord7(payload)) return null;
+  const data = isRecord7(payload["data"]) ? payload["data"] : payload;
+  const limits = Array.isArray(data["limits"]) ? data["limits"] : [];
+  const windows = [];
+  for (const raw of limits) {
+    if (!isRecord7(raw)) continue;
+    const config = CLINE_WINDOW_CONFIG[typeof raw["type"] === "string" ? raw["type"] : ""];
+    if (!config) continue;
+    const usedPercent = finitePercent4(raw["percentUsed"]);
+    if (usedPercent === null) continue;
+    const resetsAt = isoInstant3(raw["resetsAt"]);
+    windows.push({
+      id: config.id,
+      label: config.label,
+      scope: "all",
+      usedPercent,
+      windowMinutes: config.minutes,
+      ...resetsAt !== void 0 ? { resetsAt } : {},
+      remainingSeconds: secondsUntil7(resetsAt, now),
+      state: "fresh"
+    });
+  }
+  return windows.length > 0 ? windows : null;
+}
 
 // src/allowance/ProviderKeyQuotaService.ts
 function parseQuotaPayload(adapter, payload, now) {
@@ -8968,6 +9799,8 @@ function parseQuotaPayload(adapter, payload, now) {
       return parseUmansUsagePayload(payload, now);
     case "synthetic":
       return parseSyntheticQuotasPayload(payload, now);
+    case "cline-pass":
+      return parseClinePassUsageLimitsPayload(payload, now);
   }
 }
 var PROVIDER_KEY_QUOTA_CACHE_MS = 5 * 6e4;
@@ -8987,7 +9820,7 @@ function rowKeyEntries(row) {
   return [];
 }
 var ProviderKeyQuotaService = class {
-  constructor(box, fetchImpl = (url, init) => fetchUpstream6(url, init, { redactBodies: true }), now = Date.now) {
+  constructor(box, fetchImpl = (url, init) => fetchUpstream8(url, init, { redactBodies: true }), now = Date.now) {
     this.box = box;
     this.fetchImpl = fetchImpl;
     this.now = now;
@@ -9049,7 +9882,10 @@ var ProviderKeyQuotaService = class {
       headers: {
         Authorization: providerKeyQuotaAuthHeader(adapter, key),
         Accept: "application/json",
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        // The row's static identity headers ride along — the Cline usage
+        // endpoint sits behind the SAME client-identity 403 gate as inference.
+        ...mergeExtraHeaders2({}, row.extraHeaders)
       },
       signal: AbortSignal.timeout(15e3)
     });
@@ -13854,6 +14690,10 @@ function toLLMProvider(row) {
     // `parseProviderInput`), so customizations are preserved (the row value wins).
     apiModes: row.apiModes,
     selectedApiModeId: row.selectedApiModeId,
+    // Static extra request headers ride along verbatim (load-guarded — no
+    // auth/content names); core's `getProviderHeaders` merges them into every
+    // BYO request, and the same-format relay path inherits that funnel.
+    extraHeaders: row.extraHeaders,
     // Official-Anthropic signature handling only matters for the Anthropic
     // ingress (deferred → 502); leave it off for the BYO transform path.
     isOfficial: false
@@ -15803,12 +16643,13 @@ import { existsSync as existsSync22, mkdirSync as mkdirSync6, readFileSync as re
 import { dirname as dirname15 } from "path";
 import { getSharedAccountHealth as getSharedAccountHealth2 } from "@omnicross/core/pipeline/SubscriptionAccountHealth";
 import { getSharedAccountAllowanceScheduling as getSharedAccountAllowanceScheduling3 } from "@omnicross/core/pipeline/AccountAllowanceScheduling";
-import { fetchUpstream as fetchUpstream7 } from "@omnicross/core/pipeline/upstreamFetch";
+import { fetchUpstream as fetchUpstream9 } from "@omnicross/core/pipeline/upstreamFetch";
 import { getSharedIdentityStore as getSharedIdentityStore2 } from "@omnicross/core/provider-proxy/identity/SubscriptionIdentityStore";
 import {
   claudeOAuth as claudeOAuth2,
   codexOAuth as codexOAuth2,
   geminiOAuth as geminiOAuth2,
+  grokOAuth as grokOAuth2,
   kimiOAuth as kimiOAuth2
 } from "@omnicross/subscriptions";
 
@@ -15958,7 +16799,7 @@ var JsonSubscriptionCredentialStore = class {
    * a plaintext token pair into `upstream-trace.jsonl`.
    */
   buildRefreshFetch(providerId, accountId) {
-    return this.fetchImpl ?? ((url, init) => fetchUpstream7(url, init, { providerId, accountId, redactBodies: true }));
+    return this.fetchImpl ?? ((url, init) => fetchUpstream9(url, init, { providerId, accountId, redactBodies: true }));
   }
   /**
    * In-flight refresh coalescing. OAuth refresh tokens are
@@ -15999,7 +16840,7 @@ var JsonSubscriptionCredentialStore = class {
    * other hot reads. Never returns token material.
    */
   getAccountProxy(providerId, accountId) {
-    if (providerId !== "claude" && providerId !== "codex" && providerId !== "gemini" && providerId !== "opencodego" && providerId !== "kimi") {
+    if (providerId !== "claude" && providerId !== "codex" && providerId !== "gemini" && providerId !== "opencodego" && providerId !== "kimi" && providerId !== "grok" && providerId !== "copilot") {
       return void 0;
     }
     return getAccountProxy(this.readConfig(), providerId, accountId);
@@ -16018,7 +16859,7 @@ var JsonSubscriptionCredentialStore = class {
     const fingerprintOn = identityStore.isEnabled();
     const now = Date.now();
     const out = {};
-    for (const provider of ["claude", "codex", "gemini", "opencodego", "kimi"]) {
+    for (const provider of ["claude", "codex", "gemini", "opencodego", "kimi", "grok", "copilot"]) {
       const sanitized = sanitizeAccounts(config, provider);
       if (sanitized.length === 0) continue;
       for (const account of sanitized) {
@@ -16217,6 +17058,66 @@ var JsonSubscriptionCredentialStore = class {
       }
     });
   }
+  /**
+   * Refresh the Grok (xAI SuperGrok) OAuth access token. The token endpoint is
+   * resolved through OIDC discovery on every refresh (process-cached 1h by the
+   * flow module) so a rotated endpoint document is picked up without a daemon
+   * restart. HONEST `false` when no refresh_token.
+   */
+  async refreshGrokToken() {
+    return this.coalesce("grok:active", async () => {
+      const config = this.readConfig();
+      const active = getActiveAccount(config, "grok");
+      const grok = active?.tokens;
+      if (!active || !grok?.refreshToken) return false;
+      const capturedId = active.id;
+      this.materializeMigration(config);
+      const refreshFetch = this.buildRefreshFetch("grok", capturedId);
+      try {
+        const tokenEndpoint = await grokOAuth2.resolveGrokTokenEndpoint(refreshFetch);
+        const result = await grokOAuth2.refreshGrokAccessToken(grok.refreshToken, tokenEndpoint, refreshFetch);
+        const expiresAt = new Date(Date.now() + result.expiresIn * 1e3).toISOString();
+        const next = {
+          ...grok,
+          accessToken: result.accessToken,
+          refreshToken: result.refreshToken,
+          expiresAt,
+          status: "authorized",
+          lastRefreshedAt: (/* @__PURE__ */ new Date()).toISOString(),
+          errorMessage: void 0,
+          syncWarning: void 0
+        };
+        this.writeBackById("grok", capturedId, next);
+        return true;
+      } catch (error) {
+        this.markExpiredById("grok", capturedId, grok, error);
+        return false;
+      }
+    });
+  }
+  /**
+   * "Refresh" a GitHub Copilot token — there is nothing to refresh (ghu_
+   * tokens are long-lived with no exchange endpoint). A call here means the
+   * strategy saw a 401 (the token was revoked); mark the account `expired`
+   * with a re-authenticate message and return `false` (the proxy then declines
+   * the retry instead of looping on a dead token).
+   */
+  async refreshCopilotToken() {
+    return this.coalesce("copilot:active", async () => {
+      const config = this.readConfig();
+      const active = getActiveAccount(config, "copilot");
+      const copilot = active?.tokens;
+      if (!active || !copilot?.accessToken) return false;
+      this.materializeMigration(config);
+      this.markExpiredById(
+        "copilot",
+        active.id,
+        copilot,
+        new Error("GitHub Copilot tokens cannot be refreshed \u2014 re-authenticate the account")
+      );
+      return false;
+    });
+  }
   /**
    * Refresh a SPECIFIC managed account by id (background scheduler sweep and
    * account-pool resolution). It uses only that account's stored refresh
@@ -16269,7 +17170,7 @@ var JsonSubscriptionCredentialStore = class {
     }
     const oauth = account.tokens;
     if (!oauth.accessToken) return null;
-    if (providerId === "codex" || providerId === "gemini" || providerId === "kimi") {
+    if (providerId === "codex" || providerId === "gemini" || providerId === "kimi" || providerId === "grok" || providerId === "copilot") {
       const expiresAtMs = oauth.expiresAt ? Date.parse(oauth.expiresAt) : 0;
       const expiringSoon = expiresAtMs > 0 && Date.now() >= expiresAtMs - ACCOUNT_REFRESH_LEAD_MS;
       if (expiringSoon && oauth.refreshToken) {
@@ -16373,6 +17274,18 @@ var JsonSubscriptionCredentialStore = class {
         expiresAt: new Date(Date.now() + r2.expiresIn * 1e3).toISOString()
       };
     }
+    if (provider === "grok") {
+      const tokenEndpoint = await grokOAuth2.resolveGrokTokenEndpoint(refreshFetch);
+      const r2 = await grokOAuth2.refreshGrokAccessToken(refreshToken, tokenEndpoint, refreshFetch);
+      return {
+        accessToken: r2.accessToken,
+        refreshToken: r2.refreshToken,
+        expiresAt: new Date(Date.now() + r2.expiresIn * 1e3).toISOString()
+      };
+    }
+    if (provider === "copilot") {
+      throw new Error("GitHub Copilot tokens cannot be refreshed \u2014 re-authenticate the account");
+    }
     const flow = provider === "claude" ? claudeOAuth2 : provider === "codex" ? codexOAuth2 : geminiOAuth2;
     const r = await flow.refreshAccessToken(refreshToken, refreshFetch);
     return {
@@ -16616,7 +17529,7 @@ var JsonSubscriptionCredentialStore = class {
 };
 
 // src/AccountHealthProbeScheduler.ts
-import { fetchUpstream as fetchUpstream8 } from "@omnicross/core/pipeline/upstreamFetch";
+import { fetchUpstream as fetchUpstream10 } from "@omnicross/core/pipeline/upstreamFetch";
 
 // src/probe/CodexGenerationProbe.ts
 import {
@@ -16762,7 +17675,16 @@ var PROVIDER_PROBE_PLANS = {
   // Kimi's `GET /coding/v1/usages` is a verified FREE authed GET (the allowance
   // collector uses it), but the probe path also needs the fingerprint headers —
   // keep the probe local until the collector covers the health surface.
-  kimi: { kind: "local" }
+  kimi: { kind: "local" },
+  // Grok's billing proxy is a verified FREE authed GET (the allowance collector
+  // uses it) but it REJECTS non-OAuth credentials and sits on a separate host
+  // with its own product-gate header — keep the probe local, the collector
+  // owns the health surface.
+  grok: { kind: "local" },
+  // The Copilot quota endpoint (copilot_internal/user) is a verified FREE
+  // authed GET but lives on api.github.com with its own auth dialect and a
+  // monthly-only window — the allowance collector owns the health surface.
+  copilot: { kind: "local" }
 };
 function probePlanFor(providerId) {
   return PROVIDER_PROBE_PLANS[providerId] ?? { kind: "local" };
@@ -16784,7 +17706,7 @@ var AccountHealthProbeScheduler = class {
     this.logger = logger;
     this.config = config;
     this.now = opts.now ?? Date.now;
-    this.fetchImpl = opts.fetchImpl ?? fetchUpstream8;
+    this.fetchImpl = opts.fetchImpl ?? fetchUpstream10;
     this.sleep = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
     this.planFor = opts.planFor ?? probePlanFor;
   }
@@ -17692,7 +18614,7 @@ async function readAuditStats(auditDir, query2 = {}) {
 }
 
 // src/audit/AuditPruneSweeper.ts
-var DAY_MS3 = 24 * 60 * 6e4;
+var DAY_MS4 = 24 * 60 * 6e4;
 var SWEEP_INTERVAL_MS2 = 60 * 6e4;
 var ARCHIVE_BATCH = 64;
 var AuditPruneSweeper = class {
@@ -17756,7 +18678,7 @@ var AuditPruneSweeper = class {
     this.sweeping = true;
     try {
       if (!existsSync25(this.auditDir)) return 0;
-      const cutoff = this.todayMidnight() - (this.config.retentionDays - 1) * DAY_MS3;
+      const cutoff = this.todayMidnight() - (this.config.retentionDays - 1) * DAY_MS4;
       let removed = 0;
       for (const name of readdirSync6(this.auditDir)) {
         const dateMs = auditFileDateMs(name);
@@ -18013,7 +18935,7 @@ async function closeAll(writers) {
 // src/usage/UsagePruneSweeper.ts
 import { unlink as unlink3 } from "fs/promises";
 import { join as join22 } from "path";
-var DAY_MS4 = 24 * 60 * 6e4;
+var DAY_MS5 = 24 * 60 * 6e4;
 var SWEEP_INTERVAL_MS3 = 60 * 6e4;
 var DEFAULT_USAGE_RETENTION_DAYS = 90;
 var UsagePruneSweeper = class {
@@ -18070,7 +18992,7 @@ var UsagePruneSweeper = class {
     this.sweeping = true;
     try {
       const retentionDays = this.config.retentionDays ?? DEFAULT_USAGE_RETENTION_DAYS;
-      const cutoff = this.todayMidnight() - (retentionDays - 1) * DAY_MS4;
+      const cutoff = this.todayMidnight() - (retentionDays - 1) * DAY_MS5;
       let removed = 0;
       for (const entry of await listUsageDays(this.usageDir)) {
         if (!entry.hasShard) continue;
@@ -18489,7 +19411,7 @@ var AuditWriter = class {
 import { appendFileSync as appendFileSync3, mkdirSync as mkdirSync8 } from "fs";
 import { createHmac as createHmac5 } from "crypto";
 import { join as join26 } from "path";
-import { fetchUpstream as fetchUpstream9 } from "@omnicross/core/pipeline/upstreamFetch";
+import { fetchUpstream as fetchUpstream11 } from "@omnicross/core/pipeline/upstreamFetch";
 
 // src/billing/billingFiles.ts
 var BILLING_FILE_RE = /^billing-(\d{4})-(\d{2})-(\d{2})\.jsonl$/;
@@ -18512,7 +19434,7 @@ var BillingPublisher = class {
   constructor(billingDir, logger, opts = {}) {
     this.billingDir = billingDir;
     this.logger = logger;
-    this.fetchImpl = opts.fetchImpl ?? ((url, init) => fetchUpstream9(url, init));
+    this.fetchImpl = opts.fetchImpl ?? ((url, init) => fetchUpstream11(url, init));
     this.defer = opts.defer ?? ((fn) => setTimeout(fn, 0));
     this.timeoutMs = opts.timeoutMs ?? BILLING_POST_TIMEOUT_MS;
     this.now = opts.now ?? Date.now;
@@ -18762,7 +19684,7 @@ var BillingRetrySweeper = class {
 // src/TokenRefreshScheduler.ts
 var REFRESH_LEAD_MS2 = 5 * 6e4;
 var SWEEP_INTERVAL_MS5 = 6e4;
-var OAUTH_PROVIDERS2 = ["claude", "codex", "gemini", "kimi"];
+var OAUTH_PROVIDERS2 = ["claude", "codex", "gemini", "kimi", "grok", "copilot"];
 var TokenRefreshScheduler = class {
   constructor(store, logger, intervalMs = SWEEP_INTERVAL_MS5, leadMs = REFRESH_LEAD_MS2) {
     this.store = store;
@@ -18847,6 +19769,12 @@ var TokenRefreshScheduler = class {
         return this.store.refreshGeminiToken();
       case "kimi":
         return this.store.refreshKimiToken();
+      case "grok":
+        return this.store.refreshGrokToken();
+      // ghu_ tokens never near-expire (far-future expiresAt), so the sweep
+      // never reaches this — the branch exists for union totality.
+      case "copilot":
+        return this.store.refreshCopilotToken();
     }
   }
 };
@@ -18925,7 +19853,7 @@ function createRouteLeaseSubscriptionPreflight(credentials) {
 
 // src/webhook/WebhookDispatcher.ts
 import { createHmac as createHmac6 } from "crypto";
-import { fetchUpstream as fetchUpstream10 } from "@omnicross/core/pipeline/upstreamFetch";
+import { fetchUpstream as fetchUpstream12 } from "@omnicross/core/pipeline/upstreamFetch";
 var WEBHOOK_MAX_ATTEMPTS = 3;
 var WEBHOOK_QUEUE_MAX = 1e3;
 var WEBHOOK_SEND_TIMEOUT_MS = 1e4;
@@ -18945,7 +19873,7 @@ var WebhookDispatcher = class {
   sleep;
   now;
   constructor(opts = {}) {
-    this.fetchImpl = opts.fetchImpl ?? ((url, init) => fetchUpstream10(url, init));
+    this.fetchImpl = opts.fetchImpl ?? ((url, init) => fetchUpstream12(url, init));
     this.logger = opts.logger;
     this.maxAttempts = opts.maxAttempts ?? WEBHOOK_MAX_ATTEMPTS;
     this.queueMax = opts.queueMax ?? WEBHOOK_QUEUE_MAX;
@@ -19031,8 +19959,8 @@ var WebhookDispatcher = class {
         signal: AbortSignal.timeout(this.timeoutMs)
       });
       return res.ok ? { ok: true, status: res.status } : { ok: false, status: res.status };
-    } catch (err6) {
-      return { ok: false, error: err6 instanceof Error ? err6.message : String(err6) };
+    } catch (err8) {
+      return { ok: false, error: err8 instanceof Error ? err8.message : String(err8) };
     }
   }
   /**
@@ -19174,7 +20102,7 @@ function buildDaemon(config, paths) {
   setSecretBox(secretBox3);
   setSecretBox2(secretBox3);
   const decryptedConfig = decryptConfigSecrets(config, secretBox3);
-  const accountAllowanceStore = new AccountAllowanceStore6(
+  const accountAllowanceStore = new AccountAllowanceStore8(
     Date.now,
     void 0,
     new JsonAccountAllowancePersistence(defaultAccountAllowancePath(paths.configPath))
@@ -19236,7 +20164,7 @@ function buildDaemon(config, paths) {
   const pricingEngine = new PricingEngine(pricingStore, logger, {
     // Catalog egress follows the same global/env proxy policy as every other
     // daemon upstream call; no provider/account override applies here.
-    fetchImpl: ((input, init) => fetchUpstream11(String(input), init ?? {}))
+    fetchImpl: ((input, init) => fetchUpstream13(String(input), init ?? {}))
   });
   const pricingRefreshScheduler = new PricingRefreshScheduler(
     pricingEngine,
@@ -19521,7 +20449,7 @@ function buildDaemon(config, paths) {
     // — `server.proxy.byProvider[...]` was silently skipped — and the call was
     // excluded from the upstream trace, so a failing login left no evidence.
     // `redactBodies` keeps the code/verifier + minted token out of that trace.
-    oauthExchangeFetch: paths.oauthExchangeFetch ? () => paths.oauthExchangeFetch : (providerId) => (url, init) => fetchUpstream11(url, init, { providerId, redactBodies: true }),
+    oauthExchangeFetch: paths.oauthExchangeFetch ? () => paths.oauthExchangeFetch : (providerId) => (url, init) => fetchUpstream13(url, init, { providerId, redactBodies: true }),
     subscriptionAccountAppender: credentialStore,
     // Codex interactive OAuth (app-parity-2 child 5) — the async loopback flow store
     // + the one-shot 127.0.0.1:1455 listener. Token captured + persisted daemon-side;
@@ -19533,6 +20461,9 @@ function buildDaemon(config, paths) {
     // paste; the app shows the verification URL + user code and polls the
     // token-free status). Token captured + persisted daemon-side.
     kimiSessions: new CodexOAuthSessionStore(),
+    // Grok interactive OAuth — the same async DEVICE-CODE shape as kimi.
+    grokSessions: new CodexOAuthSessionStore(),
+    copilotSessions: new CodexOAuthSessionStore(),
     // Migration pack (app-parity child 6, design D2/D3) — the concrete credential
     // store provides BOTH the full DECRYPTED read (`getFullConfig`, export) and
     // the multi-account append (`appendProviderAccount`, import re-encrypts at-
@@ -19591,7 +20522,7 @@ function buildDaemon(config, paths) {
   });
   const webhookDispatcher = new WebhookDispatcher({
     logger,
-    fetchImpl: (url, init) => fetchUpstream11(url, init)
+    fetchImpl: (url, init) => fetchUpstream13(url, init)
   });
   setWebhookRuntime(webhookDispatcher, getSharedAccountHealth4());
   const auditWriter = new AuditWriter(auditDir, logger);