@anthonyhaussman/opencode-agy-auth 1.0.7 → 1.0.10

package/dist/index.d.ts

@@ -8,7 +8,7 @@ interface PluginContext {
 type PluginResult = Hooks;
 
 /**
- * 为 Opencode 注册 Agy OAuth 提供者。
+ * Registers the Agy OAuth provider for Opencode.
  */
 declare const AgyCLIOAuthPlugin: ({ client }: PluginContext) => Promise<PluginResult>;
 declare const GoogleOAuthPlugin: ({ client }: PluginContext) => Promise<PluginResult>;

package/dist/index.js

@@ -166,10 +166,14 @@ function createAgyActivityRequestId() {
   return Math.random().toString(36).substring(7);
 }
 
+// src/sdk/user-agent.ts
+import os from "os";
+
 // src/sdk/agy-cli-version.ts
-var AGY_CLI_VERSION = "1.0.3";
+var AGY_CLI_VERSION = "1.0.10";
 
 // src/sdk/user-agent.ts
+var cachedUserAgent = null;
 function getAgyCliVersion() {
   const explicitVersion = process.env.OPENCODE_AGY_CLI_VERSION?.trim();
   if (explicitVersion) {
@@ -178,7 +182,16 @@ function getAgyCliVersion() {
   return AGY_CLI_VERSION;
 }
 function buildAgyCliUserAgent(model) {
-  return "antigravity/cli/1.0.3 darwin/amd64";
+  const version2 = getAgyCliVersion();
+  if (cachedUserAgent && cachedUserAgent.startsWith("antigravity/cli/" + version2 + " ")) {
+    return cachedUserAgent;
+  }
+  const rawPlatform = os.platform();
+  const platform2 = rawPlatform === "win32" ? "windows" : rawPlatform;
+  const rawArch = os.arch();
+  const arch2 = rawArch === "x64" ? "amd64" : rawArch;
+  cachedUserAgent = "antigravity/cli/" + version2 + " " + platform2 + "/" + arch2;
+  return cachedUserAgent;
 }
 
 // src/sdk/fetch_quota.ts
@@ -731,8 +744,8 @@ function createOAuthAuthorizeMethod(options) {
           const message2 = error45 instanceof Error ? error45.message : String(error45);
           options.client.tui.showToast({
             body: {
-              title: "\u7ED1\u5B9A\u9879\u76EE\u4E0A\u4E0B\u6587\u5931\u8D25",
-              message: `\u5DF2\u6388\u6743\u6210\u529F\u4F46\u65E0\u6CD5\u7ED1\u5B9A\u9879\u76EE\uFF0C\u5C06\u65E0\u6CD5\u4F7F\u7528\u771F\u5B9E\u6A21\u578B\uFF1A${message2}`,
+              title: "Failed to bind project context",
+              message: `Authorized successfully but failed to bind project, real models will be unavailable: ${message2}`,
               variant: "warning",
               duration: 15e3
             }
@@ -752,7 +765,7 @@ function createOAuthAuthorizeMethod(options) {
     }
     return {
       url: authorization.url,
-      instructions: "\u8BF7\u5728\u6D4F\u89C8\u5668\u4E2D\u5B8C\u6210 Google \u8D26\u6237\u6388\u6743\u3002\u6388\u6743\u5B8C\u6210\u540E\uFF0C\u9875\u9762\u4F1A\u8DF3\u8F6C\u81F3 https://antigravity.google/oauth-callback?code=... \u3002\u8BF7\u5C06\u6700\u7EC8\u6D4F\u89C8\u5668\u5730\u5740\u680F\u7684\u5B8C\u6574\u8DF3\u8F6C URL \u6216\u5176\u4E2D\u7684 code \u53C2\u6570\u503C\u590D\u5236\u5E76\u7C98\u8D34\u5230\u4E0B\u65B9\u8F93\u5165\u6846\u4E2D\uFF1A",
+      instructions: "Please complete Google account authorization in your browser. After authorization, the page will redirect to https://antigravity.google/oauth-callback?code=... . Please copy the full redirect URL from your browser address bar, or just the code parameter value, and paste it into the input box below:",
       method: "code",
       callback: async (callbackUrl) => {
         try {
@@ -855,19 +868,19 @@ function ensureGitignoreSync(configDir) {
   }
 }
 var SignatureCache = class {
-  // 内存缓存映射表
+  // Memory cache map
   cache = /* @__PURE__ */ new Map();
-  // 配置项
+  // Configuration options
   memoryTtlMs;
   diskTtlMs;
   writeIntervalMs;
   cacheFilePath;
   enabled;
-  // 状态变量
+  // State variables
   dirty = false;
   writeTimer = null;
   cleanupTimer = null;
-  // 统计指标
+  // Statistical metrics
   stats = {
     memoryHits: 0,
     diskHits: 0,
@@ -886,16 +899,16 @@ var SignatureCache = class {
     }
   }
   // ===========================================================================
-  // 公开的签名缓存 API (Public Signature API)
+  // Public Signature API
   // ===========================================================================
   /**
-   * 基于会话 ID 和模型 ID 生成唯一的缓存键
+   * Generates a unique cache key based on session ID and model ID
    */
   static makeKey(sessionId, modelId) {
     return `${sessionId}:${modelId}`;
   }
   /**
-   * 将一个签名存入缓存中（标记为脏状态，等待后台写盘）
+   * Stores a signature in cache (marks as dirty, awaits background disk write)
    */
   store(key, signature) {
     if (!this.enabled) return;
@@ -906,8 +919,8 @@ var SignatureCache = class {
     this.dirty = true;
   }
   /**
-   * 从缓存中检索签名，并更新命中统计
-   * 若过期或不存在则返回 null
+   * Retrieves a signature from cache and updates hit stats
+   * Returns null if expired or missing
    */
   retrieve(key) {
     if (!this.enabled) return null;
@@ -924,7 +937,7 @@ var SignatureCache = class {
     return null;
   }
   /**
-   * 检查某个键在缓存中是否有效且未过期（不影响统计数据）
+   * Checks if a key is valid and unexpired in cache (without affecting stats)
    */
   has(key) {
     if (!this.enabled) return false;
@@ -934,11 +947,11 @@ var SignatureCache = class {
     return age <= this.memoryTtlMs;
   }
   // ===========================================================================
-  // 思维链全量缓存 API (Full Thinking Cache API)
+  // Full Thinking Cache API
   // ===========================================================================
   /**
-   * 缓存完整的思维链文本内容及签名
-   * 即使后续的上下文遭到压缩，我们也能从中自愈和恢复历史上下文中的 thought block。
+   * Caches the full thought chain text content and signature
+   * Allows self-healing and recovery of historical thought blocks even if the context is subsequently compressed.
    */
   storeThinking(key, thinkingText, signature, toolIds) {
     if (!this.enabled || !thinkingText || !signature) return;
@@ -952,7 +965,7 @@ var SignatureCache = class {
     this.dirty = true;
   }
   /**
-   * 从缓存中提取完整的思维链信息
+   * Extracts full thought chain info from cache
    */
   retrieveThinking(key) {
     if (!this.enabled) return null;
@@ -971,7 +984,7 @@ var SignatureCache = class {
     };
   }
   /**
-   * 检查是否存在某个键的完整思维链内容
+   * Checks if full thought chain content exists for a key
    */
   hasThinking(key) {
     if (!this.enabled) return false;
@@ -981,7 +994,7 @@ var SignatureCache = class {
     return age <= this.memoryTtlMs;
   }
   /**
-   * 获取当前缓存统计数据与内存占用情况
+   * Gets current cache stats and memory footprint
    */
   getStats() {
     return {
@@ -992,14 +1005,14 @@ var SignatureCache = class {
     };
   }
   /**
-   * 手动触发立即保存到磁盘
+   * Manually triggers immediate save to disk
    */
   async flush() {
     if (!this.enabled) return true;
     return this.saveToDisk();
   }
   /**
-   * 优雅关机：停止所有定时器，并将未写盘的数据保存到磁盘上
+   * Graceful shutdown: stops all timers and flushes unsaved data to disk
    */
   shutdown() {
     if (this.writeTimer) {
@@ -1015,10 +1028,10 @@ var SignatureCache = class {
     }
   }
   // ===========================================================================
-  // 磁盘数据持久化操作 (Disk Operations)
+  // Disk Operations
   // ===========================================================================
   /**
-   * 从磁盘中加载签名缓存，并验证 TTL 状态
+   * Loads signature cache from disk and validates TTL state
    */
   loadFromDisk() {
     try {
@@ -1047,8 +1060,8 @@ var SignatureCache = class {
     }
   }
   /**
-   * 将内存缓存同步保存到磁盘上（采用先写临时文件后 rename 的原子写入模式）
-   * 写入时会与磁盘上原有的未过期数据条目进行合并
+   * Synchronously saves memory cache to disk (using atomic write: temp file then rename)
+   * Merges with existing unexpired entries on disk during write
    */
   saveToDisk() {
     try {
@@ -1116,10 +1129,10 @@ var SignatureCache = class {
     }
   }
   // ===========================================================================
-  // 后台自动定时任务 (Background Tasks)
+  // Background Tasks
   // ===========================================================================
   /**
-   * 启动自动保存和自动清理过期内存条目的定时器
+   * Starts timers for auto-saving and auto-cleaning expired memory entries
    */
   startBackgroundTasks() {
     this.writeTimer = setInterval(() => {
@@ -1132,7 +1145,7 @@ var SignatureCache = class {
     }, 30 * 60 * 1e3);
   }
   /**
-   * 移除内存中超过生存周期的过期缓存
+   * Removes memory cache entries exceeding their TTL
    */
   cleanupExpired() {
     const now = Date.now();
@@ -14473,7 +14486,7 @@ async function maybeShowAgyTestToast(client, projectId) {
 
 // src/plugin/traffic.ts
 import { randomUUID } from "crypto";
-import * as os from "os";
+import * as os2 from "os";
 var lastTrafficTime = 0;
 var TRAFFIC_INTERVAL_MS = 5 * 60 * 1e3;
 function simulateClientBackgroundTraffic(accessToken, projectId, userAgentModel) {
@@ -14509,8 +14522,8 @@ async function sendListExperiments(accessToken, userAgentModel) {
 async function sendCodeAssistMetrics(accessToken, projectId, userAgentModel) {
   const url2 = `${AGY_CODE_ASSIST_ENDPOINT}/v1internal:recordCodeAssistMetrics`;
   const userAgent = buildAgyCliUserAgent(userAgentModel);
-  const plat = os.platform();
-  const arch2 = os.arch();
+  const plat = os2.platform();
+  const arch2 = os2.arch();
   const platMap = {
     darwin: "DARWIN",
     linux: "LINUX",
@@ -14568,8 +14581,8 @@ async function sendCodeAssistMetrics(accessToken, projectId, userAgentModel) {
 async function sendTrajectoryAnalytics(accessToken, userAgentModel) {
   const url2 = `${AGY_CODE_ASSIST_ENDPOINT}/v1internal:recordTrajectoryAnalytics`;
   const userAgent = buildAgyCliUserAgent(userAgentModel);
-  const plat = os.platform();
-  const arch2 = os.arch();
+  const plat = os2.platform();
+  const arch2 = os2.arch();
   const platMap = {
     darwin: "DARWIN",
     linux: "LINUX",
@@ -15376,6 +15389,9 @@ function deduplicateThinkingText(response, sentBuffer, displayedThinkingHashes)
       return block;
     });
     const filteredContent = newContent.filter((b) => b !== null);
+    if (filteredContent.length === 0) {
+      return { ...resp, content: [] };
+    }
     return { ...resp, content: filteredContent };
   }
   return response;
@@ -15518,6 +15534,11 @@ function createStreamingTransformer(signatureStore, callbacks, options = {}) {
       if (!hasSeenUsageMetadata) {
         const syntheticUsage = {
           response: {
+            candidates: [
+              {
+                finishReason: "STOP"
+              }
+            ],
             usageMetadata: {
               promptTokenCount: 0,
               candidatesTokenCount: 0,
@@ -15638,22 +15659,7 @@ function transformRequestBody(body, projectId, effectiveModel, requestedModel, t
         contents2 = normalizeContentsSequence(contents2);
         injectMissingToolCallIds(contents2);
         const latestSig = getLatestSignature(sessionId2);
-        const allFunctionCalls = [];
-        for (const content of contents2) {
-          if (content && typeof content === "object" && Array.isArray(content.parts)) {
-            for (const part of content.parts) {
-              if (part && typeof part === "object" && part.functionCall) {
-                allFunctionCalls.push(part);
-              }
-            }
-          }
-        }
-        if (allFunctionCalls.length > 0 && latestSig) {
-          const lastFunctionCall = allFunctionCalls[allFunctionCalls.length - 1];
-          if (!lastFunctionCall.thoughtSignature || lastFunctionCall.thoughtSignature === "skip_thought_signature_validator") {
-            lastFunctionCall.thoughtSignature = latestSig;
-          }
-        }
+        applyLatestSignature(contents2, latestSig);
         requestPayloadInside.contents = contents2;
       }
       return { body: JSON.stringify(wrappedBody2), userPromptId: userPromptId2, sessionId: sessionId2 };
@@ -15681,22 +15687,7 @@ function transformRequestBody(body, projectId, effectiveModel, requestedModel, t
       contents = normalizeContentsSequence(contents);
       injectMissingToolCallIds(contents);
       const latestSig = getLatestSignature(sessionId);
-      const allFunctionCalls = [];
-      for (const content of contents) {
-        if (content && typeof content === "object" && Array.isArray(content.parts)) {
-          for (const part of content.parts) {
-            if (part && typeof part === "object" && part.functionCall) {
-              allFunctionCalls.push(part);
-            }
-          }
-        }
-      }
-      if (allFunctionCalls.length > 0 && latestSig) {
-        const lastFunctionCall = allFunctionCalls[allFunctionCalls.length - 1];
-        if (!lastFunctionCall.thoughtSignature || lastFunctionCall.thoughtSignature === "skip_thought_signature_validator") {
-          lastFunctionCall.thoughtSignature = latestSig;
-        }
-      }
+      applyLatestSignature(contents, latestSig);
       requestPayload.contents = contents;
     }
     if ("model" in requestPayload) {
@@ -15936,6 +15927,24 @@ function injectMissingToolCallIds(contents) {
     }
   }
 }
+function applyLatestSignature(contents, latestSig) {
+  const allFunctionCalls = [];
+  for (const content of contents) {
+    if (content && typeof content === "object" && Array.isArray(content.parts)) {
+      for (const part of content.parts) {
+        if (part && typeof part === "object" && part.functionCall) {
+          allFunctionCalls.push(part);
+        }
+      }
+    }
+  }
+  if (allFunctionCalls.length > 0 && latestSig) {
+    const lastFunctionCall = allFunctionCalls[allFunctionCalls.length - 1];
+    if (!lastFunctionCall.thoughtSignature || lastFunctionCall.thoughtSignature === "skip_thought_signature_validator") {
+      lastFunctionCall.thoughtSignature = latestSig;
+    }
+  }
+}
 
 // src/sdk/request/response.ts
 async function transformAgyResponse(response, streaming, _ignoredDebugContext, requestedModel, sessionId, chatLogger) {
@@ -16291,45 +16300,18 @@ var latestAgyAuthResolver;
 var latestAgyConfiguredProjectId;
 var latestAgyUserAgentModel;
 var STATIC_MODELS_SIMPLE = {
-  "gemini-3.5-flash-low": {
-    name: "Gemini 3.5 Flash (Medium)",
-    description: "Gemini 3.5 Flash \u4E2D\u914D\u7248\u672C\uFF0C\u517C\u987E\u751F\u6210\u901F\u5EA6\u4E0E\u63A8\u7406\u6027\u80FD\uFF0C\u63D0\u4F9B\u9AD8\u6027\u4EF7\u6BD4\u3002",
-    maxTokens: 1048576,
-    maxOutputTokens: 65536,
-    toolCall: true,
-    reasoning: true,
-    attachment: true
-  },
-  "gemini-3-flash-agent": {
-    name: "Gemini 3.5 Flash (High)",
-    description: "Gemini 3.5 Flash \u9AD8\u914D\u667A\u80FD\u4F53\u7248\uFF0C\u54CD\u5E94\u6781\u5FEB\uFF0C\u6DF1\u5EA6\u4F18\u5316\u4E86\u591A\u6B65\u9AA4\u5DE5\u5177\u8C03\u7528\u4E0E\u6D41\u7A0B\u63A7\u5236\u3002",
-    maxTokens: 1048576,
-    maxOutputTokens: 65536,
-    toolCall: true,
-    reasoning: true,
-    attachment: true
-  },
-  "gemini-3.5-flash-extra-low": {
-    name: "Gemini 3.5 Flash (Low)",
-    description: "Gemini 3.5 Flash \u8D85\u4F4E\u914D\u7248\u672C\uFF0C\u9002\u5408\u5927\u89C4\u6A21\u3001\u4F4E\u6210\u672C\u7684\u7B80\u5355\u6587\u672C\u5904\u7406\u4EFB\u52A1\u3002",
+  "gemini-3.5-flash": {
+    name: "Gemini 3.5 Flash",
+    description: "Gemini 3.5 Flash base model. Select tier at runtime.",
     maxTokens: 1048576,
     maxOutputTokens: 65536,
     toolCall: true,
     reasoning: true,
     attachment: true
   },
-  "gemini-3.1-pro-low": {
-    name: "Gemini 3.1 Pro (Low)",
-    description: "Gemini 3.1 Pro \u4F4E\u914D\u7248\u672C\uFF0C\u9002\u5408\u9AD8\u590D\u6742\u5EA6\u7684\u903B\u8F91\u548C\u4EE3\u7801\u7F16\u5199\u4EFB\u52A1\uFF0C\u4F46\u9650\u5236\u4E86\u90E8\u5206\u5E76\u53D1\u6216\u914D\u989D\u3002",
-    maxTokens: 1048576,
-    maxOutputTokens: 65535,
-    toolCall: true,
-    reasoning: true,
-    attachment: true
-  },
-  "gemini-pro-agent": {
-    name: "Gemini 3.1 Pro (High)",
-    description: "Gemini 3.1 Pro \u9AD8\u914D/\u667A\u80FD\u4F53\u7248\u672C\uFF0C\u63D0\u4F9B\u6700\u5148\u8FDB\u7684\u591A\u6A21\u6001\u7406\u89E3\u4E0E\u957F\u6587\u672C\u63A8\u7406\u80FD\u529B\uFF0C\u5E76\u9488\u5BF9\u667A\u80FD\u4F53\u5DE5\u5177\u8C03\u7528\u8FDB\u884C\u4E86\u4F18\u5316\u3002",
+  "gemini-3.1-pro": {
+    name: "Gemini 3.1 Pro",
+    description: "Gemini 3.1 Pro base model. Select tier at runtime.",
     maxTokens: 1048576,
     maxOutputTokens: 65535,
     toolCall: true,
@@ -16338,7 +16320,7 @@ var STATIC_MODELS_SIMPLE = {
   },
   "claude-sonnet-4-6": {
     name: "Claude Sonnet 4.6 (Thinking)",
-    description: "Claude Sonnet 4.6 \u6DF1\u5EA6\u63A8\u7406\u6A21\u578B\uFF0C\u5B8C\u7F8E\u5E73\u8861\u4E86\u601D\u8003\u8FC7\u7A0B\u3001\u5904\u7406\u901F\u5EA6\u4E0E\u8F93\u51FA\u8D28\u91CF\u3002",
+    description: "Claude Sonnet 4.6 deep reasoning model, perfectly balancing thinking process, processing speed, and output quality.",
     maxTokens: 25e4,
     maxOutputTokens: 64e3,
     toolCall: true,
@@ -16347,7 +16329,7 @@ var STATIC_MODELS_SIMPLE = {
   },
   "claude-opus-4-6-thinking": {
     name: "Claude Opus 4.6 (Thinking)",
-    description: "Claude Opus 4.6 \u6DF1\u5EA6\u63A8\u7406\u6A21\u578B\uFF0C\u5185\u7F6E\u601D\u8003\u94FE\uFF0C\u975E\u5E38\u9002\u5408\u89E3\u51B3\u9876\u5C16\u96BE\u5EA6\u7684\u7B97\u6CD5\u548C\u903B\u8F91\u96BE\u9898\u3002",
+    description: "Claude Opus 4.6 deep reasoning model, built-in chain of thought, highly suitable for top-tier algorithm and logic puzzles.",
     maxTokens: 25e4,
     maxOutputTokens: 64e3,
     toolCall: true,
@@ -16356,7 +16338,7 @@ var STATIC_MODELS_SIMPLE = {
   },
   "gpt-oss-120b-medium": {
     name: "GPT-OSS 120B (Medium)",
-    description: "GPT \u5F00\u6E90 120B \u53C2\u6570\u4E2D\u914D\u6A21\u578B\uFF0C\u5728\u672C\u5730\u5316\u90E8\u7F72\u6216\u7279\u5B9A\u5F00\u6E90\u57FA\u51C6\u4E0A\u8868\u73B0\u5353\u8D8A\u3002",
+    description: "GPT open-source 120B parameter medium tier model, excellent performance in local deployment or specific open-source benchmarks.",
     maxTokens: 131072,
     maxOutputTokens: 32768,
     toolCall: true,
@@ -16364,9 +16346,29 @@ var STATIC_MODELS_SIMPLE = {
     attachment: false
   }
 };
+var TIER_MAPPING = {
+  "gemini-3.5-flash": {
+    low: "gemini-3.5-flash-extra-low",
+    medium: "gemini-3.5-flash-low",
+    high: "gemini-3-flash-agent"
+  },
+  "gemini-3.1-pro": {
+    low: "gemini-3.1-pro-low",
+    medium: "gemini-pro-agent",
+    high: "gemini-pro-agent"
+  }
+};
 var buildModelFromSimple = (modelId, simple) => {
   const isClaude = modelId.startsWith("claude-");
   const isGpt = modelId.startsWith("gpt-");
+  let variants = void 0;
+  if (TIER_MAPPING[modelId]) {
+    variants = {
+      "low": { id: "low", name: "low", displayName: "low", title: "low", label: "low", options: { name: "low" }, headers: { "x-agy-tier": "low" } },
+      "medium": { id: "medium", name: "medium", displayName: "medium", title: "medium", label: "medium", options: { name: "medium" }, headers: { "x-agy-tier": "medium" } },
+      "high": { id: "high", name: "high", displayName: "high", title: "high", label: "high", options: { name: "high" }, headers: { "x-agy-tier": "high" } }
+    };
+  }
   return {
     id: modelId,
     providerID: AGY_PROVIDER_ID,
@@ -16376,6 +16378,7 @@ var buildModelFromSimple = (modelId, simple) => {
       npm: "@ai-sdk/google"
     },
     name: simple.name,
+    family: modelId.includes("gemini") ? "gemini" : isClaude ? "claude" : isGpt ? "gpt" : "unknown",
     status: "active",
     release_date: "2026-05-26",
     capabilities: {
@@ -16414,13 +16417,91 @@ var buildModelFromSimple = (modelId, simple) => {
     options: {
       description: simple.description
     },
-    headers: {}
+    headers: {},
+    variants
   };
 };
 var STATIC_MODELS = {};
 for (const [modelId, simple] of Object.entries(STATIC_MODELS_SIMPLE)) {
   STATIC_MODELS[modelId] = buildModelFromSimple(modelId, simple);
 }
+function getSafeHeader(headers, key) {
+  if (!headers) {
+    return void 0;
+  }
+  const targetKey = key.toLowerCase();
+  if (typeof headers.get === "function") {
+    try {
+      return headers.get(targetKey) || void 0;
+    } catch {
+    }
+  }
+  if (Array.isArray(headers)) {
+    const found = headers.find((item) => {
+      if (Array.isArray(item) && typeof item[0] === "string") {
+        return item[0].toLowerCase() === targetKey;
+      }
+      return false;
+    });
+    return found ? String(found[1]) : void 0;
+  }
+  if (typeof headers === "object") {
+    const foundKey = Object.keys(headers).find((k) => k.toLowerCase() === targetKey);
+    return foundKey ? headers[foundKey] !== void 0 ? String(headers[foundKey]) : void 0 : void 0;
+  }
+  return void 0;
+}
+function setSafeHeaders(initHeaders, newHeaders) {
+  if (typeof globalThis.Headers !== "undefined") {
+    const headers = new globalThis.Headers(initHeaders ?? {});
+    for (const [k, v] of Object.entries(newHeaders)) {
+      headers.set(k, v);
+    }
+    return headers;
+  }
+  if (Array.isArray(initHeaders)) {
+    const nextHeaders2 = [...initHeaders];
+    for (const [k, v] of Object.entries(newHeaders)) {
+      const idx = nextHeaders2.findIndex((item) => Array.isArray(item) && typeof item[0] === "string" && item[0].toLowerCase() === k.toLowerCase());
+      if (idx !== -1) {
+        nextHeaders2[idx] = [k, v];
+      } else {
+        nextHeaders2.push([k, v]);
+      }
+    }
+    return nextHeaders2;
+  }
+  const nextHeaders = {};
+  if (initHeaders && typeof initHeaders === "object") {
+    for (const [k, v] of Object.entries(initHeaders)) {
+      nextHeaders[k] = String(v);
+    }
+  }
+  for (const [k, v] of Object.entries(newHeaders)) {
+    const existingKey = Object.keys(nextHeaders).find((key) => key.toLowerCase() === k.toLowerCase());
+    if (existingKey) {
+      nextHeaders[existingKey] = v;
+    } else {
+      nextHeaders[k] = v;
+    }
+  }
+  return nextHeaders;
+}
+function resolveModelTier(baseModelId, init) {
+  const parts = baseModelId.split("@");
+  const base = parts[0] || "";
+  const suffixTier = parts[1]?.toLowerCase();
+  const mapping = TIER_MAPPING[base];
+  if (!mapping) {
+    return baseModelId;
+  }
+  const headerTier = getSafeHeader(init?.headers, "x-agy-tier")?.toLowerCase() || null;
+  const requestedTier = headerTier || suffixTier;
+  if (requestedTier && Object.prototype.hasOwnProperty.call(mapping, requestedTier)) {
+    return mapping[requestedTier] || baseModelId;
+  }
+  return mapping["medium"];
+}
 var AgyCLIOAuthPlugin = async ({ client }) => {
   let latestConfig;
   const getModelsList = (provider) => {
@@ -16515,14 +16596,15 @@ var AgyCLIOAuthPlugin = async ({ client }) => {
             }
             const configuredProjectId2 = await resolveLatestConfiguredProjectId(provider);
             if (isInternal) {
-              const headers = new Headers(init?.headers ?? {});
-              const hasAuth = headers.has("Authorization") || Object.keys(init?.headers ?? {}).some((k) => k.toLowerCase() === "authorization");
+              const hasAuth = getSafeHeader(init?.headers, "Authorization") !== void 0;
               if (hasAuth) {
                 return agyFetch(input, init);
               }
-              headers.set("Authorization", `Bearer ${authRecord.access}`);
               const userAgent = buildAgyCliUserAgent(latestAgyUserAgentModel);
-              headers.set("User-Agent", userAgent);
+              const headers = setSafeHeaders(init?.headers, {
+                "Authorization": `Bearer ${authRecord.access}`,
+                "User-Agent": userAgent
+              });
               if (configuredProjectId2) {
                 simulateClientBackgroundTraffic(authRecord.access, configuredProjectId2, latestAgyUserAgentModel);
               }
@@ -16543,9 +16625,23 @@ var AgyCLIOAuthPlugin = async ({ client }) => {
               requestUserAgentModel
             );
             await maybeShowAgyTestToast(client, projectContext.effectiveProjectId);
+            const originalRequestedModel = parseGenerativeLanguageRequest(input)?.effectiveModel;
+            let modifiedInput = input;
+            if (isGL && originalRequestedModel) {
+              const originalBase = originalRequestedModel.replace("google-agy/", "");
+              const resolvedBase = resolveModelTier(originalBase, init);
+              if (originalBase !== resolvedBase) {
+                if (typeof modifiedInput === "string") {
+                  modifiedInput = modifiedInput.replace(`models/${originalBase}`, `models/${resolvedBase}`);
+                } else if (typeof Request !== "undefined" && modifiedInput instanceof Request) {
+                  const newUrl = modifiedInput.url.replace(`models/${originalBase}`, `models/${resolvedBase}`);
+                  modifiedInput = new Request(newUrl, modifiedInput);
+                }
+              }
+            }
             const parts = parseRefreshParts(authRecord.refresh);
             const transformed = prepareAgyRequest(
-              input,
+              modifiedInput,
               init,
               authRecord.access,
               projectContext.effectiveProjectId,
@@ -16616,7 +16712,7 @@ var AgyCLIOAuthPlugin = async ({ client }) => {
         if (!auth || !isOAuthAuth(auth)) {
           return {
             "login-required": {
-              name: "\u6682\u65E0\u6A21\u578B\u5217\u8868"
+              name: "No models available"
             }
           };
         }