@exulu/backend 1.56.0 → 1.57.0

package/dist/index.cjs

@@ -1546,7 +1546,7 @@ var ExuluTool = class {
     });
   }
   execute = async ({
-    agent: agentId2,
+    agent: agentId,
     config,
     user,
     inputs,
@@ -1554,14 +1554,14 @@ var ExuluTool = class {
     items
   }) => {
     console.log("[EXULU] Calling tool execute directly", {
-      agentId: agentId2,
+      agentId,
       config,
       user,
       inputs,
       project,
       items
     });
-    const agent = await exuluApp.get().agent(agentId2);
+    const agent = await exuluApp.get().agent(agentId);
     if (!agent) {
       throw new Error("Agent not found.");
     }
@@ -11838,27 +11838,141 @@ var providerRateLimiter = async (key, windowSeconds, limit, points) => {
 // src/exulu/openai-gateway.ts
 var import_express2 = require("express");
 var import_ai9 = require("ai");
+
+// src/exulu/openai-transformer.ts
+function transformStreamChunk(chunk, ctx) {
+  const base = {
+    id: ctx.completionId,
+    object: "chat.completion.chunk",
+    created: ctx.created,
+    model: ctx.modelId
+  };
+  switch (chunk.type) {
+    case "text-delta":
+      return {
+        ...base,
+        choices: [{ index: 0, delta: { content: chunk.text }, finish_reason: null }]
+      };
+    case "tool-input-start":
+      return {
+        ...base,
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  id: chunk.id,
+                  type: "function",
+                  function: { name: chunk.toolName, arguments: "" }
+                }
+              ]
+            },
+            finish_reason: null
+          }
+        ]
+      };
+    case "tool-input-delta":
+      return {
+        ...base,
+        choices: [
+          {
+            index: 0,
+            delta: { tool_calls: [{ index: 0, function: { arguments: chunk.delta } }] },
+            finish_reason: null
+          }
+        ]
+      };
+    case "finish": {
+      const inputTokens = chunk.usage?.inputTokens ?? 0;
+      const outputTokens = chunk.usage?.outputTokens ?? 0;
+      const finishReason = chunk.finishReason === "tool-calls" ? "tool_calls" : "stop";
+      return {
+        ...base,
+        choices: [{ index: 0, delta: {}, finish_reason: finishReason }],
+        usage: {
+          prompt_tokens: inputTokens,
+          completion_tokens: outputTokens,
+          total_tokens: inputTokens + outputTokens
+        }
+      };
+    }
+    default:
+      return null;
+  }
+}
+function transformCompletion(text, inputTokens, outputTokens, ctx) {
+  return {
+    id: ctx.completionId,
+    object: "chat.completion",
+    created: ctx.created,
+    model: ctx.modelId,
+    choices: [
+      {
+        index: 0,
+        message: { role: "assistant", content: text },
+        finish_reason: "stop"
+      }
+    ],
+    usage: {
+      prompt_tokens: inputTokens,
+      completion_tokens: outputTokens,
+      total_tokens: inputTokens + outputTokens
+    }
+  };
+}
+
+// src/exulu/openai-gateway.ts
 var import_node_crypto4 = require("crypto");
 var import_crypto_js6 = __toESM(require("crypto-js"), 1);
 var import_express3 = __toESM(require("express"), 1);
