@bastani/pi-ai 0.9.43 → 0.9.44-alpha.2

package/dist/api/openai-responses-shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-responses-shared.d.ts","sourceRoot":"","sources":["../../src/api/openai-responses-shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai-responses-shared.d.ts","sourceRoot":"","sources":["../../src/api/openai-responses-shared.ts"],"names":[],"mappings":"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"}

package/dist/api/openai-responses-shared.js

@@ -3,11 +3,11 @@ import { normalizeProviderId } from "../provider-id.js";
 import { appendAssistantMessageDiagnostic } from "../utils/diagnostics.js";
 import { normalizeProviderError } from "../utils/error-body.js";
 import { shortHash } from "../utils/hash.js";
-import { parseStreamingJson, parseToolCallArguments } from "../utils/json-parse.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
+import { ToolCallArgumentsStream } from "../utils/streaming-json.js";
 import { getSystemMessageText, renderSystemMessageUpdate } from "../utils/text.js";
 import { resolveTranscript, resolveTranscriptTools } from "../utils/transcript.js";
-import { appendGrammarToolInputJsonDelta, getGrammarToolInput, getJsonSchemaToolParameters, resolveGrammarConstrainedSampling, resolveJsonSchemaStrictSampling, } from "./constrained-sampling.js";
+import { appendGrammarToolInputJsonDelta, closeGrammarToolInputJson, getGrammarToolInput, getJsonSchemaToolParameters, resolveGrammarConstrainedSampling, resolveJsonSchemaStrictSampling, } from "./constrained-sampling.js";
 import { transformMessages } from "./transform-messages.js";
 // =============================================================================
 // Utilities
@@ -558,24 +558,11 @@ export function convertResponsesTools(tools, options) {
         return functionTool;
     });
 }
