ai-protocol-adapters 1.0.0-alpha.12 → 1.0.0-alpha.13

package/dist/index.d.mts

@@ -6178,18 +6178,6 @@ interface O2ASSEAdapterConfig {
     defaultRole: 'assistant' | 'user' | 'system';
     /** 是否生成唯一消息ID */
     generateUniqueMessageId: boolean;
-    /**
-     * 是否启用启发式thinking标记解析
-     *
-     * 当设置为true时，会检测content字段中的<thinking>...</thinking>标记
-     * 并自动分离为thinking_delta事件。
-     *
-     * ⚠️ 警告：只在Provider确认会在content中返回thinking标记时启用！
-     * 例如：iFlow的GLM-4.6等推理模型
-     *
-     * @default false - 默认禁用，需要显式启用
-     */
-    enableThinkingTagParsing: boolean;
 }
 
 /**

package/dist/index.d.ts

@@ -6178,18 +6178,6 @@ interface O2ASSEAdapterConfig {
     defaultRole: 'assistant' | 'user' | 'system';
     /** 是否生成唯一消息ID */
     generateUniqueMessageId: boolean;
-    /**
-     * 是否启用启发式thinking标记解析
-     *
-     * 当设置为true时，会检测content字段中的<thinking>...</thinking>标记
-     * 并自动分离为thinking_delta事件。
-     *
-     * ⚠️ 警告：只在Provider确认会在content中返回thinking标记时启用！
-     * 例如：iFlow的GLM-4.6等推理模型
-     *
-     * @default false - 默认禁用，需要显式启用
-     */
-    enableThinkingTagParsing: boolean;
 }
 
 /**

package/dist/index.js

@@ -3513,13 +3513,6 @@ var A2ORequestAdapter = class {
   convertOpenAIResponseToClaude(openaiResponse) {
     const claudeContent = [];
     const message = openaiResponse.choices?.[0]?.message;
-    const messageAny = message;
-    if (messageAny?.reasoning_content && typeof messageAny.reasoning_content === "string") {
-      claudeContent.push({
-        type: "text",
-        text: messageAny.reasoning_content
-      });
-    }
     if (message?.content) {
       claudeContent.push({
         type: "text",
@@ -4043,6 +4036,14 @@ var StreamingProtocolAdapter = class {
     if (!content) return;
     state.reasoningContent += content;
     if (!state.thinkingBlockStarted) {
+      if (state.contentBlockStarted) {
+        sseLines.push(
+          "event: content_block_stop",
+          'data: {"type":"content_block_stop","index":0}',
+          ""
+        );
+        state.contentBlockStarted = false;
+      }
       sseLines.push(
         "event: content_block_start",
         'data: {"type":"content_block_start","index":0,"content_block":{"type":"text","text":"<thinking>"}}',
@@ -4787,36 +4788,9 @@ var StreamingStateManager = class {
     };
   }
   /**
-   * 处理文本内容（支持可选的启发式思考标记检测）
-   */
-  static processTextContent(content, state, sseLines, enableThinkingTagParsing = false) {
-    if (enableThinkingTagParsing) {
-      const thinkingTagPattern = /<thinking>([\s\S]*?)(<\/thinking>|$)/i;
-      const match = content.match(thinkingTagPattern);
-      if (match) {
-        const beforeThinking = content.substring(0, match.index);
-        const thinkingContent = match[1];
-        const afterThinking = match[2] === "</thinking>" ? content.substring(match.index + match[0].length) : "";
-        if (beforeThinking.trim()) {
-          if (!state.hasContent) {
-            sseLines.push(...SSEEventGenerator.generateTextBlockStart(state.contentBlockIndex));
-            state.hasContent = true;
-          }
-          sseLines.push(...SSEEventGenerator.generateTextDelta(state.contentBlockIndex, beforeThinking));
-        }
-        if (thinkingContent.trim()) {
-          this.processReasoningContent(thinkingContent, state, sseLines);
-        }
-        if (afterThinking.trim()) {
-          if (!state.hasContent) {
-            sseLines.push(...SSEEventGenerator.generateTextBlockStart(state.contentBlockIndex));
-            state.hasContent = true;
-          }
-          sseLines.push(...SSEEventGenerator.generateTextDelta(state.contentBlockIndex, afterThinking));
-        }
-        return;
-      }
-    }
+   * 处理文本内容
+   */
+  static processTextContent(content, state, sseLines) {
     if (!state.hasContent) {
       sseLines.push(...SSEEventGenerator.generateTextBlockStart(state.contentBlockIndex));
       state.hasContent = true;
@@ -4904,9 +4878,7 @@ var DEFAULT_CONFIG2 = {
   errorDataMaxLength: 100,
   warningDataMaxLength: 50,
   defaultRole: "assistant",
-  generateUniqueMessageId: true,
-  enableThinkingTagParsing: false
-  // 🔒 默认禁用
+  generateUniqueMessageId: true
 };
 function generateMessageId() {
   return `msg_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`;
@@ -5324,6 +5296,17 @@ var O2ASSEAdapter = class {
       }
       try {
         const data = JSON.parse(dataContent);
+        if ((data.choices?.length === 0 || !data.choices) && data.prompt_filter_results) {
+          if (this.debugMode) {
+            console.warn("\u26A0\uFE0F [O2ASSEAdapter] \u68C0\u6D4B\u5230Azure\u5185\u5BB9\u8FC7\u6EE4\u5668\u54CD\u5E94:", data.prompt_filter_results);
+          }
+          StreamingStateManager.processTextContent(
+            `\u9519\u8BEF\uFF1A\u5185\u5BB9\u8FC7\u6EE4\u5668\u62E6\u622A\u4E86\u8BF7\u6C42\u3002\u8BF7\u68C0\u67E5\u8F93\u5165\u5185\u5BB9\u662F\u5426\u7B26\u5408\u4F7F\u7528\u653F\u7B56\u3002`,
+            state,
+            sseLines
+          );
+          break;
+        }
         const choice = data.choices?.[0];
         const delta = choice?.delta;
         if (!delta) {
@@ -5335,11 +5318,8 @@ var O2ASSEAdapter = class {
           }
           continue;
         }
-        if (delta.reasoning_content) {
-          StreamingStateManager.processReasoningContent(delta.reasoning_content, state, sseLines);
-        }
         if (delta.content) {
-          StreamingStateManager.processTextContent(delta.content, state, sseLines, this.config.enableThinkingTagParsing);
+          StreamingStateManager.processTextContent(delta.content, state, sseLines);
         }
         if (delta.tool_calls) {
           ToolCallProcessor.processBatchToolCalls(delta.tool_calls, state, sseLines);
@@ -5370,6 +5350,19 @@ var O2ASSEAdapter = class {
   processNonStreamingResponse(data, state, sseLines) {
     const choice = data.choices?.[0];
     if (!choice) {
+      if (data.prompt_filter_results || data.choices?.length === 0) {
+        const errorMsg = "Azure\u5185\u5BB9\u8FC7\u6EE4\u5668\u62E6\u622A\u4E86\u8BF7\u6C42";
+        const filterDetails = data.prompt_filter_results ? JSON.stringify(data.prompt_filter_results).substring(0, 500) : "choices\u4E3A\u7A7A";
+        if (this.debugMode) {
+          console.warn(`\u26A0\uFE0F [O2ASSEAdapter] ${errorMsg}:`, filterDetails);
+        }
+        StreamingStateManager.processTextContent(
+          `\u9519\u8BEF\uFF1A\u5185\u5BB9\u8FC7\u6EE4\u5668\u62E6\u622A\u4E86\u8BF7\u6C42\u3002\u8BF7\u68C0\u67E5\u8F93\u5165\u5185\u5BB9\u662F\u5426\u7B26\u5408\u4F7F\u7528\u653F\u7B56\u3002`,
+          state,
+          sseLines
+        );
+        return;
+      }
       if (this.debugMode) {
         console.warn("\u26A0\uFE0F [O2ASSEAdapter] \u975E\u6D41\u5F0F\u54CD\u5E94\u6CA1\u6709choices\u6570\u636E");
       }
@@ -5383,7 +5376,7 @@ var O2ASSEAdapter = class {
     }
     const message = choice.message;
     if (message?.content) {
-      StreamingStateManager.processTextContent(message.content, state, sseLines, this.config.enableThinkingTagParsing);
+      StreamingStateManager.processTextContent(message.content, state, sseLines);
       if (this.debugMode) {
         console.log("\u{1F50D} [O2ASSEAdapter] \u975E\u6D41\u5F0F\u54CD\u5E94content:", message.content);
       }
@@ -5699,7 +5692,6 @@ var StandardProtocolAdapter = class {
       }
     };
     let currentTextContent = "";
-    let currentThinkingContent = "";
     const toolCalls = /* @__PURE__ */ new Map();
     const toolInputBuffers = /* @__PURE__ */ new Map();
     const indexToToolId = /* @__PURE__ */ new Map();
@@ -5739,12 +5731,6 @@ var StandardProtocolAdapter = class {
               this.logDebug(`\u{1F4DD} [StandardProtocolAdapter] \u7D2F\u79EF\u6587\u672C\u5185\u5BB9 (${currentTextContent.length}\u5B57\u7B26)`, currentTextContent.substring(currentTextContent.length - 20));
             }
           }
-          if (data.type === "content_block_delta" && data.delta?.type === "thinking_delta") {
-            currentThinkingContent += data.delta.thinking;
-            if (this.debugMode && currentThinkingContent.length % 50 === 0) {
-              this.logDebug(`\u{1F4AD} [StandardProtocolAdapter] \u7D2F\u79EFthinking\u5185\u5BB9 (${currentThinkingContent.length}\u5B57\u7B26)`, currentThinkingContent.substring(currentThinkingContent.length - 20));
-            }
-          }
           if (data.type === "content_block_delta" && data.delta?.type === "input_json_delta") {
             const toolIndex = data.index;
             const toolId = indexToToolId.get(toolIndex);
@@ -5809,17 +5795,6 @@ var StandardProtocolAdapter = class {
         }
       }
     }
-    if (currentThinkingContent.trim()) {
-      response.content.push({
-        type: "text",
-        text: currentThinkingContent.trim()
-      });
-      if (this.debugMode) {
-        this.logDebug("\u{1F4AD} [StandardProtocolAdapter] \u6DFB\u52A0thinking\u5185\u5BB9:", {
-          thinkingLength: currentThinkingContent.length
-        });
-      }
-    }
     if (currentTextContent.trim()) {
       response.content.push({
         type: "text",
@@ -5831,7 +5806,6 @@ var StandardProtocolAdapter = class {
       this.logDebug("\u2705 [StandardProtocolAdapter] \u6807\u51C6\u54CD\u5E94\u6784\u5EFA\u5B8C\u6210:", {
         contentCount: response.content.length,
         textLength: currentTextContent.length,
-        thinkingLength: currentThinkingContent.length,
         toolCallsCount: toolCalls.size,
         finalUsage: response.usage,
         stopReason: response.stop_reason

package/dist/index.mjs

@@ -3406,13 +3406,6 @@ var A2ORequestAdapter = class {
   convertOpenAIResponseToClaude(openaiResponse) {
     const claudeContent = [];
     const message = openaiResponse.choices?.[0]?.message;
-    const messageAny = message;
-    if (messageAny?.reasoning_content && typeof messageAny.reasoning_content === "string") {
-      claudeContent.push({
-        type: "text",
-        text: messageAny.reasoning_content
-      });
-    }
     if (message?.content) {
       claudeContent.push({
         type: "text",
@@ -3936,6 +3929,14 @@ var StreamingProtocolAdapter = class {
     if (!content) return;
     state.reasoningContent += content;
     if (!state.thinkingBlockStarted) {
+      if (state.contentBlockStarted) {
+        sseLines.push(
+          "event: content_block_stop",
+          'data: {"type":"content_block_stop","index":0}',
+          ""
+        );
+        state.contentBlockStarted = false;
+      }
       sseLines.push(
         "event: content_block_start",
         'data: {"type":"content_block_start","index":0,"content_block":{"type":"text","text":"<thinking>"}}',
@@ -4680,36 +4681,9 @@ var StreamingStateManager = class {
     };
   }
   /**
-   * 处理文本内容（支持可选的启发式思考标记检测）
-   */
-  static processTextContent(content, state, sseLines, enableThinkingTagParsing = false) {
-    if (enableThinkingTagParsing) {
-      const thinkingTagPattern = /<thinking>([\s\S]*?)(<\/thinking>|$)/i;
-      const match = content.match(thinkingTagPattern);
-      if (match) {
-        const beforeThinking = content.substring(0, match.index);
-        const thinkingContent = match[1];
-        const afterThinking = match[2] === "</thinking>" ? content.substring(match.index + match[0].length) : "";
-        if (beforeThinking.trim()) {
-          if (!state.hasContent) {
-            sseLines.push(...SSEEventGenerator.generateTextBlockStart(state.contentBlockIndex));
-            state.hasContent = true;
-          }
-          sseLines.push(...SSEEventGenerator.generateTextDelta(state.contentBlockIndex, beforeThinking));
-        }
-        if (thinkingContent.trim()) {
-          this.processReasoningContent(thinkingContent, state, sseLines);
-        }
-        if (afterThinking.trim()) {
-          if (!state.hasContent) {
-            sseLines.push(...SSEEventGenerator.generateTextBlockStart(state.contentBlockIndex));
-            state.hasContent = true;
-          }
-          sseLines.push(...SSEEventGenerator.generateTextDelta(state.contentBlockIndex, afterThinking));
-        }
-        return;
-      }
-    }
+   * 处理文本内容
+   */
+  static processTextContent(content, state, sseLines) {
     if (!state.hasContent) {
       sseLines.push(...SSEEventGenerator.generateTextBlockStart(state.contentBlockIndex));
       state.hasContent = true;
@@ -4797,9 +4771,7 @@ var DEFAULT_CONFIG2 = {
   errorDataMaxLength: 100,
   warningDataMaxLength: 50,
   defaultRole: "assistant",
-  generateUniqueMessageId: true,
-  enableThinkingTagParsing: false
-  // 🔒 默认禁用
+  generateUniqueMessageId: true
 };
 function generateMessageId() {
   return `msg_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`;
@@ -5217,6 +5189,17 @@ var O2ASSEAdapter = class {
       }
       try {
         const data = JSON.parse(dataContent);
+        if ((data.choices?.length === 0 || !data.choices) && data.prompt_filter_results) {
+          if (this.debugMode) {
+            console.warn("\u26A0\uFE0F [O2ASSEAdapter] \u68C0\u6D4B\u5230Azure\u5185\u5BB9\u8FC7\u6EE4\u5668\u54CD\u5E94:", data.prompt_filter_results);
+          }
+          StreamingStateManager.processTextContent(
+            `\u9519\u8BEF\uFF1A\u5185\u5BB9\u8FC7\u6EE4\u5668\u62E6\u622A\u4E86\u8BF7\u6C42\u3002\u8BF7\u68C0\u67E5\u8F93\u5165\u5185\u5BB9\u662F\u5426\u7B26\u5408\u4F7F\u7528\u653F\u7B56\u3002`,
+            state,
+            sseLines
+          );
+          break;
+        }
         const choice = data.choices?.[0];
         const delta = choice?.delta;
         if (!delta) {
@@ -5228,11 +5211,8 @@ var O2ASSEAdapter = class {
           }
           continue;
         }
-        if (delta.reasoning_content) {
-          StreamingStateManager.processReasoningContent(delta.reasoning_content, state, sseLines);
-        }
         if (delta.content) {
-          StreamingStateManager.processTextContent(delta.content, state, sseLines, this.config.enableThinkingTagParsing);
+          StreamingStateManager.processTextContent(delta.content, state, sseLines);
         }
         if (delta.tool_calls) {
           ToolCallProcessor.processBatchToolCalls(delta.tool_calls, state, sseLines);
@@ -5263,6 +5243,19 @@ var O2ASSEAdapter = class {
   processNonStreamingResponse(data, state, sseLines) {
     const choice = data.choices?.[0];
     if (!choice) {
+      if (data.prompt_filter_results || data.choices?.length === 0) {
+        const errorMsg = "Azure\u5185\u5BB9\u8FC7\u6EE4\u5668\u62E6\u622A\u4E86\u8BF7\u6C42";
+        const filterDetails = data.prompt_filter_results ? JSON.stringify(data.prompt_filter_results).substring(0, 500) : "choices\u4E3A\u7A7A";
+        if (this.debugMode) {
+          console.warn(`\u26A0\uFE0F [O2ASSEAdapter] ${errorMsg}:`, filterDetails);
+        }
+        StreamingStateManager.processTextContent(
+          `\u9519\u8BEF\uFF1A\u5185\u5BB9\u8FC7\u6EE4\u5668\u62E6\u622A\u4E86\u8BF7\u6C42\u3002\u8BF7\u68C0\u67E5\u8F93\u5165\u5185\u5BB9\u662F\u5426\u7B26\u5408\u4F7F\u7528\u653F\u7B56\u3002`,
+          state,
+          sseLines
+        );
+        return;
+      }
       if (this.debugMode) {
         console.warn("\u26A0\uFE0F [O2ASSEAdapter] \u975E\u6D41\u5F0F\u54CD\u5E94\u6CA1\u6709choices\u6570\u636E");
       }
@@ -5276,7 +5269,7 @@ var O2ASSEAdapter = class {
     }
     const message = choice.message;
     if (message?.content) {
-      StreamingStateManager.processTextContent(message.content, state, sseLines, this.config.enableThinkingTagParsing);
+      StreamingStateManager.processTextContent(message.content, state, sseLines);
       if (this.debugMode) {
         console.log("\u{1F50D} [O2ASSEAdapter] \u975E\u6D41\u5F0F\u54CD\u5E94content:", message.content);
       }
@@ -5592,7 +5585,6 @@ var StandardProtocolAdapter = class {
       }
     };
     let currentTextContent = "";
-    let currentThinkingContent = "";
     const toolCalls = /* @__PURE__ */ new Map();
     const toolInputBuffers = /* @__PURE__ */ new Map();
     const indexToToolId = /* @__PURE__ */ new Map();
@@ -5632,12 +5624,6 @@ var StandardProtocolAdapter = class {
               this.logDebug(`\u{1F4DD} [StandardProtocolAdapter] \u7D2F\u79EF\u6587\u672C\u5185\u5BB9 (${currentTextContent.length}\u5B57\u7B26)`, currentTextContent.substring(currentTextContent.length - 20));
             }
           }
-          if (data.type === "content_block_delta" && data.delta?.type === "thinking_delta") {
-            currentThinkingContent += data.delta.thinking;
-            if (this.debugMode && currentThinkingContent.length % 50 === 0) {
-              this.logDebug(`\u{1F4AD} [StandardProtocolAdapter] \u7D2F\u79EFthinking\u5185\u5BB9 (${currentThinkingContent.length}\u5B57\u7B26)`, currentThinkingContent.substring(currentThinkingContent.length - 20));
-            }
-          }
           if (data.type === "content_block_delta" && data.delta?.type === "input_json_delta") {
             const toolIndex = data.index;
             const toolId = indexToToolId.get(toolIndex);
@@ -5702,17 +5688,6 @@ var StandardProtocolAdapter = class {
         }
       }
     }
-    if (currentThinkingContent.trim()) {
-      response.content.push({
-        type: "text",
-        text: currentThinkingContent.trim()
-      });
-      if (this.debugMode) {
-        this.logDebug("\u{1F4AD} [StandardProtocolAdapter] \u6DFB\u52A0thinking\u5185\u5BB9:", {
-          thinkingLength: currentThinkingContent.length
-        });
-      }
-    }
     if (currentTextContent.trim()) {
       response.content.push({
         type: "text",
@@ -5724,7 +5699,6 @@ var StandardProtocolAdapter = class {
       this.logDebug("\u2705 [StandardProtocolAdapter] \u6807\u51C6\u54CD\u5E94\u6784\u5EFA\u5B8C\u6210:", {
         contentCount: response.content.length,
         textLength: currentTextContent.length,
-        thinkingLength: currentThinkingContent.length,
         toolCallsCount: toolCalls.size,
         finalUsage: response.usage,
         stopReason: response.stop_reason

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-protocol-adapters",
-  "version": "1.0.0-alpha.12",
+  "version": "1.0.0-alpha.13",
   "description": "Universal AI Protocol Converter - OpenAI ⇄ Anthropic with full TypeScript support",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",