@omnicross/daemon 0.4.0 → 0.4.1

package/dist/cli.cjs

@@ -1171,14 +1171,14 @@ var import_node_path36 = require("path");
 var import_audit_types = require("@omnicross/contracts/audit-types");
 var import_billing_types = require("@omnicross/contracts/billing-types");
 var import_core7 = require("@omnicross/core");
-var import_GeminiCodeAssistProjectResolver = require("@omnicross/core/auth/GeminiCodeAssistProjectResolver");
+var import_GeminiCodeAssistProjectResolver2 = require("@omnicross/core/auth/GeminiCodeAssistProjectResolver");
 var import_ApiKeyPoolService = require("@omnicross/core/completion/ApiKeyPoolService");
 var import_outbound_api10 = require("@omnicross/core/outbound-api");
 var import_subscriptionRegistryPort = require("@omnicross/core/outbound-api/subscriptionRegistryPort");
 var import_SubscriptionAccountHealth4 = require("@omnicross/core/pipeline/SubscriptionAccountHealth");
-var import_AccountAllowanceStore9 = require("@omnicross/core/pipeline/AccountAllowanceStore");
+var import_AccountAllowanceStore10 = require("@omnicross/core/pipeline/AccountAllowanceStore");
 var import_AccountAllowanceScheduling5 = require("@omnicross/core/pipeline/AccountAllowanceScheduling");
-var import_upstreamFetch15 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch16 = require("@omnicross/core/pipeline/upstreamFetch");
 var import_SubscriptionIdentityStore3 = require("@omnicross/core/provider-proxy/identity/SubscriptionIdentityStore");
 var import_gemini_code_assist_resolver = require("@omnicross/core/ports/gemini-code-assist-resolver");
 var import_provider_proxy4 = require("@omnicross/core/provider-proxy");
@@ -1547,7 +1547,7 @@ function handleCopilotOAuthStatus(sessionId, deps) {
 }
 
 // src/allowance/AccountAllowanceService.ts
-var import_AccountAllowanceStore7 = require("@omnicross/core/pipeline/AccountAllowanceStore");
+var import_AccountAllowanceStore8 = require("@omnicross/core/pipeline/AccountAllowanceStore");
 var import_AccountAllowanceScheduling = require("@omnicross/core/pipeline/AccountAllowanceScheduling");
 
 // src/allowance/ClaudeAllowanceCollector.ts
@@ -2735,9 +2735,191 @@ var CopilotAllowanceCollector = class {
   }
 };
 
-// src/allowance/OpenCodeGoAllowanceCollector.ts
+// src/allowance/GeminiAllowanceCollector.ts
+var import_GeminiCodeAssistProjectResolver = require("@omnicross/core/auth/GeminiCodeAssistProjectResolver");
 var import_AccountAllowanceStore6 = require("@omnicross/core/pipeline/AccountAllowanceStore");
 var import_upstreamFetch6 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_transformers = require("@omnicross/core/transformer/transformers");
