antigravity-claude-proxy 2.9.3 → 3.0.1

package/src/format/request-converter.js

@@ -51,7 +51,7 @@ export function convertAnthropicToGoogle(anthropicRequest) {
     // before any other processing, following the pattern from Antigravity-Manager.
     const messages = cleanCacheControl(anthropicRequest.messages || []);
 
-    const { system, max_tokens, temperature, top_p, top_k, stop_sequences, tools, tool_choice, thinking } = anthropicRequest;
+    const { system, max_tokens, temperature, top_p, top_k, stop_sequences, tools, thinking } = anthropicRequest;
     const modelName = anthropicRequest.model || '';
     const modelFamily = getModelFamily(modelName);
     const isClaudeModel = modelFamily === 'claude';
@@ -63,7 +63,6 @@ export function convertAnthropicToGoogle(anthropicRequest) {
         generationConfig: {}
     };
 
-    // Handle system instruction
     if (system) {
         let systemParts = [];
         if (typeof system === 'string') {
@@ -126,7 +125,6 @@ export function convertAnthropicToGoogle(anthropicRequest) {
         if ((msg.role === 'assistant' || msg.role === 'model') && Array.isArray(msgContent)) {
             // First, try to restore signatures for unsigned thinking blocks from cache
             msgContent = restoreThinkingSignatures(msgContent);
-            // Remove trailing unsigned thinking blocks
             msgContent = removeTrailingThinkingBlocks(msgContent);
             // Reorder: thinking first, then text, then tool_use
             msgContent = reorderAssistantContent(msgContent);
@@ -228,13 +226,10 @@ export function convertAnthropicToGoogle(anthropicRequest) {
     // Convert tools to Google format
     if (tools && tools.length > 0) {
         const functionDeclarations = tools.map((tool, idx) => {
-            // Extract name from various possible locations
             const name = tool.name || tool.function?.name || tool.custom?.name || `tool-${idx}`;
 
-            // Extract description from various possible locations
             const description = tool.description || tool.function?.description || tool.custom?.description || '';
 
-            // Extract schema from various possible locations
             const schema = tool.input_schema
                 || tool.function?.input_schema
                 || tool.function?.parameters

package/src/format/response-converter.js

@@ -15,7 +15,6 @@ import { cacheSignature, cacheThinkingSignature } from './signature-cache.js';
  * @returns {Object} Anthropic format response
  */
 export function convertGoogleToAnthropic(googleResponse, model) {
-    // Handle the response wrapper
     const response = googleResponse.response || googleResponse;
 
     const candidates = response.candidates || [];
@@ -29,7 +28,6 @@ export function convertGoogleToAnthropic(googleResponse, model) {
 
     for (const part of parts) {
         if (part.text !== undefined) {
-            // Handle thinking blocks
             if (part.thought === true) {
                 const signature = part.thoughtSignature || '';
 
@@ -72,7 +70,6 @@ export function convertGoogleToAnthropic(googleResponse, model) {
             anthropicContent.push(toolUseBlock);
             hasToolCalls = true;
         } else if (part.inlineData) {
-            // Handle image content from Google format
             anthropicContent.push({
                 type: 'image',
                 source: {

package/src/format/schema-sanitizer.js

@@ -163,7 +163,7 @@ function mergeAllOf(schema) {
 
         // Merge properties (allOf properties override parent for same keys)
         if (Object.keys(mergedProperties).length > 0) {
-            result.properties = { ...mergedProperties, ...(result.properties || {}) };
+            result.properties = { ...mergedProperties, ...result.properties };
         }
 
         // Merge required
@@ -289,10 +289,6 @@ function flattenAnyOfOneOf(schema) {
     return result;
 }
 
-// ============================================================================
-// Enhanced Schema Hints (for preserving semantic information)
-// ============================================================================
-
 /**
  * Add hints for enum values (if ≤10 values).
  * This preserves enum information in the description since Gemini
@@ -611,7 +607,6 @@ export function cleanSchema(schema) {
     if (!schema || typeof schema !== 'object') return schema;
     if (Array.isArray(schema)) return schema.map(cleanSchema);
 
-    // Phase 1: Convert $refs to hints
     let result = convertRefsToHints(schema);
 
     // Phase 1b: Add enum hints (preserves enum info in description)
@@ -632,7 +627,6 @@ export function cleanSchema(schema) {
     // Phase 2c: Flatten type arrays and update required for nullable
     result = flattenTypeArrays(result);
 
-    // Phase 3: Remove unsupported keywords
     const unsupported = [
         'additionalProperties', 'default', '$schema', '$defs',
         'definitions', '$ref', '$id', '$comment', 'title',
@@ -652,7 +646,6 @@ export function cleanSchema(schema) {
         }
     }
 
-    // Phase 4: Final cleanup - recursively clean nested schemas and validate required
     if (result.properties && typeof result.properties === 'object') {
         const newProps = {};
         for (const [key, value] of Object.entries(result.properties)) {
@@ -678,21 +671,11 @@ export function cleanSchema(schema) {
         }
     }
 
-    // Phase 5: Convert type to Google's uppercase format (STRING, OBJECT, ARRAY, etc.)
-    // Only convert at current level - nested types already converted by recursive cleanSchema calls
     if (result.type && typeof result.type === 'string') {
         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`).
+    // Cloud Code rejects ARRAY schemas without a single object `items` ("items: missing field"), issue #368.
     if (result.type === 'ARRAY') {
         if (!result.items || typeof result.items !== 'object') {
             // Missing entirely, or a boolean schema like `items: true`.
@@ -713,9 +696,7 @@ export function cleanSchema(schema) {
         }
     }
 
-    // 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.
+    // Google rejects properties/required on non-OBJECT nodes, which anyOf/oneOf flattening can leave behind.
     if (result.type !== 'OBJECT') {
         delete result.properties;
         delete result.required;

package/src/format/thinking-utils.js

@@ -7,10 +7,6 @@ import { MIN_SIGNATURE_LENGTH } from '../constants.js';
 import { getCachedSignature, getCachedSignatureFamily } from './signature-cache.js';
 import { logger } from '../utils/logger.js';
 
-// ============================================================================
-// Gemini Thinking Budget Limits (Issue #289)
-// ============================================================================
-
 // Max thinking budget per Gemini model version
 // Gemini 2.5 Flash: max 24,576 (API error: "supported values are integers from 1 to 24576")
 const GEMINI_THINKING_BUDGET_LIMITS = {
@@ -57,10 +53,6 @@ export function clampGeminiThinkingBudget(modelName, budget) {
     return requestedBudget;
 }
 
-// ============================================================================
-// Cache Control Cleaning (Issue #189)
-// ============================================================================
-
 /**
  * Remove cache_control fields from all content blocks in messages.
  * This is a critical fix for Issue #189 where Claude Code CLI sends cache_control
@@ -94,7 +86,7 @@ export function cleanCacheControl(messages) {
             if (block.cache_control === undefined) return block;
 
             // Create a shallow copy without cache_control
-            const { cache_control, ...cleanBlock } = block;
+            const { cache_control: _cacheControl, ...cleanBlock } = block;
             removedCount++;
 
             return cleanBlock;
@@ -431,10 +423,6 @@ export function reorderAssistantContent(content) {
     return reordered;
 }
 
-// ============================================================================
-// Thinking Recovery Functions
-// ============================================================================
-
 /**
  * Check if a message has any VALID (signed) thinking blocks.
  * Only counts thinking blocks that have valid signatures, not unsigned ones

package/src/index.js

@@ -10,14 +10,13 @@ import app, { accountManager } from './server.js';
 import { DEFAULT_PORT } from './constants.js';
 import { logger } from './utils/logger.js';
 import { config } from './config.js';
-import { getStrategyLabel, STRATEGY_NAMES, DEFAULT_STRATEGY } from './account-manager/strategies/index.js';
+import { STRATEGY_NAMES } from './account-manager/strategies/index.js';
 import { getPackageVersion } from './utils/helpers.js';
 import path from 'path';
 import os from 'os';
 
 const packageVersion = getPackageVersion();
 
-// Parse command line arguments
 const args = process.argv.slice(2);
 const isDebug = args.includes('--debug') || args.includes('--dev-mode') || process.env.DEBUG === 'true' || process.env.DEV_MODE === 'true';
 const isFallbackEnabled = args.includes('--fallback') || process.env.FALLBACK === 'true';
@@ -31,13 +30,11 @@ for (let i = 0; i < args.length; i++) {
         strategyOverride = args[i + 1];
     }
 }
-// Validate strategy
 if (strategyOverride && !STRATEGY_NAMES.includes(strategyOverride.toLowerCase())) {
     logger.warn(`[Startup] Invalid strategy "${strategyOverride}". Valid options: ${STRATEGY_NAMES.join(', ')}. Using default.`);
     strategyOverride = null;
 }
 
-// Initialize logger and devMode
 logger.setDebug(isDebug);
 
 if (isDebug) {
@@ -65,7 +62,6 @@ const HOME_DIR = os.homedir();
 const CONFIG_DIR = path.join(HOME_DIR, '.antigravity-claude-proxy');
 
 const server = app.listen(PORT, HOST, () => {
-    // Get actual bound address
     const address = server.address();
     const boundHost = typeof address === 'string' ? address : address.address;
     const boundPort = typeof address === 'string' ? null : address.port;
@@ -78,7 +74,6 @@ const server = app.listen(PORT, HOST, () => {
     const align = (text) => text + ' '.repeat(Math.max(0, 60 - text.length));
     const align4 = (text) => text + ' '.repeat(Math.max(0, 58 - text.length));
 
-    // Build Control section dynamically
     const strategyOptions = `(${STRATEGY_NAMES.join('/')})`;
     const strategyLine2 = '                       ' + strategyOptions;
     let controlSection = '║  Control:                                                    ║\n';

package/src/modules/usage-stats.js

@@ -179,7 +179,7 @@ function track(modelId) {
  * Setup Express Middleware
  * @param {import('express').Application} app
  */
-function setupMiddleware(app) {
+function setupMiddleware(_app) {
     load();
 
     // Auto-save every minute

package/src/server.js

@@ -46,7 +46,6 @@ export const accountManager = new AccountManager();
 
 // Track initialization status
 let isInitialized = false;
-let initError = null;
 let initPromise = null;
 
 /**
@@ -65,7 +64,6 @@ async function ensureInitialized() {
             const status = accountManager.getStatus();
             logger.success(`[Server] Account pool initialized: ${status.summary}`);
         } catch (error) {
-            initError = error;
             initPromise = null; // Allow retry on failure
             logger.error('[Server] Failed to initialize account manager:', error.message);
             throw error;
@@ -78,6 +76,12 @@ async function ensureInitialized() {
 // Middleware
 app.use(cors());
 app.use(express.json({ limit: REQUEST_BODY_LIMIT }));
+// Express 5 leaves req.body undefined when no body was parsed (Express 4 set {}).
+// Keep the old behavior so handlers can destructure req.body safely.
+app.use((req, res, next) => {
+    if (req.body === undefined) req.body = {};
+    next();
+});
 
 // API Key authentication middleware for /v1/* endpoints
 app.use('/v1', (req, res, next) => {
@@ -110,7 +114,6 @@ app.use('/v1', (req, res, next) => {
     next();
 });
 
-// Setup usage statistics middleware
 usageStats.setupMiddleware(app);
 
 /**
@@ -119,11 +122,9 @@ usageStats.setupMiddleware(app);
  * Using app.use instead of app.post for earlier middleware interception
  */
 app.use((req, res, next) => {
-    // Handle Claude Code event logging requests silently
     if (req.method === 'POST' && req.path === '/api/event_logging/batch') {
         return res.status(200).json({ status: 'ok' });
     }
-    // Handle Claude Code root POST requests silently
     if (req.method === 'POST' && req.path === '/') {
         return res.status(200).json({ status: 'ok' });
     }
@@ -172,7 +173,6 @@ function parseError(error) {
     } else if (error.message.includes('PERMISSION_DENIED')) {
         errorType = 'permission_error';
         statusCode = 403;
-        errorMessage = errorMessage;
     }
 
     return { errorType, statusCode, errorMessage };
@@ -182,7 +182,6 @@ function parseError(error) {
 app.use((req, res, next) => {
     const start = Date.now();
 
-    // Log response on finish
     res.on('finish', () => {
         const duration = Date.now() - start;
         const status = res.statusCode;
@@ -235,14 +234,12 @@ app.get('/health', async (req, res) => {
         await ensureInitialized();
         const start = Date.now();
 
-        // Get high-level status first
         const status = accountManager.getStatus();
         const allAccounts = accountManager.getAllAccounts();
 
         // Fetch quotas for each account in parallel to get detailed model info
         const accountDetails = await Promise.allSettled(
             allAccounts.map(async (account) => {
-                // Check model-specific rate limits
                 const activeModelLimits = Object.entries(account.modelRateLimits || {})
                     .filter(([_, limit]) => limit.isRateLimited && limit.resetTime > Date.now());
                 const isRateLimited = activeModelLimits.length > 0;
@@ -300,7 +297,6 @@ app.get('/health', async (req, res) => {
             })
         );
 
-        // Process results
         const detailedAccounts = accountDetails.map((result, index) => {
             if (result.status === 'fulfilled') {
                 return result.value;
@@ -351,7 +347,6 @@ app.get('/account-limits', async (req, res) => {
         const format = req.query.format || 'json';
         const includeHistory = req.query.includeHistory === 'true';
 
-        // Fetch quotas for each account in parallel
         const results = await Promise.allSettled(
             allAccounts.map(async (account) => {
                 // Skip invalid accounts
@@ -367,13 +362,11 @@ app.get('/account-limits', async (req, res) => {
                 try {
                     const token = await accountManager.getTokenForAccount(account);
 
-                    // Fetch subscription tier first to get project ID
                     const subscription = await getSubscriptionTier(token);
 
                     // Then fetch quotas with project ID for accurate quota info
                     const quotas = await getModelQuotas(token, subscription.projectId);
 
-                    // Update account object with fresh data
                     account.subscription = {
                         tier: subscription.tier,
                         projectId: subscription.projectId,
@@ -418,7 +411,6 @@ app.get('/account-limits', async (req, res) => {
             })
         );
 
-        // Process results
         const accountLimits = results.map((result, index) => {
             if (result.status === 'fulfilled') {
                 return result.value;
@@ -442,16 +434,13 @@ app.get('/account-limits', async (req, res) => {
 
         const sortedModels = Array.from(allModelIds).sort();
 
-        // Return ASCII table format
         if (format === 'table') {
             res.setHeader('Content-Type', 'text/plain; charset=utf-8');
 
-            // Build table
             const lines = [];
             const timestamp = new Date().toLocaleString();
             lines.push(`Account Limits (${timestamp})`);
 
-            // Get account status info
             const status = accountManager.getStatus();
             lines.push(`Accounts: ${status.total} total, ${status.available} available, ${status.rateLimited} rate-limited, ${status.invalid} invalid`);
             lines.push('');
@@ -470,7 +459,6 @@ app.get('/account-limits', async (req, res) => {
                 const shortEmail = acc.email.split('@')[0].slice(0, 22);
                 const lastUsed = acc.lastUsed ? new Date(acc.lastUsed).toLocaleString() : 'never';
 
-                // Get status and error from accountLimits
                 const accLimit = accountLimits.find(a => a.email === acc.email);
                 let accStatus;
                 if (acc.isInvalid) {
@@ -492,7 +480,6 @@ app.get('/account-limits', async (req, res) => {
                     }
                 }
 
-                // Get reset time from quota API
                 const claudeModel = sortedModels.find(m => m.includes('claude'));
                 const quota = claudeModel && accLimit?.models?.[claudeModel];
                 const resetTime = quota?.resetTime
@@ -558,13 +545,11 @@ app.get('/account-limits', async (req, res) => {
             return res.send(lines.join('\n'));
         }
 
-        // Get account metadata from AccountManager
         const accountStatus = accountManager.getStatus();
         const accountMetadataMap = new Map(
             accountStatus.accounts.map(a => [a.email, a])
         );
 
-        // Build response data
         const responseData = {
             timestamp: new Date().toLocaleString(),
             totalAccounts: allAccounts.length,
@@ -699,7 +684,6 @@ app.post('/v1/messages/count_tokens', (req, res) => {
  * Main messages endpoint - Anthropic Messages API compatible
  */
 
-
 /**
  * Anthropic-compatible Messages API
  * POST /v1/messages
@@ -738,7 +722,6 @@ app.post('/v1/messages', async (req, res) => {
 
         const modelId = requestedModel;
 
-        // Validate model ID before processing
         const { account: validationAccount } = accountManager.selectAccount();
         if (validationAccount) {
             const token = await accountManager.getTokenForAccount(validationAccount);
@@ -757,7 +740,6 @@ app.post('/v1/messages', async (req, res) => {
             accountManager.resetAllRateLimits();
         }
 
-        // Validate required fields
         if (!messages || !Array.isArray(messages)) {
             return res.status(400).json({
                 type: 'error',
@@ -773,7 +755,6 @@ app.post('/v1/messages', async (req, res) => {
             return res.json({});
         }
 
-        // Build the request object
         const request = {
             model: modelId,
             messages,
@@ -807,7 +788,6 @@ app.post('/v1/messages', async (req, res) => {
             // to ensure we don't send a 200 OK if the upstream fails immediately (e.g. 429/503).
 
             try {
-                // Initialize the generator
                 const generator = sendMessageStream(request, accountManager, FALLBACK_ENABLED);
                 
                 // BUFFERING STRATEGY:
@@ -866,7 +846,6 @@ app.post('/v1/messages', async (req, res) => {
             }
 
         } else {
-            // Handle non-streaming response
             const response = await sendMessage(request, accountManager, FALLBACK_ENABLED);
             usageStats.track(response?.model || modelId);
             res.json(response);
@@ -886,6 +865,7 @@ app.post('/v1/messages', async (req, res) => {
                 await forceRefresh();
                 errorMessage = 'Token was expired and has been refreshed. Please retry your request.';
             } catch (refreshError) {
+                logger.warn(`[API] Token refresh failed: ${refreshError.message}`);
                 errorMessage = 'Could not refresh token. Make sure Antigravity is running.';
             }
         }
@@ -917,8 +897,7 @@ app.post('/v1/messages', async (req, res) => {
  */
 usageStats.setupRoutes(app);
 
-app.use('*', (req, res) => {
-    // Log 404s (use originalUrl since wildcard strips req.path)
+app.use((req, res) => {
     if (logger.isDebugEnabled) {
         logger.debug(`[API] 404 Not Found: ${req.method} ${req.originalUrl}`);
     }

package/src/utils/claude-config.js

@@ -83,7 +83,7 @@ export async function updateClaudeConfig(updates) {
     try {
         await fs.mkdir(configDir, { recursive: true });
     } catch (error) {
-        // Ignore if exists
+        logger.debug(`[ClaudeConfig] Could not create ${configDir}: ${error.message}`);
     }
 
     // 4. Write back to file
@@ -112,7 +112,7 @@ export async function replaceClaudeConfig(config) {
     try {
         await fs.mkdir(configDir, { recursive: true });
     } catch (error) {
-        // Ignore if exists
+        logger.debug(`[ClaudeConfig] Could not create ${configDir}: ${error.message}`);
     }
 
     // 2. Write config directly (no merge)
@@ -153,10 +153,6 @@ function isObject(item) {
     return (item && typeof item === 'object' && !Array.isArray(item));
 }
 
-// ==========================================
-// Claude CLI Presets
-// ==========================================
-
 /**
  * Get the path to the presets file
  * @returns {string} Absolute path to claude-presets.json

package/src/utils/native-module-helper.js

@@ -64,14 +64,12 @@ export function rebuildModule(packagePath) {
     try {
         logger.info(`[NativeModule] Rebuilding native module at: ${packagePath}`);
 
-        // Run npm rebuild in the package directory
         const output = execSync('npm rebuild', {
             cwd: packagePath,
             stdio: 'pipe', // Capture output instead of printing
             timeout: 120000 // 2 minute timeout
         });
 
-        // Log rebuild output for debugging
         const outputStr = output?.toString().trim();
         if (outputStr) {
             logger.debug(`[NativeModule] Rebuild output:\n${outputStr}`);
@@ -140,7 +138,6 @@ export function clearRequireCache(modulePath, cache, visited = new Set()) {
         }
     }
 
-    // Remove from parent's children array
     if (mod.parent && mod.parent.children) {
         const idx = mod.parent.children.indexOf(mod);
         if (idx !== -1) {
@@ -148,7 +145,6 @@ export function clearRequireCache(modulePath, cache, visited = new Set()) {
         }
     }
 
-    // Delete from cache
     delete cache[modulePath];
 }
 

package/src/utils/proxy.js

@@ -1,13 +1,4 @@
-/**
- * HTTP Proxy Support
- * 
- * Configures global fetch to use HTTP proxy from environment variables.
- * Supports: http_proxy, HTTP_PROXY, https_proxy, HTTPS_PROXY
- * 
- * This module should be imported at the very beginning of the application
- * entry point (src/index.js) before any fetch calls are made.
- */
-
+// Routes global fetch through http(s)_proxy env vars. Import before any fetch call (see src/index.js).
 import { ProxyAgent, setGlobalDispatcher } from 'undici';
 import { logger } from './logger.js';
 

package/src/utils/version-detector.js

@@ -27,7 +27,7 @@ import { config } from '../config.js';
 
 // Fallback for User-Agent version (ideVersion in product.json), used only when
 // no installed Antigravity version is detected
-const FALLBACK_USER_AGENT_VERSION = process.env.FALLBACK_ANTIGRAVITY_VERSION || '2.25.0';
+const FALLBACK_USER_AGENT_VERSION = process.env.FALLBACK_ANTIGRAVITY_VERSION || '2.32.0';
 
 // Detected versions must be above this to be used (older installs are ignored)
 const MIN_DETECTED_USER_AGENT_VERSION = '2.0.3';
@@ -104,7 +104,7 @@ function getProductJson() {
                 }
             }
         } catch (e) {
-            // Continue to next path
+            logDetectionFailure(`Reading ${p}`, e);
         }
     }
 
@@ -112,6 +112,15 @@ function getProductJson() {
     return null;
 }
 
+/**
+ * Debug-log a failed detection step (lazy import to avoid circular deps).
+ */
+function logDetectionFailure(step, err) {
+    import('./logger.js').then(({ logger }) => {
+        logger.debug(`[VersionDetector] ${step} failed: ${err?.message ?? err}`);
+    }).catch(() => {});
+}
+
 /**
  * Log version detection results once at startup (lazy import to avoid circular deps).
  */
@@ -188,7 +197,7 @@ function getUserAgentVersionConfig() {
             localVersion = getVersionWindows();
         }
     } catch (error) {
-        // Silently fail and use fallback
+        logDetectionFailure('OS version detection', error);
     }
 
     return resolveUserAgentVersion({ localVersion });
@@ -246,7 +255,7 @@ function getVersionMacos() {
             return version;
         }
     } catch (e) {
-        // plutil failed or file not found
+        logDetectionFailure('plutil', e);
     }
     return null;
 }
@@ -273,7 +282,7 @@ function getVersionWindows() {
             }
         }
     } catch (e) {
-        // PowerShell or path issues
+        logDetectionFailure('PowerShell version lookup', e);
     }
     return null;
 }