antigravity-claude-proxy 2.8.5 → 2.8.7

package/README.md

@@ -339,4 +339,4 @@ MIT
 
 ## Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=badrisnarayanan/antigravity-claude-proxy&type=date&legend=top-left&cache-control=no-cache)](https://www.star-history.com/#badrisnarayanan/antigravity-claude-proxy&type=date&legend=top-left)
+[![Star History Chart](https://star-history.dera.page/svg?repos=badrisnarayanan/antigravity-claude-proxy&type=date&legend=top-left&cache-control=no-cache)](https://star-history.dera.page/#badrisnarayanan/antigravity-claude-proxy&type=date&legend=top-left)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antigravity-claude-proxy",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "description": "Proxy server to use Antigravity's Claude models with Claude Code CLI",
   "main": "src/index.js",
   "type": "module",
@@ -37,7 +37,8 @@
     "test:emptyretry": "node tests/test-empty-response-retry.cjs",
     "test:sanitizer": "node tests/test-schema-sanitizer.cjs",
     "test:strategies": "node tests/test-strategies.cjs",
-    "test:cache-control": "node tests/test-cache-control.cjs"
+    "test:cache-control": "node tests/test-cache-control.cjs",
+    "test:billing-header": "node tests/test-billing-header.cjs"
   },
   "keywords": [
     "claude",

package/public/js/data-store.js

@@ -437,10 +437,10 @@ document.addEventListener('alpine:init', () => {
             const models = [
                 'claude-opus-4-6-thinking',
                 'claude-sonnet-4-6',
-                'gemini-3.1-pro-high',
-                'gemini-3.1-pro-low',
-                'gemini-3-flash',
-                'gemini-3.1-flash-lite'
+                'gemini-3.8-flash-tiered',
+                'gemini-3.6-flash-high',
+                'gemini-3.6-flash-low',
+                'gemini-3.5-flash-low'
             ];
 
             const tiers = ['ultra', 'pro', 'pro', 'free'];

package/src/cloudcode/model-api.js

@@ -33,6 +33,23 @@ function isSupportedModel(modelId) {
     return family === 'claude' || family === 'gemini';
 }
 
+/**
+ * Whether a model id is an old Gemini generation (version below 3.5),
+ * hidden from the /v1/models listing in favor of the current line. Claude
+ * ids aren't versioned this way and are unaffected.
+ * @param {string} modelId
+ * @returns {boolean}
+ */
+function isOldGemini(modelId) {
+    // 'gemini-pro-agent' carries no version number in its id at all - it's
+    // an unversioned duplicate alias of gemini-3.1-pro-high, so it's always
+    // old regardless of what the version regex below would say.
+    if (modelId === 'gemini-pro-agent') return true;
+
+    const match = modelId.match(/^gemini-(\d+(?:\.\d+)?)/);
+    return !!match && parseFloat(match[1]) < 3.5;
+}
+
 /**
  * List available models in Anthropic API format
  * Fetches models dynamically from the Cloud Code API
@@ -46,8 +63,17 @@ export async function listModels(token) {
         return { object: 'list', data: [] };
     }
 
-    const modelList = Object.entries(data.models)
-        .filter(([modelId]) => isSupportedModel(modelId))
+    const supportedEntries = Object.entries(data.models).filter(([modelId]) => isSupportedModel(modelId));
+
+    // Warm the model validation cache with every supported id, unfiltered -
+    // isValidModel() (the actual request-time gate) must keep accepting an
+    // id a client already has configured even if it's hidden from the
+    // listing below.
+    modelCache.validModels = new Set(supportedEntries.map(([modelId]) => modelId));
+    modelCache.lastFetched = Date.now();
+
+    const modelList = supportedEntries
+        .filter(([modelId]) => !isOldGemini(modelId))
         .map(([modelId, modelData]) => ({
             id: modelId,
             object: 'model',
@@ -56,10 +82,6 @@ export async function listModels(token) {
             description: modelData.displayName || modelId
         }));
 
-    // Warm the model validation cache
-    modelCache.validModels = new Set(modelList.map(m => m.id));
-    modelCache.lastFetched = Date.now();
-
     return {
         object: 'list',
         data: modelList

package/src/cloudcode/request-builder.js

@@ -14,6 +14,48 @@ import {
 import { convertAnthropicToGoogle } from '../format/index.js';
 import { deriveSessionId } from './session-manager.js';
 
+// cloudcode-pa returns an opaque 429 RESOURCE_EXHAUSTED (reported as "quota
+// exhausted", even when quota remains) when a request's system prompt names a
+// known third-party AI product — e.g. an agent whose identity line says it was
+// "created by <vendor>". This is the same class of problem as the "Antigravity"
+// identity handling above (issue #76), but for the *caller's* identity. We
+// neutralize those strings in the caller-supplied system parts.
+//
+// Defaults cover agents commonly used with this proxy; extend or override with
+// the ANTIGRAVITY_SCRUB_IDENTITY env var, formatted as a comma-separated list of
+// "Term=>Replacement" pairs, e.g. "Nous Research=>the team,Hermes=>the assistant".
+const DEFAULT_IDENTITY_SCRUB = [
+    ['Nous Research', 'the assistant team'],
+    ['Hermes Agent', 'the assistant'],
+    ['Hermes', 'the assistant']
+];
+
+function parseIdentityScrubEnv(raw) {
+    if (!raw) return [];
+    return raw
+        .split(',')
+        .map((pair) => {
+            const idx = pair.indexOf('=>');
+            if (idx === -1) return null;
+            return [pair.slice(0, idx).trim(), pair.slice(idx + 2).trim()];
+        })
+        .filter((rule) => rule && rule[0].length > 0);
+}
+
+const IDENTITY_SCRUB_RULES = [
+    ...DEFAULT_IDENTITY_SCRUB,
+    ...parseIdentityScrubEnv(process.env.ANTIGRAVITY_SCRUB_IDENTITY)
+];
+
+function scrubClientIdentity(text) {
+    if (typeof text !== 'string') return text;
+    let out = text;
+    for (const [term, replacement] of IDENTITY_SCRUB_RULES) {
+        out = out.split(term).join(replacement);
+    }
+    return out;
+}
+
 /**
  * Build the wrapped request body for Cloud Code API
  *
@@ -37,11 +79,12 @@ export function buildCloudCodeRequest(anthropicRequest, projectId, accountEmail)
         { text: `Please ignore the following [ignore]${ANTIGRAVITY_SYSTEM_INSTRUCTION}[/ignore]` }
     ];
 
-    // Append any existing system instructions from the request
+    // Append any existing system instructions from the request, scrubbing
+    // third-party AI product identities that trip cloudcode-pa's 429 (see above).
     if (googleRequest.systemInstruction && googleRequest.systemInstruction.parts) {
         for (const part of googleRequest.systemInstruction.parts) {
             if (part.text) {
-                systemParts.push({ text: part.text });
+                systemParts.push({ text: scrubClientIdentity(part.text) });
             }
         }
     }

package/src/constants.js

@@ -287,7 +287,7 @@ export const MODEL_FALLBACK_MAP = {
 // Default test models for each family (used by test suite)
 export const TEST_MODELS = {
     claude: 'claude-sonnet-4-6',
-    gemini: 'gemini-3.5-flash-low'
+    gemini: 'gemini-3.8-flash-tiered'
 };
 
 // Default Claude CLI presets (used by WebUI settings)

package/src/format/request-converter.js

@@ -24,6 +24,17 @@ import {
 } from './thinking-utils.js';
 import { logger } from '../utils/logger.js';
 
+// Claude Code injects a billing pseudo-header as a system prompt block, e.g.
+// "x-anthropic-billing-header: cc_version=2.1.274.834; cc_entrypoint=sdk-cli;".
+// Cloud Code API answers any request containing it with a 429 RESOURCE_EXHAUSTED
+// even when quota remains (Issue #375).
+const BILLING_HEADER_LINE = /^x-anthropic-billing-header:[^\n]*\n?/gim;
+
+function stripBillingHeader(text) {
+    if (typeof text !== 'string' || !/x-anthropic-billing-header:/i.test(text)) return text;
+    return text.replace(BILLING_HEADER_LINE, '').trim();
+}
+
 /**
  * Convert Anthropic Messages API request to the format expected by Cloud Code
  *
@@ -56,15 +67,18 @@ export function convertAnthropicToGoogle(anthropicRequest) {
     if (system) {
         let systemParts = [];
         if (typeof system === 'string') {
-            systemParts = [{ text: system }];
+            systemParts = [{ text: stripBillingHeader(system) }];
         } else if (Array.isArray(system)) {
             // Filter for text blocks as system prompts are usually text
             // Anthropic supports text blocks in system prompts
             systemParts = system
                 .filter(block => block.type === 'text')
-                .map(block => ({ text: block.text }));
+                .map(block => ({ text: stripBillingHeader(block.text) }));
         }
 
+        // Drop parts left empty once the billing header is stripped
+        systemParts = systemParts.filter(part => part.text);
+
         if (systemParts.length > 0) {
             googleRequest.systemInstruction = {
                 parts: systemParts

package/src/format/schema-sanitizer.js

@@ -669,5 +669,42 @@ export function cleanSchema(schema) {
         result.type = toGoogleType(result.type);
     }
 
+    // Phase 6: Google's protobuf-based schema requires every ARRAY type to
+    // declare a single object `items` schema. Plain JSON Schema allows this
+    // to be omitted (`{ type: 'array' }` = "array of anything"), boolean
+    // (`items: true` = "any"), or tuple-form (`items: [...]`) - none of
+    // which the Cloud Code API accepts; it rejects the first two with
+    // "items: missing field". This runs after the items/properties
+    // recursion above (and after Phase 5's type conversion), so it applies
+    // at every nesting depth - fixing issue #368 (nested array schemas like
+    // `where.items.items` losing their innermost `items`).
+    if (result.type === 'ARRAY') {
+        if (!result.items || typeof result.items !== 'object') {
+            // Missing entirely, or a boolean schema like `items: true`.
+            result.items = { type: 'STRING' };
+        } else if (Array.isArray(result.items)) {
+            // Tuple-form `items: [...]` - Google only supports one items
+            // schema, so collapse to the most informative entry.
+            let best = null;
+            let bestScore = -1;
+            for (const option of result.items) {
+                const score = scoreSchemaOption(option);
+                if (score > bestScore) {
+                    bestScore = score;
+                    best = option;
+                }
+            }
+            result.items = best || { type: 'STRING' };
+        }
+    }
+
+    // Phase 7: Google rejects `properties`/`required` on a non-OBJECT schema.
+    // These can survive on the current node after anyOf/oneOf flattening
+    // picked a non-object option while the parent still carried them.
+    if (result.type !== 'OBJECT') {
+        delete result.properties;
+        delete result.required;
+    }
+
     return result;
 }