@mariozechner/pi-ai 0.5.14 → 0.5.16

package/dist/providers/openai-completions.js

@@ -49,10 +49,8 @@ export class OpenAICompletionsLLM {
             const stream = await this.client.chat.completions.create(params, {
                 signal: options?.signal,
             });
-            let content = "";
-            let reasoningContent = "";
-            let reasoningField = null;
-            const parsedToolCalls = [];
+            const blocks = [];
+            let currentBlock = null;
             let usage = {
                 input: 0,
                 output: 0,
@@ -61,7 +59,6 @@ export class OpenAICompletionsLLM {
                 cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
             };
             let finishReason = null;
-            let blockType = null;
             for await (const chunk of stream) {
                 if (chunk.usage) {
                     usage = {
@@ -87,103 +84,173 @@ export class OpenAICompletionsLLM {
                     if (choice.delta.content !== null &&
                         choice.delta.content !== undefined &&
                         choice.delta.content.length > 0) {
-                        if (blockType === "thinking") {
-                            options?.onThinking?.("", true);
-                            blockType = null;
+                        // Check if we need to switch to text block
+                        if (!currentBlock || currentBlock.type !== "text") {
+                            // Save current block if exists
+                            if (currentBlock) {
+                                if (currentBlock.type === "thinking") {
+                                    options?.onEvent?.({ type: "thinking_end", content: currentBlock.thinking });
+                                }
+                                else if (currentBlock.type === "toolCall") {
+                                    currentBlock.arguments = JSON.parse(currentBlock.partialArgs || "{}");
+                                    delete currentBlock.partialArgs;
+                                    options?.onEvent?.({ type: "toolCall", toolCall: currentBlock });
+                                }
+                                blocks.push(currentBlock);
+                            }
+                            // Start new text block
+                            currentBlock = { type: "text", text: "" };
+                            options?.onEvent?.({ type: "text_start" });
+                        }
+                        // Append to text block
+                        if (currentBlock.type === "text") {
+                            currentBlock.text += choice.delta.content;
+                            options?.onEvent?.({
+                                type: "text_delta",
+                                content: currentBlock.text,
+                                delta: choice.delta.content,
+                            });
                         }
-                        content += choice.delta.content;
-                        options?.onText?.(choice.delta.content, false);
-                        blockType = "text";
                     }
                     // Handle reasoning_content field
                     if (choice.delta.reasoning_content !== null &&
-                        choice.delta.reasoning_content !== undefined) {
-                        if (blockType === "text") {
-                            options?.onText?.("", true);
-                            blockType = null;
+                        choice.delta.reasoning_content !== undefined &&
+                        choice.delta.reasoning_content.length > 0) {
+                        // Check if we need to switch to thinking block
+                        if (!currentBlock || currentBlock.type !== "thinking") {
+                            // Save current block if exists
+                            if (currentBlock) {
+                                if (currentBlock.type === "text") {
+                                    options?.onEvent?.({ type: "text_end", content: currentBlock.text });
+                                }
+                                else if (currentBlock.type === "toolCall") {
+                                    currentBlock.arguments = JSON.parse(currentBlock.partialArgs || "{}");
+                                    delete currentBlock.partialArgs;
+                                    options?.onEvent?.({ type: "toolCall", toolCall: currentBlock });
+                                }
+                                blocks.push(currentBlock);
+                            }
+                            // Start new thinking block
+                            currentBlock = { type: "thinking", thinking: "", thinkingSignature: "reasoning_content" };
+                            options?.onEvent?.({ type: "thinking_start" });
+                        }
+                        // Append to thinking block
+                        if (currentBlock.type === "thinking") {
+                            const delta = choice.delta.reasoning_content;
+                            currentBlock.thinking += delta;
+                            options?.onEvent?.({ type: "thinking_delta", content: currentBlock.thinking, delta });
                         }
-                        reasoningContent += choice.delta.reasoning_content;
-                        reasoningField = "reasoning_content";
-                        options?.onThinking?.(choice.delta.reasoning_content, false);
-                        blockType = "thinking";
                     }
                     // Handle reasoning field
-                    if (choice.delta.reasoning !== null && choice.delta.reasoning !== undefined) {
-                        if (blockType === "text") {
-                            options?.onText?.("", true);
-                            blockType = null;
+                    if (choice.delta.reasoning !== null &&
+                        choice.delta.reasoning !== undefined &&
+                        choice.delta.reasoning.length > 0) {
+                        // Check if we need to switch to thinking block
+                        if (!currentBlock || currentBlock.type !== "thinking") {
+                            // Save current block if exists
+                            if (currentBlock) {
+                                if (currentBlock.type === "text") {
+                                    options?.onEvent?.({ type: "text_end", content: currentBlock.text });
+                                }
+                                else if (currentBlock.type === "toolCall") {
+                                    currentBlock.arguments = JSON.parse(currentBlock.partialArgs || "{}");
+                                    delete currentBlock.partialArgs;
+                                    options?.onEvent?.({ type: "toolCall", toolCall: currentBlock });
+                                }
+                                blocks.push(currentBlock);
+                            }
+                            // Start new thinking block
+                            currentBlock = { type: "thinking", thinking: "", thinkingSignature: "reasoning" };
+                            options?.onEvent?.({ type: "thinking_start" });
+                        }
+                        // Append to thinking block
+                        if (currentBlock.type === "thinking") {
+                            const delta = choice.delta.reasoning;
+                            currentBlock.thinking += delta;
+                            options?.onEvent?.({ type: "thinking_delta", content: currentBlock.thinking, delta });
                         }
-                        reasoningContent += choice.delta.reasoning;
-                        reasoningField = "reasoning";
-                        options?.onThinking?.(choice.delta.reasoning, false);
-                        blockType = "thinking";
                     }
                     // Handle tool calls
                     if (choice?.delta?.tool_calls) {
-                        if (blockType === "text") {
-                            options?.onText?.("", true);
-                            blockType = null;
-                        }
-                        if (blockType === "thinking") {
-                            options?.onThinking?.("", true);
-                            blockType = null;
-                        }
                         for (const toolCall of choice.delta.tool_calls) {
-                            if (parsedToolCalls.length === 0 ||
-                                (toolCall.id !== undefined && parsedToolCalls[parsedToolCalls.length - 1].id !== toolCall.id)) {
-                                parsedToolCalls.push({
+                            // Check if we need a new tool call block
+                            if (!currentBlock ||
+                                currentBlock.type !== "toolCall" ||
+                                (toolCall.id && currentBlock.id !== toolCall.id)) {
+                                // Save current block if exists
+                                if (currentBlock) {
+                                    if (currentBlock.type === "text") {
+                                        options?.onEvent?.({ type: "text_end", content: currentBlock.text });
+                                    }
+                                    else if (currentBlock.type === "thinking") {
+                                        options?.onEvent?.({ type: "thinking_end", content: currentBlock.thinking });
+                                    }
+                                    else if (currentBlock.type === "toolCall") {
+                                        currentBlock.arguments = JSON.parse(currentBlock.partialArgs || "{}");
+                                        delete currentBlock.partialArgs;
+                                        options?.onEvent?.({ type: "toolCall", toolCall: currentBlock });
+                                    }
+                                    blocks.push(currentBlock);
+                                }
+                                // Start new tool call block
+                                currentBlock = {
+                                    type: "toolCall",
                                     id: toolCall.id || "",
                                     name: toolCall.function?.name || "",
-                                    arguments: "",
-                                });
+                                    arguments: {},
+                                    partialArgs: "",
+                                };
                             }
-                            const current = parsedToolCalls[parsedToolCalls.length - 1];
-                            if (toolCall.id)
-                                current.id = toolCall.id;
-                            if (toolCall.function?.name)
-                                current.name = toolCall.function.name;
-                            if (toolCall.function?.arguments) {
-                                current.arguments += toolCall.function.arguments;
+                            // Accumulate tool call data
+                            if (currentBlock.type === "toolCall") {
+                                if (toolCall.id)
+                                    currentBlock.id = toolCall.id;
+                                if (toolCall.function?.name)
+                                    currentBlock.name = toolCall.function.name;
+                                if (toolCall.function?.arguments) {
+                                    currentBlock.partialArgs += toolCall.function.arguments;
+                                }
                             }
                         }
                     }
                 }
                 // Capture finish reason
                 if (choice.finish_reason) {
-                    if (blockType === "text") {
-                        options?.onText?.("", true);
-                        blockType = null;
-                    }
-                    if (blockType === "thinking") {
-                        options?.onThinking?.("", true);
-                        blockType = null;
-                    }
                     finishReason = choice.finish_reason;
                 }
             }
-            // Convert tool calls map to array
-            const toolCalls = parsedToolCalls.map((tc) => ({
-                id: tc.id,
-                name: tc.name,
-                arguments: JSON.parse(tc.arguments),
-            }));
+            // Save final block if exists
+            if (currentBlock) {
+                if (currentBlock.type === "text") {
+                    options?.onEvent?.({ type: "text_end", content: currentBlock.text });
+                }
+                else if (currentBlock.type === "thinking") {
+                    options?.onEvent?.({ type: "thinking_end", content: currentBlock.thinking });
+                }
+                else if (currentBlock.type === "toolCall") {
+                    currentBlock.arguments = JSON.parse(currentBlock.partialArgs || "{}");
+                    delete currentBlock.partialArgs;
+                    options?.onEvent?.({ type: "toolCall", toolCall: currentBlock });
+                }
+                blocks.push(currentBlock);
+            }
             // Calculate cost
             calculateCost(this.modelInfo, usage);
-            return {
+            const output = {
                 role: "assistant",
-                content: content || undefined,
-                thinking: reasoningContent || undefined,
-                thinkingSignature: reasoningField || undefined,
-                toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+                content: blocks,
                 provider: this.modelInfo.provider,
                 model: this.modelInfo.id,
                 usage,
                 stopReason: this.mapStopReason(finishReason),
             };
+            options?.onEvent?.({ type: "done", reason: output.stopReason, message: output });
+            return output;
         }
         catch (error) {
-            return {
+            const output = {
                 role: "assistant",
+                content: [],
                 provider: this.modelInfo.provider,
                 model: this.modelInfo.id,
                 usage: {
@@ -196,6 +263,8 @@ export class OpenAICompletionsLLM {
                 stopReason: "error",
                 error: error instanceof Error ? error.message : String(error),
             };
+            options?.onEvent?.({ type: "error", error: output.error || "Unknown error" });
+            return output;
         }
     }
     convertMessages(messages, systemPrompt) {
@@ -247,14 +316,26 @@ export class OpenAICompletionsLLM {
             else if (msg.role === "assistant") {
                 const assistantMsg = {
                     role: "assistant",
-                    content: msg.content || null,
+                    content: null,
                 };
-                // LLama.cpp server + gpt-oss
-                if (msg.thinking && msg.thinkingSignature && msg.thinkingSignature.length > 0) {
-                    assistantMsg[msg.thinkingSignature] = msg.thinking;
+                // Build content from blocks
+                const textBlocks = msg.content.filter((b) => b.type === "text");
+                if (textBlocks.length > 0) {
+                    assistantMsg.content = textBlocks.map((b) => b.text).join("");
+                }
+                // Handle thinking blocks for llama.cpp server + gpt-oss
+                const thinkingBlocks = msg.content.filter((b) => b.type === "thinking");
+                if (thinkingBlocks.length > 0) {
+                    // Use the signature from the first thinking block if available
+                    const signature = thinkingBlocks[0].thinkingSignature;
+                    if (signature && signature.length > 0) {
+                        assistantMsg[signature] = thinkingBlocks.map((b) => b.thinking).join("");
+                    }
                 }
-                if (msg.toolCalls) {
-                    assistantMsg.tool_calls = msg.toolCalls.map((tc) => ({
+                // Handle tool calls
+                const toolCalls = msg.content.filter((b) => b.type === "toolCall");
+                if (toolCalls.length > 0) {
+                    assistantMsg.tool_calls = toolCalls.map((tc) => ({
                         id: tc.id,
                         type: "function",
                         function: {

package/dist/providers/openai-completions.js.map

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

package/dist/providers/openai-responses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-responses.d.ts","sourceRoot":"","sources":["../../src/providers/openai-responses.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACX,gBAAgB,EAChB,OAAO,EACP,GAAG,EACH,UAAU,EAEV,KAAK,EAKL,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,yBAA0B,SAAQ,UAAU;IAC5D,eAAe,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACxD,gBAAgB,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC;CAC1D;AAED,qBAAa,kBAAmB,YAAW,GAAG,CAAC,yBAAyB,CAAC;IACxE,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAQ;gBAEb,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM;IAazC,QAAQ,IAAI,KAAK;IAIX,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAqJhG,OAAO,CAAC,cAAc;IAoFtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,aAAa;CAarB"}
+{"version":3,"file":"openai-responses.d.ts","sourceRoot":"","sources":["../../src/providers/openai-responses.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACX,gBAAgB,EAChB,OAAO,EACP,GAAG,EACH,UAAU,EAEV,KAAK,EAML,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,yBAA0B,SAAQ,UAAU;IAC5D,eAAe,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACxD,gBAAgB,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC;CAC1D;AAED,qBAAa,kBAAmB,YAAW,GAAG,CAAC,yBAAyB,CAAC;IACxE,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAQ;gBAEb,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM;IAazC,QAAQ,IAAI,KAAK;IAIX,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAuMhG,OAAO,CAAC,cAAc;IA0FtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,aAAa;CAarB"}

package/dist/providers/openai-responses.js

@@ -43,11 +43,9 @@ export class OpenAIResponsesLLM {
             const stream = await this.client.responses.create(params, {
                 signal: options?.signal,
             });
-            let content = "";
-            let contentSignature = "";
-            let thinking = "";
-            const toolCalls = [];
-            const reasoningItems = [];
+            const outputItems = []; // any for function_call items
+            let currentTextAccum = ""; // For delta accumulation
+            let currentThinkingAccum = ""; // For delta accumulation
             let usage = {
                 input: 0,
                 output: 0,
@@ -57,43 +55,63 @@ export class OpenAIResponsesLLM {
             };
             let stopReason = "stop";
             for await (const event of stream) {
-                // Handle reasoning summary for models that support it
-                if (event.type === "response.reasoning_summary_text.delta") {
+                // Handle output item start
+                if (event.type === "response.output_item.added") {
+                    const item = event.item;
+                    if (item.type === "reasoning") {
+                        options?.onEvent?.({ type: "thinking_start" });
+                        currentThinkingAccum = "";
+                    }
+                    else if (item.type === "message") {
+                        options?.onEvent?.({ type: "text_start" });
+                        currentTextAccum = "";
+                    }
+                }
+                // Handle reasoning summary deltas
+                else if (event.type === "response.reasoning_summary_text.delta") {
                     const delta = event.delta;
-                    thinking += delta;
-                    options?.onThinking?.(delta, false);
+                    currentThinkingAccum += delta;
+                    options?.onEvent?.({ type: "thinking_delta", content: currentThinkingAccum, delta });
                 }
-                else if (event.type === "response.reasoning_summary_text.done") {
-                    if (event.text) {
-                        thinking = event.text;
-                    }
-                    options?.onThinking?.("", true);
+                // Add a new line between summary parts (hack...)
+                else if (event.type === "response.reasoning_summary_part.done") {
+                    currentThinkingAccum += "\n\n";
+                    options?.onEvent?.({ type: "thinking_delta", content: currentThinkingAccum, delta: "\n\n" });
                 }
-                // Handle main text output
+                // Handle text output deltas
                 else if (event.type === "response.output_text.delta") {
                     const delta = event.delta;
-                    content += delta;
-                    options?.onText?.(delta, false);
+                    currentTextAccum += delta;
+                    options?.onEvent?.({ type: "text_delta", content: currentTextAccum, delta });
                 }
-                else if (event.type === "response.output_text.done") {
-                    if (event.text) {
-                        content = event.text;
-                    }
-                    options?.onText?.("", true);
-                    contentSignature = event.item_id;
+                // Handle refusal output deltas
+                else if (event.type === "response.refusal.delta") {
+                    const delta = event.delta;
+                    currentTextAccum += delta;
+                    options?.onEvent?.({ type: "text_delta", content: currentTextAccum, delta });
                 }
-                // Handle function calls
+                // Handle output item completion
                 else if (event.type === "response.output_item.done") {
                     const item = event.item;
-                    if (item?.type === "function_call") {
-                        toolCalls.push({
+                    if (item.type === "reasoning") {
+                        const thinkingContent = item.summary?.map((s) => s.text).join("\n\n") || "";
+                        options?.onEvent?.({ type: "thinking_end", content: thinkingContent });
+                        outputItems.push(item);
+                    }
+                    else if (item.type === "message") {
+                        const textContent = item.content.map((c) => (c.type === "output_text" ? c.text : c.refusal)).join("");
+                        options?.onEvent?.({ type: "text_end", content: textContent });
+                        outputItems.push(item);
+                    }
+                    else if (item.type === "function_call") {
+                        const toolCall = {
+                            type: "toolCall",
                             id: item.call_id + "|" + item.id,
                             name: item.name,
                             arguments: JSON.parse(item.arguments),
-                        });
-                    }
-                    if (item.type === "reasoning") {
-                        reasoningItems.push(item);
+                        };
+                        options?.onEvent?.({ type: "toolCall", toolCall });
+                        outputItems.push(item);
                     }
                 }
                 // Handle completion
@@ -110,38 +128,67 @@ export class OpenAIResponsesLLM {
                     }
                     // Map status to stop reason
                     stopReason = this.mapStopReason(response?.status);
-                    if (toolCalls.length > 0 && stopReason === "stop") {
-                        stopReason = "toolUse";
-                    }
                 }
                 // Handle errors
                 else if (event.type === "error") {
-                    return {
+                    const errorOutput = {
                         role: "assistant",
+                        content: [],
                         provider: this.modelInfo.provider,
                         model: this.modelInfo.id,
                         usage,
                         stopReason: "error",
                         error: `Code ${event.code}: ${event.message}` || "Unknown error",
                     };
+                    options?.onEvent?.({ type: "error", error: errorOutput.error || "Unknown error" });
+                    return errorOutput;
                 }
             }
-            return {
+            // Convert output items to blocks
+            const blocks = [];
+            for (const item of outputItems) {
+                if (item.type === "reasoning") {
+                    blocks.push({
+                        type: "thinking",
+                        thinking: item.summary?.map((s) => s.text).join("\n\n") || "",
+                        thinkingSignature: JSON.stringify(item), // Full item for resubmission
+                    });
+                }
+                else if (item.type === "message") {
+                    blocks.push({
+                        type: "text",
+                        text: item.content.map((c) => (c.type === "output_text" ? c.text : c.refusal)).join(""),
+                        textSignature: item.id, // ID for resubmission
+                    });
+                }
+                else if (item.type === "function_call") {
+                    blocks.push({
+                        type: "toolCall",
+                        id: item.call_id + "|" + item.id,
+                        name: item.name,
+                        arguments: JSON.parse(item.arguments),
+                    });
+                }
+            }
+            // Check if we have tool calls for stop reason
+            if (blocks.some((b) => b.type === "toolCall") && stopReason === "stop") {
+                stopReason = "toolUse";
+            }
+            const output = {
                 role: "assistant",
-                content: content || undefined,
-                contentSignature: contentSignature || undefined,
-                thinking: thinking || undefined,
-                thinkingSignature: JSON.stringify(reasoningItems) || undefined,
-                toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+                content: blocks,
                 provider: this.modelInfo.provider,
                 model: this.modelInfo.id,
                 usage,
                 stopReason,
             };
+            options?.onEvent?.({ type: "done", reason: output.stopReason, message: output });
+            return output;
         }
         catch (error) {
-            return {
+            const output = {
                 role: "assistant",
+                content: [],
                 provider: this.modelInfo.provider,
                 model: this.modelInfo.id,
                 usage: {
@@ -154,6 +201,8 @@ export class OpenAIResponsesLLM {
                 stopReason: "error",
                 error: error instanceof Error ? error.message : String(error),
             };
+            options?.onEvent?.({ type: "error", error: output.error || "Unknown error" });
+            return output;
         }
     }
     convertToInput(messages, systemPrompt) {
@@ -201,13 +250,28 @@ export class OpenAIResponsesLLM {
                 }
             }
             else if (msg.role === "assistant") {
-                // Assistant messages - add both content and tool calls to output
+                // Process content blocks in order
                 const output = [];
-                if (msg.thinkingSignature) {
-                    output.push(...JSON.parse(msg.thinkingSignature));
-                }
-                if (msg.toolCalls) {
-                    for (const toolCall of msg.toolCalls) {
+                for (const block of msg.content) {
+                    if (block.type === "thinking") {
+                        // Push the full reasoning item(s) from signature
+                        if (block.thinkingSignature) {
+                            const reasoningItem = JSON.parse(block.thinkingSignature);
+                            output.push(reasoningItem);
+                        }
+                    }
+                    else if (block.type === "text") {
+                        const textBlock = block;
+                        output.push({
+                            type: "message",
+                            role: "assistant",
+                            content: [{ type: "output_text", text: textBlock.text, annotations: [] }],
+                            status: "completed",
+                            id: textBlock.textSignature || "msg_" + Math.random().toString(36).substring(2, 15),
+                        });
+                    }
+                    else if (block.type === "toolCall") {
+                        const toolCall = block;
                         output.push({
                             type: "function_call",
                             id: toolCall.id.split("|")[1], // Extract original ID
@@ -217,15 +281,6 @@ export class OpenAIResponsesLLM {
                         });
                     }
                 }
-                if (msg.content) {
-                    output.push({
-                        type: "message",
-                        role: "assistant",
-                        content: [{ type: "output_text", text: msg.content, annotations: [] }],
-                        status: "completed",
-                        id: msg.contentSignature || "msg_" + Math.random().toString(36).substring(2, 15),
-                    });
-                }
                 // Add all output items to input
                 input.push(...output);
             }