opencode-antigravity-auth 1.0.0 → 1.0.2

package/README.md

@@ -17,7 +17,7 @@ Enable Opencode to authenticate against **Antigravity** (Google's IDE) via OAuth
 
 ```json
 {
-  "plugin": ["opencode-antigravity-auth"]
+  "plugin": ["opencode-antigravity-auth@1.0.2"]
 }
 ```
 
@@ -30,7 +30,6 @@ Enable Opencode to authenticate against **Antigravity** (Google's IDE) via OAuth
 3) **Declare the models you want**
 
 Add Antigravity models under the `provider.google.models` section of your config:
-
 ```json
 {
   "plugin": ["opencode-antigravity-auth"],
@@ -39,27 +38,45 @@ Add Antigravity models under the `provider.google.models` section of your config
       "models": {
         "gemini-3-pro-high": {
           "name": "Gemini 3 Pro High (Antigravity)",
-          "limit": { "context": 1048576, "output": 65535 }
+          "limit": {
+            "context": 1048576,
+            "output": 65535
+          }
         },
         "gemini-3-pro-low": {
           "name": "Gemini 3 Pro Low (Antigravity)",
-          "limit": { "context": 1048576, "output": 65535 }
+          "limit": {
+            "context": 1048576,
+            "output": 65535
+          }
         },
         "claude-sonnet-4-5": {
           "name": "Claude Sonnet 4.5 (Antigravity)",
-          "limit": { "context": 200000, "output": 64000 }
+          "limit": {
+            "context": 200000,
+            "output": 64000
+          }
         },
         "claude-sonnet-4-5-thinking": {
           "name": "Claude Sonnet 4.5 Thinking (Antigravity)",
-          "limit": { "context": 200000, "output": 64000 }
+          "limit": {
+            "context": 200000,
+            "output": 64000
+          }
         },
         "claude-opus-4-5-thinking": {
           "name": "Claude Opus 4.5 Thinking (Antigravity)",
-          "limit": { "context": 200000, "output": 64000 }
+          "limit": {
+            "context": 200000,
+            "output": 64000
+          }
         },
         "gpt-oss-120b-medium": {
           "name": "GPT-OSS 120B Medium (Antigravity)",
-          "limit": { "context": 131072, "output": 32768 }
+          "limit": {
+            "context": 131072,
+            "output": 32768
+          }
         }
       }
     }
@@ -123,4 +140,4 @@ Use at your own risk. Proceed only if you understand and accept these risks.
 ## Credits
 
 - Inspired by and different from [opencode-gemini-auth](https://github.com/jenslys/opencode-gemini-auth) by [jenslys](https://github.com/jenslys). Thanks for the groundwork! 🚀
-- Thanks to [CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) for the inspiration.
+- Thanks to [CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) for the inspiration.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencode-antigravity-auth",
   "module": "index.ts",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "author": "noefabris",
   "repository": "https://github.com/NoeFabris/opencode-antigravity-auth",
   "files": [

package/src/constants.ts

@@ -58,6 +58,11 @@ export const ANTIGRAVITY_LOAD_ENDPOINTS = [
  */
 export const ANTIGRAVITY_ENDPOINT = ANTIGRAVITY_ENDPOINT_DAILY;
 
+/**
+ * Hardcoded project id used when Antigravity does not return one (e.g., business/workspace accounts).
+ */
+export const ANTIGRAVITY_DEFAULT_PROJECT_ID = "rising-fact-p41fc";
+
 export const ANTIGRAVITY_HEADERS = {
   "User-Agent": "antigravity/1.11.5 windows/amd64",
   "X-Goog-Api-Client": "google-cloud-sdk vscode_cloudshelleditor/0.1",

package/src/plugin/project.ts

@@ -2,7 +2,7 @@ import {
   ANTIGRAVITY_HEADERS,
   ANTIGRAVITY_ENDPOINT_FALLBACKS,
   ANTIGRAVITY_LOAD_ENDPOINTS,
-  ANTIGRAVITY_PROVIDER_ID,
+  ANTIGRAVITY_DEFAULT_PROJECT_ID,
 } from "../constants";
 import { formatRefreshParts, parseRefreshParts } from "./auth";
 import type {
@@ -275,16 +275,14 @@ export async function ensureProjectContext(
       return { auth, effectiveProjectId: parts.managedProjectId };
     }
 
-    const loadPayload = await loadManagedProject(accessToken, parts.projectId);
-    const resolvedManagedProjectId = extractManagedProjectId(loadPayload);
-
-    if (resolvedManagedProjectId) {
+    const fallbackProjectId = ANTIGRAVITY_DEFAULT_PROJECT_ID;
+    const persistManagedProject = async (managedProjectId: string): Promise<ProjectContextResult> => {
       const updatedAuth: OAuthAuthDetails = {
         ...auth,
         refresh: formatRefreshParts({
           refreshToken: parts.refreshToken,
           projectId: parts.projectId,
-          managedProjectId: resolvedManagedProjectId,
+          managedProjectId,
         }),
       };
 
@@ -293,49 +291,23 @@ export async function ensureProjectContext(
         body: updatedAuth,
       });
 
-      return { auth: updatedAuth, effectiveProjectId: resolvedManagedProjectId };
-    }
-
-    if (parts.projectId) {
-      return { auth, effectiveProjectId: parts.projectId };
-    }
-
-    if (!loadPayload) {
-      throw new ProjectIdRequiredError();
-    }
-
-    const currentTierId = loadPayload.currentTier?.id ?? undefined;
-    if (currentTierId && currentTierId !== "FREE") {
-      throw new ProjectIdRequiredError();
-    }
+      return { auth: updatedAuth, effectiveProjectId: managedProjectId };
+    };
 
-    const defaultTierId = getDefaultTierId(loadPayload.allowedTiers);
-    const tierId = defaultTierId ?? "FREE";
+    // Try to resolve a managed project from Antigravity if possible.
+    const loadPayload = await loadManagedProject(accessToken, parts.projectId ?? fallbackProjectId);
+    const resolvedManagedProjectId = extractManagedProjectId(loadPayload);
 
-    if (tierId !== "FREE") {
-      throw new ProjectIdRequiredError();
+    if (resolvedManagedProjectId) {
+      return persistManagedProject(resolvedManagedProjectId);
     }
 
-    const onboardedProjectId = await onboardManagedProject(accessToken, tierId, parts.projectId);
-    if (onboardedProjectId) {
-      const updatedAuth: OAuthAuthDetails = {
-        ...auth,
-        refresh: formatRefreshParts({
-          refreshToken: parts.refreshToken,
-          projectId: parts.projectId,
-          managedProjectId: onboardedProjectId,
-        }),
-      };
-
-      await client.auth.set({
-        path: { id: providerId },
-        body: updatedAuth,
-      });
-
-      return { auth: updatedAuth, effectiveProjectId: onboardedProjectId };
+    if (parts.projectId) {
+      return { auth, effectiveProjectId: parts.projectId };
     }
 
-    throw new ProjectIdRequiredError();
+    // No project id present in auth; fall back to the hardcoded id for requests.
+    return { auth, effectiveProjectId: fallbackProjectId };
   };
 
   if (!cacheKey) {

package/src/plugin/request.ts

@@ -23,35 +23,8 @@ function generateSyntheticProjectId(): string {
 }
 
 const STREAM_ACTION = "streamGenerateContent";
-const MODEL_FALLBACKS: Record<string, string> = {
-  "gemini-2.5-flash-image": "gemini-2.5-flash",
-  "gemini-2.5-flash": "gemini-3-pro-preview",
-  "models/gemini-2.5-flash": "gemini-3-pro-preview",
-  "gemini-3-pro-high": "gemini-3-pro-preview",
-  "gemini-3-pro-low": "gemini-3-pro-preview",
-  "claude-sonnet-4-5": "claude-4-5-sonnet",
-  "claude-sonnet-4-5-thinking": "claude-4-5-sonnet-thinking",
-  "claude-opus-4-5-thinking": "claude-4-5-opus-thinking",
-  "gpt-oss-120b-medium": "gpt-oss-120b-medium",
-};
-
-// Maps friendly/alias names to the upstream model IDs Antigravity expects.
-const MODEL_UPSTREAM_ALIASES: Record<string, string> = {
-  "gemini-2.5-computer-use-preview-10-2025": "rev19-uic3-1p",
-  "gemini-3-pro-image-preview": "gemini-3-pro-image",
-  "gemini-3-pro-preview": "gemini-3-pro-high",
-  "gemini-claude-sonnet-4-5": "claude-sonnet-4-5",
-  "gemini-claude-sonnet-4-5-thinking": "claude-sonnet-4-5-thinking",
-  "gemini-claude-opus-4-5-thinking": "claude-opus-4-5-thinking",
-  // Anthropic model name normalization (order expected by Antigravity)
-  "claude-4-5-sonnet": "claude-sonnet-4-5",
-  "claude-4-5-sonnet-thinking": "claude-sonnet-4-5-thinking",
-  "claude-4-5-opus-thinking": "claude-opus-4-5-thinking",
-};
-
 /**
- * Endpoint fallback order (daily → autopush → prod)
- * Matches CLIProxy and Vibeproxy behavior
+ * Detects requests headed to the Google Generative Language API so we can intercept them.
  */
 export function isGenerativeLanguageRequest(input: RequestInfo): input is string {
   return typeof input === "string" && input.includes("generativelanguage.googleapis.com");
@@ -121,8 +94,8 @@ export function prepareAntigravityRequest(
   }
 
   const [, rawModel = "", rawAction = ""] = match;
-  const effectiveModel = MODEL_FALLBACKS[rawModel] ?? rawModel;
-  const upstreamModel = MODEL_UPSTREAM_ALIASES[effectiveModel] ?? effectiveModel;
+  const effectiveModel = rawModel;
+  const upstreamModel = rawModel;
   const streaming = rawAction === STREAM_ACTION;
   const baseEndpoint = endpointOverride ?? ANTIGRAVITY_ENDPOINT;
   const transformedUrl = `${baseEndpoint}/v1internal:${rawAction}${
@@ -187,41 +160,86 @@ export function prepareAntigravityRequest(
           }
         }
 
-        // Normalize tools. For Claude models, send functionDeclarations with parameters (no custom).
+        // Normalize tools. For Claude models, keep full function declarations (names + schemas).
         if (Array.isArray(requestPayload.tools)) {
           if (isClaudeModel) {
-            // Use functionDeclarations with parameters (mirrors CLIProxy path that Antigravity accepts).
-            const claudeTools: any[] = requestPayload.tools.map((tool: any, idx: number) => {
-              const schema =
-                tool.function?.parameters ||
-                tool.function?.input_schema ||
-                tool.function?.inputSchema ||
+            const functionDeclarations: any[] = [];
+            const passthroughTools: any[] = [];
+
+            const normalizeSchema = (schema: any) => {
+              if (schema && typeof schema === "object") {
+                return schema;
+              }
+              toolDebugMissing += 1;
+              return { type: "object", properties: {} };
+            };
+
+            requestPayload.tools.forEach((tool: any, idx: number) => {
+              const pushDeclaration = (decl: any, source: string) => {
+                const schema =
+                  decl?.parameters ||
+                  decl?.input_schema ||
+                  decl?.inputSchema ||
+                  tool.parameters ||
+                  tool.input_schema ||
+                  tool.inputSchema ||
+                  tool.function?.parameters ||
+                  tool.function?.input_schema ||
+                  tool.function?.inputSchema ||
+                  tool.custom?.parameters ||
+                  tool.custom?.input_schema;
+
+                const name =
+                  decl?.name ||
+                  tool.name ||
+                  tool.function?.name ||
+                  tool.custom?.name ||
+                  `tool-${functionDeclarations.length}`;
+
+                const description =
+                  decl?.description ||
+                  tool.description ||
+                  tool.function?.description ||
+                  tool.custom?.description ||
+                  "";
+
+                functionDeclarations.push({
+                  name,
+                  description,
+                  parameters: normalizeSchema(schema),
+                });
+
+                toolDebugSummaries.push(
+                  `decl=${name},src=${source},hasSchema=${schema ? "y" : "n"}`,
+                );
+              };
+
+              if (Array.isArray(tool.functionDeclarations) && tool.functionDeclarations.length > 0) {
+                tool.functionDeclarations.forEach((decl: any) => pushDeclaration(decl, "functionDeclarations"));
+                return;
+              }
+
+              // Fall back to function/custom style definitions.
+              if (
+                tool.function ||
+                tool.custom ||
                 tool.parameters ||
                 tool.input_schema ||
-                tool.inputSchema ||
-                tool.custom?.parameters ||
-                tool.custom?.input_schema ||
-                { type: "object", properties: {} };
-              const name =
-                tool.name ||
-                tool.function?.name ||
-                tool.custom?.name ||
-                `tool-${idx}`;
-              const description =
-                tool.description || tool.function?.description || tool.custom?.description || "";
-
-              return {
-                functionDeclarations: [
-                  {
-                    name,
-                    description,
-                    parameters: schema,
-                  },
-                ],
-              };
+                tool.inputSchema
+              ) {
+                pushDeclaration(tool.function ?? tool.custom ?? tool, "function/custom");
+                return;
+              }
+
+              // Preserve any non-function tool entries (e.g., codeExecution) untouched.
+              passthroughTools.push(tool);
             });
 
-            requestPayload.tools = claudeTools;
+            const finalTools: any[] = [];
+            if (functionDeclarations.length > 0) {
+              finalTools.push({ functionDeclarations });
+            }
+            requestPayload.tools = finalTools.concat(passthroughTools);
           } else {
             // Default normalization for non-Claude models
             requestPayload.tools = requestPayload.tools.map((tool: any, toolIndex: number) => {
@@ -290,6 +308,45 @@ export function prepareAntigravityRequest(
           }
         }
 
+        // For Claude models, ensure functionCall/tool use parts carry IDs (required by Anthropic).
+        if (isClaudeModel && Array.isArray(requestPayload.contents)) {
+          let toolCallCounter = 0;
+          const lastCallIdByName = new Map<string, string>();
+
+          requestPayload.contents = requestPayload.contents.map((content: any) => {
+            if (!content || !Array.isArray(content.parts)) {
+              return content;
+            }
+
+            const newParts = content.parts.map((part: any) => {
+              if (part && typeof part === "object" && part.functionCall) {
+                const call = { ...part.functionCall };
+                if (!call.id) {
+                  call.id = `tool-call-${++toolCallCounter}`;
+                }
+                const nameKey = typeof call.name === "string" ? call.name : `tool-${toolCallCounter}`;
+                lastCallIdByName.set(nameKey, call.id);
+                return { ...part, functionCall: call };
+              }
+
+              if (part && typeof part === "object" && part.functionResponse) {
+                const resp = { ...part.functionResponse };
+                if (!resp.id && typeof resp.name === "string") {
+                  const linkedId = lastCallIdByName.get(resp.name);
+                  if (linkedId) {
+                    resp.id = linkedId;
+                  }
+                }
+                return { ...part, functionResponse: resp };
+              }
+
+              return part;
+            });
+
+            return { ...content, parts: newParts };
+          });
+        }
+
         if ("model" in requestPayload) {
           delete requestPayload.model;
         }
@@ -313,12 +370,6 @@ export function prepareAntigravityRequest(
         }
 
         body = JSON.stringify(wrappedBody);
-        
-        if (wrappedBody.request && typeof wrappedBody.request === 'object') {
-             (wrappedBody.request as any).sessionId = "-" + Math.floor(Math.random() * 9000000000000000000).toString();
-        }
-
-        body = JSON.stringify(wrappedBody);
       }
     } catch (error) {
       throw error;

package/src/plugin.ts

@@ -222,7 +222,6 @@ export const createAntigravityPlugin = (providerId: string) => async (
         label: "OAuth with Google (Antigravity)",
         type: "oauth",
         authorize: async () => {
-          console.log("\n=== Google Antigravity OAuth Setup ===");
 
           const isHeadless = !!(
             process.env.SSH_CONNECTION ||
@@ -252,7 +251,6 @@ export const createAntigravityPlugin = (providerId: string) => async (
               } else {
                 exec(`xdg-open "${authorization.url}"`);
               }
-              console.log("Opening your browser to authenticate...");
             } catch (e) {
               console.log("Could not open browser automatically. Please Copy/Paste the URL below.");
             }
@@ -260,8 +258,6 @@ export const createAntigravityPlugin = (providerId: string) => async (
 
           if (listener) {
              const { host } = new URL(ANTIGRAVITY_REDIRECT_URI);
-             console.log(`1. We'll automatically capture the browser redirect on http://${host}.`);
-             console.log("2. Once you see the 'Authentication complete' page in your browser, return to this terminal.\n");
              
             return {
               url: authorization.url,
@@ -300,9 +296,6 @@ export const createAntigravityPlugin = (providerId: string) => async (
             };
           }
 
-          console.log("1. Visit the URL below to sign in.");
-          console.log("2. Copy the full redirected URL (localhost) and paste it back here.\n");
-
           return {
             url: authorization.url,
             instructions: