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

package/dist/index.js

@@ -20695,6 +20695,8 @@ async function setupOpenCodeV2(ctx) {
         p.activation = "enabled";
         p.package = "aisdk:@ai-sdk/google";
         p.description = "Google Gemini Antigravity Code Assist OAuth provider";
+        p.settings = { ...p.settings || {}, apiKey: "dummy" };
+        p.integrationID = AGY_PROVIDER_ID;
       });
       if (typeof editor?.model?.update === "function") {
         for (const [modelId, simple] of Object.entries(STATIC_MODELS_SIMPLE)) {
@@ -20728,9 +20730,20 @@ async function setupOpenCodeV2(ctx) {
       id: AGY_PROVIDER_ID,
       name: "Antigravity CLI",
       npm: "aisdk:@ai-sdk/google",
+      settings: { apiKey: "dummy" },
+      integrationID: AGY_PROVIDER_ID,
       models: { ...catalog.providers[AGY_PROVIDER_ID]?.models || {} },
       ...catalog.providers[AGY_PROVIDER_ID]
     };
+    if (catalog.providers[AGY_PROVIDER_ID].settings) {
+      catalog.providers[AGY_PROVIDER_ID].settings = {
+        ...catalog.providers[AGY_PROVIDER_ID].settings,
+        apiKey: "dummy"
+      };
+    } else {
+      catalog.providers[AGY_PROVIDER_ID].settings = { apiKey: "dummy" };
+    }
+    catalog.providers[AGY_PROVIDER_ID].integrationID = AGY_PROVIDER_ID;
     const targetModels = catalog.providers[AGY_PROVIDER_ID].models;
     for (const [modelId, simple] of Object.entries(STATIC_MODELS_SIMPLE)) {
       const isClaude = modelId.startsWith("claude-");
@@ -20827,61 +20840,141 @@ async function setupOpenCodeV2(ctx) {
       editor[AGY_V2_QUOTA_SUMMARY_COMMAND] = commands[AGY_V2_QUOTA_SUMMARY_COMMAND];
     }
   });
-  ctx.session.hook("http.request", async (event) => {
-    if (!event) return;
-    const url2 = typeof event.url === "string" ? event.url : event.request?.url || "";
-    const isGL = isGenerativeLanguageRequest(url2);
-    const isInternal = url2.includes("cloudcode-pa.googleapis.com");
-    if (!isGL && !isInternal) {
-      return;
-    }
-    event.headers = event.headers || {};
-    let modelName;
-    if (isGL) {
-      const parsed = parseGenerativeLanguageRequest(url2);
-      modelName = parsed?.effectiveModel;
-    }
-    const userAgent = buildAgyCliUserAgent(modelName);
-    if (typeof event.headers.set === "function") {
-      if (!event.headers.get("User-Agent")) {
-        event.headers.set("User-Agent", userAgent);
-      }
-    } else {
-      if (!event.headers["User-Agent"] && !event.headers["user-agent"]) {
-        event.headers["User-Agent"] = userAgent;
+  ctx.integration?.transform?.((editor) => {
+    if (!editor) return;
+    editor.update?.(AGY_PROVIDER_ID, (integration) => {
+      integration.name = "Antigravity CLI (plugin)";
+    });
+    editor.method?.update?.({
+      integrationID: AGY_PROVIDER_ID,
+      method: {
+        id: "oauth",
+        type: "oauth",
+        label: "Antigravity CLI (OAuth)"
+      },
+      authorize: async () => {
+        return {
+          mode: "auto",
+          url: "https://accounts.google.com/o/oauth2/auth",
+          instructions: "Login with Google Cloud / Antigravity CLI credentials"
+        };
       }
-    }
-  });
-  ctx.session.hook("http.response", async (event) => {
-    if (!event) return;
-    if (event.response?.status === 429) {
-      return;
-    }
+    });
   });
-  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;
+  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;
+      if (isGL) {
+        const parsed = parseGenerativeLanguageRequest(rawUrl);
+        modelName = parsed?.effectiveModel;
+        if (typeof event.headers.delete === "function") {
+          event.headers.delete("x-goog-api-key");
+          event.headers.delete("api-key");
         } else {
-          event.retryDelayMs = await resolveRetryDelayMs(response, event.attempt || 1);
+          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];
+            }
+          }
+        }
+        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) {
+            const cleanedUrl = parsedUrl.toString();
+            if (typeof event.url === "string") {
+              event.url = cleanedUrl;
+            }
+            if (event.request && typeof event.request === "object") {
+              if (typeof event.request.url === "string") {
+                event.request.url = cleanedUrl;
+              }
+            }
+          }
+        } catch {
+        }
+        const hasAuth = typeof event.headers.get === "function" ? !!event.headers.get("Authorization") : 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"}`;
+          }
         }
       }
-    } 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;
+      const userAgent = buildAgyCliUserAgent(modelName);
+      if (typeof event.headers.set === "function") {
+        if (!event.headers.get("User-Agent")) {
+          event.headers.set("User-Agent", userAgent);
+        }
+      } else {
+        if (!event.headers["User-Agent"] && !event.headers["user-agent"]) {
+          event.headers["User-Agent"] = userAgent;
         }
       }
-    }
-  });
+    },
+    { providerID: AGY_PROVIDER_ID }
+  );
+  ctx.session.hook(
+    "http.response",
+    async (event) => {
+      if (!event) return;
+      if (event.response?.status === 429) {
+        return;
+      }
+    },
+    { 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 }
+  );
 }
 var v2PluginDefinition = defineOpenCodeV2Plugin({
   id: AGY_PROVIDER_ID,