@corbat-tech/coco 2.23.0 → 2.23.1

package/dist/index.js

@@ -13412,6 +13412,7 @@ var OpenAIProvider = class {
         requestParams
       );
       const toolCallBuilders = /* @__PURE__ */ new Map();
+      let lastToolCallKey = null;
       const streamTimeout = this.config.timeout ?? 12e4;
       let lastActivityTime = Date.now();
       const timeoutController = new AbortController();
@@ -13461,9 +13462,9 @@ var OpenAIProvider = class {
           }
           if (delta?.tool_calls) {
             for (const toolCallDelta of delta.tool_calls) {
-              const index = toolCallDelta.index ?? toolCallBuilders.size;
-              if (!toolCallBuilders.has(index)) {
-                toolCallBuilders.set(index, {
+              const key = typeof toolCallDelta.index === "number" ? `index:${toolCallDelta.index}` : typeof toolCallDelta.id === "string" && toolCallDelta.id.length > 0 ? `id:${toolCallDelta.id}` : toolCallBuilders.size === 1 ? Array.from(toolCallBuilders.keys())[0] ?? `fallback:${toolCallBuilders.size}` : lastToolCallKey ?? `fallback:${toolCallBuilders.size}`;
+              if (!toolCallBuilders.has(key)) {
+                toolCallBuilders.set(key, {
                   id: toolCallDelta.id ?? "",
                   name: toolCallDelta.function?.name ?? "",
                   arguments: ""
@@ -13476,7 +13477,8 @@ var OpenAIProvider = class {
                   }
                 };
               }
-              const builder = toolCallBuilders.get(index);
+              const builder = toolCallBuilders.get(key);
+              lastToolCallKey = key;
               if (toolCallDelta.id) {
                 builder.id = toolCallDelta.id;
               }
@@ -14064,6 +14066,7 @@ var OpenAIProvider = class {
         requestParams
       );
       const fnCallBuilders = /* @__PURE__ */ new Map();
+      const outputIndexToBuilderKey = /* @__PURE__ */ new Map();
       const streamTimeout = this.config.timeout ?? 12e4;
       let lastActivityTime = Date.now();
       const timeoutController = new AbortController();
@@ -14093,8 +14096,11 @@ var OpenAIProvider = class {
                 fnCallBuilders.set(itemKey, {
                   callId: fc.call_id,
                   name: fc.name,
-                  arguments: ""
+                  arguments: fc.arguments ?? ""
                 });
+                if (typeof event.output_index === "number") {
+                  outputIndexToBuilderKey.set(event.output_index, itemKey);
+                }
                 yield {
                   type: "tool_use_start",
                   toolCall: { id: fc.call_id, name: fc.name }
@@ -14103,7 +14109,9 @@ var OpenAIProvider = class {
               break;
             case "response.function_call_arguments.delta":
               {
-                const builder = fnCallBuilders.get(event.item_id);
+                const builderKey = (event.item_id && fnCallBuilders.has(event.item_id) ? event.item_id : null) ?? (typeof event.output_index === "number" ? outputIndexToBuilderKey.get(event.output_index) ?? null : null) ?? (fnCallBuilders.size === 1 ? Array.from(fnCallBuilders.keys())[0] : null);
+                if (!builderKey) break;
+                const builder = fnCallBuilders.get(builderKey);
                 if (builder) {
                   builder.arguments += event.delta;
                 }
@@ -14111,17 +14119,22 @@ var OpenAIProvider = class {
               break;
             case "response.function_call_arguments.done":
               {
-                const builder = fnCallBuilders.get(event.item_id);
+                const builderKey = (event.item_id && fnCallBuilders.has(event.item_id) ? event.item_id : null) ?? (typeof event.output_index === "number" ? outputIndexToBuilderKey.get(event.output_index) ?? null : null) ?? (fnCallBuilders.size === 1 ? Array.from(fnCallBuilders.keys())[0] : null);
+                if (!builderKey) break;
+                const builder = fnCallBuilders.get(builderKey);
                 if (builder) {
                   yield {
                     type: "tool_use_end",
                     toolCall: {
                       id: builder.callId,
                       name: builder.name,
-                      input: this.parseResponsesArguments(event.arguments)
+                      input: this.parseResponsesArguments(event.arguments ?? builder.arguments)
                     }
                   };
-                  fnCallBuilders.delete(event.item_id);
+                  fnCallBuilders.delete(builderKey);
+                  for (const [idx, key] of outputIndexToBuilderKey.entries()) {
+                    if (key === builderKey) outputIndexToBuilderKey.delete(idx);
+                  }
                 }
               }
               break;
@@ -14637,6 +14650,7 @@ var CodexProvider = class {
       let outputTokens = 0;
       const toolCalls = [];
       const fnCallBuilders = /* @__PURE__ */ new Map();
+      const outputIndexToBuilderKey = /* @__PURE__ */ new Map();
       await this.readSSEStream(response, (event) => {
         if (event.id) responseId = event.id;
         switch (event.type) {
@@ -14653,25 +14667,35 @@ var CodexProvider = class {
               fnCallBuilders.set(itemKey, {
                 callId: item.call_id,
                 name: item.name,
-                arguments: ""
+                arguments: item.arguments ?? ""
               });
+              if (typeof event.output_index === "number") {
+                outputIndexToBuilderKey.set(event.output_index, itemKey);
+              }
             }
             break;
           }
           case "response.function_call_arguments.delta": {
-            const builder = fnCallBuilders.get(event.item_id);
+            const builderKey = (event.item_id && fnCallBuilders.has(event.item_id) ? event.item_id : null) ?? (typeof event.output_index === "number" ? outputIndexToBuilderKey.get(event.output_index) ?? null : null) ?? (fnCallBuilders.size === 1 ? Array.from(fnCallBuilders.keys())[0] : null);
+            if (!builderKey) break;
+            const builder = fnCallBuilders.get(builderKey);
             if (builder) builder.arguments += event.delta ?? "";
             break;
           }
           case "response.function_call_arguments.done": {
-            const builder = fnCallBuilders.get(event.item_id);
+            const builderKey = (event.item_id && fnCallBuilders.has(event.item_id) ? event.item_id : null) ?? (typeof event.output_index === "number" ? outputIndexToBuilderKey.get(event.output_index) ?? null : null) ?? (fnCallBuilders.size === 1 ? Array.from(fnCallBuilders.keys())[0] : null);
+            if (!builderKey) break;
+            const builder = fnCallBuilders.get(builderKey);
             if (builder) {
               toolCalls.push({
                 id: builder.callId,
                 name: builder.name,
-                input: parseArguments(event.arguments)
+                input: parseArguments(event.arguments ?? builder.arguments)
               });
-              fnCallBuilders.delete(event.item_id);
+              fnCallBuilders.delete(builderKey);
+              for (const [idx, key] of outputIndexToBuilderKey.entries()) {
+                if (key === builderKey) outputIndexToBuilderKey.delete(idx);
+              }
             }
             break;
           }
@@ -14784,6 +14808,7 @@ var CodexProvider = class {
     const decoder = new TextDecoder();
     let buffer = "";
     const fnCallBuilders = /* @__PURE__ */ new Map();
+    const outputIndexToBuilderKey = /* @__PURE__ */ new Map();
     let lastActivityTime = Date.now();
     const timeoutController = new AbortController();
     const timeoutInterval = setInterval(() => {
@@ -14822,8 +14847,11 @@ var CodexProvider = class {
                 fnCallBuilders.set(itemKey, {
                   callId: item.call_id,
                   name: item.name,
-                  arguments: ""
+                  arguments: item.arguments ?? ""
                 });
+                if (typeof event.output_index === "number") {
+                  outputIndexToBuilderKey.set(event.output_index, itemKey);
+                }
                 yield {
                   type: "tool_use_start",
                   toolCall: { id: item.call_id, name: item.name }
@@ -14832,14 +14860,18 @@ var CodexProvider = class {
               break;
             }
             case "response.function_call_arguments.delta": {
-              const builder = fnCallBuilders.get(event.item_id);
+              const builderKey = (event.item_id && fnCallBuilders.has(event.item_id) ? event.item_id : null) ?? (typeof event.output_index === "number" ? outputIndexToBuilderKey.get(event.output_index) ?? null : null) ?? (fnCallBuilders.size === 1 ? Array.from(fnCallBuilders.keys())[0] : null);
+              if (!builderKey) break;
+              const builder = fnCallBuilders.get(builderKey);
               if (builder) {
                 builder.arguments += event.delta ?? "";
               }
               break;
             }
             case "response.function_call_arguments.done": {
-              const builder = fnCallBuilders.get(event.item_id);
+              const builderKey = (event.item_id && fnCallBuilders.has(event.item_id) ? event.item_id : null) ?? (typeof event.output_index === "number" ? outputIndexToBuilderKey.get(event.output_index) ?? null : null) ?? (fnCallBuilders.size === 1 ? Array.from(fnCallBuilders.keys())[0] : null);
+              if (!builderKey) break;
+              const builder = fnCallBuilders.get(builderKey);
               if (builder) {
                 yield {
                   type: "tool_use_end",
@@ -14849,7 +14881,10 @@ var CodexProvider = class {
                     input: parseArguments(event.arguments ?? builder.arguments)
                   }
                 };
-                fnCallBuilders.delete(event.item_id);
+                fnCallBuilders.delete(builderKey);
+                for (const [idx, key] of outputIndexToBuilderKey.entries()) {
+                  if (key === builderKey) outputIndexToBuilderKey.delete(idx);
+                }
               }
               break;
             }
@@ -15222,8 +15257,8 @@ var GeminiProvider = class {
       const { history, lastMessage } = this.convertMessages(messages);
       const chat = model.startChat({ history });
       const result = await chat.sendMessageStream(lastMessage);
-      const emittedToolCalls = /* @__PURE__ */ new Set();
       let streamStopReason;
+      let streamToolCallCounter = 0;
       for await (const chunk of result.stream) {
         const text = chunk.text();
         if (text) {
@@ -15238,30 +15273,23 @@ var GeminiProvider = class {
           for (const part of candidate.content.parts) {
             if ("functionCall" in part && part.functionCall) {
               const funcCall = part.functionCall;
-              const sortedArgs = funcCall.args ? Object.keys(funcCall.args).sort().map(
-                (k) => `${k}:${JSON.stringify(funcCall.args[k])}`
-              ).join(",") : "";
-              const callKey = `${funcCall.name}-${sortedArgs}`;
-              if (!emittedToolCalls.has(callKey)) {
-                emittedToolCalls.add(callKey);
-                const toolCall = {
-                  id: funcCall.name,
-                  // Gemini uses name as ID
-                  name: funcCall.name,
-                  input: funcCall.args ?? {}
-                };
-                yield {
-                  type: "tool_use_start",
-                  toolCall: {
-                    id: toolCall.id,
-                    name: toolCall.name
-                  }
-                };
-                yield {
-                  type: "tool_use_end",
-                  toolCall
-                };
-              }
+              streamToolCallCounter++;
+              const toolCall = {
+                id: `gemini_call_${streamToolCallCounter}`,
+                name: funcCall.name,
+                input: funcCall.args ?? {}
+              };
+              yield {
+                type: "tool_use_start",
+                toolCall: {
+                  id: toolCall.id,
+                  name: toolCall.name
+                }
+              };
+              yield {
+                type: "tool_use_end",
+                toolCall
+              };
             }
           }
         }
@@ -15336,13 +15364,13 @@ var GeminiProvider = class {
    * Convert messages to Gemini format
    */
   convertMessages(messages) {
+    const toolNameByUseId = this.buildToolUseNameMap(messages);
+    const conversation = messages.filter((m) => m.role !== "system");
     const history = [];
     let lastUserMessage = "";
-    for (const msg of messages) {
-      if (msg.role === "system") {
-        continue;
-      }
-      const parts = this.convertContent(msg.content);
+    for (let i = 0; i < conversation.length; i++) {
+      const msg = conversation[i];
+      const isLastMessage = i === conversation.length - 1;
       if (msg.role === "user") {
         if (Array.isArray(msg.content) && msg.content[0]?.type === "tool_result") {
           const functionResponses = [];
@@ -15351,23 +15379,49 @@ var GeminiProvider = class {
               const toolResult = block;
               functionResponses.push({
                 functionResponse: {
-                  name: toolResult.tool_use_id,
-                  // Gemini uses name, we store it in tool_use_id
+                  // Gemini expects the function name in functionResponse.name.
+                  // Recover it from prior assistant tool_use blocks when possible.
+                  name: toolNameByUseId.get(toolResult.tool_use_id) ?? toolResult.tool_use_id,
                   response: { result: toolResult.content }
                 }
               });
             }
           }
-          history.push({ role: "user", parts: functionResponses });
+          if (isLastMessage) {
+            lastUserMessage = functionResponses;
+          } else {
+            history.push({ role: "user", parts: functionResponses });
+          }
         } else {
-          lastUserMessage = parts;
+          const parts = this.convertContent(msg.content);
+          if (isLastMessage) {
+            lastUserMessage = parts;
+          } else {
+            history.push({ role: "user", parts });
+          }
         }
       } else if (msg.role === "assistant") {
+        const parts = this.convertContent(msg.content);
         history.push({ role: "model", parts });
       }
     }
     return { history, lastMessage: lastUserMessage };
   }
+  /**
+   * Build a map from tool_use IDs to function names from assistant history.
+   */
+  buildToolUseNameMap(messages) {
+    const map = /* @__PURE__ */ new Map();
+    for (const msg of messages) {
+      if (msg.role !== "assistant" || !Array.isArray(msg.content)) continue;
+      for (const block of msg.content) {
+        if (block.type === "tool_use") {
+          map.set(block.id, block.name);
+        }
+      }
+    }
+    return map;
+  }
   /**
    * Convert content to Gemini parts
    */
@@ -15444,14 +15498,15 @@ var GeminiProvider = class {
     let textContent = "";
     const toolCalls = [];
     if (candidate?.content?.parts) {
+      let toolIndex = 0;
       for (const part of candidate.content.parts) {
         if ("text" in part && part.text) {
           textContent += part.text;
         }
         if ("functionCall" in part && part.functionCall) {
+          toolIndex++;
           toolCalls.push({
-            id: part.functionCall.name,
-            // Use name as ID for Gemini
+            id: `gemini_call_${toolIndex}`,
             name: part.functionCall.name,
             input: part.functionCall.args ?? {}
           });