@anthonyhaussman/opencode-agy-auth 1.2.13-alpha.0 → 1.2.13-alpha.1

package/dist/index.js

@@ -15337,6 +15337,12 @@ function formatRelativeResetTime(resetTime) {
 
 // src/plugin/quota.ts
 var AGY_QUOTA_TOOL_NAME = "agy_quota";
+var AGY_V2_QUOTA_COMMAND = "agy-quota";
+var AGY_V2_QUOTA_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota usage for the current authenticated account.
+
+Immediately call \`${AGY_QUOTA_TOOL_NAME}\` with no arguments and return its output verbatim.
+Do not call other tools.
+`;
 function createAgyQuotaTool({
   client,
   getAuthResolver,
@@ -15576,6 +15582,12 @@ function splitModelVariant(modelId) {
 
 // src/plugin/quota-summary.ts
 var AGY_QUOTA_SUMMARY_TOOL_NAME = "agy_quota_summary";
+var AGY_V2_QUOTA_SUMMARY_COMMAND = "agy-quota-summary";
+var AGY_V2_QUOTA_SUMMARY_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota summary (weekly and 5-hour limits by model group) for the current authenticated account.
+
+Immediately call \`${AGY_QUOTA_SUMMARY_TOOL_NAME}\` with no arguments and return its output verbatim.
+Do not call other tools.
+`;
 function createAgyQuotaSummaryTool({
   client,
   getAuthResolver,
@@ -19792,9 +19804,14 @@ function normalizeToolSchemaTypes(tools, toolMapper) {
           fn.name = toolMapper ? toolMapper.toGemini(fn.name) : sanitizeToolName(fn.name);
         }
         if (fn) {
+          if (!fn.parameters) {
+            fn.parameters = fn.parameters_json_schema ?? fn.parametersJsonSchema;
+          }
           if (!fn.parameters) {
             fn.parameters = { type: "OBJECT", properties: {} };
           }
+          delete fn.parameters_json_schema;
+          delete fn.parametersJsonSchema;
           sanitizeSchema(fn.parameters);
         }
       }
@@ -20219,22 +20236,81 @@ var ChatLoggerImpl = class {
   }
 };
 
-// src/plugin.ts
-var AGY_QUOTA_COMMAND = "agyquota";
-var AGY_QUOTA_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota usage for the current authenticated account.
-
-Immediately call \`${AGY_QUOTA_TOOL_NAME}\` with no arguments and return its output verbatim.
-Do not call other tools.
-`;
-var AGY_QUOTA_SUMMARY_COMMAND = "agyquotasummary";
-var AGY_QUOTA_SUMMARY_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota summary (weekly and 5-hour limits by model group) for the current authenticated account.
+// src/plugin/headers.ts
+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 toUrlString(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  const candidate = value.url;
+  if (candidate) {
+    return candidate;
+  }
+  return value.toString();
+}
 
-Immediately call \`${AGY_QUOTA_SUMMARY_TOOL_NAME}\` with no arguments and return its output verbatim.
-Do not call other tools.
-`;
-var latestAgyAuthResolver;
-var latestAgyConfiguredProjectId;
-var latestAgyUserAgentModel;
+// src/plugin/tier.ts
 var STATIC_MODELS_SIMPLE = {
   "gemini-3.8-flash": {
     name: "Gemini 3.8 Flash",
@@ -20322,6 +20398,39 @@ var TIER_MAPPING = {
     high: "gemini-3.1-pro-high"
   }
 };
+function resolveModelTier(baseModelId, headersOrInit) {
+  const parts = baseModelId.split("@");
+  const base = parts[0] || "";
+  const suffixTier = parts[1]?.toLowerCase();
+  const mapping = TIER_MAPPING[base];
+  if (!mapping) {
+    return baseModelId;
+  }
+  const rawHeaders = headersOrInit && typeof headersOrInit === "object" && "headers" in headersOrInit ? headersOrInit.headers : headersOrInit;
+  const headerTier = getSafeHeader(rawHeaders, "x-agy-tier")?.toLowerCase() || null;
+  const requestedTier = headerTier || suffixTier;
+  if (requestedTier && Object.prototype.hasOwnProperty.call(mapping, requestedTier)) {
+    return mapping[requestedTier] || baseModelId;
+  }
+  return mapping["medium"] ?? mapping["high"] ?? baseModelId;
+}
+
+// src/plugin.ts
+var AGY_QUOTA_COMMAND = "agyquota";
+var AGY_QUOTA_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota usage for the current authenticated account.
+
+Immediately call \`${AGY_QUOTA_TOOL_NAME}\` with no arguments and return its output verbatim.
+Do not call other tools.
+`;
+var AGY_QUOTA_SUMMARY_COMMAND = "agyquotasummary";
+var AGY_QUOTA_SUMMARY_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota summary (weekly and 5-hour limits by model group) for the current authenticated account.
+
+Immediately call \`${AGY_QUOTA_SUMMARY_TOOL_NAME}\` with no arguments and return its output verbatim.
+Do not call other tools.
+`;
+var latestAgyAuthResolver;
+var latestAgyConfiguredProjectId;
+var latestAgyUserAgentModel;
 var buildModelFromSimple = (modelId, simple) => {
   const isClaude = modelId.startsWith("claude-");
   const isGpt = modelId.startsWith("gpt-");
@@ -20415,83 +20524,6 @@ 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"] ?? mapping["high"];
-}
 var AgyCLIOAuthPlugin = async ({ client }) => {
   let latestConfig;
   updateStaticModelsWithPricing(STATIC_MODELS);
@@ -20819,139 +20851,30 @@ async function ensureProjectContextOrThrow(authRecord, client, configuredProject
     throw error45;
   }
 }
-function toUrlString(value) {
-  if (typeof value === "string") {
-    return value;
-  }
-  const candidate = value.url;
-  if (candidate) {
-    return candidate;
-  }
-  return value.toString();
-}
 
 // src/plugin/types.ts
 function defineOpenCodeV2Plugin(def) {
   return def;
 }
 
-// src/plugin/v2.ts
+// src/plugin/v2-storage.ts
+import { closeSync, existsSync as existsSync6, mkdirSync as mkdirSync5, openSync, readFileSync as readFileSync5, renameSync as renameSync4, unlinkSync as unlinkSync4, writeFileSync as writeFileSync5 } from "fs";
+import { randomUUID as randomUUID4 } from "crypto";
 import { homedir as homedir4 } from "os";
 import { join as join6 } from "path";
-import { existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
-import "http";
-var AGY_V2_QUOTA_COMMAND = "agy-quota";
-var AGY_V2_QUOTA_SUMMARY_COMMAND = "agy-quota-summary";
-var AGY_V2_QUOTA_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota usage for the current authenticated account.
-
-Immediately call \`${AGY_QUOTA_TOOL_NAME}\` with no arguments and return its output verbatim.
-Do not call other tools.
-`;
-var AGY_V2_QUOTA_SUMMARY_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota summary (weekly and 5-hour limits by model group) for the current authenticated account.
-
-Immediately call \`${AGY_QUOTA_SUMMARY_TOOL_NAME}\` with no arguments and return its output verbatim.
-Do not call other tools.
-`;
-function getSafeHeader2(headers, key) {
-  if (!headers) {
-    return void 0;
+var storedAuthOverrideForTesting = void 0;
+function loadStoredAuthFromJson() {
+  if (storedAuthOverrideForTesting !== void 0) {
+    return storedAuthOverrideForTesting;
   }
-  const targetKey = key.toLowerCase();
-  if (typeof headers.get === "function") {
-    try {
-      return headers.get(targetKey) || void 0;
-    } catch {
+  const authPath = join6(homedir4(), ".local", "share", "opencode", "auth.json");
+  try {
+    if (existsSync6(authPath)) {
+      const content = readFileSync5(authPath, "utf8");
+      const data = JSON.parse(content);
+      return data?.[AGY_PROVIDER_ID];
     }
-  }
-  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 setSafeHeaders2(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 toUrlString2(value) {
-  if (typeof value === "string") {
-    return value;
-  }
-  const candidate = value.url;
-  if (candidate) {
-    return candidate;
-  }
-  return value.toString();
-}
-function resolveModelTier2(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 = getSafeHeader2(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"] ?? mapping["high"];
-}
-var storedAuthOverrideForTesting = void 0;
-function loadStoredAuthFromJson() {
-  if (storedAuthOverrideForTesting !== void 0) {
-    return storedAuthOverrideForTesting;
-  }
-  const authPath = join6(homedir4(), ".local", "share", "opencode", "auth.json");
-  try {
-    if (existsSync6(authPath)) {
-      const content = readFileSync5(authPath, "utf8");
-      const data = JSON.parse(content);
-      return data?.[AGY_PROVIDER_ID];
-    }
-  } catch {
+  } catch {
   }
   return void 0;
 }
@@ -20959,43 +20882,61 @@ function saveStoredAuthToJson(authRecord) {
   if (process.env.NODE_ENV === "test" || process.env.VITEST || storedAuthOverrideForTesting !== void 0) {
     return;
   }
+  const dirPath = join6(homedir4(), ".local", "share", "opencode");
+  if (!existsSync6(dirPath)) {
+    mkdirSync5(dirPath, { recursive: true });
+  }
+  const authPath = join6(dirPath, "auth.json");
+  const data = existsSync6(authPath) ? JSON.parse(readFileSync5(authPath, "utf8")) : {};
+  data[AGY_PROVIDER_ID] = {
+    type: "oauth",
+    refresh: authRecord.refresh,
+    access: authRecord.access,
+    expires: authRecord.expires
+  };
+  const tempPath = `${authPath}.${process.pid}.${randomUUID4()}.tmp`;
+  let tempFileDescriptor;
+  let ownsTempFile = false;
   try {
-    const dirPath = join6(homedir4(), ".local", "share", "opencode");
-    if (!existsSync6(dirPath)) {
-      mkdirSync5(dirPath, { recursive: true });
+    tempFileDescriptor = openSync(tempPath, "wx", 384);
+    ownsTempFile = true;
+    writeFileSync5(tempFileDescriptor, JSON.stringify(data, null, 2), {
+      encoding: "utf8"
+    });
+    closeSync(tempFileDescriptor);
+    tempFileDescriptor = void 0;
+    renameSync4(tempPath, authPath);
+  } catch (error45) {
+    if (tempFileDescriptor !== void 0) {
+      try {
+        closeSync(tempFileDescriptor);
+      } catch {
+      }
     }
-    const authPath = join6(dirPath, "auth.json");
-    let data = {};
-    if (existsSync6(authPath)) {
+    if (ownsTempFile) {
       try {
-        data = JSON.parse(readFileSync5(authPath, "utf8")) || {};
+        unlinkSync4(tempPath);
       } catch {
-        data = {};
       }
     }
-    data[AGY_PROVIDER_ID] = {
-      type: "oauth",
-      refresh: authRecord.refresh,
-      access: authRecord.access,
-      expires: authRecord.expires
-    };
-    writeFileSync5(authPath, JSON.stringify(data, null, 2), "utf8");
-  } catch {
+    throw error45;
   }
 }
+
+// src/plugin/v2-fetch.ts
 function createV2FetchInterceptor(getAuthSnapshot) {
   return async function agyV2Fetch(input, init) {
     const isGL = isGenerativeLanguageRequest(input);
-    const isInternal = toUrlString2(input).includes("cloudcode-pa.googleapis.com");
+    const isInternal = toUrlString(input).includes("cloudcode-pa.googleapis.com");
     if (!isGL && !isInternal) {
-      return agyFetch(input, init);
+      return (globalThis.fetch || fetch)(input, init);
     }
     let rawAuth = getAuthSnapshot ? await getAuthSnapshot() : void 0;
     if (!rawAuth) {
       rawAuth = loadStoredAuthFromJson();
     }
     if (!rawAuth || !isOAuthAuth(rawAuth)) {
-      return agyFetch(input, init);
+      return (globalThis.fetch || fetch)(input, init);
     }
     let authRecord = resolveCachedAuth(rawAuth);
     if (accessTokenExpired(authRecord)) {
@@ -21006,19 +20947,19 @@ function createV2FetchInterceptor(getAuthSnapshot) {
       }
     }
     if (!authRecord.access) {
-      return agyFetch(input, init);
+      return (globalThis.fetch || fetch)(input, init);
     }
     if (isInternal) {
-      const hasAuth = getSafeHeader2(init?.headers, "Authorization") !== void 0;
+      const hasAuth = getSafeHeader(init?.headers, "Authorization") !== void 0;
       if (hasAuth) {
-        return agyFetch(input, init);
+        return (globalThis.fetch || fetch)(input, init);
       }
       const userAgent = buildAgyCliUserAgent();
-      const headers = setSafeHeaders2(init?.headers, {
+      const headers = setSafeHeaders(init?.headers, {
         Authorization: `Bearer ${authRecord.access}`,
         "User-Agent": userAgent
       });
-      return agyFetch(input, {
+      return (globalThis.fetch || fetch)(input, {
         ...init,
         headers
       });
@@ -21044,7 +20985,7 @@ function createV2FetchInterceptor(getAuthSnapshot) {
     let modifiedInput = input;
     if (isGL && originalRequestedModel) {
       const originalBase = originalRequestedModel.replace("google-agy/", "");
-      const resolvedBase = resolveModelTier2(originalBase, init);
+      const resolvedBase = resolveModelTier(originalBase, init);
       if (originalBase !== resolvedBase) {
         if (typeof modifiedInput === "string") {
           modifiedInput = modifiedInput.replace(`models/${originalBase}`, `models/${resolvedBase}`);
@@ -21064,7 +21005,7 @@ function createV2FetchInterceptor(getAuthSnapshot) {
     const chatLogger = createChatLogger();
     if (chatLogger) {
       chatLogger.logRequest(
-        toUrlString2(transformed.request),
+        toUrlString(transformed.request),
         transformed.init.method || "GET",
         transformed.init.headers,
         transformed.init.body
@@ -21081,6 +21022,304 @@ function createV2FetchInterceptor(getAuthSnapshot) {
     );
   };
 }
+
+// src/plugin/v2-session.ts
+function createV2HttpRequestHook(state = {}) {
+  return async (event) => {
+    if (!event) return;
+    const rawUrl = typeof event.url === "string" ? event.url : event.request?.url || "";
+    const isGL = isGenerativeLanguageRequest(rawUrl);
+    const isInternal = rawUrl.includes("cloudcode-pa.googleapis.com");
+    if (!isGL && !isInternal) {
+      return;
+    }
+    event.headers = event.headers || {};
+    let modelName;
+    let rawAuth = event.auth;
+    if (rawAuth && !rawAuth.type) {
+      const tokenVal = rawAuth.access || rawAuth.token;
+      if (tokenVal || rawAuth.refresh) {
+        rawAuth = { type: "oauth", access: tokenVal, ...rawAuth };
+      }
+    }
+    if (!rawAuth || !isOAuthAuth(rawAuth)) {
+      rawAuth = loadStoredAuthFromJson();
+    }
+    let authRecord = rawAuth && isOAuthAuth(rawAuth) ? resolveCachedAuth(rawAuth) : void 0;
+    if (authRecord && accessTokenExpired(authRecord)) {
+      const refreshed = await refreshAccessToken(authRecord, { auth: { set: async () => {
+      } } });
+      if (refreshed) {
+        authRecord = refreshed;
+        try {
+          saveStoredAuthToJson(refreshed);
+        } catch {
+          console.warn("[Agy Auth] Refreshed credentials could not be persisted; the current request will continue.");
+        }
+      }
+    }
+    if (isGL) {
+      const parsed = parseGenerativeLanguageRequest(rawUrl);
+      modelName = parsed?.effectiveModel;
+      if (modelName) {
+        state.lastInterceptedModel = modelName;
+      }
+      if (typeof event.headers.delete === "function") {
+        event.headers.delete("x-goog-api-key");
+        event.headers.delete("api-key");
+      } else {
+        for (const key of Object.keys(event.headers)) {
+          const lower = key.toLowerCase();
+          if (lower === "x-goog-api-key" || lower === "api-key") {
+            delete event.headers[key];
+          }
+        }
+      }
+      if (event.request?.headers) {
+        if (typeof event.request.headers.delete === "function") {
+          event.request.headers.delete("x-goog-api-key");
+          event.request.headers.delete("api-key");
+        } else {
+          for (const key of Object.keys(event.request.headers)) {
+            const lower = key.toLowerCase();
+            if (lower === "x-goog-api-key" || lower === "api-key") {
+              delete event.request.headers[key];
+            }
+          }
+        }
+      }
+      let cleanUrl = rawUrl;
+      try {
+        const parsedUrl = new URL(rawUrl);
+        let urlChanged = false;
+        for (const param of ["key", "x-goog-api-key", "api-key"]) {
+          if (parsedUrl.searchParams.has(param)) {
+            parsedUrl.searchParams.delete(param);
+            urlChanged = true;
+          }
+        }
+        if (urlChanged) {
+          cleanUrl = parsedUrl.toString();
+        }
+      } catch {
+      }
+      if (authRecord && authRecord.access) {
+        let projectContext;
+        try {
+          projectContext = await ensureProjectContext(
+            authRecord,
+            { auth: { set: async () => {
+            } } },
+            void 0,
+            modelName
+          );
+        } catch {
+          projectContext = {
+            effectiveProjectId: parseRefreshParts(authRecord.refresh).projectId || "antigravity",
+            auth: authRecord
+          };
+        }
+        const originalRequestedModel = modelName;
+        let modifiedUrl = cleanUrl;
+        if (originalRequestedModel) {
+          const originalBase = originalRequestedModel.replace("google-agy/", "");
+          const initHeaders = event.headers instanceof Headers ? event.headers : event.request?.headers;
+          const resolvedBase = resolveModelTier(originalBase, { headers: initHeaders });
+          if (originalBase !== resolvedBase) {
+            modifiedUrl = modifiedUrl.replace(`models/${originalBase}`, `models/${resolvedBase}`);
+          }
+        }
+        let bodyPayload = event.body;
+        if (bodyPayload === void 0 && event.request) {
+          if (typeof event.request.clone === "function") {
+            try {
+              bodyPayload = await event.request.clone().text();
+            } catch {
+            }
+          } else if (event.request.body !== void 0) {
+            bodyPayload = event.request.body;
+          }
+        }
+        let preExistingUserAgent;
+        if (typeof event.headers?.get === "function") {
+          preExistingUserAgent = event.headers.get("user-agent") || event.headers.get("User-Agent") || void 0;
+        } else if (event.headers && typeof event.headers === "object") {
+          preExistingUserAgent = event.headers["user-agent"] || event.headers["User-Agent"] || void 0;
+        }
+        if (!preExistingUserAgent && typeof event.request?.headers?.get === "function") {
+          preExistingUserAgent = event.request.headers.get("user-agent") || event.request.headers.get("User-Agent") || void 0;
+        } else if (!preExistingUserAgent && event.request?.headers && typeof event.request.headers === "object") {
+          preExistingUserAgent = event.request.headers["user-agent"] || event.request.headers["User-Agent"] || void 0;
+        }
+        const method = event.method || event.request?.method || "POST";
+        const requestHeaders = event.headers || event.request?.headers;
+        const transformed = prepareAgyRequest(
+          modifiedUrl,
+          {
+            method,
+            headers: requestHeaders,
+            body: bodyPayload
+          },
+          authRecord.access,
+          projectContext.effectiveProjectId
+        );
+        const targetUrl = toUrlString(transformed.request);
+        if (typeof event.url === "string") {
+          event.url = targetUrl;
+        }
+        if (event.request && typeof event.request === "object") {
+          if (typeof Request !== "undefined" && event.request instanceof Request) {
+            event.request = new Request(targetUrl, {
+              method: transformed.init.method,
+              headers: transformed.init.headers,
+              body: transformed.init.body
+            });
+          } else if (typeof event.request.url === "string") {
+            try {
+              event.request.url = targetUrl;
+            } catch {
+            }
+          }
+        }
+        const headerEntries = transformed.init.headers instanceof Headers ? Array.from(transformed.init.headers.entries()) : Object.entries(transformed.init.headers || {});
+        for (const [k, v] of headerEntries) {
+          const lowerK = k.toLowerCase();
+          if (lowerK === "user-agent") {
+            if (preExistingUserAgent) {
+              continue;
+            }
+            if (typeof event.headers?.set === "function") {
+              event.headers.set("User-Agent", v);
+            } else if (event.headers) {
+              event.headers["User-Agent"] = v;
+            }
+            if (event.request?.headers && typeof event.request.headers.set === "function") {
+              event.request.headers.set("User-Agent", v);
+            } else if (event.request?.headers && typeof event.request.headers === "object") {
+              event.request.headers["User-Agent"] = v;
+            }
+            continue;
+          }
+          if (typeof event.headers?.set === "function") {
+            event.headers.set(k, v);
+          } else if (event.headers) {
+            event.headers[k] = v;
+          }
+          if (event.request?.headers && typeof event.request.headers.set === "function") {
+            event.request.headers.set(k, v);
+          } else if (event.request?.headers && typeof event.request.headers === "object") {
+            event.request.headers[k] = v;
+          }
+        }
+        if (transformed.init.body !== void 0) {
+          event.body = transformed.init.body;
+          if (event.request && typeof event.request === "object" && !(event.request instanceof Request)) {
+            event.request.body = transformed.init.body;
+          }
+        }
+      } else {
+        if (typeof event.url === "string") {
+          event.url = cleanUrl;
+        }
+        if (event.request && typeof event.request === "object") {
+          if (typeof Request !== "undefined" && event.request instanceof Request) {
+            event.request = new Request(cleanUrl, event.request);
+          } else if (typeof event.request.url === "string") {
+            try {
+              event.request.url = cleanUrl;
+            } catch {
+            }
+          }
+        }
+      }
+    }
+    if (authRecord && authRecord.access) {
+      if (typeof event.headers?.set === "function") {
+        event.headers.set("Authorization", `Bearer ${authRecord.access}`);
+      } else if (event.headers) {
+        event.headers["Authorization"] = `Bearer ${authRecord.access}`;
+      }
+      if (event.request?.headers && typeof event.request.headers.set === "function") {
+        event.request.headers.set("Authorization", `Bearer ${authRecord.access}`);
+      } else if (event.request?.headers && typeof event.request.headers === "object") {
+        event.request.headers["Authorization"] = `Bearer ${authRecord.access}`;
+      }
+    }
+    const userAgent = buildAgyCliUserAgent(modelName);
+    if (typeof event.headers?.set === "function") {
+      if (!event.headers.get("User-Agent") && !event.headers.get("user-agent")) {
+        event.headers.set("User-Agent", userAgent);
+      }
+    } else if (event.headers) {
+      if (!event.headers["User-Agent"] && !event.headers["user-agent"]) {
+        event.headers["User-Agent"] = userAgent;
+      }
+    }
+    if (event.request?.headers && typeof event.request.headers.set === "function") {
+      if (!event.request.headers.get("User-Agent") && !event.request.headers.get("user-agent")) {
+        event.request.headers.set("User-Agent", userAgent);
+      }
+    } else if (event.request?.headers && typeof event.request.headers === "object") {
+      if (!event.request.headers["User-Agent"] && !event.request.headers["user-agent"]) {
+        event.request.headers["User-Agent"] = userAgent;
+      }
+    }
+  };
+}
+function createV2HttpResponseHook(state = {}) {
+  return async (event) => {
+    if (!event || !event.response) return;
+    const rawUrl = typeof event.url === "string" ? event.url : event.request?.url || "";
+    const isInternal = rawUrl.includes("cloudcode-pa.googleapis.com");
+    if (isInternal && event.response instanceof Response) {
+      const isStreaming = rawUrl.includes(":streamGenerateCode") || event.response.headers.get("content-type")?.includes("text/event-stream");
+      const parsedModel = parseGenerativeLanguageRequest(rawUrl)?.effectiveModel || state.lastInterceptedModel;
+      const transformed = await transformAgyResponse(
+        event.response,
+        !!isStreaming,
+        null,
+        parsedModel,
+        void 0,
+        void 0
+      );
+      event.response = transformed;
+    }
+  };
+}
+function createV2RetryHook() {
+  return async (event) => {
+    if (!event) return;
+    const response = event.response;
+    if (response instanceof Response) {
+      if (response.status === 429 || response.status === 503) {
+        const quota = await classifyQuotaResponse(response);
+        if (quota?.retryDelayMs) {
+          event.retryDelayMs = quota.retryDelayMs;
+        } else {
+          event.retryDelayMs = await resolveRetryDelayMs(response, event.attempt || 1);
+        }
+      }
+    } else if (event.details && Array.isArray(event.details)) {
+      const retryInfo = event.details.find(
+        (d) => d && d["@type"] === "type.googleapis.com/google.rpc.RetryInfo"
+      );
+      if (retryInfo?.retryDelay) {
+        const delayMs = retryInternals.parseRetryDelayValue(retryInfo.retryDelay);
+        if (delayMs !== null) {
+          event.retryDelayMs = delayMs;
+        }
+      }
+    }
+  };
+}
+function registerV2SessionHooks(ctx) {
+  const state = {};
+  ctx.session.hook("http.request", createV2HttpRequestHook(state), { providerID: AGY_PROVIDER_ID });
+  ctx.session.hook("http.response", createV2HttpResponseHook(state), { providerID: AGY_PROVIDER_ID });
+  ctx.session.hook("retry", createV2RetryHook(), { providerID: AGY_PROVIDER_ID });
+}
+
+// src/plugin/v2.ts
 async function setupOpenCodeV2(ctx) {
   const resolveVariants = (modelId) => {
     const mapping = TIER_MAPPING[modelId];
@@ -21341,7 +21580,14 @@ async function setupOpenCodeV2(ctx) {
               };
             } catch {
             }
-            saveStoredAuthToJson(authRecord);
+            try {
+              saveStoredAuthToJson(authRecord);
+            } catch {
+              return {
+                type: "failed",
+                error: "Google authentication succeeded but AGY credentials could not be stored. Check filesystem access and retry."
+              };
+            }
             return {
               type: "oauth",
               methodID: "oauth",
@@ -21362,292 +21608,7 @@ async function setupOpenCodeV2(ctx) {
     event.options.apiKey = "dummy";
     event.options.fetch = createV2FetchInterceptor();
   });
-  let lastInterceptedModel;
-  ctx.session.hook(
-    "http.request",
-    async (event) => {
-      if (!event) return;
-      const rawUrl = typeof event.url === "string" ? event.url : event.request?.url || "";
-      const isGL = isGenerativeLanguageRequest(rawUrl);
-      const isInternal = rawUrl.includes("cloudcode-pa.googleapis.com");
-      if (!isGL && !isInternal) {
-        return;
-      }
-      event.headers = event.headers || {};
-      let modelName;
-      let rawAuth = event.auth;
-      if (rawAuth && !rawAuth.type) {
-        const tokenVal = rawAuth.access || rawAuth.token;
-        if (tokenVal || rawAuth.refresh) {
-          rawAuth = { type: "oauth", access: tokenVal, ...rawAuth };
-        }
-      }
-      if (!rawAuth || !isOAuthAuth(rawAuth)) {
-        rawAuth = loadStoredAuthFromJson();
-      }
-      let authRecord = rawAuth && isOAuthAuth(rawAuth) ? resolveCachedAuth(rawAuth) : void 0;
-      if (authRecord && accessTokenExpired(authRecord)) {
-        const refreshed = await refreshAccessToken(authRecord, { auth: { set: async () => {
-        } } });
-        if (refreshed) {
-          authRecord = refreshed;
-          saveStoredAuthToJson(refreshed);
-        }
-      }
-      if (isGL) {
-        const parsed = parseGenerativeLanguageRequest(rawUrl);
-        modelName = parsed?.effectiveModel;
-        if (modelName) {
-          lastInterceptedModel = modelName;
-        }
-        if (typeof event.headers.delete === "function") {
-          event.headers.delete("x-goog-api-key");
-          event.headers.delete("api-key");
-        } else {
-          for (const key of Object.keys(event.headers)) {
-            const lower = key.toLowerCase();
-            if (lower === "x-goog-api-key" || lower === "api-key") {
-              delete event.headers[key];
-            }
-          }
-        }
-        if (event.request?.headers) {
-          if (typeof event.request.headers.delete === "function") {
-            event.request.headers.delete("x-goog-api-key");
-            event.request.headers.delete("api-key");
-          } else {
-            for (const key of Object.keys(event.request.headers)) {
-              const lower = key.toLowerCase();
-              if (lower === "x-goog-api-key" || lower === "api-key") {
-                delete event.request.headers[key];
-              }
-            }
-          }
-        }
-        let cleanUrl = rawUrl;
-        try {
-          const parsedUrl = new URL(rawUrl);
-          let urlChanged = false;
-          for (const param of ["key", "x-goog-api-key", "api-key"]) {
-            if (parsedUrl.searchParams.has(param)) {
-              parsedUrl.searchParams.delete(param);
-              urlChanged = true;
-            }
-          }
-          if (urlChanged) {
-            cleanUrl = parsedUrl.toString();
-          }
-        } catch {
-        }
-        if (authRecord && authRecord.access) {
-          let projectContext;
-          try {
-            projectContext = await ensureProjectContext(
-              authRecord,
-              { auth: { set: async () => {
-              } } },
-              void 0,
-              modelName
-            );
-          } catch {
-            projectContext = {
-              effectiveProjectId: parseRefreshParts(authRecord.refresh).projectId || "antigravity",
-              auth: authRecord
-            };
-          }
-          const originalRequestedModel = modelName;
-          let modifiedUrl = cleanUrl;
-          if (originalRequestedModel) {
-            const originalBase = originalRequestedModel.replace("google-agy/", "");
-            const initHeaders = event.headers instanceof Headers ? event.headers : event.request?.headers;
-            const resolvedBase = resolveModelTier2(originalBase, { headers: initHeaders });
-            if (originalBase !== resolvedBase) {
-              modifiedUrl = modifiedUrl.replace(`models/${originalBase}`, `models/${resolvedBase}`);
-            }
-          }
-          let bodyPayload = event.body;
-          if (bodyPayload === void 0 && event.request) {
-            if (typeof event.request.clone === "function") {
-              try {
-                bodyPayload = await event.request.clone().text();
-              } catch {
-              }
-            } else if (event.request.body !== void 0) {
-              bodyPayload = event.request.body;
-            }
-          }
-          let preExistingUserAgent;
-          if (typeof event.headers?.get === "function") {
-            preExistingUserAgent = event.headers.get("user-agent") || event.headers.get("User-Agent") || void 0;
-          } else if (event.headers && typeof event.headers === "object") {
-            preExistingUserAgent = event.headers["user-agent"] || event.headers["User-Agent"] || void 0;
-          }
-          if (!preExistingUserAgent && typeof event.request?.headers?.get === "function") {
-            preExistingUserAgent = event.request.headers.get("user-agent") || event.request.headers.get("User-Agent") || void 0;
-          } else if (!preExistingUserAgent && event.request?.headers && typeof event.request.headers === "object") {
-            preExistingUserAgent = event.request.headers["user-agent"] || event.request.headers["User-Agent"] || void 0;
-          }
-          const method = event.method || event.request?.method || "POST";
-          const requestHeaders = event.headers || event.request?.headers;
-          const transformed = prepareAgyRequest(
-            modifiedUrl,
-            {
-              method,
-              headers: requestHeaders,
-              body: bodyPayload
-            },
-            authRecord.access,
-            projectContext.effectiveProjectId
-          );
-          const targetUrl = toUrlString2(transformed.request);
-          if (typeof event.url === "string") {
-            event.url = targetUrl;
-          }
-          if (event.request && typeof event.request === "object") {
-            if (typeof Request !== "undefined" && event.request instanceof Request) {
-              event.request = new Request(targetUrl, {
-                method: transformed.init.method,
-                headers: transformed.init.headers,
-                body: transformed.init.body
-              });
-            } else if (typeof event.request.url === "string") {
-              try {
-                event.request.url = targetUrl;
-              } catch {
-              }
-            }
-          }
-          const headerEntries = transformed.init.headers instanceof Headers ? Array.from(transformed.init.headers.entries()) : Object.entries(transformed.init.headers || {});
-          for (const [k, v] of headerEntries) {
-            const lowerK = k.toLowerCase();
-            if (lowerK === "user-agent") {
-              if (preExistingUserAgent) {
-                continue;
-              }
-              if (typeof event.headers?.set === "function") {
-                event.headers.set("User-Agent", v);
-              } else if (event.headers) {
-                event.headers["User-Agent"] = v;
-              }
-              if (event.request?.headers && typeof event.request.headers.set === "function") {
-                event.request.headers.set("User-Agent", v);
-              } else if (event.request?.headers && typeof event.request.headers === "object") {
-                event.request.headers["User-Agent"] = v;
-              }
-              continue;
-            }
-            if (typeof event.headers?.set === "function") {
-              event.headers.set(k, v);
-            } else if (event.headers) {
-              event.headers[k] = v;
-            }
-            if (event.request?.headers && typeof event.request.headers.set === "function") {
-              event.request.headers.set(k, v);
-            } else if (event.request?.headers && typeof event.request.headers === "object") {
-              event.request.headers[k] = v;
-            }
-          }
-          if (transformed.init.body !== void 0) {
-            event.body = transformed.init.body;
-            if (event.request && typeof event.request === "object" && !(event.request instanceof Request)) {
-              event.request.body = transformed.init.body;
-            }
-          }
-        } else {
-          if (typeof event.url === "string") {
-            event.url = cleanUrl;
-          }
-          if (event.request && typeof event.request === "object") {
-            if (typeof event.request.url === "string") {
-              event.request.url = cleanUrl;
-            }
-          }
-        }
-      }
-      if (authRecord && authRecord.access) {
-        if (typeof event.headers?.set === "function") {
-          event.headers.set("Authorization", `Bearer ${authRecord.access}`);
-        } else if (event.headers) {
-          event.headers["Authorization"] = `Bearer ${authRecord.access}`;
-        }
-        if (event.request?.headers && typeof event.request.headers.set === "function") {
-          event.request.headers.set("Authorization", `Bearer ${authRecord.access}`);
-        } else if (event.request?.headers && typeof event.request.headers === "object") {
-          event.request.headers["Authorization"] = `Bearer ${authRecord.access}`;
-        }
-      }
-      const userAgent = buildAgyCliUserAgent(modelName);
-      if (typeof event.headers?.set === "function") {
-        if (!event.headers.get("User-Agent") && !event.headers.get("user-agent")) {
-          event.headers.set("User-Agent", userAgent);
-        }
-      } else if (event.headers) {
-        if (!event.headers["User-Agent"] && !event.headers["user-agent"]) {
-          event.headers["User-Agent"] = userAgent;
-        }
-      }
-      if (event.request?.headers && typeof event.request.headers.set === "function") {
-        if (!event.request.headers.get("User-Agent") && !event.request.headers.get("user-agent")) {
-          event.request.headers.set("User-Agent", userAgent);
-        }
-      } else if (event.request?.headers && typeof event.request.headers === "object") {
-        if (!event.request.headers["User-Agent"] && !event.request.headers["user-agent"]) {
-          event.request.headers["User-Agent"] = userAgent;
-        }
-      }
-    },
-    { providerID: AGY_PROVIDER_ID }
-  );
-  ctx.session.hook(
-    "http.response",
-    async (event) => {
-      if (!event || !event.response) return;
-      const rawUrl = typeof event.url === "string" ? event.url : event.request?.url || "";
-      const isInternal = rawUrl.includes("cloudcode-pa.googleapis.com");
-      if (isInternal && event.response instanceof Response) {
-        const isStreaming = rawUrl.includes(":streamGenerateCode") || event.response.headers.get("content-type")?.includes("text/event-stream");
-        const parsedModel = parseGenerativeLanguageRequest(rawUrl)?.effectiveModel || lastInterceptedModel;
-        const transformed = await transformAgyResponse(
-          event.response,
-          !!isStreaming,
-          null,
-          parsedModel,
-          void 0,
-          void 0
-        );
-        event.response = transformed;
-      }
-    },
-    { providerID: AGY_PROVIDER_ID }
-  );
-  ctx.session.hook(
-    "retry",
-    async (event) => {
-      if (!event) return;
-      const response = event.response;
-      if (response instanceof Response) {
-        if (response.status === 429 || response.status === 503) {
-          const quota = await classifyQuotaResponse(response);
-          if (quota?.retryDelayMs) {
-            event.retryDelayMs = quota.retryDelayMs;
-          } else {
-            event.retryDelayMs = await resolveRetryDelayMs(response, event.attempt || 1);
-          }
-        }
-      } else if (event.details && Array.isArray(event.details)) {
-        const retryInfo = event.details.find(
-          (d) => d && d["@type"] === "type.googleapis.com/google.rpc.RetryInfo"
-        );
-        if (retryInfo?.retryDelay) {
-          const delayMs = retryInternals.parseRetryDelayValue(retryInfo.retryDelay);
-          if (delayMs !== null) {
-            event.retryDelayMs = delayMs;
-          }
-        }
-      }
-    },
-    { providerID: AGY_PROVIDER_ID }
-  );
+  registerV2SessionHooks(ctx);
 }
 var v2PluginDefinition = defineOpenCodeV2Plugin({
   id: AGY_PROVIDER_ID,