protocol-proxy 2.3.2 → 2.3.4

package/lib/converters/anthropic-to-gemini.js

@@ -133,12 +133,14 @@ function mapFinishReason(reason) {
 // ==================== SSE 流式转换 ====================
 
 function createSSEConverter() {
-  const state = { started: false, textBlockStarted: false, textBlockClosed: false, blockIndex: 0, sentFunctionCall: new Map() };
+  const state = { started: false, textBlockStarted: false, textBlockClosed: false, blockIndex: 0, sentFunctionCall: new Map(), buffer: '' };
 
   return {
     convertChunk(chunkText) {
       let output = '';
-      const lines = chunkText.split('\n');
+      state.buffer += chunkText;
+      const lines = state.buffer.split('\n');
+      state.buffer = lines.pop() || '';
 
       for (const line of lines) {
         const trimmed = line.trim();

package/lib/converters/anthropic-to-openai.js

@@ -218,7 +218,10 @@ function createSSEConverter(targetModel) {
     messageId: null,
     started: false,
     textBlockStarted: false,
-    toolCalls: new Map(), // index -> { id, name, args }
+    textBlockClosed: false,
+    textBlockIndex: 0,
+    blockIndex: 0,
+    toolCalls: new Map(), // index -> { id, name, args, blockIndex }
     buffer: '',
   };
 
@@ -292,32 +295,41 @@ function processLine(line, state, targetModel) {
   if (delta.content !== undefined && delta.content !== null) {
     if (!state.textBlockStarted) {
       state.textBlockStarted = true;
+      state.textBlockIndex = state.blockIndex++;
       output += encodeAnthropicEvent('content_block_start', {
         type: 'content_block_start',
-        index: 0,
+        index: state.textBlockIndex,
         content_block: { type: 'text', text: '' },
       });
     }
     output += encodeAnthropicEvent('content_block_delta', {
       type: 'content_block_delta',
-      index: 0,
+      index: state.textBlockIndex,
       delta: { type: 'text_delta', text: delta.content },
     });
   }
 
   // tool_calls
   if (delta.tool_calls && Array.isArray(delta.tool_calls)) {
+    // 在首个 tool_call 前关闭 text block
+    if (state.textBlockStarted && !state.textBlockClosed) {
+      state.textBlockClosed = true;
+      output += encodeAnthropicEvent('content_block_stop', {
+        type: 'content_block_stop',
+        index: state.textBlockIndex,
+      });
+    }
     for (const tc of delta.tool_calls) {
       const idx = tc.index || 0;
       let tool = state.toolCalls.get(idx);
 
       if (!tool) {
         // 新的 tool_call
-        tool = { id: tc.id, name: tc.function?.name, args: '' };
+        tool = { id: tc.id, name: tc.function?.name, args: '', blockIndex: state.blockIndex++ };
         state.toolCalls.set(idx, tool);
         output += encodeAnthropicEvent('content_block_start', {
           type: 'content_block_start',
-          index: idx + 1, // text block 占 index 0
+          index: tool.blockIndex,
           content_block: {
             type: 'tool_use',
             id: tc.id,
@@ -331,7 +343,7 @@ function processLine(line, state, targetModel) {
         tool.args += tc.function.arguments;
         output += encodeAnthropicEvent('content_block_delta', {
           type: 'content_block_delta',
-          index: idx + 1,
+          index: tool.blockIndex,
           delta: { type: 'input_json_delta', partial_json: tc.function.arguments },
         });
       }
@@ -341,16 +353,17 @@ function processLine(line, state, targetModel) {
   // finish_reason
   if (choice.finish_reason) {
     const stopReason = mapFinishReason(choice.finish_reason);
-    if (state.textBlockStarted) {
+    if (state.textBlockStarted && !state.textBlockClosed) {
+      state.textBlockClosed = true;
       output += encodeAnthropicEvent('content_block_stop', {
         type: 'content_block_stop',
-        index: 0,
+        index: state.textBlockIndex,
       });
     }
-    for (let i = 0; i < state.toolCalls.size; i++) {
+    for (const [, tool] of state.toolCalls) {
       output += encodeAnthropicEvent('content_block_stop', {
         type: 'content_block_stop',
-        index: i + 1,
+        index: tool.blockIndex,
       });
     }
     output += encodeAnthropicEvent('message_delta', {

package/lib/converters/gemini-to-anthropic.js

@@ -155,12 +155,14 @@ function mapFinishReason(reason) {
 // ==================== SSE 流式转换 ====================
 
 function createSSEConverter(nameToId = new Map()) {
-  const state = { started: false, textBlockStarted: false, textBlockClosed: false, blockIndex: 0, sentFunctionCall: new Map(), nameToId };
+  const state = { started: false, textBlockStarted: false, textBlockClosed: false, blockIndex: 0, sentFunctionCall: new Map(), nameToId, buffer: '' };
 
   return {
     convertChunk(chunkText) {
       let output = '';
-      const lines = chunkText.split('\n');
+      state.buffer += chunkText;
+      const lines = state.buffer.split('\n');
+      state.buffer = lines.pop() || '';
 
       for (const line of lines) {
         const trimmed = line.trim();

package/lib/converters/gemini-to-openai.js

@@ -152,12 +152,14 @@ function mapFinishReason(reason) {
 // ==================== SSE 流式转换 ====================
 
 function createSSEConverter() {
-  const state = { started: false, sentFunctionCall: new Map() };
+  const state = { started: false, sentFunctionCall: new Map(), buffer: '' };
 
   return {
     convertChunk(chunkText) {
       let output = '';
-      const lines = chunkText.split('\n');
+      state.buffer += chunkText;
+      const lines = state.buffer.split('\n');
+      state.buffer = lines.pop() || '';
 
       for (const line of lines) {
         const trimmed = line.trim();

package/lib/converters/openai-to-anthropic.js

@@ -188,6 +188,7 @@ function createSSEConverter(targetModel) {
     blockIndex: 0,
     toolUseId: null,
     toolName: null,
+    toolCallIndex: -1,
     sentRole: false,
     sentToolInit: false,
     buffer: '',
@@ -243,6 +244,7 @@ function processLine(line, state, targetModel) {
       if (state.blockType === 'tool_use') {
         state.toolUseId = event.content_block.id;
         state.toolName = event.content_block.name;
+        state.toolCallIndex = (state.toolCallIndex || 0) + 1;
       }
       return '';
     }
@@ -267,7 +269,7 @@ function processLine(line, state, targetModel) {
           state.sentToolInit = true;
           const toolCallChunk = {
             tool_calls: [{
-              index: 0,
+              index: state.toolCallIndex,
               id: state.toolUseId,
               type: 'function',
               function: { name: state.toolName, arguments: delta.partial_json },
@@ -276,7 +278,7 @@ function processLine(line, state, targetModel) {
           return prefix + encodeOpenAIChunk(state.messageId, targetModel, toolCallChunk);
         }
         return prefix + encodeOpenAIChunk(state.messageId, targetModel, {
-          tool_calls: [{ index: 0, function: { arguments: delta.partial_json } }],
+          tool_calls: [{ index: state.toolCallIndex, function: { arguments: delta.partial_json } }],
         });
       }
 

package/lib/converters/openai-to-gemini.js

@@ -183,12 +183,14 @@ function mapFinishReason(reason) {
 // ==================== SSE 流式转换 ====================
 
 function createSSEConverter() {
-  const state = { started: false, sentFunctionCall: new Map() };
+  const state = { started: false, sentFunctionCall: new Map(), buffer: '' };
 
   return {
     convertChunk(chunkText) {
       let output = '';
-      const lines = chunkText.split('\n');
+      state.buffer += chunkText;
+      const lines = state.buffer.split('\n');
+      state.buffer = lines.pop() || '';
 
       for (const line of lines) {
         const trimmed = line.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protocol-proxy",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "OpenAI / Anthropic 协议转换透明代理",
   "main": "server.js",
   "bin": {