n9router 0.4.44 → 0.4.46

package/app/open-sse/translator/request/openai-to-commandcode.js

@@ -12,6 +12,8 @@
 import { register } from "../index.js";
 import { FORMATS } from "../formats.js";
 import { randomUUID } from "crypto";
+import { ROLE, OPENAI_BLOCK } from "../schema/index.js";
+import { DEFAULT_MAX_TOKENS } from "../../config/runtimeConfig.js";
 
 function flattenText(content) {
   if (content == null) return "";
@@ -28,26 +30,26 @@ function flattenText(content) {
 }
 
 function toContentBlocks(content) {
-  if (content == null) return [{ type: "text", text: "" }];
-  if (typeof content === "string") return [{ type: "text", text: content }];
+  if (content == null) return [{ type: OPENAI_BLOCK.TEXT, text: "" }];
+  if (typeof content === "string") return [{ type: OPENAI_BLOCK.TEXT, text: content }];
   if (Array.isArray(content)) {
     const blocks = [];
     for (const part of content) {
       if (typeof part === "string") {
-        blocks.push({ type: "text", text: part });
+        blocks.push({ type: OPENAI_BLOCK.TEXT, text: part });
       } else if (part && typeof part === "object") {
-        if (part.type === "text" && typeof part.text === "string") {
-          blocks.push({ type: "text", text: part.text });
-        } else if (part.type === "image_url" || part.type === "image") {
-          blocks.push({ type: "text", text: "[image omitted]" });
+        if (part.type === OPENAI_BLOCK.TEXT && typeof part.text === "string") {
+          blocks.push({ type: OPENAI_BLOCK.TEXT, text: part.text });
+        } else if (part.type === OPENAI_BLOCK.IMAGE_URL || part.type === OPENAI_BLOCK.IMAGE) {
+          blocks.push({ type: OPENAI_BLOCK.TEXT, text: "[image omitted]" });
         } else if (typeof part.text === "string") {
-          blocks.push({ type: "text", text: part.text });
+          blocks.push({ type: OPENAI_BLOCK.TEXT, text: part.text });
         }
       }
     }
-    return blocks.length ? blocks : [{ type: "text", text: "" }];
+    return blocks.length ? blocks : [{ type: OPENAI_BLOCK.TEXT, text: "" }];
   }
-  return [{ type: "text", text: String(content) }];
+  return [{ type: OPENAI_BLOCK.TEXT, text: String(content) }];
 }
 
 function safeParseJson(s) {
@@ -64,16 +66,16 @@ function convertMessages(messages = []) {
     if (!m) continue;
     const role = m.role;
 
-    if (role === "system") {
+    if (role === ROLE.SYSTEM) {
       const t = flattenText(m.content);
       if (t) systemTexts.push(t);
       continue;
     }
 
-    if (role === "tool") {
+    if (role === ROLE.TOOL) {
       const value = typeof m.content === "string" ? m.content : flattenText(m.content);
       out.push({
-        role: "tool",
+        role: ROLE.TOOL,
         content: [{
           type: "tool-result",
           toolCallId: m.tool_call_id || "",
@@ -84,10 +86,10 @@ function convertMessages(messages = []) {
       continue;
     }
 
-    if (role === "assistant") {
+    if (role === ROLE.ASSISTANT) {
       const blocks = [];
       const text = flattenText(m.content);
-      if (text) blocks.push({ type: "text", text });
+      if (text) blocks.push({ type: OPENAI_BLOCK.TEXT, text });
       if (Array.isArray(m.tool_calls)) {
         for (const tc of m.tool_calls) {
           const fn = tc.function || {};
@@ -99,11 +101,11 @@ function convertMessages(messages = []) {
           });
         }
       }
-      out.push({ role: "assistant", content: blocks.length ? blocks : [{ type: "text", text: "" }] });
+      out.push({ role: ROLE.ASSISTANT, content: blocks.length ? blocks : [{ type: OPENAI_BLOCK.TEXT, text: "" }] });
       continue;
     }
 
-    out.push({ role: "user", content: toContentBlocks(m.content) });
+    out.push({ role: ROLE.USER, content: toContentBlocks(m.content) });
   }
 
   return { messages: out, system: systemTexts.join("\n\n") };
@@ -114,7 +116,7 @@ function convertTools(tools) {
   const result = [];
   for (const t of tools) {
     if (!t) continue;
-    if (t.type === "function" && t.function) {
+    if (t.type === OPENAI_BLOCK.FUNCTION && t.function) {
       result.push({
         name: t.function.name,
         description: t.function.description,
@@ -131,13 +133,13 @@ function convertTools(tools) {
   return result.length ? result : undefined;
 }
 
-export function openaiToCommandCode(model, body, stream /* , credentials */) {
+export function openaiToCommandCodeRequest(model, body, stream /* , credentials */) {
   const { messages, system } = convertMessages(body.messages);
   const params = {
     model,
     messages,
     stream: stream !== false,
-    max_tokens: body.max_tokens ?? body.max_output_tokens ?? 64000,
+    max_tokens: body.max_tokens ?? body.max_output_tokens ?? DEFAULT_MAX_TOKENS,
     temperature: body.temperature ?? 0.3,
   };
 
@@ -167,4 +169,4 @@ export function openaiToCommandCode(model, body, stream /* , credentials */) {
   };
 }
 
-register(FORMATS.OPENAI, FORMATS.COMMANDCODE, openaiToCommandCode, null);
+register(FORMATS.OPENAI, FORMATS.COMMANDCODE, openaiToCommandCodeRequest, null);

package/app/open-sse/translator/request/openai-to-cursor.js

@@ -8,6 +8,8 @@
  */
 import { register } from "../index.js";
 import { FORMATS } from "../formats.js";
+import { ROLE, OPENAI_BLOCK, CLAUDE_BLOCK } from "../schema/index.js";
+import { DEFAULT_MIN_TOKENS } from "../../config/runtimeConfig.js";
 
 function extractContent(content) {
   if (typeof content === "string") return content;
@@ -15,7 +17,7 @@ function extractContent(content) {
     return content
       .filter(part => {
         if (!part || typeof part !== "object") return false;
-        return part.type === "text" && typeof part.text === "string";
+        return part.type === OPENAI_BLOCK.TEXT && typeof part.text === "string";
       })
       .map(part => part.text || "")
       .join("");
@@ -63,14 +65,14 @@ function convertMessages(messages) {
   };
 
   for (const msg of messages) {
-    if (msg.role === "assistant" && msg.tool_calls) {
+    if (msg.role === ROLE.ASSISTANT && msg.tool_calls) {
       for (const tc of msg.tool_calls) {
         rememberToolMeta(tc.id || "", tc.function?.name || "tool");
       }
     }
-    if (msg.role === "assistant" && Array.isArray(msg.content)) {
+    if (msg.role === ROLE.ASSISTANT && Array.isArray(msg.content)) {
       for (const part of msg.content) {
-        if (part?.type !== "tool_use") continue;
+        if (part?.type !== CLAUDE_BLOCK.TOOL_USE) continue;
         rememberToolMeta(part.id || "", part.name || "tool");
       }
     }
@@ -79,38 +81,38 @@ function convertMessages(messages) {
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
 
-    if (msg.role === "system") {
+    if (msg.role === ROLE.SYSTEM) {
       result.push({
-        role: "user",
+        role: ROLE.USER,
         content: `[System Instructions]\n${extractContent(msg.content)}`
       });
       continue;
     }
 
-    if (msg.role === "tool") {
+    if (msg.role === ROLE.TOOL) {
       const toolContent = extractContent(msg.content);
       const toolCallId = msg.tool_call_id || "";
       const toolMeta = toolCallMetaMap.get(toolCallId) || {};
       const toolName = msg.name || toolMeta.name || "tool";
       result.push({
-        role: "user",
+        role: ROLE.USER,
         content: buildToolResultBlock(toolName, toolCallId, toolContent)
       });
       continue;
     }
 
-    if (msg.role === "user" || msg.role === "assistant") {
-      if (msg.role === "user" && Array.isArray(msg.content)) {
+    if (msg.role === ROLE.USER || msg.role === ROLE.ASSISTANT) {
+      if (msg.role === ROLE.USER && Array.isArray(msg.content)) {
         const parts = [];
         for (const block of msg.content) {
           if (!block || typeof block !== "object") continue;
-          if (block.type === "text") {
+          if (block.type === CLAUDE_BLOCK.TEXT) {
             if (typeof block.text === "string") {
               parts.push(block.text || "");
             }
             continue;
           }
-          if (block.type === "tool_result") {
+          if (block.type === CLAUDE_BLOCK.TOOL_RESULT) {
             const toolCallId = block.tool_use_id || "";
             const toolMeta =
               toolCallMetaMap.get(toolCallId) ||
@@ -121,25 +123,25 @@ function convertMessages(messages) {
           }
         }
         const joined = parts.filter(Boolean).join("\n");
-        if (joined) result.push({ role: "user", content: joined });
+        if (joined) result.push({ role: ROLE.USER, content: joined });
         continue;
       }
 
       const content = extractContent(msg.content);
 
-      if (msg.role === "assistant" && msg.tool_calls && msg.tool_calls.length > 0) {
-        const assistantMsg = { role: "assistant", content: content || "" };
+      if (msg.role === ROLE.ASSISTANT && msg.tool_calls && msg.tool_calls.length > 0) {
+        const assistantMsg = { role: ROLE.ASSISTANT, content: content || "" };
         assistantMsg.tool_calls = msg.tool_calls.map(tc => {
           const { index, ...rest } = tc || {};
           return rest;
         });
         result.push(assistantMsg);
-      } else if (msg.role === "assistant" && Array.isArray(msg.content)) {
+      } else if (msg.role === ROLE.ASSISTANT && Array.isArray(msg.content)) {
         const extractedToolCalls = msg.content
-          .filter(b => b?.type === "tool_use")
+          .filter(b => b?.type === CLAUDE_BLOCK.TOOL_USE)
           .map(b => ({
             id: b.id || "",
-            type: "function",
+            type: OPENAI_BLOCK.FUNCTION,
             function: {
               name: b.name || "tool",
               arguments: JSON.stringify(b.input || {})
@@ -149,12 +151,12 @@ function convertMessages(messages) {
 
         if (extractedToolCalls.length > 0) {
           result.push({
-            role: "assistant",
+            role: ROLE.ASSISTANT,
             content: content || "",
             tool_calls: extractedToolCalls
           });
         } else if (content) {
-          result.push({ role: "assistant", content });
+          result.push({ role: ROLE.ASSISTANT, content });
         }
       } else {
         if (content) {
@@ -167,7 +169,7 @@ function convertMessages(messages) {
   return result;
 }
 
-export function buildCursorRequest(model, body, stream, credentials) {
+export function openaiToCursorRequest(model, body, stream, credentials) {
   const messages = convertMessages(body.messages || []);
 
   // Strip fields irrelevant to Cursor (OpenAI/Anthropic-specific)
@@ -176,8 +178,8 @@ export function buildCursorRequest(model, body, stream, credentials) {
   return {
     ...rest,
     messages,
-    max_tokens: 32000
+    max_tokens: DEFAULT_MIN_TOKENS
   };
 }
 
-register(FORMATS.OPENAI, FORMATS.CURSOR, buildCursorRequest, null);
+register(FORMATS.OPENAI, FORMATS.CURSOR, openaiToCursorRequest, null);

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

@@ -3,7 +3,6 @@ import { FORMATS } from "../formats.js";
 import { DEFAULT_THINKING_AG_SIGNATURE, DEFAULT_THINKING_GEMINI_CLI_SIGNATURE } from "../../config/defaultThinkingSignature.js";
 import { ANTIGRAVITY_DEFAULT_SYSTEM } from "../../config/appConstants.js";
 import { openaiToClaudeRequestForAntigravity } from "./openai-to-claude.js";
-
 function generateUUID() {
   return crypto.randomUUID();
 }
@@ -17,8 +16,9 @@ import {
   generateSessionId,
   generateProjectId,
   cleanJSONSchemaForAntigravity
-} from "../helpers/geminiHelper.js";
-import { deriveSessionId } from "../../utils/sessionManager.js";
+} from "../formats/gemini.js";
+import { deriveSessionId, toNumericSessionId } from "../../utils/sessionManager.js";
+import { ROLE, GEMINI_ROLE, OPENAI_BLOCK, CLAUDE_BLOCK } from "../schema/index.js";
 
 // Sanitize function names for Gemini API.
 // Gemini requires: starts with [a-zA-Z_], followed by [a-zA-Z0-9_.:\-], max 64 chars.
@@ -35,6 +35,17 @@ function sanitizeGeminiFunctionName(name) {
   return sanitized.substring(0, 64);
 }
 
+function normalizeGeminiContents(contents) {
+  const out = [];
+  for (const c of contents || []) {
+    if (!c?.role || !Array.isArray(c.parts) || c.parts.length === 0) continue;
+    const last = out.at(-1);
+    if (last?.role === c.role) last.parts.push(...c.parts);
+    else out.push({ ...c, parts: [...c.parts] });
+  }
+  return out;
+}
+
 // Core: Convert OpenAI request to Gemini format (base for all variants)
 function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG_SIGNATURE) {
   const result = {
@@ -62,9 +73,9 @@ function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG
   const tcID2Name = {};
   if (body.messages && Array.isArray(body.messages)) {
     for (const msg of body.messages) {
-      if (msg.role === "assistant" && msg.tool_calls) {
+      if (msg.role === ROLE.ASSISTANT && msg.tool_calls) {
         for (const tc of msg.tool_calls) {
-          if (tc.type === "function" && tc.id && tc.function?.name) {
+          if (tc.type === OPENAI_BLOCK.FUNCTION && tc.id && tc.function?.name) {
             tcID2Name[tc.id] = tc.function.name;
           }
         }
@@ -76,7 +87,7 @@ function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG
   const toolResponses = {};
   if (body.messages && Array.isArray(body.messages)) {
     for (const msg of body.messages) {
-      if (msg.role === "tool" && msg.tool_call_id) {
+      if (msg.role === ROLE.TOOL && msg.tool_call_id) {
         toolResponses[msg.tool_call_id] = msg.content;
       }
     }
@@ -89,17 +100,17 @@ function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG
       const role = msg.role;
       const content = msg.content;
 
-      if (role === "system" && body.messages.length > 1) {
+      if (role === ROLE.SYSTEM && body.messages.length > 1) {
         result.systemInstruction = {
-          role: "user",
+          role: GEMINI_ROLE.USER,
           parts: [{ text: typeof content === "string" ? content : extractTextContent(content) }]
         };
-      } else if (role === "user" || (role === "system" && body.messages.length === 1)) {
+      } else if (role === ROLE.USER || (role === ROLE.SYSTEM && body.messages.length === 1)) {
         const parts = convertOpenAIContentToParts(content);
         if (parts.length > 0) {
-          result.contents.push({ role: "user", parts });
+          result.contents.push({ role: GEMINI_ROLE.USER, parts });
         }
-      } else if (role === "assistant") {
+      } else if (role === ROLE.ASSISTANT) {
         const parts = [];
 
         // Thinking/reasoning → thought part with signature
@@ -124,7 +135,7 @@ function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG
         if (msg.tool_calls && Array.isArray(msg.tool_calls)) {
           const toolCallIds = [];
           for (const tc of msg.tool_calls) {
-            if (tc.type !== "function") continue;
+            if (tc.type !== OPENAI_BLOCK.FUNCTION) continue;
 
             const args = tryParseJSON(tc.function?.arguments || "{}");
             parts.push({
@@ -139,7 +150,7 @@ function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG
           }
 
           if (parts.length > 0) {
-            result.contents.push({ role: "model", parts });
+            result.contents.push({ role: GEMINI_ROLE.MODEL, parts });
           }
 
           // Check if there are actual tool responses in the next messages
@@ -177,11 +188,11 @@ function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG
               });
             }
             if (toolParts.length > 0) {
-              result.contents.push({ role: "user", parts: toolParts });
+              result.contents.push({ role: GEMINI_ROLE.USER, parts: toolParts });
             }
           }
         } else if (parts.length > 0) {
-          result.contents.push({ role: "model", parts });
+          result.contents.push({ role: GEMINI_ROLE.MODEL, parts });
         }
       }
     }
@@ -201,7 +212,7 @@ function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG
         });
       }
       // OpenAI format
-      else if (t.type === "function" && t.function) {
+      else if (t.type === OPENAI_BLOCK.FUNCTION && t.function) {
         const fn = t.function;
         const cleanedSchema = cleanJSONSchemaForAntigravity(structuredClone(fn.parameters || { type: "object", properties: {} }));
         functionDeclarations.push({
@@ -217,6 +228,7 @@ function openaiToGeminiBase(model, body, stream, signature = DEFAULT_THINKING_AG
     }
   }
 
+  result.contents = normalizeGeminiContents(result.contents);
   return result;
 }
 
@@ -228,25 +240,7 @@ export function openaiToGeminiRequest(model, body, stream) {
 // OpenAI -> Gemini CLI (Cloud Code Assist)
 export function openaiToGeminiCLIRequest(model, body, stream) {
   const gemini = openaiToGeminiBase(model, body, stream, DEFAULT_THINKING_GEMINI_CLI_SIGNATURE);
-  const isClaude = model.toLowerCase().includes("claude");
-
-  // Add thinking config for CLI
-  if (body.reasoning_effort) {
-    const budgetMap = { low: 1024, medium: 8192, high: 32768 };
-    const budget = budgetMap[body.reasoning_effort] || 8192;
-    gemini.generationConfig.thinkingConfig = {
-      thinkingBudget: budget,
-      include_thoughts: true
-    };
-  }
-
-  // Thinking config from Claude format
-  if (body.thinking?.type === "enabled" && body.thinking.budget_tokens) {
-    gemini.generationConfig.thinkingConfig = {
-      thinkingBudget: body.thinking.budget_tokens,
-      include_thoughts: true
-    };
-  }
+  // Thinking is normalized centrally by applyThinking (thinkingUnified.js) after translation.
 
   // Clean schema for tools
   if (gemini.tools?.[0]?.functionDeclarations) {
@@ -277,7 +271,7 @@ function wrapInCloudCodeEnvelope(model, geminiCLI, credentials = null, isAntigra
     userAgent: isAntigravity ? "antigravity" : "gemini-cli",
     requestId: isAntigravity ? `agent-${generateUUID()}` : generateRequestId(),
     request: {
-      sessionId: isAntigravity ? deriveSessionId(credentials?.email || credentials?.connectionId) : generateSessionId(),
+      sessionId: toNumericSessionId(credentials?._clientSessionId) || (isAntigravity ? deriveSessionId(credentials?.email || credentials?.connectionId) : generateSessionId()),
       contents: geminiCLI.contents,
       systemInstruction: geminiCLI.systemInstruction,
       generationConfig: geminiCLI.generationConfig,
@@ -299,7 +293,7 @@ function wrapInCloudCodeEnvelope(model, geminiCLI, credentials = null, isAntigra
     if (envelope.request.systemInstruction?.parts) {
       envelope.request.systemInstruction.parts.unshift(...systemParts);
     } else {
-      envelope.request.systemInstruction = { role: "user", parts: systemParts };
+      envelope.request.systemInstruction = { role: GEMINI_ROLE.USER, parts: systemParts };
     }
 
     // Add toolConfig for Antigravity
@@ -317,7 +311,7 @@ function wrapInCloudCodeEnvelope(model, geminiCLI, credentials = null, isAntigra
 }
 
 // Wrap Claude format in Cloud Code envelope for Antigravity
-function wrapInCloudCodeEnvelopeForClaude(model, claudeRequest, credentials = null) {
+function wrapInCloudCodeEnvelopeForClaude(model, claudeRequest, credentials = null, signature = DEFAULT_THINKING_AG_SIGNATURE) {
   const projectId = credentials?.projectId || generateProjectId();
 
   const envelope = {
@@ -327,7 +321,7 @@ function wrapInCloudCodeEnvelopeForClaude(model, claudeRequest, credentials = nu
     requestId: `agent-${generateUUID()}`,
     requestType: "agent",
     request: {
-      sessionId: deriveSessionId(credentials?.email || credentials?.connectionId),
+      sessionId: toNumericSessionId(credentials?._clientSessionId) || deriveSessionId(credentials?.email || credentials?.connectionId),
       contents: [],
       generationConfig: {
         temperature: claudeRequest.temperature || 1,
@@ -342,7 +336,7 @@ function wrapInCloudCodeEnvelopeForClaude(model, claudeRequest, credentials = nu
     for (const msg of claudeRequest.messages) {
       if (Array.isArray(msg.content)) {
         for (const block of msg.content) {
-          if (block.type === "tool_use" && block.id && block.name) {
+          if (block.type === CLAUDE_BLOCK.TOOL_USE && block.id && block.name) {
             toolUseIdToName[block.id] = block.name;
           }
         }
@@ -357,20 +351,21 @@ function wrapInCloudCodeEnvelopeForClaude(model, claudeRequest, credentials = nu
 
       if (Array.isArray(msg.content)) {
         for (const block of msg.content) {
-          if (block.type === "text") {
+          if (block.type === CLAUDE_BLOCK.TEXT) {
             parts.push({ text: block.text });
-          } else if (block.type === "tool_use") {
+          } else if (block.type === CLAUDE_BLOCK.TOOL_USE) {
             parts.push({
+              thoughtSignature: signature,
               functionCall: {
                 id: block.id,
                 name: sanitizeGeminiFunctionName(block.name),
                 args: block.input || {}
               }
             });
-          } else if (block.type === "tool_result") {
+          } else if (block.type === CLAUDE_BLOCK.TOOL_RESULT) {
             let content = block.content;
             if (Array.isArray(content)) {
-              content = content.map(c => c.type === "text" ? c.text : JSON.stringify(c)).join("\n");
+              content = content.map(c => c.type === CLAUDE_BLOCK.TEXT ? c.text : JSON.stringify(c)).join("\n");
             }
             // Resolve the original tool name from the id — Gemini requires it to match the functionCall name
             const resolvedName = toolUseIdToName[block.tool_use_id]
@@ -391,7 +386,7 @@ function wrapInCloudCodeEnvelopeForClaude(model, claudeRequest, credentials = nu
 
       if (parts.length > 0) {
         envelope.request.contents.push({
-          role: msg.role === "assistant" ? "model" : "user",
+          role: msg.role === ROLE.ASSISTANT ? GEMINI_ROLE.MODEL : GEMINI_ROLE.USER,
           parts
         });
       }
@@ -440,9 +435,10 @@ function wrapInCloudCodeEnvelopeForClaude(model, claudeRequest, credentials = nu
   if (envelope.request.systemInstruction?.parts) {
     envelope.request.systemInstruction.parts.unshift(...systemParts);
   } else {
-    envelope.request.systemInstruction = { role: "user", parts: systemParts };
+    envelope.request.systemInstruction = { role: GEMINI_ROLE.USER, parts: systemParts };
   }
 
+  envelope.request.contents = normalizeGeminiContents(envelope.request.contents);
   return envelope;
 }