@corbat-tech/coco 2.23.0 → 2.23.1

package/dist/cli/index.js

@@ -1792,6 +1792,7 @@ var init_openai = __esm({
             requestParams
           );
           const toolCallBuilders = /* @__PURE__ */ new Map();
+          let lastToolCallKey = null;
           const streamTimeout = this.config.timeout ?? 12e4;
           let lastActivityTime = Date.now();
           const timeoutController = new AbortController();
@@ -1841,9 +1842,9 @@ var init_openai = __esm({
               }
               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: ""
@@ -1856,7 +1857,8 @@ var init_openai = __esm({
                       }
                     };
                   }
-                  const builder = toolCallBuilders.get(index);
+                  const builder = toolCallBuilders.get(key);
+                  lastToolCallKey = key;
                   if (toolCallDelta.id) {
                     builder.id = toolCallDelta.id;
                   }
@@ -2444,6 +2446,7 @@ var init_openai = __esm({
             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();
@@ -2473,8 +2476,11 @@ var init_openai = __esm({
                     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 }
@@ -2483,7 +2489,9 @@ var init_openai = __esm({
                   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;
                     }
@@ -2491,17 +2499,22 @@ var init_openai = __esm({
                   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;
@@ -4640,6 +4653,7 @@ var init_codex = __esm({
           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) {
@@ -4656,25 +4670,35 @@ var init_codex = __esm({
                   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;
               }
@@ -4787,6 +4811,7 @@ var init_codex = __esm({
         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(() => {
@@ -4825,8 +4850,11 @@ var init_codex = __esm({
                     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 }
@@ -4835,14 +4863,18 @@ var init_codex = __esm({
                   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",
@@ -4852,7 +4884,10 @@ var init_codex = __esm({
                         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;
                 }
@@ -5243,8 +5278,8 @@ var init_gemini = __esm({
           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 text13 = chunk.text();
             if (text13) {
@@ -5259,30 +5294,23 @@ var init_gemini = __esm({
               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
+                  };
                 }
               }
             }
@@ -5357,13 +5385,13 @@ var init_gemini = __esm({
        * 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 = [];
@@ -5372,23 +5400,49 @@ var init_gemini = __esm({
                   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
        */
@@ -5465,14 +5519,15 @@ var init_gemini = __esm({
         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 ?? {}
               });
@@ -31546,6 +31601,15 @@ async function selectModelInteractively(models, currentModelId) {
     renderMenu();
   });
 }
+async function persistModelPreference(provider, model) {
+  try {
+    await saveProviderPreference(provider, model);
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    console.log(chalk2.yellow(`\u26A0 Could not persist model preference: ${reason}`));
+    console.log(chalk2.dim("  Model changed for this session only.\n"));
+  }
+}
 var modelCommand = {
   name: "model",
   aliases: ["m"],
@@ -31594,7 +31658,7 @@ var modelCommand = {
         return false;
       }
       session.config.provider.model = selectedModel;
-      await saveProviderPreference(currentProvider, selectedModel);
+      await persistModelPreference(currentProvider, selectedModel);
       const modelInfo2 = providerDef.models.find((m) => m.id === selectedModel);
       console.log(chalk2.green(`\u2713 Switched to ${modelInfo2?.name ?? selectedModel}
 `));
@@ -31616,7 +31680,7 @@ var modelCommand = {
     if (!foundInProvider) {
       console.log(chalk2.yellow(`Model "${newModel}" not in known list, setting anyway...`));
       session.config.provider.model = newModel;
-      await saveProviderPreference(currentProvider, newModel);
+      await persistModelPreference(currentProvider, newModel);
       console.log(chalk2.green(`\u2713 Model set to: ${newModel}
 `));
       return false;
@@ -31631,7 +31695,7 @@ var modelCommand = {
       return false;
     }
     session.config.provider.model = newModel;
-    await saveProviderPreference(currentProvider, newModel);
+    await persistModelPreference(currentProvider, newModel);
     const modelInfo = providerDef.models.find((m) => m.id === newModel);
     console.log(chalk2.green(`\u2713 Switched to ${modelInfo?.name ?? newModel}
 `));