-function convertOpenAIMessagesToCoreMessages(messages) {
+function convertOpenAIToolsToAiSdkTools(tools) {
+  return Object.fromEntries(
+    tools.map((t) => {
+      const params = t.function.parameters ?? {};
+      return [
+        t.function.name,
+        {
+          description: t.function.description ?? "",
+          inputSchema: (0, import_ai9.jsonSchema)({
+            type: "object",
+            properties: params.properties ?? {},
+            ...params.required ? { required: params.required } : {}
+          })
+        }
+      ];
+    })
+  );
+}
+function convertOpenAIMessagesToModelMessages(messages) {
   const systemParts = [];
   const coreMessages = [];
+  const toolCallIdToName = /* @__PURE__ */ new Map();
   for (const msg of messages) {
     if (msg.role === "system") {
       systemParts.push(typeof msg.content === "string" ? msg.content : "");
       continue;
     }
     if (msg.role === "user") {
+      const last = coreMessages[coreMessages.length - 1];
       if (typeof msg.content === "string") {
-        coreMessages.push({ role: "user", content: msg.content });
+        if (last?.role === "user" && typeof last.content === "string") {
+          last.content += "\n\n" + msg.content;
+        } else {
+          coreMessages.push({ role: "user", content: msg.content });
+        }
       } else if (Array.isArray(msg.content)) {
         const parts = msg.content.flatMap((part) => {
           if (part.type === "text") return [{ type: "text", text: part.text }];
           if (part.type === "image_url") return [{ type: "image", image: part.image_url.url }];
           return [];
         });
-        coreMessages.push({ role: "user", content: parts });
+        if (last?.role === "user" && Array.isArray(last.content)) {
+          last.content.push(...parts);
+        } else {
+          coreMessages.push({ role: "user", content: parts });
+        }
       }
       continue;
     }
@@ -11869,11 +11983,20 @@ function convertOpenAIMessagesToCoreMessages(messages) {
           parts.push({ type: "text", text: msg.content });
         }
         for (const tc of msg.tool_calls) {
+          toolCallIdToName.set(tc.id, tc.function.name);
+          const rawArgs = tc.function.arguments;
+          const input = rawArgs == null ? {} : typeof rawArgs === "object" ? rawArgs : (() => {
+            try {
+              return JSON.parse(rawArgs);
+            } catch {
+              return {};
+            }
+          })();
           parts.push({
             type: "tool-call",
             toolCallId: tc.id,
             toolName: tc.function.name,
-            args: JSON.parse(tc.function.arguments || "{}")
+            input
           });
         }
         coreMessages.push({ role: "assistant", content: parts });
@@ -11886,13 +12009,17 @@ function convertOpenAIMessagesToCoreMessages(messages) {
       continue;
     }
     if (msg.role === "tool") {
+      const toolCallId = msg.tool_call_id ?? "";
+      const toolName = toolCallIdToName.get(toolCallId) ?? "unknown";
+      const resultText = typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content);
       coreMessages.push({
         role: "tool",
         content: [
           {
             type: "tool-result",
-            toolCallId: msg.tool_call_id ?? "",
-            result: msg.content
+            toolCallId,
+            toolName,
+            output: { type: "text", value: resultText }
           }
         ]
       });
@@ -12009,8 +12136,32 @@ var registerOpenAIGatewayRoutes = async (app, providers, tools, contexts, config
     }
   );
   app.post(
-    "/gateway/open-ai/v1/chat/completions",
+    ["/gateway/open-ai/v1/chat/completions", "/gateway/open-ai/v1/completions"],
     import_express3.default.json({ limit: REQUEST_SIZE_LIMIT }),
+    (req, _res, next) => {
+      console.log("[OPENAI GATEWAY] incoming request:", {
+        url: req.originalUrl,
+        method: req.method,
+        headers: {
+          authorization: req.headers["authorization"] ? "[present]" : "[missing]",
+          "x-api-key": req.headers["x-api-key"] ? "[present]" : "[missing]",
+          "exulu-api-key": req.headers["exulu-api-key"] ? "[present]" : "[missing]",
+          "content-type": req.headers["content-type"]
+        },
+        body: {
+          model: req.body?.model,
+          stream: req.body?.stream,
+          messagesCount: req.body?.messages?.length,
+          hasPrompt: typeof req.body?.prompt === "string",
+          tools: req.body?.tools
+        }
+      });
+      if (typeof req.body.prompt === "string") {
+        req.body.messages = [{ role: "user", content: req.body.prompt }];
+        delete req.body.prompt;
+      }
+      next();
+    },
     async (req, res) => {
       try {
         const { db: db2 } = await postgresClient();
@@ -12116,8 +12267,10 @@ var registerOpenAIGatewayRoutes = async (app, providers, tools, contexts, config
           languageModel,
           agent
         );
+        const clientTools = Array.isArray(req.body.tools) ? req.body.tools : [];
+        const activeTools = clientTools.length > 0 ? convertOpenAIToolsToAiSdkTools(clientTools) : convertedTools;
         const openaiMessages = req.body.messages ?? [];
-        const { systemPrompt: requestSystemPrompt, coreMessages } = convertOpenAIMessagesToCoreMessages(openaiMessages);
+        const { systemPrompt: requestSystemPrompt, coreMessages } = convertOpenAIMessagesToModelMessages(openaiMessages);
         const agentInstructions = agent.instructions ?? "";
         const systemParts = [
           agentInstructions ? `You are an agent named: ${agent.name}
@@ -12129,7 +12282,8 @@ ${project.description}` : ""}` : "",
         const systemPrompt = systemParts.join("\n\n");
         const completionId = `chatcmpl-${(0, import_node_crypto4.randomUUID)()}`;
         const created = Math.floor(Date.now() / 1e3);
-        const hasTools = Object.keys(convertedTools).length > 0;
+        const hasTools = Object.keys(activeTools).length > 0;
+        const ctx = { completionId, created, modelId };
         if (req.body.stream === true) {
           res.setHeader("Content-Type", "text/event-stream");
           res.setHeader("Cache-Control", "no-cache");
@@ -12138,9 +12292,9 @@ ${project.description}` : ""}` : "",
             model: languageModel,
             system: systemPrompt || void 0,
             messages: coreMessages,
-            tools: hasTools ? convertedTools : void 0,
+            tools: hasTools ? activeTools : void 0,
             maxRetries: 2,
-            stopWhen: [(0, import_ai9.stepCountIs)(5)],
+            stopWhen: clientTools.length > 0 ? void 0 : [(0, import_ai9.stepCountIs)(5)],
             onError: (error) => {
               console.error("[OPENAI GATEWAY] stream error:", error);
             }
@@ -12159,83 +12313,17 @@ ${project.description}` : ""}` : "",
           let inputTokens = 0;
           let outputTokens = 0;
           for await (const chunk of result.fullStream) {
-            if (chunk.type === "text-delta") {
-              res.write(
-                `data: ${JSON.stringify({
-                  id: completionId,
-                  object: "chat.completion.chunk",
-                  created,
-                  model: modelId,
-                  choices: [{ index: 0, delta: { content: chunk.text }, finish_reason: null }]
-                })}
-
-`
-              );
-            } else if (chunk.type === "tool-input-start") {
-              res.write(
-                `data: ${JSON.stringify({
-                  id: completionId,
-                  object: "chat.completion.chunk",
-                  created,
-                  model: modelId,
-                  choices: [
-                    {
-                      index: 0,
-                      delta: {
-                        tool_calls: [
-                          {
-                            index: 0,
-                            id: chunk.id,
-                            type: "function",
-                            function: { name: chunk.toolName, arguments: "" }
-                          }
-                        ]
-                      },
-                      finish_reason: null
-                    }
-                  ]
-                })}
-
-`
-              );
-            } else if (chunk.type === "tool-input-delta") {
-              res.write(
-                `data: ${JSON.stringify({
-                  id: completionId,
-                  object: "chat.completion.chunk",
-                  created,
-                  model: modelId,
-                  choices: [
-                    {
-                      index: 0,
-                      delta: { tool_calls: [{ index: 0, function: { arguments: chunk.delta } }] },
-                      finish_reason: null
-                    }
-                  ]
-                })}
-
-`
-              );
-            } else if (chunk.type === "finish") {
-              inputTokens = chunk.usage?.inputTokens ?? 0;
-              outputTokens = chunk.usage?.outputTokens ?? 0;
-              const finishReason = chunk.finishReason === "tool-calls" ? "tool_calls" : "stop";
-              res.write(
-                `data: ${JSON.stringify({
-                  id: completionId,
-                  object: "chat.completion.chunk",
-                  created,
-                  model: modelId,
-                  choices: [{ index: 0, delta: {}, finish_reason: finishReason }],
-                  usage: {
-                    prompt_tokens: inputTokens,
-                    completion_tokens: outputTokens,
-                    total_tokens: inputTokens + outputTokens
-                  }
-                })}
+            console.log("[OPENAI GATEWAY] chunk:", chunk.type);
+            const openAIChunk = transformStreamChunk(chunk, ctx);
+            if (openAIChunk) {
+              if (chunk.type === "finish") {
+                inputTokens = chunk.usage?.inputTokens ?? 0;
+                outputTokens = chunk.usage?.outputTokens ?? 0;
+                console.log("[OPENAI GATEWAY] finish_reason:", openAIChunk.choices[0]?.finish_reason);
+              }
+              res.write(`data: ${JSON.stringify(openAIChunk)}
 
-`
-              );
+`);
             }
           }
           res.write("data: [DONE]\n\n");
@@ -12246,29 +12334,12 @@ ${project.description}` : ""}` : "",
             model: languageModel,
             system: systemPrompt || void 0,
             messages: coreMessages,
-            tools: hasTools ? convertedTools : void 0,
+            tools: hasTools ? activeTools : void 0,
             maxRetries: 2,
-            stopWhen: [(0, import_ai9.stepCountIs)(5)]
-          });
-          res.json({
-            id: completionId,
-            object: "chat.completion",
-            created,
-            model: agentId,
-            choices: [
-              {
-                index: 0,
-                message: { role: "assistant", content: text },
-                finish_reason: "stop"
-              }
-            ],
-            usage: {
-              prompt_tokens: usage.promptTokens,
-              completion_tokens: usage.completionTokens,
-              total_tokens: usage.totalTokens
-            }
+            stopWhen: clientTools.length > 0 ? void 0 : [(0, import_ai9.stepCountIs)(5)]
           });
-          await writeStatistics(agent, project, user, usage.promptTokens, usage.completionTokens);
+          res.json(transformCompletion(text, usage.inputTokens ?? 0, usage.outputTokens ?? 0, ctx));
+          await writeStatistics(agent, project, user, usage.inputTokens ?? 0, usage.outputTokens ?? 0);
         }
       } catch (error) {
         console.error("[OPENAI GATEWAY] /v1/chat/completions error:", error);

package/dist/index.js

@@ -1486,7 +1486,7 @@ var ExuluTool = class {
     });
   }
   execute = async ({
-    agent: agentId2,
+    agent: agentId,
     config,
     user,
     inputs,
@@ -1494,14 +1494,14 @@ var ExuluTool = class {
     items
   }) => {
     console.log("[EXULU] Calling tool execute directly", {
-      agentId: agentId2,
+      agentId,
       config,
       user,
       inputs,
       project,
       items
     });
-    const agent = await exuluApp.get().agent(agentId2);
+    const agent = await exuluApp.get().agent(agentId);
     if (!agent) {
       throw new Error("Agent not found.");
     }
@@ -11800,29 +11800,144 @@ import "express";
 import {
   streamText as streamText2,
   generateText as generateText5,
-  stepCountIs as stepCountIs3
+  stepCountIs as stepCountIs3,
+  jsonSchema
 } from "ai";
+
+// src/exulu/openai-transformer.ts
+function transformStreamChunk(chunk, ctx) {
+  const base = {
+    id: ctx.completionId,
+    object: "chat.completion.chunk",
+    created: ctx.created,
+    model: ctx.modelId
+  };
+  switch (chunk.type) {
+    case "text-delta":
+      return {
+        ...base,
+        choices: [{ index: 0, delta: { content: chunk.text }, finish_reason: null }]
+      };
+    case "tool-input-start":
+      return {
+        ...base,
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  id: chunk.id,
+                  type: "function",
+                  function: { name: chunk.toolName, arguments: "" }
+                }
+              ]
+            },
+            finish_reason: null
+          }
+        ]
+      };
+    case "tool-input-delta":
+      return {
+        ...base,
+        choices: [
+          {
+            index: 0,
+            delta: { tool_calls: [{ index: 0, function: { arguments: chunk.delta } }] },
+            finish_reason: null
+          }
+        ]
+      };
+    case "finish": {
+      const inputTokens = chunk.usage?.inputTokens ?? 0;
+      const outputTokens = chunk.usage?.outputTokens ?? 0;
+      const finishReason = chunk.finishReason === "tool-calls" ? "tool_calls" : "stop";
+      return {
+        ...base,
+        choices: [{ index: 0, delta: {}, finish_reason: finishReason }],
+        usage: {
+          prompt_tokens: inputTokens,
+          completion_tokens: outputTokens,
+          total_tokens: inputTokens + outputTokens
+        }
+      };
+    }
+    default:
+      return null;
+  }
+}
+function transformCompletion(text, inputTokens, outputTokens, ctx) {
+  return {
+    id: ctx.completionId,
+    object: "chat.completion",
+    created: ctx.created,
+    model: ctx.modelId,
+    choices: [
+      {
+        index: 0,
+        message: { role: "assistant", content: text },
+        finish_reason: "stop"
+      }
+    ],
+    usage: {
+      prompt_tokens: inputTokens,
+      completion_tokens: outputTokens,
+      total_tokens: inputTokens + outputTokens
+    }
+  };
+}
+
+// src/exulu/openai-gateway.ts
 import { randomUUID as randomUUID4 } from "crypto";
 import CryptoJS6 from "crypto-js";
 import express from "express";
-function convertOpenAIMessagesToCoreMessages(messages) {
+function convertOpenAIToolsToAiSdkTools(tools) {
+  return Object.fromEntries(
+    tools.map((t) => {
+      const params = t.function.parameters ?? {};
+      return [
+        t.function.name,
+        {
+          description: t.function.description ?? "",
+          inputSchema: jsonSchema({
+            type: "object",
+            properties: params.properties ?? {},
+            ...params.required ? { required: params.required } : {}
+          })
+        }
+      ];
+    })
+  );
+}
+function convertOpenAIMessagesToModelMessages(messages) {
   const systemParts = [];
   const coreMessages = [];
+  const toolCallIdToName = /* @__PURE__ */ new Map();
   for (const msg of messages) {
     if (msg.role === "system") {
       systemParts.push(typeof msg.content === "string" ? msg.content : "");
       continue;
     }
     if (msg.role === "user") {
+      const last = coreMessages[coreMessages.length - 1];
       if (typeof msg.content === "string") {
-        coreMessages.push({ role: "user", content: msg.content });
+        if (last?.role === "user" && typeof last.content === "string") {
+          last.content += "\n\n" + msg.content;
+        } else {
+          coreMessages.push({ role: "user", content: msg.content });
+        }
       } else if (Array.isArray(msg.content)) {
         const parts = msg.content.flatMap((part) => {
           if (part.type === "text") return [{ type: "text", text: part.text }];
           if (part.type === "image_url") return [{ type: "image", image: part.image_url.url }];
           return [];
         });
-        coreMessages.push({ role: "user", content: parts });
+        if (last?.role === "user" && Array.isArray(last.content)) {
+          last.content.push(...parts);
+        } else {
+          coreMessages.push({ role: "user", content: parts });
+        }
       }
       continue;
     }
@@ -11833,11 +11948,20 @@ function convertOpenAIMessagesToCoreMessages(messages) {
           parts.push({ type: "text", text: msg.content });
         }
         for (const tc of msg.tool_calls) {
+          toolCallIdToName.set(tc.id, tc.function.name);
+          const rawArgs = tc.function.arguments;
+          const input = rawArgs == null ? {} : typeof rawArgs === "object" ? rawArgs : (() => {
+            try {
+              return JSON.parse(rawArgs);
+            } catch {
+              return {};
+            }
+          })();
           parts.push({
             type: "tool-call",
             toolCallId: tc.id,
             toolName: tc.function.name,
-            args: JSON.parse(tc.function.arguments || "{}")
+            input
           });
         }
         coreMessages.push({ role: "assistant", content: parts });
@@ -11850,13 +11974,17 @@ function convertOpenAIMessagesToCoreMessages(messages) {
       continue;
     }
     if (msg.role === "tool") {
+      const toolCallId = msg.tool_call_id ?? "";
+      const toolName = toolCallIdToName.get(toolCallId) ?? "unknown";
+      const resultText = typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content);
       coreMessages.push({
         role: "tool",
         content: [
           {
             type: "tool-result",
-            toolCallId: msg.tool_call_id ?? "",
-            result: msg.content
+            toolCallId,
+            toolName,
+            output: { type: "text", value: resultText }
           }
         ]
       });
@@ -11973,8 +12101,32 @@ var registerOpenAIGatewayRoutes = async (app, providers, tools, contexts, config
     }
   );
   app.post(
-    "/gateway/open-ai/v1/chat/completions",
+    ["/gateway/open-ai/v1/chat/completions", "/gateway/open-ai/v1/completions"],
     express.json({ limit: REQUEST_SIZE_LIMIT }),
+    (req, _res, next) => {
+      console.log("[OPENAI GATEWAY] incoming request:", {
+        url: req.originalUrl,
+        method: req.method,
+        headers: {
+          authorization: req.headers["authorization"] ? "[present]" : "[missing]",
+          "x-api-key": req.headers["x-api-key"] ? "[present]" : "[missing]",
+          "exulu-api-key": req.headers["exulu-api-key"] ? "[present]" : "[missing]",
+          "content-type": req.headers["content-type"]
+        },
+        body: {
+          model: req.body?.model,
+          stream: req.body?.stream,
+          messagesCount: req.body?.messages?.length,
+          hasPrompt: typeof req.body?.prompt === "string",
+          tools: req.body?.tools
+        }
+      });
+      if (typeof req.body.prompt === "string") {
+        req.body.messages = [{ role: "user", content: req.body.prompt }];
+        delete req.body.prompt;
+      }
+      next();
+    },
     async (req, res) => {
       try {
         const { db: db2 } = await postgresClient();
@@ -12080,8 +12232,10 @@ var registerOpenAIGatewayRoutes = async (app, providers, tools, contexts, config
           languageModel,
           agent
         );
+        const clientTools = Array.isArray(req.body.tools) ? req.body.tools : [];
+        const activeTools = clientTools.length > 0 ? convertOpenAIToolsToAiSdkTools(clientTools) : convertedTools;
         const openaiMessages = req.body.messages ?? [];
-        const { systemPrompt: requestSystemPrompt, coreMessages } = convertOpenAIMessagesToCoreMessages(openaiMessages);
+        const { systemPrompt: requestSystemPrompt, coreMessages } = convertOpenAIMessagesToModelMessages(openaiMessages);
         const agentInstructions = agent.instructions ?? "";
         const systemParts = [
           agentInstructions ? `You are an agent named: ${agent.name}
@@ -12093,7 +12247,8 @@ ${project.description}` : ""}` : "",
         const systemPrompt = systemParts.join("\n\n");
         const completionId = `chatcmpl-${randomUUID4()}`;
         const created = Math.floor(Date.now() / 1e3);
-        const hasTools = Object.keys(convertedTools).length > 0;
+        const hasTools = Object.keys(activeTools).length > 0;
+        const ctx = { completionId, created, modelId };
         if (req.body.stream === true) {
           res.setHeader("Content-Type", "text/event-stream");
           res.setHeader("Cache-Control", "no-cache");
@@ -12102,9 +12257,9 @@ ${project.description}` : ""}` : "",
             model: languageModel,
             system: systemPrompt || void 0,
             messages: coreMessages,
-            tools: hasTools ? convertedTools : void 0,
+            tools: hasTools ? activeTools : void 0,
             maxRetries: 2,
-            stopWhen: [stepCountIs3(5)],
+            stopWhen: clientTools.length > 0 ? void 0 : [stepCountIs3(5)],
             onError: (error) => {
               console.error("[OPENAI GATEWAY] stream error:", error);
             }
@@ -12123,83 +12278,17 @@ ${project.description}` : ""}` : "",
           let inputTokens = 0;
           let outputTokens = 0;
           for await (const chunk of result.fullStream) {
-            if (chunk.type === "text-delta") {
-              res.write(
-                `data: ${JSON.stringify({
-                  id: completionId,
-                  object: "chat.completion.chunk",
-                  created,
-                  model: modelId,
-                  choices: [{ index: 0, delta: { content: chunk.text }, finish_reason: null }]
-                })}
-
-`
-              );
-            } else if (chunk.type === "tool-input-start") {
-              res.write(
-                `data: ${JSON.stringify({
-                  id: completionId,
-                  object: "chat.completion.chunk",
-                  created,
-                  model: modelId,
-                  choices: [
-                    {
-                      index: 0,
-                      delta: {
-                        tool_calls: [
-                          {
-                            index: 0,
-                            id: chunk.id,
-                            type: "function",
-                            function: { name: chunk.toolName, arguments: "" }
-                          }
-                        ]
-                      },
-                      finish_reason: null
-                    }
-                  ]
-                })}
-
-`
-              );
-            } else if (chunk.type === "tool-input-delta") {
-              res.write(
-                `data: ${JSON.stringify({
-                  id: completionId,
-                  object: "chat.completion.chunk",
-                  created,
-                  model: modelId,
-                  choices: [
-                    {
-                      index: 0,
-                      delta: { tool_calls: [{ index: 0, function: { arguments: chunk.delta } }] },
-                      finish_reason: null
-                    }
-                  ]
-                })}
-
-`
-              );
-            } else if (chunk.type === "finish") {
-              inputTokens = chunk.usage?.inputTokens ?? 0;
-              outputTokens = chunk.usage?.outputTokens ?? 0;
-              const finishReason = chunk.finishReason === "tool-calls" ? "tool_calls" : "stop";
-              res.write(
-                `data: ${JSON.stringify({
-                  id: completionId,
-                  object: "chat.completion.chunk",
-                  created,
-                  model: modelId,
-                  choices: [{ index: 0, delta: {}, finish_reason: finishReason }],
-                  usage: {
-                    prompt_tokens: inputTokens,
-                    completion_tokens: outputTokens,
-                    total_tokens: inputTokens + outputTokens
-                  }
-                })}
+            console.log("[OPENAI GATEWAY] chunk:", chunk.type);
+            const openAIChunk = transformStreamChunk(chunk, ctx);
+            if (openAIChunk) {
+              if (chunk.type === "finish") {
+                inputTokens = chunk.usage?.inputTokens ?? 0;
+                outputTokens = chunk.usage?.outputTokens ?? 0;
+                console.log("[OPENAI GATEWAY] finish_reason:", openAIChunk.choices[0]?.finish_reason);
+              }
+              res.write(`data: ${JSON.stringify(openAIChunk)}
 
-`
-              );
+`);
             }
           }
           res.write("data: [DONE]\n\n");
@@ -12210,29 +12299,12 @@ ${project.description}` : ""}` : "",
             model: languageModel,
             system: systemPrompt || void 0,
             messages: coreMessages,
-            tools: hasTools ? convertedTools : void 0,
+            tools: hasTools ? activeTools : void 0,
             maxRetries: 2,
-            stopWhen: [stepCountIs3(5)]
-          });
-          res.json({
-            id: completionId,
-            object: "chat.completion",
-            created,
-            model: agentId,
-            choices: [
-              {
-                index: 0,
-                message: { role: "assistant", content: text },
-                finish_reason: "stop"
-              }
-            ],
-            usage: {
-              prompt_tokens: usage.promptTokens,
-              completion_tokens: usage.completionTokens,
-              total_tokens: usage.totalTokens
-            }
+            stopWhen: clientTools.length > 0 ? void 0 : [stepCountIs3(5)]
           });
-          await writeStatistics(agent, project, user, usage.promptTokens, usage.completionTokens);
+          res.json(transformCompletion(text, usage.inputTokens ?? 0, usage.outputTokens ?? 0, ctx));
+          await writeStatistics(agent, project, user, usage.inputTokens ?? 0, usage.outputTokens ?? 0);
         }
       } catch (error) {
         console.error("[OPENAI GATEWAY] /v1/chat/completions error:", error);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exulu/backend",
   "author": "Qventu Bv.",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "main": "./dist/index.js",
   "private": false,
   "publishConfig": {