@anthonyhaussman/opencode-agy-auth 1.2.3-alpha.3 → 1.2.3-alpha.5

package/dist/index.js

@@ -1581,7 +1581,11 @@ function createOAuthAuthorizeMethod(options) {
     const isHeadless = !!(process.env.SSH_CONNECTION || process.env.SSH_CLIENT || process.env.SSH_TTY || process.env.OPENCODE_HEADLESS);
     const authorization = await authorizeAgy();
     if (!isHeadless) {
-      openBrowserUrl(authorization.url);
+      if (options?.openBrowser) {
+        options.openBrowser(authorization.url);
+      } else {
+        openBrowserUrl(authorization.url);
+      }
     }
     return {
       url: authorization.url,
@@ -1635,16 +1639,23 @@ function parseOAuthCallbackInput(input) {
   }
   return { code: trimmed };
 }
+function defaultOpenBrowserLauncher(command, args) {
+  const child = spawn(command, args, {
+    stdio: "ignore",
+    detached: true
+  });
+  child.unref?.();
+}
+var openBrowserLauncher = defaultOpenBrowserLauncher;
 function openBrowserUrl(url2) {
+  if ((process.env.NODE_ENV === "test" || process.env.VITEST) && openBrowserLauncher === defaultOpenBrowserLauncher) {
+    return;
+  }
   try {
     const platform2 = process.platform;
     const command = platform2 === "darwin" ? "open" : platform2 === "win32" ? "rundll32" : "xdg-open";
     const args = platform2 === "win32" ? ["url.dll,FileProtocolHandler", url2] : [url2];
-    const child = spawn(command, args, {
-      stdio: "ignore",
-      detached: true
-    });
-    child.unref?.();
+    openBrowserLauncher(command, args);
   } catch {
   }
 }
@@ -20664,6 +20675,10 @@ function defineOpenCodeV2Plugin(def) {
 }
 
 // src/plugin/v2.ts
+import { homedir as homedir4 } from "os";
+import { join as join6 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } 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.
@@ -20676,6 +20691,207 @@ var AGY_V2_QUOTA_SUMMARY_COMMAND_TEMPLATE = `Retrieve Agy Code Assist quota summ
 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;
+  }
+  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 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 {
+  }
+  return void 0;
+}
+function createV2FetchInterceptor(getAuthSnapshot) {
+  return async function agyV2Fetch(input, init) {
+    const isGL = isGenerativeLanguageRequest(input);
+    const isInternal = toUrlString2(input).includes("cloudcode-pa.googleapis.com");
+    if (!isGL && !isInternal) {
+      return agyFetch(input, init);
+    }
+    let rawAuth = getAuthSnapshot ? await getAuthSnapshot() : void 0;
+    if (!rawAuth) {
+      rawAuth = loadStoredAuthFromJson();
+    }
+    if (!rawAuth || !isOAuthAuth(rawAuth)) {
+      return agyFetch(input, init);
+    }
+    let authRecord = resolveCachedAuth(rawAuth);
+    if (accessTokenExpired(authRecord)) {
+      const refreshed = await refreshAccessToken(authRecord, { auth: { set: async () => {
+      } } });
+      if (refreshed) {
+        authRecord = refreshed;
+      }
+    }
+    if (!authRecord.access) {
+      return agyFetch(input, init);
+    }
+    if (isInternal) {
+      const hasAuth = getSafeHeader2(init?.headers, "Authorization") !== void 0;
+      if (hasAuth) {
+        return agyFetch(input, init);
+      }
+      const userAgent = buildAgyCliUserAgent();
+      const headers = setSafeHeaders2(init?.headers, {
+        Authorization: `Bearer ${authRecord.access}`,
+        "User-Agent": userAgent
+      });
+      return agyFetch(input, {
+        ...init,
+        headers
+      });
+    }
+    const requestTarget = parseGenerativeLanguageRequest(input);
+    const requestUserAgentModel = requestTarget?.effectiveModel;
+    let projectContext;
+    try {
+      projectContext = await ensureProjectContext(
+        authRecord,
+        { auth: { set: async () => {
+        } } },
+        void 0,
+        requestUserAgentModel
+      );
+    } catch {
+      projectContext = {
+        effectiveProjectId: parseRefreshParts(authRecord.refresh).projectId || "antigravity",
+        auth: authRecord
+      };
+    }
+    const originalRequestedModel = parseGenerativeLanguageRequest(input)?.effectiveModel;
+    let modifiedInput = input;
+    if (isGL && originalRequestedModel) {
+      const originalBase = originalRequestedModel.replace("google-agy/", "");
+      const resolvedBase = resolveModelTier2(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 transformed = prepareAgyRequest(
+      modifiedInput,
+      init,
+      authRecord.access,
+      projectContext.effectiveProjectId,
+      void 0
+    );
+    const chatLogger = createChatLogger();
+    if (chatLogger) {
+      chatLogger.logRequest(
+        toUrlString2(transformed.request),
+        transformed.init.method || "GET",
+        transformed.init.headers,
+        transformed.init.body
+      );
+    }
+    const response = await fetchWithRetry(transformed.request, transformed.init);
+    return transformAgyResponse(
+      response,
+      transformed.streaming,
+      null,
+      transformed.requestedModel,
+      transformed.sessionId,
+      chatLogger
+    );
+  };
+}
 async function setupOpenCodeV2(ctx) {
   ctx.catalog.transform(async (editor) => {
     if (!editor) return;
@@ -20853,14 +21069,65 @@ async function setupOpenCodeV2(ctx) {
         label: "Antigravity CLI (OAuth)"
       },
       authorize: async () => {
+        const authorization = await authorizeAgy();
         return {
-          mode: "auto",
-          url: "https://accounts.google.com/o/oauth2/auth",
-          instructions: "Login with Google Cloud / Antigravity CLI credentials"
+          mode: "code",
+          url: authorization.url,
+          instructions: "Please complete Google account authorization in your browser. After authorization, copy the full redirect URL or code and paste it below:",
+          callback: async (code) => {
+            const trimmed = code.trim();
+            const parsed = parseOAuthCallbackInput(trimmed);
+            const authCode = parsed.code || trimmed;
+            if (!authCode) {
+              return { type: "failed", error: "Missing authorization code in callback input" };
+            }
+            if (parsed.state && parsed.state !== authorization.state) {
+              return { type: "failed", error: "State mismatch in callback input (possible CSRF attempt)" };
+            }
+            const exchangeResult = await exchangeAgyWithVerifier(authCode, authorization.verifier);
+            if (exchangeResult.type !== "success") {
+              return exchangeResult;
+            }
+            const initialRefresh = formatRefreshParts({
+              refreshToken: exchangeResult.refresh
+            });
+            let authRecord = {
+              type: "oauth",
+              refresh: initialRefresh,
+              access: exchangeResult.access,
+              expires: exchangeResult.expires
+            };
+            try {
+              const projectContext = await ensureProjectContext(
+                authRecord,
+                { auth: { set: async () => {
+                } } }
+              );
+              authRecord = {
+                ...authRecord,
+                refresh: projectContext.auth.refresh
+              };
+            } catch {
+            }
+            return {
+              type: "success",
+              refresh: authRecord.refresh,
+              access: authRecord.access,
+              expires: authRecord.expires
+            };
+          }
         };
       }
     });
   });
+  ctx.aisdk?.hook("sdk", async (event) => {
+    if (!event) return;
+    const isMatchingProvider = event.providerID === AGY_PROVIDER_ID || event.model?.providerID === AGY_PROVIDER_ID;
+    if (!isMatchingProvider) return;
+    event.options = event.options || {};
+    event.options.apiKey = "dummy";
+    event.options.fetch = createV2FetchInterceptor();
+  });
   ctx.session.hook(
     "http.request",
     async (event) => {
@@ -20887,6 +21154,19 @@ async function setupOpenCodeV2(ctx) {
             }
           }
         }
+        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];
+              }
+            }
+          }
+        }
         try {
           const parsedUrl = new URL(rawUrl);
           let urlChanged = false;
@@ -20909,18 +21189,29 @@ async function setupOpenCodeV2(ctx) {
           }
         } catch {
         }
-        const hasAuth = typeof event.headers.get === "function" ? !!event.headers.get("Authorization") : Object.keys(event.headers).some((k) => k.toLowerCase() === "authorization");
+        const hasAuth = typeof event.headers?.get === "function" ? !!event.headers.get("Authorization") : event.headers && Object.keys(event.headers).some((k) => k.toLowerCase() === "authorization");
         if (!hasAuth) {
           let token;
           if (typeof event.auth?.access === "string" && event.auth.access) {
             token = event.auth.access;
           } else if (typeof event.auth?.token === "string" && event.auth.token) {
             token = event.auth.token;
-          }
-          if (typeof event.headers.set === "function") {
-            event.headers.set("Authorization", `Bearer ${token || "dummy"}`);
           } else {
-            event.headers["Authorization"] = `Bearer ${token || "dummy"}`;
+            const storedAuth = loadStoredAuthFromJson();
+            if (storedAuth && isOAuthAuth(storedAuth)) {
+              const resolved = resolveCachedAuth(storedAuth);
+              token = resolved.access;
+            }
+          }
+          if (token) {
+            if (typeof event.headers?.set === "function") {
+              event.headers.set("Authorization", `Bearer ${token}`);
+            } else if (event.headers) {
+              event.headers["Authorization"] = `Bearer ${token}`;
+            }
+            if (event.request?.headers && typeof event.request.headers.set === "function") {
+              event.request.headers.set("Authorization", `Bearer ${token}`);
+            }
           }
         }
       }