@mmmbuto/zai-codex-bridge 0.4.4 → 0.4.6

package/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.6] - 2026-01-16
+
+### Fixed
+- Avoid empty output_text items in tool-only streaming responses
+- Only emit output_text.done/content_part.done when output text exists
+
+## [0.4.5] - 2026-01-16
+
+### Fixed
+- Handle streaming tool_calls without `index` by assigning a stable fallback index
+- Improve tool name logging when tools define top-level `name`
+
 ## [0.4.4] - 2026-01-16
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mmmbuto/zai-codex-bridge",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Local proxy that translates OpenAI Responses API format to Z.AI Chat Completions format for Codex",
   "main": "src/server.js",
   "bin": {

package/src/server.js

@@ -130,7 +130,7 @@ function summarizeTools(tools, limit = 8) {
     types[type] = (types[type] || 0) + 1;
     if (names.length < limit) {
       if (type === 'function') {
-        names.push(tool?.function?.name || '(missing_name)');
+        names.push(tool?.function?.name || tool?.name || '(missing_name)');
       } else {
         names.push(type);
       }
@@ -359,7 +359,9 @@ function translateChatToResponses(chatResponse, responsesRequest, ids, allowTool
   if (reasoningText) {
     content.push({ type: 'reasoning_text', text: reasoningText, annotations: [] });
   }
-  content.push({ type: 'output_text', text: outputText, annotations: [] });
+  if (outputText) {
+    content.push({ type: 'output_text', text: outputText, annotations: [] });
+  }
 
   const msgItem = {
     id: msgId,
@@ -369,11 +371,16 @@ function translateChatToResponses(chatResponse, responsesRequest, ids, allowTool
     content,
   };
 
-  // Build output array: message item + any function_call items
-  const finalOutput = [msgItem];
+  // Build output array: message item (if any) + any function_call items
+  const finalOutput = [];
+
+  const hasToolCalls = allowTools && msg.tool_calls && Array.isArray(msg.tool_calls);
+  if (content.length > 0 || !hasToolCalls) {
+    finalOutput.push(msgItem);
+  }
 
   // Handle tool_calls (only if allowTools)
-  if (allowTools && msg.tool_calls && Array.isArray(msg.tool_calls)) {
+  if (hasToolCalls) {
     for (const tc of msg.tool_calls) {
       const callId = tc.id || `call_${randomUUID().replace(/-/g, '')}`;
       const name = tc.function?.name || '';
@@ -517,20 +524,17 @@ async function streamChatToResponses(upstreamBody, res, responsesRequest, ids, a
     item: msgItemInProgress,
   });
 
-  sse({
-    type: 'response.content_part.added',
-    item_id: msgId,
-    output_index: OUTPUT_INDEX,
-    content_index: CONTENT_INDEX,
-    part: { type: 'output_text', text: '', annotations: [] },
-  });
+  // content_part.added emitted only if we receive output_text
+  let contentPartAdded = false;
 
   let out = '';
   let reasoning = '';
 
   // Tool call tracking (only if allowTools)
   const toolCallsMap = new Map(); // index -> { callId, name, outputIndex, arguments, partialArgs }
+  const toolCallsById = new Map(); // callId -> index
   const TOOL_BASE_INDEX = 1; // After message item
+  let nextToolIndex = 0;
 
   while (true) {
     const { done, value } = await reader.read();
@@ -563,12 +567,22 @@ async function streamChatToResponses(upstreamBody, res, responsesRequest, ids, a
         // Handle tool_calls (only if allowTools)
         if (allowTools && delta.tool_calls && Array.isArray(delta.tool_calls)) {
           for (const tc of delta.tool_calls) {
-            const index = tc.index;
-            if (index == null) continue;
+            let index = tc.index;
+            const tcId = tc.id;
+
+            if (index == null) {
+              if (tcId && toolCallsById.has(tcId)) {
+                index = toolCallsById.get(tcId);
+              } else {
+                index = nextToolIndex++;
+              }
+            } else if (index >= nextToolIndex) {
+              nextToolIndex = index + 1;
+            }
 
             if (!toolCallsMap.has(index)) {
               // New tool call - send output_item.added
-              const callId = tc.id || `call_${randomUUID().replace(/-/g, '')}`;
+              const callId = tcId || `call_${randomUUID().replace(/-/g, '')}`;
               const name = tc.function?.name || '';
               const outputIndex = TOOL_BASE_INDEX + index;
 
@@ -579,6 +593,7 @@ async function streamChatToResponses(upstreamBody, res, responsesRequest, ids, a
                 arguments: '',
                 partialArgs: ''
               });
+              if (callId) toolCallsById.set(callId, index);
 
               const fnItemInProgress = {
                 id: callId,
@@ -675,6 +690,16 @@ async function streamChatToResponses(upstreamBody, res, responsesRequest, ids, a
         }
 
         if (typeof delta.content === 'string' && delta.content.length) {
+          if (!contentPartAdded) {
+            sse({
+              type: 'response.content_part.added',
+              item_id: msgId,
+              output_index: OUTPUT_INDEX,
+              content_index: CONTENT_INDEX,
+              part: { type: 'output_text', text: '', annotations: [] },
+            });
+            contentPartAdded = true;
+          }
           out += delta.content;
           sse({
             type: 'response.output_text.delta',
@@ -699,28 +724,40 @@ async function streamChatToResponses(upstreamBody, res, responsesRequest, ids, a
     });
   }
 
-  sse({
-    type: 'response.output_text.done',
-    item_id: msgId,
-    output_index: OUTPUT_INDEX,
-    content_index: CONTENT_INDEX,
-    text: out,
-  });
+  if (out.length) {
+    sse({
+      type: 'response.output_text.done',
+      item_id: msgId,
+      output_index: OUTPUT_INDEX,
+      content_index: CONTENT_INDEX,
+      text: out,
+    });
 
-  sse({
-    type: 'response.content_part.done',
-    item_id: msgId,
-    output_index: OUTPUT_INDEX,
-    content_index: CONTENT_INDEX,
-    part: { type: 'output_text', text: out, annotations: [] },
-  });
+    if (contentPartAdded) {
+      sse({
+        type: 'response.content_part.done',
+        item_id: msgId,
+        output_index: OUTPUT_INDEX,
+        content_index: CONTENT_INDEX,
+        part: { type: 'output_text', text: out, annotations: [] },
+      });
+    }
+  }
+
+  const msgContent = [];
+  if (reasoning.length) {
+    msgContent.push({ type: 'reasoning_text', text: reasoning, annotations: [] });
+  }
+  if (out.length) {
+    msgContent.push({ type: 'output_text', text: out, annotations: [] });
+  }
 
   const msgItemDone = {
     id: msgId,
     type: 'message',
     status: 'completed',
     role: 'assistant',
-    content: [{ type: 'output_text', text: out, annotations: [] }],
+    content: msgContent,
   };
 
   sse({
@@ -729,8 +766,11 @@ async function streamChatToResponses(upstreamBody, res, responsesRequest, ids, a
     item: msgItemDone,
   });
 
-  // Build final output array: message item + any function_call items
-  const finalOutput = [msgItemDone];
+  // Build final output array: message item (if any) + any function_call items
+  const finalOutput = [];
+  if (msgContent.length > 0 || toolCallsMap.size === 0) {
+    finalOutput.push(msgItemDone);
+  }
   if (allowTools && toolCallsMap.size > 0) {
     const ordered = Array.from(toolCallsMap.entries()).sort((a, b) => a[0] - b[0]);
     for (const [, tcData] of ordered) {