-function getCustomToolCallInput(block) {
-    const property = block.customInput?.property;
-    if (property === undefined)
-        return "";
-    const value = block.arguments[property];
-    return typeof value === "string" ? value : "";
-}
-function appendCustomToolCallInput(block, nextInput, close) {
-    const customInput = block.customInput;
-    if (!customInput)
-        return undefined;
-    const delta = appendGrammarToolInputJsonDelta(customInput.jsonBuffer, customInput.property, nextInput, close);
-    block.arguments = { [customInput.property]: nextInput };
-    return delta;
-}
 export async function processResponsesStream(openaiStream, output, stream, model, options) {
     let sawTerminalResponseEvent = false;
     const outputSlots = new Map();
+    // Tool calls whose output_item.done has not arrived yet.
+    const unfinishedToolCalls = new Set();
     const reasoningBlocksById = new Map();
     const applyMessagePhaseStopReason = (item) => {
         if (item.type === "message" && item.phase === "final_answer") {
@@ -619,19 +606,21 @@ export async function processResponsesStream(openaiStream, output, stream, model
             return slot;
         }
         if (item.type === "function_call") {
+            const args = new ToolCallArgumentsStream();
             const block = {
                 type: "toolCall",
                 id: `${item.call_id}|${item.id}`,
                 name: item.name,
-                arguments: {},
+                arguments: item.arguments ? args.append(item.arguments) : {},
                 ...(item.namespace !== undefined ? { namespace: item.namespace } : {}),
-                partialJson: item.arguments || "",
             };
             output.content.push(block);
+            unfinishedToolCalls.add(block);
             const slot = {
                 type: "toolCall",
                 block,
                 contentIndex: output.content.length - 1,
+                input: { kind: "json", arguments: args },
             };
             outputSlots.set(outputIndex, slot);
             stream.push({ type: "toolcall_start", contentIndex: slot.contentIndex, partial: output });
@@ -646,16 +635,14 @@ export async function processResponsesStream(openaiStream, output, stream, model
                 name: item.name,
                 arguments: { [inputProperty]: input },
                 ...(item.namespace !== undefined ? { namespace: item.namespace } : {}),
-                customInput: {
-                    property: inputProperty,
-                    jsonBuffer: { input: "", started: false, closed: false },
-                },
             };
             output.content.push(block);
+            unfinishedToolCalls.add(block);
             const slot = {
                 type: "toolCall",
                 block,
                 contentIndex: output.content.length - 1,
+                input: customInput(inputProperty, input),
             };
             outputSlots.set(outputIndex, slot);
             stream.push({ type: "toolcall_start", contentIndex: slot.contentIndex, partial: output });
@@ -804,36 +791,31 @@ export async function processResponsesStream(openaiStream, output, stream, model
         }
         else if (event.type === "response.function_call_arguments.delta") {
             const slot = getSlot(event.output_index, "toolCall");
-            if (!slot || slot.block.partialJson === undefined)
+            if (slot?.input.kind !== "json")
                 continue;
-            slot.block.partialJson += event.delta;
-            slot.block.arguments = parseStreamingJson(slot.block.partialJson);
+            slot.block.arguments = slot.input.arguments.append(event.delta);
             pushToolCallDelta(slot, event.delta);
         }
         else if (event.type === "response.function_call_arguments.done") {
             const slot = getSlot(event.output_index, "toolCall");
-            if (!slot || slot.block.partialJson === undefined)
+            if (slot?.input.kind !== "json")
                 continue;
-            const previousPartialJson = slot.block.partialJson;
-            slot.block.partialJson = event.arguments;
-            slot.block.arguments = parseStreamingJson(slot.block.partialJson);
-            if (event.arguments.startsWith(previousPartialJson)) {
-                const delta = event.arguments.slice(previousPartialJson.length);
-                if (delta.length > 0)
-                    pushToolCallDelta(slot, delta);
-            }
+            const replaced = slot.input.arguments.replace(event.arguments);
+            slot.block.arguments = replaced.arguments;
+            if (replaced.delta)
+                pushToolCallDelta(slot, replaced.delta);
         }
         else if (event.type === "response.custom_tool_call_input.delta") {
             const slot = getSlot(event.output_index, "toolCall");
-            if (!slot || !slot.block.customInput)
+            if (slot?.input.kind !== "custom")
                 continue;
-            pushToolCallDelta(slot, appendCustomToolCallInput(slot.block, getCustomToolCallInput(slot.block) + event.delta, false));
+            pushToolCallDelta(slot, appendCustomInput(slot.block, slot.input, event.delta));
         }
         else if (event.type === "response.custom_tool_call_input.done") {
             const slot = getSlot(event.output_index, "toolCall");
-            if (!slot || !slot.block.customInput)
+            if (slot?.input.kind !== "custom")
                 continue;
-            pushToolCallDelta(slot, appendCustomToolCallInput(slot.block, event.input, true));
+            pushToolCallDelta(slot, closeCustomInput(slot.block, slot.input, event.input));
         }
         else if (event.type === "response.output_item.done") {
             const item = event.item;
@@ -866,15 +848,13 @@ export async function processResponsesStream(openaiStream, output, stream, model
                 });
                 outputSlots.delete(event.output_index);
             }
-            else if (item.type === "function_call" &&
-                slot?.type === "toolCall" &&
-                slot.block.partialJson !== undefined) {
-                Object.assign(slot.block, parseToolCallArguments(item.arguments || slot.block.partialJson));
+            else if (item.type === "function_call" && slot?.type === "toolCall" && slot.input.kind === "json") {
+                if (item.arguments)
+                    slot.input.arguments.replace(item.arguments);
+                Object.assign(slot.block, slot.input.arguments.finish());
                 if (item.namespace !== undefined)
                     slot.block.namespace = item.namespace;
-                // Finalize in-place and strip the scratch buffer so replay only
-                // carries parsed arguments.
-                delete slot.block.partialJson;
+                unfinishedToolCalls.delete(slot.block);
                 stream.push({
                     type: "toolcall_end",
                     contentIndex: slot.contentIndex,
@@ -883,11 +863,11 @@ export async function processResponsesStream(openaiStream, output, stream, model
                 });
                 outputSlots.delete(event.output_index);
             }
-            else if (item.type === "custom_tool_call" && slot?.type === "toolCall" && slot.block.customInput) {
-                pushToolCallDelta(slot, appendCustomToolCallInput(slot.block, item.input ?? getCustomToolCallInput(slot.block), true));
+            else if (item.type === "custom_tool_call" && slot?.type === "toolCall" && slot.input.kind === "custom") {
+                pushToolCallDelta(slot, closeCustomInput(slot.block, slot.input, item.input));
                 if (item.namespace !== undefined)
                     slot.block.namespace = item.namespace;
-                delete slot.block.customInput;
+                unfinishedToolCalls.delete(slot.block);
                 stream.push({
                     type: "toolcall_end",
                     contentIndex: slot.contentIndex,
@@ -921,18 +901,39 @@ export async function processResponsesStream(openaiStream, output, stream, model
     }
     // The agent runs every tool call in the final message. Refuse to hand over calls whose
     // output_item.done never arrived: their arguments may be cut off or mixed up, e.g. when a
-    // non-compliant server omits output_index. Finished calls have their scratch buffers removed.
+    // non-compliant server omits output_index.
     if (output.stopReason === "toolUse") {
-        for (const block of output.content) {
-            if (block.type !== "toolCall")
-                continue;
-            const toolCall = block;
-            if (toolCall.partialJson !== undefined || toolCall.customInput !== undefined) {
-                throw new Error(`OpenAI Responses stream completed with an unfinished tool call: ${toolCall.name} (${toolCall.id})`);
-            }
+        for (const toolCall of unfinishedToolCalls) {
+            throw new Error(`OpenAI Responses stream completed with an unfinished tool call: ${toolCall.name} (${toolCall.id})`);
         }
     }
 }
+/** Stream state of a custom tool call that starts with `initialInput`. */
+function customInput(property, initialInput) {
+    const buffer = { input: "", started: false, closed: false };
+    return {
+        kind: "custom",
+        property,
+        buffer,
+        unsent: appendGrammarToolInputJsonDelta(buffer, property, initialInput) ?? "",
+    };
+}
+/** Append to a streaming custom tool input; returns the matching piece of its JSON arguments text. */
+function appendCustomInput(block, input, delta) {
+    return sendCustomInput(block, input, appendGrammarToolInputJsonDelta(input.buffer, input.property, delta));
+}
+/** Close a custom tool input with the provider's complete input, if it sent one. */
+function closeCustomInput(block, input, finalInput) {
+    return sendCustomInput(block, input, closeGrammarToolInputJson(input.buffer, input.property, finalInput));
+}
+function sendCustomInput(block, input, jsonDelta) {
+    block.arguments = { [input.property]: input.buffer.input };
+    if (input.unsent === "")
+        return jsonDelta;
+    const sent = input.unsent + (jsonDelta ?? "");
+    input.unsent = "";
+    return sent;
+}
 function mapStopReason(status, incompleteReason) {
     if (!status)
         return { stopReason: "stop" };