@acosmi/sdk-ts 2.19.0 → 2.19.1

package/dist/node/adapters/openai.mjs

@@ -306,16 +306,90 @@ var OpenAIStreamConverter = class {
    *  可能已被 text/tool 推进的 this.blockIndex (否则 content_block_stop 索引错配)。 */
   thinkingBlockIndex = 0;
   textStarted = false;
-  /** OpenAI tool_call index → Anthropic block index */
+  /** OpenAI tool_call 键 → Anthropic block index。键正常是 `tc.index`；上游省略
+   *  index 时退化为 `id:<tool_call_id>`，两者都没有时沿用上一个键（见
+   *  {@link resolveToolKey}）。 */
   toolBlockIndex = /* @__PURE__ */ new Map();
   blockIndex = 0;
+  /** 每个 tool block 已发出的 `partial_json` 累积，用于识别「每片重发全量参数」
+   *  的上游（见 tool_calls 分支的累计判别）。 */
+  toolArgsAccum = /* @__PURE__ */ new Map();
+  /** 上一次解析出的 tool 键，供缺 index 且缺 id 的后续增量沿用。 */
+  lastToolKey = null;
+  /** 已发出 message_delta/message_stop，避免 finish_reason 与 `[DONE]` 各收一次。 */
+  messageClosed = false;
+  /**
+   * 解析一条 tool_call delta 归属的块键。
+   *
+   * OpenAI 流式规范里 `index` 是必填，但兼容实现常有省略。此前这里直接用
+   * `tc.index` 做 Map 键：两个都省略 index 的 tool_call 会共用键 `undefined`，
+   * 于是只开一个块、两段参数拼进同一条 `partial_json` 流，产出 `{…}{…}` 这种
+   * 必然非法的 JSON。这里按「index → id → 沿用上一个」三级降级，让至少一种
+   * 稳定标识生效。
+   */
+  resolveToolKey(tc) {
+    if (typeof tc.index === "number" && Number.isFinite(tc.index)) {
+      this.lastToolKey = tc.index;
+      return tc.index;
+    }
+    if (typeof tc.id === "string" && tc.id !== "") {
+      const key = `id:${tc.id}`;
+      this.lastToolKey = key;
+      return key;
+    }
+    if (this.lastToolKey !== null) return this.lastToolKey;
+    this.lastToolKey = 0;
+    return 0;
+  }
+  /**
+   * 关闭仍打开的 text / thinking / tool 块，并收口 message。
+   *
+   * 由 `finish_reason` 分支与 `[DONE]` 分支共用：上游断流或只发 `[DONE]` 而不发
+   * `finish_reason` 时，此前一个 `content_block_stop` 都不会发，下游拿到的是一个
+   * 永不闭合的 tool_use 块。
+   */
+  closeOpenBlocks(events, stopReason) {
+    if (this.messageClosed) return;
+    this.messageClosed = true;
+    if (this.textStarted) {
+      events.push({
+        event: "content_block_stop",
+        data: JSON.stringify({ type: "content_block_stop", index: this.blockIndex })
+      });
+      this.textStarted = false;
+    } else if (this.thinkingStarted && !this.thinkingStopped) {
+      this.thinkingStopped = true;
+      events.push({
+        event: "content_block_stop",
+        data: JSON.stringify({ type: "content_block_stop", index: this.thinkingBlockIndex })
+      });
+    }
+    for (const idx of this.toolBlockIndex.values()) {
+      events.push({
+        event: "content_block_stop",
+        data: JSON.stringify({ type: "content_block_stop", index: idx })
+      });
+    }
+    events.push({
+      event: "message_delta",
+      data: JSON.stringify({ type: "message_delta", delta: { stop_reason: stopReason } })
+    });
+    events.push({
+      event: "message_stop",
+      data: JSON.stringify({ type: "message_stop" })
+    });
+  }
   /**
    * 将一行 OpenAI SSE data 转换为零或多个 Anthropic 格式 StreamEvent
    * 返回 { events, done }
    */
   convert(data) {
     if (data === "[DONE]") {
-      return { events: [], done: true };
+      const events2 = [];
+      if (this.messageStarted) {
+        this.closeOpenBlocks(events2, "end_turn");
+      }
+      return { events: events2, done: true };
     }
     let chunk;
     try {
@@ -387,7 +461,9 @@ var OpenAIStreamConverter = class {
       events.push({ event: "content_block_delta", data: deltaJSON });
     }
     for (const tc of choice.delta.tool_calls ?? []) {
-      if (!this.toolBlockIndex.has(tc.index)) {
+      const fn = tc.function;
+      const toolKey = this.resolveToolKey(tc);
+      if (!this.toolBlockIndex.has(toolKey)) {
         if (this.thinkingStarted && !this.thinkingStopped) {
           this.thinkingStopped = true;
           const stopJSON = JSON.stringify({
@@ -406,56 +482,46 @@ var OpenAIStreamConverter = class {
           this.blockIndex++;
           this.textStarted = false;
         }
-        this.toolBlockIndex.set(tc.index, this.blockIndex);
+        this.toolBlockIndex.set(toolKey, this.blockIndex);
         const blockJSON = JSON.stringify({
           type: "content_block_start",
           index: this.blockIndex,
           content_block: {
             type: "tool_use",
             id: tc.id,
-            name: tc.function.name,
+            name: fn?.name,
             input: {}
           }
         });
         events.push({ event: "content_block_start", data: blockJSON });
         this.blockIndex++;
       }
-      if (tc.function.arguments && tc.function.arguments !== "") {
-        const idx = this.toolBlockIndex.get(tc.index);
-        const deltaJSON = JSON.stringify({
-          type: "content_block_delta",
-          index: idx,
-          delta: {
-            type: "input_json_delta",
-            partial_json: tc.function.arguments
-          }
-        });
-        events.push({ event: "content_block_delta", data: deltaJSON });
+      if (fn?.arguments !== void 0 && fn.arguments !== null && fn.arguments !== "") {
+        const rawArgs = typeof fn.arguments === "string" ? fn.arguments : JSON.stringify(fn.arguments);
+        const accum = this.toolArgsAccum.get(toolKey) ?? "";
+        let emit = rawArgs;
+        if (accum !== "" && rawArgs.length > accum.length && rawArgs.startsWith(accum)) {
+          emit = rawArgs.slice(accum.length);
+          this.toolArgsAccum.set(toolKey, rawArgs);
+        } else {
+          this.toolArgsAccum.set(toolKey, accum + rawArgs);
+        }
+        if (emit !== "") {
+          const idx = this.toolBlockIndex.get(toolKey);
+          const deltaJSON = JSON.stringify({
+            type: "content_block_delta",
+            index: idx,
+            delta: {
+              type: "input_json_delta",
+              partial_json: emit
+            }
+          });
+          events.push({ event: "content_block_delta", data: deltaJSON });
+        }
       }
     }
     if (choice.finish_reason != null && choice.finish_reason !== "") {
-      if (this.textStarted) {
-        const stopJSON2 = JSON.stringify({
-          type: "content_block_stop",
-          index: this.blockIndex
-        });
-        events.push({ event: "content_block_stop", data: stopJSON2 });
-      } else if (this.thinkingStarted && !this.thinkingStopped) {
-        this.thinkingStopped = true;
-        const stopJSON2 = JSON.stringify({
-          type: "content_block_stop",
-          index: this.thinkingBlockIndex
-        });
-        events.push({ event: "content_block_stop", data: stopJSON2 });
-      }
-      for (const idx of this.toolBlockIndex.values()) {
-        const stopJSON2 = JSON.stringify({
-          type: "content_block_stop",
-          index: idx
-        });
-        events.push({ event: "content_block_stop", data: stopJSON2 });
-      }
-      let stopReason = "end_turn";
+      let stopReason;
       switch (choice.finish_reason) {
         case "tool_calls":
           stopReason = "tool_use";
@@ -463,14 +529,13 @@ var OpenAIStreamConverter = class {
         case "length":
           stopReason = "max_tokens";
           break;
+        case "stop":
+          stopReason = "end_turn";
+          break;
+        default:
+          stopReason = choice.finish_reason;
       }
-      const deltaJSON = JSON.stringify({
-        type: "message_delta",
-        delta: { stop_reason: stopReason }
-      });
-      events.push({ event: "message_delta", data: deltaJSON });
-      const stopJSON = JSON.stringify({ type: "message_stop" });
-      events.push({ event: "message_stop", data: stopJSON });
+      this.closeOpenBlocks(events, stopReason);
     }
     return { events, done: false };
   }