+var GEMINI_ALLOWANCE_CACHE_MS = 5 * 6e4;
+function isRecord4(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function secondsUntil6(instant, now) {
+  if (!instant) return void 0;
+  return Math.max(0, Math.floor((Date.parse(instant) - now) / 1e3));
+}
+function parseGeminiQuotaPayload(payload, now) {
+  if (!isRecord4(payload)) return null;
+  const buckets = Array.isArray(payload["buckets"]) ? payload["buckets"] : [];
+  const windows = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of buckets) {
+    if (!isRecord4(raw)) continue;
+    const modelId = typeof raw["modelId"] === "string" && raw["modelId"].trim() ? raw["modelId"].trim() : void 0;
+    const id = `gemini:${modelId ?? "all"}`;
+    if (seen.has(id)) continue;
+    seen.add(id);
+    const fractionRaw = typeof raw["remainingFraction"] === "number" ? raw["remainingFraction"] : Number(raw["remainingFraction"]);
+    const usedPercent = Number.isFinite(fractionRaw) ? Math.round(Math.min(100, Math.max(0, (1 - Math.min(1, Math.max(0, fractionRaw))) * 100)) * 10) / 10 : null;
+    const resetRaw = typeof raw["resetTime"] === "string" && raw["resetTime"].trim() ? raw["resetTime"] : void 0;
+    const resetsAt = resetRaw !== void 0 && Number.isFinite(Date.parse(resetRaw)) ? new Date(Date.parse(resetRaw)).toISOString() : void 0;
+    windows.push({
+      id,
+      label: modelId ? `Gemini ${modelId}` : "Gemini quota",
+      scope: modelId ? "model-family" : "all",
+      ...modelId ? { modelFamily: modelId } : {},
+      usedPercent,
+      ...resetsAt !== void 0 ? { resetsAt } : {},
+      remainingSeconds: secondsUntil6(resetsAt, now),
+      state: "fresh"
+    });
+  }
+  return windows.length > 0 ? windows : null;
+}
+var GeminiAllowanceCollector = class {
+  constructor(credentials, store = (0, import_AccountAllowanceStore6.getSharedAccountAllowanceStore)(), fetchImpl = (url, init, accountId) => (0, import_upstreamFetch6.fetchUpstream)(url, init, { providerId: "gemini", accountId, redactBodies: true }), now = Date.now, projectResolver = (0, import_GeminiCodeAssistProjectResolver.getGeminiCodeAssistProjectResolver)()) {
+    this.credentials = credentials;
+    this.store = store;
+    this.fetchImpl = fetchImpl;
+    this.now = now;
+    this.projectResolver = projectResolver;
+  }
+  credentials;
+  store;
+  fetchImpl;
+  now;
+  projectResolver;
+  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("gemini", 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("gemini", 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, "gemini_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) {
+    let accessToken = await this.credentials.getAccessTokenForAccount("gemini", accountId);
+    if (!accessToken) return this.failureSnapshot(accountId, "gemini_usage_token_unavailable", this.now());
+    let project;
+    try {
+      project = await this.projectResolver.resolveProject(accessToken);
+    } catch {
+      project = void 0;
+    }
+    let response = await this.request(accountId, accessToken, project);
+    if (response.status === 401 || response.status === 403) {
+      const refreshed = await this.credentials.refreshAccountToken("gemini", accountId);
+      if (!refreshed) return this.failureSnapshot(accountId, "gemini_usage_unauthorized", this.now());
+      accessToken = await this.credentials.getAccessTokenForAccount("gemini", accountId);
+      if (!accessToken) return this.failureSnapshot(accountId, "gemini_usage_token_unavailable", this.now());
+      response = await this.request(accountId, accessToken, project);
+      if (response.status === 401 || response.status === 403) {
+        return this.failureSnapshot(accountId, "gemini_usage_unauthorized", this.now());
+      }
+    }
+    if (!response.ok) return this.failureSnapshot(accountId, "gemini_usage_http_error", this.now());
+    let payload;
+    try {
+      payload = await response.json();
+    } catch {
+      return this.failureSnapshot(accountId, "gemini_usage_invalid_response", this.now());
+    }
+    const now = this.now();
+    const windows = parseGeminiQuotaPayload(payload, now);
+    const snapshot = {
+      providerId: "gemini",
+      accountId,
+      source: "oauth-usage-api",
+      observedAt: new Date(now).toISOString(),
+      expiresAt: new Date(now + GEMINI_ALLOWANCE_CACHE_MS).toISOString(),
+      windows: windows ?? [
+        { id: "gemini-quota", label: "Gemini quota", scope: "all", usedPercent: null, state: "unavailable" }
+      ],
+      ...windows ? {} : { lastErrorCode: "gemini_usage_invalid_response" }
+    };
+    this.store.set(snapshot);
+    return snapshot;
+  }
+  request(accountId, accessToken, project) {
+    return this.fetchImpl(`${(0, import_transformers.resolveCodeAssistEndpoint)()}/v1internal:retrieveUserQuota`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: "application/json",
+        "Content-Type": "application/json",
+        ...(0, import_transformers.getGeminiCliIdentityHeaders)()
+      },
+      body: JSON.stringify(project ? { project } : {}),
+      signal: AbortSignal.timeout(15e3)
+    }, accountId);
+  }
+  failureSnapshot(accountId, code, now) {
+    const existing = this.store.get("gemini", accountId, now);
+    const snapshot = existing ? {
+      ...existing,
+      expiresAt: new Date(now + GEMINI_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: "gemini",
+      accountId,
+      source: "oauth-usage-api",
+      observedAt: new Date(now).toISOString(),
+      expiresAt: new Date(now + GEMINI_ALLOWANCE_CACHE_MS).toISOString(),
+      windows: [
+        { id: "gemini-quota", label: "Gemini quota", scope: "all", usedPercent: null, state: "unavailable" }
+      ],
+      lastErrorCode: code
+    };
+    this.store.set(snapshot);
+    return snapshot;
+  }
+  unsupportedSnapshot(accountId, now) {
+    return {
+      providerId: "gemini",
+      accountId,
+      source: "oauth-usage-api",
+      observedAt: new Date(now).toISOString(),
+      windows: [
+        { id: "gemini-quota", label: "Gemini quota", scope: "all", usedPercent: null, state: "unsupported" }
+      ],
+      lastErrorCode: "gemini_usage_unsupported_auth"
+    };
+  }
+};
+
+// src/allowance/OpenCodeGoAllowanceCollector.ts
+var import_AccountAllowanceStore7 = require("@omnicross/core/pipeline/AccountAllowanceStore");
+var import_upstreamFetch7 = require("@omnicross/core/pipeline/upstreamFetch");
 var import_subscriptions7 = require("@omnicross/subscriptions");
 var OPENCODEGO_ALLOWANCE_CACHE_MS = 5 * 6e4;
 var OPENCODEGO_DEFAULT_GO_BASE = "https://opencode.ai/zen/go";
@@ -2751,7 +2933,7 @@ function isoInstant2(value) {
   const time = Date.parse(value);
   return Number.isFinite(time) ? new Date(time).toISOString() : void 0;
 }
