refactor: streamline provider interactions and enhance error handling

open-sse/translator/index.js

@@ -51,7 +51,7 @@ export function translateRequest(sourceFormat, targetFormat, model, body, stream
     if (targetFormat !== FORMATS.OPENAI) {
       const fromOpenAI = requestRegistry.get(`${FORMATS.OPENAI}:${targetFormat}`);
       if (fromOpenAI) {
-        result = fromOpenAI(model, result, stream);
+        result = fromOpenAI(model, result, stream, credentials);
       }
     }
   }

open-sse/translator/request/openai-to-gemini.js

@@ -1,6 +1,10 @@
 import { register } from "../index.js";
 import { FORMATS } from "../formats.js";
 import { DEFAULT_THINKING_GEMINI_SIGNATURE } from "../../config/defaultThinkingSignature.js";
+
+function generateUUID() {
+  return crypto.randomUUID();
+}
 import {
   DEFAULT_SAFETY_SETTINGS,
   convertOpenAIContentToParts,
@@ -215,29 +219,45 @@ function openaiToGeminiCLIRequest(model, body, stream) {
 }
 
 // Wrap Gemini CLI format in Cloud Code wrapper
-function wrapInCloudCodeEnvelope(model, geminiCLI, credentials = null) {
+function wrapInCloudCodeEnvelope(model, geminiCLI, credentials = null, isAntigravity = false) {
   const projectId = credentials?.projectId || generateProjectId();
   
-  return {
+  const envelope = {
     project: projectId,
     model: model,
-    userAgent: "gemini-cli",
-    requestId: generateRequestId(),
+    userAgent: isAntigravity ? "antigravity" : "gemini-cli",
+    requestId: isAntigravity ? `agent-${generateUUID()}` : generateRequestId(),
     request: {
       sessionId: generateSessionId(),
       contents: geminiCLI.contents,
       systemInstruction: geminiCLI.systemInstruction,
       generationConfig: geminiCLI.generationConfig,
-      safetySettings: geminiCLI.safetySettings,
       tools: geminiCLI.tools,
     }
   };
+
+  // Antigravity specific fields
+  if (isAntigravity) {
+    envelope.requestType = "agent";
+    // Remove safetySettings for Antigravity
+    // Add toolConfig for Antigravity
+    if (geminiCLI.tools?.length > 0) {
+      envelope.request.toolConfig = {
+        functionCallingConfig: { mode: "VALIDATED" }
+      };
+    }
+  } else {
+    // Keep safetySettings for Gemini CLI
+    envelope.request.safetySettings = geminiCLI.safetySettings;
+  }
+
+  return envelope;
 }
 
 // OpenAI -> Antigravity (Sandbox Cloud Code with wrapper)
 function openaiToAntigravityRequest(model, body, stream, credentials = null) {
   const geminiCLI = openaiToGeminiCLIRequest(model, body, stream);
-  return wrapInCloudCodeEnvelope(model, geminiCLI, credentials);
+  return wrapInCloudCodeEnvelope(model, geminiCLI, credentials, true);
 }
 
 // Register

open-sse/translator/response/claude-to-openai.js

@@ -28,7 +28,6 @@ function claudeToOpenAIResponse(chunk, state) {
       state.messageId = chunk.message?.id || `msg_${Date.now()}`;
       state.model = chunk.message?.model;
       state.toolCallIndex = 0;
-      console.log("🔍 ----------- toolCallIndex", state.toolCallIndex);
       results.push(createChunk(state, { role: "assistant" }));
       break;
     }
@@ -114,6 +113,13 @@ function claudeToOpenAIResponse(chunk, state) {
     case "message_stop": {
       if (!state.finishReasonSent) {
         const finishReason = state.finishReason || (state.toolCalls?.size > 0 ? "tool_calls" : "stop");
+        const usageObj = state.usage ? {
+          usage: {
+            prompt_tokens: state.usage.input_tokens || 0,
+            completion_tokens: state.usage.output_tokens || 0,
+            total_tokens: (state.usage.input_tokens || 0) + (state.usage.output_tokens || 0)
+          }
+        } : {};
         results.push({
           id: `chatcmpl-${state.messageId}`,
           object: "chat.completion.chunk",
@@ -124,13 +130,7 @@ function claudeToOpenAIResponse(chunk, state) {
             delta: {},
             finish_reason: finishReason
           }],
-          ...(state.usage && {
-            usage: {
-              prompt_tokens: state.usage.input_tokens || 0,
-              completion_tokens: state.usage.output_tokens || 0,
-              total_tokens: (state.usage.input_tokens || 0) + (state.usage.output_tokens || 0)
-            }
-          })
+          ...usageObj
         });
         state.finishReasonSent = true;
       }