-function secondsUntil6(instant, now) {
+function secondsUntil7(instant, now) {
   if (!instant) return void 0;
   return Math.max(0, Math.floor((Date.parse(instant) - now) / 1e3));
 }
@@ -2766,12 +2948,12 @@ function windowFromPayload3(id, label, minutes, payload, now) {
     usedPercent,
     windowMinutes: minutes,
     ...resetsAt !== void 0 ? { resetsAt } : {},
-    remainingSeconds: secondsUntil6(resetsAt, now),
+    remainingSeconds: secondsUntil7(resetsAt, now),
     state: usedPercent !== null || resetsAt ? "fresh" : "unavailable"
   };
 }
 var OpenCodeGoAllowanceCollector = class {
-  constructor(credentials, store = (0, import_AccountAllowanceStore6.getSharedAccountAllowanceStore)(), fetchImpl = (url, init, accountId) => (0, import_upstreamFetch6.fetchUpstream)(url, init, { providerId: "opencodego", accountId, redactBodies: true }), now = Date.now) {
+  constructor(credentials, store = (0, import_AccountAllowanceStore7.getSharedAccountAllowanceStore)(), fetchImpl = (url, init, accountId) => (0, import_upstreamFetch7.fetchUpstream)(url, init, { providerId: "opencodego", accountId, redactBodies: true }), now = Date.now) {
     this.credentials = credentials;
     this.store = store;
     this.fetchImpl = fetchImpl;
@@ -2876,7 +3058,7 @@ function codexUnavailable(accountId, now) {
   };
 }
 var AccountAllowanceService = class {
-  constructor(credentials, store = (0, import_AccountAllowanceStore7.getSharedAccountAllowanceStore)(), collector, codexCollector, kimiCollector, opencodegoCollector, grokCollector, copilotCollector, now = Date.now) {
+  constructor(credentials, store = (0, import_AccountAllowanceStore8.getSharedAccountAllowanceStore)(), collector, codexCollector, kimiCollector, opencodegoCollector, grokCollector, copilotCollector, geminiCollector, now = Date.now) {
     this.credentials = credentials;
     this.store = store;
     this.now = now;
@@ -2886,6 +3068,7 @@ var AccountAllowanceService = class {
     this.opencodegoCollector = opencodegoCollector ?? new OpenCodeGoAllowanceCollector(credentials, store);
     this.grokCollector = grokCollector ?? new GrokAllowanceCollector(credentials, store);
     this.copilotCollector = copilotCollector ?? new CopilotAllowanceCollector(credentials, store);
+    this.geminiCollector = geminiCollector ?? new GeminiAllowanceCollector(credentials, store);
   }
   credentials;
   store;
@@ -2896,6 +3079,7 @@ var AccountAllowanceService = class {
   grokCollector;
   copilotCollector;
   opencodegoCollector;
+  geminiCollector;
   /**
    * Read all/filtered snapshots. Claude's and Codex's five-minute caches are
    * refreshed lazily on read (Codex polls `/backend-api/wham/usage`; the
@@ -2939,6 +3123,11 @@ var AccountAllowanceService = class {
       (account) => !filter.accountId || account.id === filter.accountId
     );
     if (wantsCopilot) await this.copilotCollector.collectMany(copilotAccounts);
+    const wantsGemini = !filter.providerId || filter.providerId === "gemini";
+    const geminiAccounts = (config.geminiAccounts ?? []).filter(
+      (account) => !filter.accountId || account.id === filter.accountId
+    );
+    if (wantsGemini) await this.geminiCollector.collectMany(geminiAccounts);
     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}`);
@@ -2946,6 +3135,7 @@ var AccountAllowanceService = class {
     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}`);
+    if (wantsGemini) for (const account of geminiAccounts) known.add(`gemini\0${account.id}`);
     return this.store.list(filter).filter((snapshot) => known.has(`${snapshot.providerId}\0${snapshot.accountId}`));
   }
   knownAccounts(config) {
@@ -2955,7 +3145,8 @@ var AccountAllowanceService = class {
       ...(config.kimiAccounts ?? []).map((account) => ({ providerId: "kimi", 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 }))
+      ...(config.copilotAccounts ?? []).map((account) => ({ providerId: "copilot", accountId: account.id })),
+      ...(config.geminiAccounts ?? []).map((account) => ({ providerId: "gemini", accountId: account.id }))
     ];
   }
   /** Force-refresh Claude usage for one account or every stored Claude account. */
@@ -3016,6 +3207,15 @@ var AccountAllowanceService = class {
     );
     return this.grokCollector.collectMany(accounts, { force: true });
   }
+  /** Force-refresh Gemini usage (Code Assist retrieveUserQuota) for one/all accounts. */
+  async refreshGemini(accountId) {
+    const config = await this.credentials.getFullConfig();
+    this.store.pruneToKnownAccounts(this.knownAccounts(config));
+    const accounts = (config.geminiAccounts ?? []).filter(
+      (account) => !accountId || account.id === accountId
+    );
+    return this.geminiCollector.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
@@ -3032,6 +3232,7 @@ var AccountAllowanceService = class {
     await this.opencodegoCollector.collectMany(config.opencodegoAccounts ?? [], { refreshAheadMs });
     await this.grokCollector.collectMany(config.grokAccounts ?? [], { refreshAheadMs });
     await this.copilotCollector.collectMany(config.copilotAccounts ?? [], { refreshAheadMs });
+    await this.geminiCollector.collectMany(config.geminiAccounts ?? [], { refreshAheadMs });
   }
   /** Remove a cache row as soon as an account is deleted by the admin path. */
   removeAccountSnapshot(providerId, accountId) {
@@ -3126,7 +3327,7 @@ var ClaudeAllowanceRefreshScheduler = class {
 var import_node_crypto4 = require("crypto");
 var import_node_fs6 = require("fs");
 var import_node_path6 = require("path");
-var import_AccountAllowanceStore8 = require("@omnicross/core/pipeline/AccountAllowanceStore");
+var import_AccountAllowanceStore9 = require("@omnicross/core/pipeline/AccountAllowanceStore");
 var ACCOUNT_ALLOWANCE_CACHE_VERSION = 1;
 var MAX_PERSISTED_ALLOWANCE_SNAPSHOTS = 256;
 var MAX_ALLOWANCE_CACHE_BYTES = 1e6;
@@ -3155,7 +3356,7 @@ var JsonAccountAllowancePersistence = class {
   save(snapshots) {
     const rows = [];
     for (const snapshot of snapshots) {
-      const normalized2 = (0, import_AccountAllowanceStore8.normalizeAccountAllowanceSnapshot)(snapshot);
+      const normalized2 = (0, import_AccountAllowanceStore9.normalizeAccountAllowanceSnapshot)(snapshot);
       if (!normalized2) continue;
       rows.push(normalized2);
       if (rows.length >= MAX_PERSISTED_ALLOWANCE_SNAPSHOTS) break;
@@ -3431,7 +3632,7 @@ var import_outbound_api5 = require("@omnicross/core/outbound-api");
 var import_image_generation_types = require("@omnicross/contracts/image-generation-types");
 var import_AccountAllowanceScheduling2 = require("@omnicross/core/pipeline/AccountAllowanceScheduling");
 var import_SubscriptionAccountHealth = require("@omnicross/core/pipeline/SubscriptionAccountHealth");
-var import_upstreamFetch9 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch10 = require("@omnicross/core/pipeline/upstreamFetch");
 var import_core3 = require("@omnicross/core");
 
 // src/image-generation/imagesConfigValidation.ts
@@ -5085,11 +5286,11 @@ function preserveOutboundProxySecrets(incoming, current) {
 }
 
 // src/proxy/upstreamProxyResolver.ts
-var import_upstreamFetch7 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch8 = require("@omnicross/core/pipeline/upstreamFetch");
 var serverProxy;
 function setServerProxyConfig(proxy) {
   serverProxy = proxy;
-  (0, import_upstreamFetch7.bumpUpstreamProxyGeneration)();
+  (0, import_upstreamFetch8.bumpUpstreamProxyGeneration)();
 }
 function getServerProxyConfig() {
   return serverProxy;
@@ -6152,7 +6353,7 @@ async function runSearchLiveChecks(contributions, now = () => (/* @__PURE__ */ n
 }
 
 // src/search/SearchAssembly.ts
-var import_upstreamFetch8 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch9 = require("@omnicross/core/pipeline/upstreamFetch");
 var import_search = require("@omnicross/core/search");
 var import_api2 = require("@omnicross/core/search/api");
 var import_http2 = require("@omnicross/core/search/http");
@@ -6170,7 +6371,7 @@ function searchPolicyFrom(config) {
   };
 }
 function resolveSearchUpstreamDispatcher(url) {
-  return (0, import_upstreamFetch8.resolveUpstreamDispatcher)({ url });
+  return (0, import_upstreamFetch9.resolveUpstreamDispatcher)({ url });
 }
 var searchUpstreamProxyConfig = createUpstreamProxyResolver();
 function resolveSearchUpstreamProxyConfig(url) {
@@ -6452,7 +6653,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 isRecord4(value) {
+function isRecord5(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function redactSearchServerConfig(search) {
@@ -6502,13 +6703,13 @@ function resolveSecretField(entry, field, stored) {
   else delete entry[field];
 }
 function preserveSearchSecrets(incoming, current) {
-  if (!isRecord4(incoming)) return incoming;
+  if (!isRecord5(incoming)) return incoming;
   const section = { ...incoming };
   const providersValue = section["providers"];
-  if (!isRecord4(providersValue)) return section;
+  if (!isRecord5(providersValue)) return section;
   const providers = {};
   for (const [id, entryValue] of Object.entries(providersValue)) {
-    if (!isRecord4(entryValue)) {
+    if (!isRecord5(entryValue)) {
       providers[id] = entryValue;
       continue;
     }
@@ -6586,7 +6787,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 isRecord5(value) {
+function isRecord6(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function nonBlank(value) {
@@ -6606,7 +6807,7 @@ function validateGatewayBindingsSegment(patch) {
   const ids = /* @__PURE__ */ new Set();
   raw.forEach((entry, index) => {
     const path2 = `bindings[${index}]`;
-    if (!isRecord5(entry)) {
+    if (!isRecord6(entry)) {
       errors.push(`${path2} must be an object`);
       return;
     }
@@ -6635,12 +6836,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) => !isRecord5(mapping) || !nonBlank(mapping.source) || !nonBlank(mapping.target)
+        (mapping) => !isRecord6(mapping) || !nonBlank(mapping.source) || !nonBlank(mapping.target)
       )) {
         errors.push(`${path2}.modelMappings must contain non-empty source and target strings`);
       }
     }
-    if (!isRecord5(entry.target) || !TARGET_KINDS.has(String(entry.target.kind))) {
+    if (!isRecord6(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`);
@@ -6655,7 +6856,7 @@ function validateGatewayBindingsSegment(patch) {
       }
     }
     if (entry.modelMap !== void 0) {
-      if (!isRecord5(entry.modelMap) || Object.values(entry.modelMap).some((value) => typeof value !== "string")) {
+      if (!isRecord6(entry.modelMap) || Object.values(entry.modelMap).some((value) => typeof value !== "string")) {
         errors.push(`${path2}.modelMap must contain string values`);
       }
     }
@@ -7716,7 +7917,7 @@ function query(req) {
 }
 function allowanceProvider(value) {
   if (!value) return void 0;
-  return value === "claude" || value === "codex" || value === "kimi" || value === "opencodego" || value === "grok" || value === "copilot" ? value : null;
+  return value === "claude" || value === "codex" || value === "kimi" || value === "opencodego" || value === "grok" || value === "copilot" || value === "gemini" ? value : null;
 }
 async function handleAccountAllowanceApi(req, res, method, rest, service) {
   if (!service) return writeError2(res, 501, "account allowance service is not available");
@@ -7731,7 +7932,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, opencodego, grok, or copilot");
+      return writeError2(res, 400, "providerId must be claude, codex, kimi, opencodego, grok, copilot, or gemini");
     }
     const accountId = rest.length >= 2 ? rest[1] : params.get("accountId") ?? void 0;
     const allowances = await service.list({ providerId, accountId });
@@ -7793,6 +7994,16 @@ async function handleAccountAllowanceApi(req, res, method, rest, service) {
       }
       return writeJson3(res, 200, { allowances: allowances2 });
     }
+    if (requestedProvider === "gemini") {
+      if (!service.refreshGemini) {
+        return writeError2(res, 501, "gemini allowance refresh is not available");
+      }
+      const allowances2 = await service.refreshGemini(accountId);
+      if (accountId && allowances2.length === 0) {
+        return writeError2(res, 404, `Gemini 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`);
@@ -8139,7 +8350,7 @@ async function handleDiscoverModels(res, id, cfg) {
     const headers = { Accept: "application/json" };
     if (resolvedKey) headers["Authorization"] = `Bearer ${resolvedKey}`;
     Object.assign(headers, expandRowExtraHeaders(row));
-    const response = await (0, import_upstreamFetch9.fetchUpstream)(url, { method: "GET", headers }, { providerId: "byo" });
+    const response = await (0, import_upstreamFetch10.fetchUpstream)(url, { method: "GET", headers }, { providerId: "byo" });
     if (!response.ok) {
       const text = await response.text().catch(() => "");
       let message = text.slice(0, 300);
@@ -8199,7 +8410,7 @@ async function handleTestModel(req, res, id, cfg) {
   Object.assign(headers, expandRowExtraHeaders(row));
   const startedAt = Date.now();
   try {
-    const response = await (0, import_upstreamFetch9.fetchUpstream)(
+    const response = await (0, import_upstreamFetch10.fetchUpstream)(
       url,
       { method: "POST", headers, body: JSON.stringify(payload) },
       { providerId: "byo" }
@@ -9606,12 +9817,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, isRecord6(payload) ? payload : {});
+  const path2 = resolvePlaygroundPath(endpoint, isRecord7(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 isRecord6(v) {
+function isRecord7(v) {
   return !!v && typeof v === "object" && !Array.isArray(v);
 }
 function proxyToOutbound(res, outboundPort, path2, key, body) {
@@ -9747,7 +9958,7 @@ async function handleUiStatic(req, res, urlPath, uiDist) {
 }
 
 // src/admin/version.ts
-var DAEMON_VERSION = true ? "0.4.0" : "0.0.0-dev";
+var DAEMON_VERSION = true ? "0.4.1" : "0.0.0-dev";
 
 // src/admin/AdminServer.ts
 var LOOPBACK_ADDR = "127.0.0.1";
@@ -10167,7 +10378,7 @@ function createPoolKeysLoader(getProviderRow, autoDisabled) {
 
 // src/allowance/ProviderKeyQuotaService.ts
 var import_core4 = require("@omnicross/core");
-var import_upstreamFetch10 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch11 = require("@omnicross/core/pipeline/upstreamFetch");
 
 // src/allowance/ProviderKeyQuota.ts
 var MINUTE_MS3 = 6e4;
@@ -10196,11 +10407,11 @@ function isoInstant3(value) {
   }
   return void 0;
 }
-function secondsUntil7(instant, now) {
+function secondsUntil8(instant, now) {
   if (!instant) return void 0;
   return Math.max(0, Math.floor((Date.parse(instant) - now) / 1e3));
 }
-function isRecord7(value) {
+function isRecord8(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function detectProviderKeyQuotaAdapter(baseUrl) {
@@ -10213,7 +10424,7 @@ function detectProviderKeyQuotaAdapter(baseUrl) {
   }
   const host = url.hostname.toLowerCase();
   const path2 = url.pathname.toLowerCase();
-  if ((host === "api.z.ai" || host === "open.bigmodel.cn") && path2.includes("/coding")) {
+  if ((host === "api.z.ai" || host === "open.bigmodel.cn") && (path2.includes("/coding") || path2.includes("/anthropic"))) {
     return "zai";
   }
   if ((host === "api.minimax.io" || host === "api.minimaxi.com") && // Token Plan rides the plain openai `/v1` (chat completions) surface; the
@@ -10267,17 +10478,17 @@ function zaiWindowIdLabel(durationMs) {
   return { id: "quota", label: "Quota" };
 }
 function parseZaiQuotaPayload(payload, now) {
-  if (!isRecord7(payload)) return null;
-  const data = isRecord7(payload["data"]) ? payload["data"] : payload;
+  if (!isRecord8(payload)) return null;
+  const data = isRecord8(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 (!isRecord7(raw)) continue;
+    if (!isRecord8(raw)) continue;
     const item = raw;
     if (item.type === void 0) continue;
     const details = raw["usageDetails"];
-    if (Array.isArray(details) && details.some((d) => isRecord7(d) && d["modelCode"] === "zread")) {
+    if (Array.isArray(details) && details.some((d) => isRecord8(d) && d["modelCode"] === "zread")) {
       continue;
     }
     const durationMs = zaiWindowDurationMs(item);
@@ -10296,7 +10507,7 @@ function parseZaiQuotaPayload(payload, now) {
       usedPercent,
       ...durationMs !== void 0 ? { windowMinutes: Math.round(durationMs / MINUTE_MS3) } : {},
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil7(resetsAt, now),
+      remainingSeconds: secondsUntil8(resetsAt, now),
       state: "fresh"
     };
     const existing = byWindow.get(id);
@@ -10310,7 +10521,7 @@ function parseZaiQuotaPayload(payload, now) {
 var MINIMAX_STATUS_EXHAUSTED = 2;
 var MINIMAX_SHARED_BUCKET = "general";
 function parseMiniMaxBucket(value) {
-  if (!isRecord7(value)) return null;
+  if (!isRecord8(value)) return null;
   const modelName = typeof value["model_name"] === "string" ? value["model_name"].trim() : "";
   if (!modelName) return null;
   const instant = (v) => {
@@ -10337,14 +10548,14 @@ function minimaxWindow(id, label, windowMinutes, resetsAtMs, remainingPercent, s
     usedPercent,
     ...windowMinutes !== void 0 ? { windowMinutes } : {},
     ...resetsAt !== void 0 ? { resetsAt } : {},
-    remainingSeconds: secondsUntil7(resetsAt, now),
+    remainingSeconds: secondsUntil8(resetsAt, now),
     state: usedPercent !== null ? "fresh" : "unavailable"
   };
 }
 function parseMiniMaxTokenPlanPayload(payload, now) {
-  if (!isRecord7(payload)) return null;
+  if (!isRecord8(payload)) return null;
   const baseResp = payload["base_resp"];
-  if (!isRecord7(baseResp) || baseResp["status_code"] !== 0) return null;
+  if (!isRecord8(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) {
@@ -10377,11 +10588,11 @@ function parseMiniMaxTokenPlanPayload(payload, now) {
   ];
 }
 function parseUmansUsagePayload(payload, now) {
-  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;
+  if (!isRecord8(payload)) return null;
+  const limits = isRecord8(payload["limits"]) ? payload["limits"] : void 0;
+  const requests = limits && isRecord8(limits["requests"]) ? limits["requests"] : void 0;
+  const usage = isRecord8(payload["usage"]) ? payload["usage"] : void 0;
+  const window = isRecord8(payload["window"]) ? payload["window"] : void 0;
   const hardCap = finiteNumber5(requests?.["hard_cap"]);
   const softLimit = finiteNumber5(requests?.["limit"]);
   const requestsInWindow = finiteNumber5(usage?.["requests_in_window"]);
@@ -10402,15 +10613,15 @@ function parseUmansUsagePayload(payload, now) {
       usedPercent,
       windowMinutes: 5 * 60,
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil7(resetsAt, now),
+      remainingSeconds: secondsUntil8(resetsAt, now),
       state: "fresh"
     }
   ];
 }
 function parseSyntheticQuotasPayload(payload, now) {
-  if (!isRecord7(payload)) return null;
-  const fiveHour = isRecord7(payload["rollingFiveHourLimit"]) ? payload["rollingFiveHourLimit"] : void 0;
-  const weekly = isRecord7(payload["weeklyTokenLimit"]) ? payload["weeklyTokenLimit"] : void 0;
+  if (!isRecord8(payload)) return null;
+  const fiveHour = isRecord8(payload["rollingFiveHourLimit"]) ? payload["rollingFiveHourLimit"] : void 0;
+  const weekly = isRecord8(payload["weeklyTokenLimit"]) ? payload["weeklyTokenLimit"] : void 0;
   const windows = [];
   if (fiveHour) {
     const max = finiteNumber5(fiveHour["max"]);
@@ -10424,7 +10635,7 @@ function parseSyntheticQuotasPayload(payload, now) {
       usedPercent,
       windowMinutes: 5 * 60,
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil7(resetsAt, now),
+      remainingSeconds: secondsUntil8(resetsAt, now),
       state: usedPercent !== null || resetsAt ? "fresh" : "unavailable"
     });
   }
@@ -10439,7 +10650,7 @@ function parseSyntheticQuotasPayload(payload, now) {
       usedPercent,
       windowMinutes: 7 * 24 * 60,
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil7(resetsAt, now),
+      remainingSeconds: secondsUntil8(resetsAt, now),
       state: usedPercent !== null || resetsAt ? "fresh" : "unavailable"
     });
   }
@@ -10451,12 +10662,12 @@ var CLINE_WINDOW_CONFIG = {
   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;
+  if (!isRecord8(payload)) return null;
+  const data = isRecord8(payload["data"]) ? payload["data"] : payload;
   const limits = Array.isArray(data["limits"]) ? data["limits"] : [];
   const windows = [];
   for (const raw of limits) {
-    if (!isRecord7(raw)) continue;
+    if (!isRecord8(raw)) continue;
     const config = CLINE_WINDOW_CONFIG[typeof raw["type"] === "string" ? raw["type"] : ""];
     if (!config) continue;
     const usedPercent = finitePercent4(raw["percentUsed"]);
@@ -10469,7 +10680,7 @@ function parseClinePassUsageLimitsPayload(payload, now) {
       usedPercent,
       windowMinutes: config.minutes,
       ...resetsAt !== void 0 ? { resetsAt } : {},
-      remainingSeconds: secondsUntil7(resetsAt, now),
+      remainingSeconds: secondsUntil8(resetsAt, now),
       state: "fresh"
     });
   }
@@ -10508,7 +10719,7 @@ function rowKeyEntries(row) {
   return [];
 }
 var ProviderKeyQuotaService = class {
-  constructor(box, fetchImpl = (url, init) => (0, import_upstreamFetch10.fetchUpstream)(url, init, { redactBodies: true }), now = Date.now) {
+  constructor(box, fetchImpl = (url, init) => (0, import_upstreamFetch11.fetchUpstream)(url, init, { redactBodies: true }), now = Date.now) {
     this.box = box;
     this.fetchImpl = fetchImpl;
     this.now = now;
@@ -17172,7 +17383,7 @@ var import_node_fs28 = require("fs");
 var import_node_path27 = require("path");
 var import_SubscriptionAccountHealth2 = require("@omnicross/core/pipeline/SubscriptionAccountHealth");
 var import_AccountAllowanceScheduling3 = require("@omnicross/core/pipeline/AccountAllowanceScheduling");
-var import_upstreamFetch11 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch12 = require("@omnicross/core/pipeline/upstreamFetch");
 var import_SubscriptionIdentityStore2 = require("@omnicross/core/provider-proxy/identity/SubscriptionIdentityStore");
 var import_subscriptions11 = require("@omnicross/subscriptions");
 
@@ -17322,7 +17533,7 @@ var JsonSubscriptionCredentialStore = class {
    * a plaintext token pair into `upstream-trace.jsonl`.
    */
   buildRefreshFetch(providerId, accountId) {
-    return this.fetchImpl ?? ((url, init) => (0, import_upstreamFetch11.fetchUpstream)(url, init, { providerId, accountId, redactBodies: true }));
+    return this.fetchImpl ?? ((url, init) => (0, import_upstreamFetch12.fetchUpstream)(url, init, { providerId, accountId, redactBodies: true }));
   }
   /**
    * In-flight refresh coalescing. OAuth refresh tokens are
@@ -18052,7 +18263,7 @@ var JsonSubscriptionCredentialStore = class {
 };
 
 // src/AccountHealthProbeScheduler.ts
-var import_upstreamFetch12 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch13 = require("@omnicross/core/pipeline/upstreamFetch");
 
 // src/probe/CodexGenerationProbe.ts
 var import_codexCliHeaders = require("@omnicross/core/provider-proxy/identity/codexCliHeaders");
@@ -18226,7 +18437,7 @@ var AccountHealthProbeScheduler = class {
     this.logger = logger;
     this.config = config;
     this.now = opts.now ?? Date.now;
-    this.fetchImpl = opts.fetchImpl ?? import_upstreamFetch12.fetchUpstream;
+    this.fetchImpl = opts.fetchImpl ?? import_upstreamFetch13.fetchUpstream;
     this.sleep = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
     this.planFor = opts.planFor ?? probePlanFor;
   }
@@ -19382,7 +19593,7 @@ var AuditWriter = class {
 var import_node_fs34 = require("fs");
 var import_node_crypto24 = require("crypto");
 var import_node_path34 = require("path");
-var import_upstreamFetch13 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch14 = require("@omnicross/core/pipeline/upstreamFetch");
 
 // src/billing/billingFiles.ts
 var BILLING_FILE_RE = /^billing-(\d{4})-(\d{2})-(\d{2})\.jsonl$/;
@@ -19405,7 +19616,7 @@ var BillingPublisher = class {
   constructor(billingDir, logger, opts = {}) {
     this.billingDir = billingDir;
     this.logger = logger;
-    this.fetchImpl = opts.fetchImpl ?? ((url, init) => (0, import_upstreamFetch13.fetchUpstream)(url, init));
+    this.fetchImpl = opts.fetchImpl ?? ((url, init) => (0, import_upstreamFetch14.fetchUpstream)(url, init));
     this.defer = opts.defer ?? ((fn) => setTimeout(fn, 0));
     this.timeoutMs = opts.timeoutMs ?? BILLING_POST_TIMEOUT_MS;
     this.now = opts.now ?? Date.now;
@@ -19822,7 +20033,7 @@ function createRouteLeaseSubscriptionPreflight(credentials) {
 
 // src/webhook/WebhookDispatcher.ts
 var import_node_crypto25 = require("crypto");
-var import_upstreamFetch14 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch15 = require("@omnicross/core/pipeline/upstreamFetch");
 var WEBHOOK_MAX_ATTEMPTS = 3;
 var WEBHOOK_QUEUE_MAX = 1e3;
 var WEBHOOK_SEND_TIMEOUT_MS = 1e4;
@@ -19842,7 +20053,7 @@ var WebhookDispatcher = class {
   sleep;
   now;
   constructor(opts = {}) {
-    this.fetchImpl = opts.fetchImpl ?? ((url, init) => (0, import_upstreamFetch14.fetchUpstream)(url, init));
+    this.fetchImpl = opts.fetchImpl ?? ((url, init) => (0, import_upstreamFetch15.fetchUpstream)(url, init));
     this.logger = opts.logger;
     this.maxAttempts = opts.maxAttempts ?? WEBHOOK_MAX_ATTEMPTS;
     this.queueMax = opts.queueMax ?? WEBHOOK_QUEUE_MAX;
@@ -20066,12 +20277,12 @@ function buildDaemon(config, paths) {
   setSecretBox(secretBox3);
   setSecretBox2(secretBox3);
   const decryptedConfig = decryptConfigSecrets(config, secretBox3);
-  const accountAllowanceStore = new import_AccountAllowanceStore9.AccountAllowanceStore(
+  const accountAllowanceStore = new import_AccountAllowanceStore10.AccountAllowanceStore(
     Date.now,
     void 0,
     new JsonAccountAllowancePersistence(defaultAccountAllowancePath(paths.configPath))
   );
-  (0, import_AccountAllowanceStore9.setSharedAccountAllowanceStore)(accountAllowanceStore);
+  (0, import_AccountAllowanceStore10.setSharedAccountAllowanceStore)(accountAllowanceStore);
   (0, import_AccountAllowanceScheduling5.getSharedAccountAllowanceScheduling)().configure(
     (0, import_outbound_api10.normalizeServerConfig)(decryptedConfig.server).allowanceScheduling
   );
@@ -20104,12 +20315,12 @@ function buildDaemon(config, paths) {
   );
   (0, import_subscriptions12.setSubscriptionProviderRegistry)(subscriptionRegistry);
   setServerProxyConfig(decryptedConfig.server?.proxy);
-  (0, import_upstreamFetch15.setUpstreamProxyResolver)(
+  (0, import_upstreamFetch16.setUpstreamProxyResolver)(
     createUpstreamProxyResolver({
       getAccountProxy: (providerId, accountId) => credentialStore.getAccountProxy(providerId, accountId)
     })
   );
-  (0, import_gemini_code_assist_resolver.setGeminiCodeAssistResolver)((0, import_GeminiCodeAssistProjectResolver.getGeminiCodeAssistProjectResolver)());
+  (0, import_gemini_code_assist_resolver.setGeminiCodeAssistResolver)((0, import_GeminiCodeAssistProjectResolver2.getGeminiCodeAssistProjectResolver)());
   const autoDisableStore = new AutoDisableStore();
   const providerKeyQuotaService = new ProviderKeyQuotaService(secretBox3);
   const apiKeyPool = new import_ApiKeyPoolService.ApiKeyPoolService(
@@ -20128,7 +20339,7 @@ function buildDaemon(config, paths) {
   const pricingEngine = new import_usage2.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) => (0, import_upstreamFetch15.fetchUpstream)(String(input), init ?? {}))
+    fetchImpl: ((input, init) => (0, import_upstreamFetch16.fetchUpstream)(String(input), init ?? {}))
   });
   const pricingRefreshScheduler = new PricingRefreshScheduler(
     pricingEngine,
@@ -20413,7 +20624,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) => (0, import_upstreamFetch15.fetchUpstream)(url, init, { providerId, redactBodies: true }),
+    oauthExchangeFetch: paths.oauthExchangeFetch ? () => paths.oauthExchangeFetch : (providerId) => (url, init) => (0, import_upstreamFetch16.fetchUpstream)(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;
@@ -20486,7 +20697,7 @@ function buildDaemon(config, paths) {
   });
   const webhookDispatcher = new WebhookDispatcher({
     logger,
-    fetchImpl: (url, init) => (0, import_upstreamFetch15.fetchUpstream)(url, init)
+    fetchImpl: (url, init) => (0, import_upstreamFetch16.fetchUpstream)(url, init)
   });
   setWebhookRuntime(webhookDispatcher, (0, import_SubscriptionAccountHealth4.getSharedAccountHealth)());
   const auditWriter = new AuditWriter(auditDir, logger);
@@ -21351,7 +21562,7 @@ function spawnCliInherit(plan) {
 var import_node_child_process3 = require("child_process");
 var import_node_readline2 = require("readline");
 var import_node_util7 = require("util");
-var import_upstreamFetch16 = require("@omnicross/core/pipeline/upstreamFetch");
+var import_upstreamFetch17 = require("@omnicross/core/pipeline/upstreamFetch");
 var import_subscriptions13 = require("@omnicross/subscriptions");
 var PROVIDERS2 = ["claude", "codex", "gemini", "kimi", "grok", "copilot"];
 async function runLogin(argv, deps) {
@@ -21393,10 +21604,10 @@ async function runLogin(argv, deps) {
   const resolvedOpenBrowser = resolved.openBrowser;
   const box = resolveSecretBox(values["master-key-file"]);
   setSecretBox(box);
-  (0, import_upstreamFetch16.setUpstreamProxyResolver)(createUpstreamProxyResolver());
+  (0, import_upstreamFetch17.setUpstreamProxyResolver)(createUpstreamProxyResolver());
   try {
     const tokensPath = defaultTokensPath(values.config);
-    const exchangeFetch = resolved.tokensFetch ?? ((url, init) => (0, import_upstreamFetch16.fetchUpstream)(url, init, { providerId: provider, redactBodies: true }));
+    const exchangeFetch = resolved.tokensFetch ?? ((url, init) => (0, import_upstreamFetch17.fetchUpstream)(url, init, { providerId: provider, redactBodies: true }));
     const store = new JsonSubscriptionCredentialStore(tokensPath, box, exchangeFetch);
     const expiresAt = await runProviderLogin(
       provider,
@@ -21410,7 +21621,7 @@ async function runLogin(argv, deps) {
     console.info(`  token: [stored, encrypted]   expiresAt: ${expiresAt ?? "n/a"}`);
   } finally {
     setSecretBox(null);
-    (0, import_upstreamFetch16.setUpstreamProxyResolver)(null);
+    (0, import_upstreamFetch17.setUpstreamProxyResolver)(null);
   }
 }
 async function runProviderLogin(provider, store, deps, exchangeFetch, label, enterpriseUrl) {