@promptbook/node 0.110.0-5 → 0.110.0-8

package/umd/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('colors'), require('fs/promises'), require('path'), require('spacetrim'), require('jszip'), require('crypto'), require('crypto-js'), require('crypto-js/enc-hex'), require('@mozilla/readability'), require('jsdom'), require('showdown'), require('child_process'), require('waitasecond'), require('dotenv'), require('crypto-js/sha256'), require('rxjs'), require('moment'), require('mime-types'), require('papaparse'), require('bottleneck'), require('openai')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'colors', 'fs/promises', 'path', 'spacetrim', 'jszip', 'crypto', 'crypto-js', 'crypto-js/enc-hex', '@mozilla/readability', 'jsdom', 'showdown', 'child_process', 'waitasecond', 'dotenv', 'crypto-js/sha256', 'rxjs', 'moment', 'mime-types', 'papaparse', 'bottleneck', 'openai'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-node"] = {}, global.colors, global.promises, global.path, global.spaceTrim$1, global.JSZip, global.crypto, global.cryptoJs, global.hexEncoder, global.readability, global.jsdom, global.showdown, global.child_process, global.waitasecond, global.dotenv, global.sha256, global.rxjs, global.moment, global.mimeTypes, global.papaparse, global.Bottleneck, global.OpenAI));
-})(this, (function (exports, colors, promises, path, spaceTrim$1, JSZip, crypto, cryptoJs, hexEncoder, readability, jsdom, showdown, child_process, waitasecond, dotenv, sha256, rxjs, moment, mimeTypes, papaparse, Bottleneck, OpenAI) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('colors'), require('fs/promises'), require('path'), require('spacetrim'), require('jszip'), require('crypto'), require('crypto-js'), require('crypto-js/enc-hex'), require('@mozilla/readability'), require('jsdom'), require('showdown'), require('child_process'), require('waitasecond'), require('dotenv'), require('crypto-js/sha256'), require('rxjs'), require('moment'), require('mime-types'), require('papaparse'), require('@openai/agents'), require('bottleneck'), require('openai')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'colors', 'fs/promises', 'path', 'spacetrim', 'jszip', 'crypto', 'crypto-js', 'crypto-js/enc-hex', '@mozilla/readability', 'jsdom', 'showdown', 'child_process', 'waitasecond', 'dotenv', 'crypto-js/sha256', 'rxjs', 'moment', 'mime-types', 'papaparse', '@openai/agents', 'bottleneck', 'openai'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-node"] = {}, global.colors, global.promises, global.path, global.spaceTrim$1, global.JSZip, global.crypto, global.cryptoJs, global.hexEncoder, global.readability, global.jsdom, global.showdown, global.child_process, global.waitasecond, global.dotenv, global.sha256, global.rxjs, global.moment, global.mimeTypes, global.papaparse, global.agents, global.Bottleneck, global.OpenAI));
+})(this, (function (exports, colors, promises, path, spaceTrim$1, JSZip, crypto, cryptoJs, hexEncoder, readability, jsdom, showdown, child_process, waitasecond, dotenv, sha256, rxjs, moment, mimeTypes, papaparse, agents, Bottleneck, OpenAI) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -48,7 +48,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.110.0-5';
+    const PROMPTBOOK_ENGINE_VERSION = '0.110.0-8';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -20323,6 +20323,40 @@
         return toolCall.name === ASSISTANT_PREPARATION_TOOL_CALL_NAME;
     }
 
+    /**
+     * Builds a stable identity string for tool calls across partial updates.
+     *
+     * @param toolCall - Tool call entry to identify.
+     * @returns Stable identity string for deduplication.
+     *
+     * @private function of <Chat/>
+     */
+    function getToolCallIdentity(toolCall) {
+        const rawToolCall = toolCall.rawToolCall;
+        const rawId = (rawToolCall === null || rawToolCall === void 0 ? void 0 : rawToolCall.id) || (rawToolCall === null || rawToolCall === void 0 ? void 0 : rawToolCall.callId) || (rawToolCall === null || rawToolCall === void 0 ? void 0 : rawToolCall.call_id);
+        if (rawId) {
+            return `id:${rawId}`;
+        }
+        if (toolCall.createdAt) {
+            return `time:${toolCall.createdAt}:${toolCall.name}`;
+        }
+        const argsKey = (() => {
+            if (typeof toolCall.arguments === 'string') {
+                return toolCall.arguments;
+            }
+            if (!toolCall.arguments) {
+                return '';
+            }
+            try {
+                return JSON.stringify(toolCall.arguments);
+            }
+            catch (_a) {
+                return '';
+            }
+        })();
+        return `fallback:${toolCall.name}:${argsKey}`;
+    }
+
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
 
@@ -22372,16 +22406,11 @@
                 const openAiOptions = { ...this.options };
                 delete openAiOptions.isVerbose;
                 delete openAiOptions.userId;
-                // Enhanced configuration for better ECONNRESET handling
+                // Enhanced configuration with retries and timeouts.
                 const enhancedOptions = {
                     ...openAiOptions,
                     timeout: API_REQUEST_TIMEOUT,
                     maxRetries: CONNECTION_RETRIES_LIMIT,
-                    defaultHeaders: {
-                        Connection: 'keep-alive',
-                        'Keep-Alive': 'timeout=30, max=100',
-                        ...openAiOptions.defaultHeaders,
-                    },
                 };
                 this.client = new OpenAI__default["default"](enhancedOptions);
             }
@@ -23304,604 +23333,151 @@
         }
     }
 
-    /**
-     * Uploads files to OpenAI and returns their IDs
-     *
-     * @private utility for `OpenAiAssistantExecutionTools` and `OpenAiCompatibleExecutionTools`
-     */
-    async function uploadFilesToOpenAi(client, files) {
-        const fileIds = [];
-        for (const file of files) {
-            // Note: OpenAI API expects a File object or a ReadStream
-            // In browser environment, we can pass the File object directly
-            // In Node.js environment, we might need to convert it or use a different approach
-            // But since `Prompt.files` already contains `File` objects, we try to pass them directly
-            const uploadedFile = await client.files.create({
-                file: file,
-                purpose: 'assistants',
-            });
-            fileIds.push(uploadedFile.id);
-        }
-        return fileIds;
-    }
-
     const DEFAULT_KNOWLEDGE_SOURCE_DOWNLOAD_TIMEOUT_MS = 30000;
     const DEFAULT_KNOWLEDGE_SOURCE_UPLOAD_TIMEOUT_MS = 900000;
     const VECTOR_STORE_PROGRESS_LOG_INTERVAL_MIN_MS = 15000;
     const VECTOR_STORE_STALL_LOG_THRESHOLD_MS = 30000;
     /**
-     * Execution Tools for calling OpenAI API Assistants
-     *
-     * This is useful for calling OpenAI API with a single assistant, for more wide usage use `OpenAiExecutionTools`.
-     *
-     * Note: [🦖] There are several different things in Promptbook:
-     * - `Agent` - which represents an AI Agent with its source, memories, actions, etc. Agent is a higher-level abstraction which is internally using:
-     * - `LlmExecutionTools` - which wraps one or more LLM models and provides an interface to execute them
-     * - `AgentLlmExecutionTools` - which is a specific implementation of `LlmExecutionTools` that wraps another LlmExecutionTools and applies agent-specific system prompts and requirements
-     * - `OpenAiAssistantExecutionTools` - which is a specific implementation of `LlmExecutionTools` for OpenAI models with assistant capabilities, recommended for usage in `Agent` or `AgentLlmExecutionTools`
-     * - `RemoteAgent` - which is an `Agent` that connects to a Promptbook Agents Server
+     * Base class for OpenAI execution tools that need hosted vector stores.
      *
      * @public exported from `@promptbook/openai`
      */
-    class OpenAiAssistantExecutionTools extends OpenAiExecutionTools {
+    class OpenAiVectorStoreHandler extends OpenAiExecutionTools {
         /**
-         * Creates OpenAI Execution Tools.
-         *
-         * @param options which are relevant are directly passed to the OpenAI client
+         * Returns the per-knowledge-source download timeout in milliseconds.
          */
-        constructor(options) {
+        getKnowledgeSourceDownloadTimeoutMs() {
             var _a;
-            if (options.isProxied) {
-                throw new NotYetImplementedError(`Proxy mode is not yet implemented for OpenAI assistants`);
-            }
-            super(options);
-            this.isCreatingNewAssistantsAllowed = false;
-            this.assistantId = options.assistantId;
-            this.isCreatingNewAssistantsAllowed = (_a = options.isCreatingNewAssistantsAllowed) !== null && _a !== void 0 ? _a : false;
-            if (this.assistantId === null && !this.isCreatingNewAssistantsAllowed) {
-                throw new NotAllowed(`Assistant ID is null and creating new assistants is not allowed - this configuration does not make sense`);
-            }
-            // <- TODO: !!! `OpenAiAssistantExecutionToolsOptions` - Allow `assistantId: null` together with `isCreatingNewAssistantsAllowed: true`
-            // TODO: [👱] Make limiter same as in `OpenAiExecutionTools`
+            return (_a = this.vectorStoreOptions.knowledgeSourceDownloadTimeoutMs) !== null && _a !== void 0 ? _a : DEFAULT_KNOWLEDGE_SOURCE_DOWNLOAD_TIMEOUT_MS;
         }
-        get title() {
-            return 'OpenAI Assistant';
+        /**
+         * Returns the max concurrency for knowledge source uploads.
+         */
+        getKnowledgeSourceUploadMaxConcurrency() {
+            var _a;
+            return (_a = this.vectorStoreOptions.knowledgeSourceUploadMaxConcurrency) !== null && _a !== void 0 ? _a : 5;
         }
-        get description() {
-            return 'Use single assistant provided by OpenAI';
+        /**
+         * Returns the polling interval in milliseconds for vector store uploads.
+         */
+        getKnowledgeSourceUploadPollIntervalMs() {
+            var _a;
+            return (_a = this.vectorStoreOptions.knowledgeSourceUploadPollIntervalMs) !== null && _a !== void 0 ? _a : 5000;
         }
         /**
-         * Calls OpenAI API to use a chat model.
+         * Returns the overall upload timeout in milliseconds for vector store uploads.
          */
-        async callChatModel(prompt) {
-            return this.callChatModelStream(prompt, () => { });
+        getKnowledgeSourceUploadTimeoutMs() {
+            var _a;
+            return (_a = this.vectorStoreOptions.knowledgeSourceUploadTimeoutMs) !== null && _a !== void 0 ? _a : DEFAULT_KNOWLEDGE_SOURCE_UPLOAD_TIMEOUT_MS;
         }
         /**
-         * Calls OpenAI API to use a chat model with streaming.
+         * Returns true if we should continue even if vector store ingestion stalls.
          */
-        async callChatModelStream(prompt, onProgress) {
-            var _a, _b, _c, _d, _e, _f;
-            if (this.options.isVerbose) {
-                console.info('💬 OpenAI callChatModel call', { prompt });
+        shouldContinueOnVectorStoreStall() {
+            var _a;
+            return (_a = this.vectorStoreOptions.shouldContinueOnVectorStoreStall) !== null && _a !== void 0 ? _a : true;
+        }
+        /**
+         * Returns vector-store-specific options with extended settings.
+         */
+        get vectorStoreOptions() {
+            return this.options;
+        }
+        /**
+         * Returns the OpenAI vector stores API surface, supporting stable and beta SDKs.
+         */
+        getVectorStoresApi(client) {
+            var _a, _b;
+            const vectorStores = (_a = client.vectorStores) !== null && _a !== void 0 ? _a : (_b = client.beta) === null || _b === void 0 ? void 0 : _b.vectorStores;
+            if (!vectorStores) {
+                throw new Error('OpenAI client does not support vector stores. Please ensure you are using a compatible version of the OpenAI SDK with vector store support.');
             }
-            const { content, parameters, modelRequirements /*, format*/ } = prompt;
-            const client = await this.getClient();
-            // TODO: [☂] Use here more modelRequirements
-            if (modelRequirements.modelVariant !== 'CHAT') {
-                throw new PipelineExecutionError('Use callChatModel only for CHAT variant');
+            return vectorStores;
+        }
+        /**
+         * Downloads a knowledge source URL into a File for vector store upload.
+         */
+        async downloadKnowledgeSourceFile(options) {
+            var _a;
+            const { source, timeoutMs, logLabel } = options;
+            const startedAtMs = Date.now();
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+            if (this.options.isVerbose) {
+                console.info('[🤰]', 'Downloading knowledge source', {
+                    source,
+                    timeoutMs,
+                    logLabel,
+                });
             }
-            // TODO: [👨‍👨‍👧‍👧] Remove:
-            for (const key of ['maxTokens', 'modelName', 'seed', 'temperature']) {
-                if (modelRequirements[key] !== undefined) {
-                    throw new NotYetImplementedError(`In \`OpenAiAssistantExecutionTools\` you cannot specify \`${key}\``);
+            try {
+                const response = await fetch(source, { signal: controller.signal });
+                const contentType = (_a = response.headers.get('content-type')) !== null && _a !== void 0 ? _a : undefined;
+                if (!response.ok) {
+                    console.error('[🤰]', 'Failed to download knowledge source', {
+                        source,
+                        status: response.status,
+                        statusText: response.statusText,
+                        contentType,
+                        elapsedMs: Date.now() - startedAtMs,
+                        logLabel,
+                    });
+                    return null;
+                }
+                const buffer = await response.arrayBuffer();
+                let filename = source.split('/').pop() || 'downloaded-file';
+                try {
+                    const url = new URL(source);
+                    filename = url.pathname.split('/').pop() || filename;
+                }
+                catch (error) {
+                    // Keep default filename
+                }
+                const file = new File([buffer], filename, contentType ? { type: contentType } : undefined);
+                const elapsedMs = Date.now() - startedAtMs;
+                const sizeBytes = buffer.byteLength;
+                if (this.options.isVerbose) {
+                    console.info('[🤰]', 'Downloaded knowledge source', {
+                        source,
+                        filename,
+                        sizeBytes,
+                        contentType,
+                        elapsedMs,
+                        logLabel,
+                    });
                 }
+                return { file, sizeBytes, filename, elapsedMs };
             }
-            /*
-            TODO: [👨‍👨‍👧‍👧] Implement all of this for Assistants
-            const modelName = modelRequirements.modelName || this.getDefaultChatModel().modelName;
-            const modelSettings = {
-                model: modelName,
-
-                temperature: modelRequirements.temperature,
-
-                // <- TODO: [🈁] Use `seed` here AND/OR use is `isDeterministic` for entire execution tools
-                // <- Note: [🧆]
-            } as OpenAI.Chat.Completions.CompletionCreateParamsNonStreaming; // <- TODO: Guard here types better
-
-            if (format === 'JSON') {
-                modelSettings.response_format = {
-                    type: 'json_object',
-                };
+            catch (error) {
+                assertsError(error);
+                console.error('[🤰]', 'Error downloading knowledge source', {
+                    source,
+                    elapsedMs: Date.now() - startedAtMs,
+                    logLabel,
+                    error: serializeError(error),
+                });
+                return null;
             }
-            */
-            // <- TODO: [🚸] Not all models are compatible with JSON mode
-            //        > 'response_format' of type 'json_object' is not supported with this model.
-            const rawPromptContent = templateParameters(content, {
-                ...parameters,
-                modelName: 'assistant',
-                //          <- [🧠] What is the best value here
-            });
-            // Build thread messages: include previous thread messages + current user message
-            const threadMessages = [];
-            // TODO: [🈹] Maybe this should not be here but in other place, look at commit 39d705e75e5bcf7a818c3af36bc13e1c8475c30c
-            // Add previous messages from thread (if any)
-            if ('thread' in prompt && Array.isArray(prompt.thread)) {
-                const previousMessages = prompt.thread.map((msg) => ({
-                    role: (msg.sender === 'assistant' ? 'assistant' : 'user'),
-                    content: msg.content,
-                }));
-                threadMessages.push(...previousMessages);
+            finally {
+                clearTimeout(timeoutId);
             }
-            // Always add the current user message
-            const currentUserMessage = {
-                role: 'user',
-                content: rawPromptContent,
-            };
-            if ('files' in prompt && Array.isArray(prompt.files) && prompt.files.length > 0) {
-                const fileIds = await uploadFilesToOpenAi(client, prompt.files);
-                currentUserMessage.attachments = fileIds.map((fileId) => ({
-                    file_id: fileId,
-                    tools: [{ type: 'file_search' }, { type: 'code_interpreter' }],
-                }));
+        }
+        /**
+         * Logs vector store file batch diagnostics to help trace ingestion stalls or failures.
+         */
+        async logVectorStoreFileBatchDiagnostics(options) {
+            var _a, _b, _c, _d, _e;
+            const { client, vectorStoreId, batchId, uploadedFiles, logLabel, reason } = options;
+            if (reason === 'stalled' && !this.options.isVerbose) {
+                return;
             }
-            threadMessages.push(currentUserMessage);
-            // Check if tools are being used - if so, use non-streaming mode
-            const hasTools = modelRequirements.tools !== undefined && modelRequirements.tools.length > 0;
-            const start = $getCurrentDate();
-            let complete;
-            // [🐱‍🚀] When tools are present, we need to use the non-streaming Runs API
-            // because streaming doesn't support tool execution flow properly
-            if (hasTools) {
-                onProgress({
-                    content: '',
-                    modelName: 'assistant',
-                    timing: { start, complete: $getCurrentDate() },
-                    usage: UNCERTAIN_USAGE,
-                    rawPromptContent,
-                    rawRequest: null,
-                    rawResponse: null,
-                });
-                const rawRequest = {
-                    assistant_id: this.assistantId,
-                    thread: {
-                        messages: threadMessages,
-                    },
-                    tools: mapToolsToOpenAi(modelRequirements.tools),
-                };
-                if (this.options.isVerbose) {
-                    console.info(colors__default["default"].bgWhite('rawRequest (non-streaming with tools)'), JSON.stringify(rawRequest, null, 4));
-                }
-                // Create thread and run
-                const threadAndRun = await client.beta.threads.createAndRun(rawRequest);
-                let run = threadAndRun;
-                const completedToolCalls = [];
-                const toolCallStartedAt = new Map();
-                // Poll until run completes or requires action
-                while (run.status === 'queued' || run.status === 'in_progress' || run.status === 'requires_action') {
-                    if (run.status === 'requires_action' && ((_a = run.required_action) === null || _a === void 0 ? void 0 : _a.type) === 'submit_tool_outputs') {
-                        // Execute tools
-                        const toolCalls = run.required_action.submit_tool_outputs.tool_calls;
-                        const toolOutputs = [];
-                        for (const toolCall of toolCalls) {
-                            if (toolCall.type === 'function') {
-                                const functionName = toolCall.function.name;
-                                const functionArgs = JSON.parse(toolCall.function.arguments);
-                                const calledAt = $getCurrentDate();
-                                if (toolCall.id) {
-                                    toolCallStartedAt.set(toolCall.id, calledAt);
-                                }
-                                onProgress({
-                                    content: '',
-                                    modelName: 'assistant',
-                                    timing: { start, complete: $getCurrentDate() },
-                                    usage: UNCERTAIN_USAGE,
-                                    rawPromptContent,
-                                    rawRequest: null,
-                                    rawResponse: null,
-                                    toolCalls: [
-                                        {
-                                            name: functionName,
-                                            arguments: toolCall.function.arguments,
-                                            result: '',
-                                            rawToolCall: toolCall,
-                                            createdAt: calledAt,
-                                        },
-                                    ],
-                                });
-                                if (this.options.isVerbose) {
-                                    console.info(`🔧 Executing tool: ${functionName}`, functionArgs);
-                                }
-                                // Get execution tools for script execution
-                                const executionTools = this.options
-                                    .executionTools;
-                                if (!executionTools || !executionTools.script) {
-                                    throw new PipelineExecutionError(`Model requested tool '${functionName}' but no executionTools.script were provided in OpenAiAssistantExecutionTools options`);
-                                }
-                                // TODO: [DRY] Use some common tool caller (similar to OpenAiCompatibleExecutionTools)
-                                const scriptTools = Array.isArray(executionTools.script)
-                                    ? executionTools.script
-                                    : [executionTools.script];
-                                let functionResponse;
-                                let errors;
-                                try {
-                                    const scriptTool = scriptTools[0]; // <- TODO: [🧠] Which script tool to use?
-                                    functionResponse = await scriptTool.execute({
-                                        scriptLanguage: 'javascript',
-                                        script: `
-                                        const args = ${JSON.stringify(functionArgs)};
-                                        return await ${functionName}(args);
-                                    `,
-                                        parameters: prompt.parameters,
-                                    });
-                                    if (this.options.isVerbose) {
-                                        console.info(`✅ Tool ${functionName} executed:`, functionResponse);
-                                    }
-                                }
-                                catch (error) {
-                                    assertsError(error);
-                                    const serializedError = serializeError(error);
-                                    errors = [serializedError];
-                                    functionResponse = spaceTrim__default["default"]((block) => `
-                                    
-                                        The invoked tool \`${functionName}\` failed with error:
-                                        
-                                        \`\`\`json
-                                        ${block(JSON.stringify(serializedError, null, 4))}
-                                        \`\`\`
-
-                                    `);
-                                    console.error(colors__default["default"].bgRed(`❌ Error executing tool ${functionName}:`));
-                                    console.error(error);
-                                }
-                                toolOutputs.push({
-                                    tool_call_id: toolCall.id,
-                                    output: functionResponse,
-                                });
-                                completedToolCalls.push({
-                                    name: functionName,
-                                    arguments: toolCall.function.arguments,
-                                    result: functionResponse,
-                                    rawToolCall: toolCall,
-                                    createdAt: toolCall.id ? toolCallStartedAt.get(toolCall.id) || calledAt : calledAt,
-                                    errors,
-                                });
-                            }
-                        }
-                        // Submit tool outputs
-                        run = await client.beta.threads.runs.submitToolOutputs(run.thread_id, run.id, {
-                            tool_outputs: toolOutputs,
-                        });
-                    }
-                    else {
-                        // Wait a bit before polling again
-                        await new Promise((resolve) => setTimeout(resolve, 500));
-                        run = await client.beta.threads.runs.retrieve(run.thread_id, run.id);
-                    }
-                }
-                if (run.status !== 'completed') {
-                    throw new PipelineExecutionError(`Assistant run failed with status: ${run.status}`);
-                }
-                // Get messages from the thread
-                const messages = await client.beta.threads.messages.list(run.thread_id);
-                const assistantMessages = messages.data.filter((msg) => msg.role === 'assistant');
-                if (assistantMessages.length === 0) {
-                    throw new PipelineExecutionError('No assistant messages found after run completion');
-                }
-                const lastMessage = assistantMessages[0];
-                const textContent = lastMessage.content.find((c) => c.type === 'text');
-                if (!textContent || textContent.type !== 'text') {
-                    throw new PipelineExecutionError('No text content in assistant response');
-                }
-                complete = $getCurrentDate();
-                const resultContent = textContent.text.value;
-                const usage = UNCERTAIN_USAGE;
-                // Progress callback with final result
-                const finalChunk = {
-                    content: resultContent,
-                    modelName: 'assistant',
-                    timing: { start, complete },
-                    usage,
-                    rawPromptContent,
-                    rawRequest,
-                    rawResponse: { run, messages: messages.data },
-                    toolCalls: completedToolCalls.length > 0 ? completedToolCalls : undefined,
-                };
-                onProgress(finalChunk);
-                return exportJson({
-                    name: 'promptResult',
-                    message: `Result of \`OpenAiAssistantExecutionTools.callChatModelStream\` (with tools)`,
-                    order: [],
-                    value: finalChunk,
-                });
-            }
-            // Streaming mode (without tools)
-            const rawRequest = {
-                // TODO: [👨‍👨‍👧‍👧] ...modelSettings,
-                // TODO: [👨‍👨‍👧‍👧][🧠] What about system message for assistants, does it make sense - combination of OpenAI assistants with Promptbook Personas
-                assistant_id: this.assistantId,
-                thread: {
-                    messages: threadMessages,
-                },
-                tools: modelRequirements.tools === undefined ? undefined : mapToolsToOpenAi(modelRequirements.tools),
-                // <- TODO: Add user identification here> user: this.options.user,
-            };
-            if (this.options.isVerbose) {
-                console.info(colors__default["default"].bgWhite('rawRequest (streaming)'), JSON.stringify(rawRequest, null, 4));
-            }
-            const stream = await client.beta.threads.createAndRunStream(rawRequest);
-            stream.on('connect', () => {
-                if (this.options.isVerbose) {
-                    console.info('connect', stream.currentEvent);
-                }
-            });
-            stream.on('textDelta', (textDelta, snapshot) => {
-                if (this.options.isVerbose && textDelta.value) {
-                    console.info('textDelta', textDelta.value);
-                }
-                const chunk = {
-                    content: snapshot.value,
-                    modelName: 'assistant',
-                    timing: {
-                        start,
-                        complete: $getCurrentDate(),
-                    },
-                    usage: UNCERTAIN_USAGE,
-                    rawPromptContent,
-                    rawRequest,
-                    rawResponse: snapshot,
-                };
-                onProgress(chunk);
-            });
-            stream.on('messageCreated', (message) => {
-                if (this.options.isVerbose) {
-                    console.info('messageCreated', message);
-                }
-            });
-            stream.on('messageDone', (message) => {
-                if (this.options.isVerbose) {
-                    console.info('messageDone', message);
-                }
-            });
-            // TODO: [🐱‍🚀] Handle tool calls in assistants
-            // Note: OpenAI Assistant streaming with tool calls requires special handling.
-            // The stream will pause when a tool call is needed, and we need to:
-            // 1. Wait for the run to reach 'requires_action' status
-            // 2. Execute the tool calls
-            // 3. Submit tool outputs via a separate API call (not on the stream)
-            // 4. Continue the run
-            // This requires switching to non-streaming mode or using the Runs API directly.
-            // For now, tools with assistants should use the non-streaming chat completions API instead.
-            const rawResponse = await stream.finalMessages();
-            if (this.options.isVerbose) {
-                console.info(colors__default["default"].bgWhite('rawResponse'), JSON.stringify(rawResponse, null, 4));
-            }
-            if (rawResponse.length !== 1) {
-                throw new PipelineExecutionError(`There is NOT 1 BUT ${rawResponse.length} finalMessages from OpenAI`);
-            }
-            if (rawResponse[0].content.length !== 1) {
-                throw new PipelineExecutionError(`There is NOT 1 BUT ${rawResponse[0].content.length} finalMessages content from OpenAI`);
-            }
-            if (((_b = rawResponse[0].content[0]) === null || _b === void 0 ? void 0 : _b.type) !== 'text') {
-                throw new PipelineExecutionError(`There is NOT 'text' BUT ${(_c = rawResponse[0].content[0]) === null || _c === void 0 ? void 0 : _c.type} finalMessages content type from OpenAI`);
-            }
-            let resultContent = (_d = rawResponse[0].content[0]) === null || _d === void 0 ? void 0 : _d.text.value;
-            // Process annotations to replace file IDs with filenames
-            if ((_e = rawResponse[0].content[0]) === null || _e === void 0 ? void 0 : _e.text.annotations) {
-                const annotations = (_f = rawResponse[0].content[0]) === null || _f === void 0 ? void 0 : _f.text.annotations;
-                // Map to store file ID -> filename to avoid duplicate requests
-                const fileIdToName = new Map();
-                for (const annotation of annotations) {
-                    if (annotation.type === 'file_citation') {
-                        const fileId = annotation.file_citation.file_id;
-                        let filename = fileIdToName.get(fileId);
-                        if (!filename) {
-                            try {
-                                const file = await client.files.retrieve(fileId);
-                                filename = file.filename;
-                                fileIdToName.set(fileId, filename);
-                            }
-                            catch (error) {
-                                console.error(`Failed to retrieve file info for ${fileId}`, error);
-                                // Fallback to "Source" or keep original if fetch fails
-                                filename = 'Source';
-                            }
-                        }
-                        if (filename && resultContent) {
-                            // Replace the citation marker with filename
-                            // Regex to match the second part of the citation: 【id†source】 -> 【id†filename】
-                            // Note: annotation.text contains the exact marker like 【4:0†source】
-                            const newText = annotation.text.replace(/†.*?】/, `†${filename}】`);
-                            resultContent = resultContent.replace(annotation.text, newText);
-                        }
-                    }
-                }
-            }
-            // eslint-disable-next-line prefer-const
-            complete = $getCurrentDate();
-            const usage = UNCERTAIN_USAGE;
-            // <- TODO: [🥘] Compute real usage for assistant
-            //       ?> const usage = computeOpenAiUsage(content, resultContent || '', rawResponse);
-            if (resultContent === null) {
-                throw new PipelineExecutionError('No response message from OpenAI');
-            }
-            return exportJson({
-                name: 'promptResult',
-                message: `Result of \`OpenAiAssistantExecutionTools.callChatModelStream\``,
-                order: [],
-                value: {
-                    content: resultContent,
-                    modelName: 'assistant',
-                    // <- TODO: [🥘] Detect used model in assistant
-                    //       ?> model: rawResponse.model || modelName,
-                    timing: {
-                        start,
-                        complete,
-                    },
-                    usage,
-                    rawPromptContent,
-                    rawRequest,
-                    rawResponse,
-                    // <- [🗯]
-                },
-            });
-        }
-        /*
-        public async playground() {
-            const client = await this.getClient();
-
-            // List all assistants
-            const assistants = await client.beta.assistants.list();
-         
-            // Get details of a specific assistant
-            const assistantId = 'asst_MO8fhZf4dGloCfXSHeLcIik0';
-            const assistant = await client.beta.assistants.retrieve(assistantId);
-
-            // Update an assistant
-            const updatedAssistant = await client.beta.assistants.update(assistantId, {
-                name: assistant.name + '(M)',
-                description: 'Updated description via Promptbook',
-                metadata: {
-                    [Math.random().toString(36).substring(2, 15)]: new Date().toISOString(),
-                },
-            });
-      
-            await forEver();
-        }
-        */
-        /**
-         * Get an existing assistant tool wrapper
-         */
-        getAssistant(assistantId) {
-            return new OpenAiAssistantExecutionTools({
-                ...this.options,
-                isCreatingNewAssistantsAllowed: this.isCreatingNewAssistantsAllowed,
-                assistantId,
-            });
-        }
-        /**
-         * Returns the per-knowledge-source download timeout in milliseconds.
-         */
-        getKnowledgeSourceDownloadTimeoutMs() {
-            var _a;
-            return (_a = this.assistantOptions.knowledgeSourceDownloadTimeoutMs) !== null && _a !== void 0 ? _a : DEFAULT_KNOWLEDGE_SOURCE_DOWNLOAD_TIMEOUT_MS;
-        }
-        /**
-         * Returns the max concurrency for knowledge source uploads.
-         */
-        getKnowledgeSourceUploadMaxConcurrency() {
-            var _a;
-            return (_a = this.assistantOptions.knowledgeSourceUploadMaxConcurrency) !== null && _a !== void 0 ? _a : 5;
-        }
-        /**
-         * Returns the polling interval in milliseconds for vector store uploads.
-         */
-        getKnowledgeSourceUploadPollIntervalMs() {
-            var _a;
-            return (_a = this.assistantOptions.knowledgeSourceUploadPollIntervalMs) !== null && _a !== void 0 ? _a : 5000;
-        }
-        /**
-         * Returns the overall upload timeout in milliseconds for vector store uploads.
-         */
-        getKnowledgeSourceUploadTimeoutMs() {
-            var _a;
-            return (_a = this.assistantOptions.knowledgeSourceUploadTimeoutMs) !== null && _a !== void 0 ? _a : DEFAULT_KNOWLEDGE_SOURCE_UPLOAD_TIMEOUT_MS;
-        }
-        /**
-         * Returns true if we should continue even if vector store ingestion stalls.
-         */
-        shouldContinueOnVectorStoreStall() {
-            var _a;
-            return (_a = this.assistantOptions.shouldContinueOnVectorStoreStall) !== null && _a !== void 0 ? _a : true;
-        }
-        /**
-         * Returns assistant-specific options with extended settings.
-         */
-        get assistantOptions() {
-            return this.options;
-        }
-        /**
-         * Downloads a knowledge source URL into a File for vector store upload.
-         */
-        async downloadKnowledgeSourceFile(options) {
-            var _a;
-            const { source, timeoutMs, logLabel } = options;
-            const startedAtMs = Date.now();
-            const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
-            if (this.options.isVerbose) {
-                console.info('[🤰]', 'Downloading knowledge source', {
-                    source,
-                    timeoutMs,
-                    logLabel,
-                });
-            }
-            try {
-                const response = await fetch(source, { signal: controller.signal });
-                const contentType = (_a = response.headers.get('content-type')) !== null && _a !== void 0 ? _a : undefined;
-                if (!response.ok) {
-                    console.error('[🤰]', 'Failed to download knowledge source', {
-                        source,
-                        status: response.status,
-                        statusText: response.statusText,
-                        contentType,
-                        elapsedMs: Date.now() - startedAtMs,
-                        logLabel,
-                    });
-                    return null;
-                }
-                const buffer = await response.arrayBuffer();
-                let filename = source.split('/').pop() || 'downloaded-file';
-                try {
-                    const url = new URL(source);
-                    filename = url.pathname.split('/').pop() || filename;
-                }
-                catch (error) {
-                    // Keep default filename
-                }
-                const file = new File([buffer], filename, contentType ? { type: contentType } : undefined);
-                const elapsedMs = Date.now() - startedAtMs;
-                const sizeBytes = buffer.byteLength;
-                if (this.options.isVerbose) {
-                    console.info('[🤰]', 'Downloaded knowledge source', {
-                        source,
-                        filename,
-                        sizeBytes,
-                        contentType,
-                        elapsedMs,
-                        logLabel,
-                    });
-                }
-                return { file, sizeBytes, filename, elapsedMs };
-            }
-            catch (error) {
-                assertsError(error);
-                console.error('[🤰]', 'Error downloading knowledge source', {
-                    source,
-                    elapsedMs: Date.now() - startedAtMs,
-                    logLabel,
-                    error: serializeError(error),
-                });
-                return null;
-            }
-            finally {
-                clearTimeout(timeoutId);
-            }
-        }
-        /**
-         * Logs vector store file batch diagnostics to help trace ingestion stalls or failures.
-         */
-        async logVectorStoreFileBatchDiagnostics(options) {
-            var _a, _b;
-            const { client, vectorStoreId, batchId, uploadedFiles, logLabel, reason } = options;
-            if (reason === 'stalled' && !this.options.isVerbose) {
-                return;
-            }
-            if (!batchId.startsWith('vsfb_')) {
-                console.error('[🤰]', 'Vector store file batch diagnostics skipped (invalid batch id)', {
-                    vectorStoreId,
-                    batchId,
-                    reason,
-                    logLabel,
+            if (!batchId.startsWith('vsfb_')) {
+                console.error('[🤰]', 'Vector store file batch diagnostics skipped (invalid batch id)', {
+                    vectorStoreId,
+                    batchId,
+                    reason,
+                    logLabel,
                 });
                 return;
             }
@@ -23910,8 +23486,10 @@
                 fileIdToMetadata.set(file.fileId, file);
             }
             try {
+                const vectorStores = this.getVectorStoresApi(client);
                 const limit = Math.min(100, Math.max(10, uploadedFiles.length));
-                const batchFilesPage = await client.beta.vectorStores.fileBatches.listFiles(vectorStoreId, batchId, {
+                const batchFilesPage = await vectorStores.fileBatches.listFiles(batchId, {
+                    vector_store_id: vectorStoreId,
                     limit,
                 });
                 const batchFiles = (_a = batchFilesPage.data) !== null && _a !== void 0 ? _a : [];
@@ -23925,23 +23503,27 @@
                 const inProgressSamples = [];
                 const batchFileIds = new Set();
                 for (const file of batchFiles) {
-                    batchFileIds.add(file.id);
-                    statusCounts[file.status] = ((_b = statusCounts[file.status]) !== null && _b !== void 0 ? _b : 0) + 1;
-                    const metadata = fileIdToMetadata.get(file.id);
-                    if (file.last_error) {
+                    const status = (_b = file.status) !== null && _b !== void 0 ? _b : 'unknown';
+                    statusCounts[status] = ((_c = statusCounts[status]) !== null && _c !== void 0 ? _c : 0) + 1;
+                    const vectorStoreFileId = file.id;
+                    const uploadedFileId = (_d = file.file_id) !== null && _d !== void 0 ? _d : file.fileId;
+                    const fileId = uploadedFileId !== null && uploadedFileId !== void 0 ? uploadedFileId : vectorStoreFileId;
+                    batchFileIds.add(fileId);
+                    const metadata = fileIdToMetadata.get(fileId);
+                    if (status === 'failed') {
                         errorSamples.push({
-                            fileId: file.id,
+                            fileId,
+                            status,
+                            error: (_e = file.last_error) === null || _e === void 0 ? void 0 : _e.message,
                             filename: metadata === null || metadata === void 0 ? void 0 : metadata.filename,
-                            sizeBytes: metadata === null || metadata === void 0 ? void 0 : metadata.sizeBytes,
-                            status: file.status,
-                            lastError: file.last_error,
+                            vectorStoreFileId: uploadedFileId ? vectorStoreFileId : undefined,
                         });
                     }
-                    else if (file.status === 'in_progress' && inProgressSamples.length < 5) {
+                    if (status === 'in_progress') {
                         inProgressSamples.push({
-                            fileId: file.id,
+                            fileId,
                             filename: metadata === null || metadata === void 0 ? void 0 : metadata.filename,
-                            sizeBytes: metadata === null || metadata === void 0 ? void 0 : metadata.sizeBytes,
+                            vectorStoreFileId: uploadedFileId ? vectorStoreFileId : undefined,
                         });
                     }
                 }
@@ -23953,7 +23535,7 @@
                     filename: file.filename,
                     sizeBytes: file.sizeBytes,
                 }));
-                const vectorStore = await client.beta.vectorStores.retrieve(vectorStoreId);
+                const vectorStore = await vectorStores.retrieve(vectorStoreId);
                 const logPayload = {
                     vectorStoreId,
                     batchId,
@@ -23987,8 +23569,9 @@
          * Uploads knowledge source files to the vector store and polls until processing completes.
          */
         async uploadKnowledgeSourceFilesToVectorStore(options) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
             const { client, vectorStoreId, files, totalBytes, logLabel } = options;
+            const vectorStores = this.getVectorStoresApi(client);
             const uploadStartedAtMs = Date.now();
             const maxConcurrency = Math.max(1, this.getKnowledgeSourceUploadMaxConcurrency());
             const pollIntervalMs = Math.max(1000, this.getKnowledgeSourceUploadPollIntervalMs());
@@ -24105,373 +23688,1288 @@
                     failedCount: failedUploads.length,
                     logLabel,
                 });
-                return null;
+                return null;
+            }
+            const batch = await vectorStores.fileBatches.create(vectorStoreId, {
+                file_ids: fileIds,
+            });
+            const expectedBatchId = batch.id;
+            const expectedBatchIdValid = expectedBatchId.startsWith('vsfb_');
+            if (!expectedBatchIdValid) {
+                console.error('[🤰]', 'Vector store file batch id looks invalid', {
+                    vectorStoreId,
+                    batchId: expectedBatchId,
+                    batchVectorStoreId: batch.vector_store_id,
+                    logLabel,
+                });
+            }
+            else if (batch.vector_store_id !== vectorStoreId) {
+                console.error('[🤰]', 'Vector store file batch vector store id mismatch', {
+                    vectorStoreId,
+                    batchId: expectedBatchId,
+                    batchVectorStoreId: batch.vector_store_id,
+                    logLabel,
+                });
+            }
+            if (this.options.isVerbose) {
+                console.info('[🤰]', 'Created vector store file batch', {
+                    vectorStoreId,
+                    batchId: expectedBatchId,
+                    fileCount: fileIds.length,
+                    logLabel,
+                });
+            }
+            const pollStartedAtMs = Date.now();
+            const progressLogIntervalMs = Math.max(VECTOR_STORE_PROGRESS_LOG_INTERVAL_MIN_MS, pollIntervalMs);
+            const diagnosticsIntervalMs = Math.max(60000, pollIntervalMs * 5);
+            // let lastStatus: string | undefined;
+            let lastCountsKey = '';
+            let lastProgressKey = '';
+            let lastLogAtMs = 0;
+            let lastProgressAtMs = pollStartedAtMs;
+            let lastDiagnosticsAtMs = pollStartedAtMs;
+            let latestBatch = batch;
+            let loggedBatchIdMismatch = false;
+            let loggedBatchIdFallback = false;
+            let loggedBatchIdInvalid = false;
+            let shouldPoll = true;
+            while (shouldPoll) {
+                const nowMs = Date.now();
+                // [🤰] Note: Sometimes OpenAI returns Vector Store object instead of Batch object, or IDs get swapped.
+                const rawBatchId = typeof latestBatch.id === 'string' ? latestBatch.id : '';
+                const rawVectorStoreId = latestBatch.vector_store_id;
+                let returnedBatchId = rawBatchId;
+                let returnedBatchIdValid = typeof returnedBatchId === 'string' && returnedBatchId.startsWith('vsfb_');
+                if (!returnedBatchIdValid && expectedBatchIdValid) {
+                    if (!loggedBatchIdFallback) {
+                        console.error('[🤰]', 'Vector store file batch id missing from response; falling back to expected', {
+                            vectorStoreId,
+                            expectedBatchId,
+                            returnedBatchId,
+                            rawVectorStoreId,
+                            logLabel,
+                        });
+                        loggedBatchIdFallback = true;
+                    }
+                    returnedBatchId = expectedBatchId;
+                    returnedBatchIdValid = true;
+                }
+                if (!returnedBatchIdValid && !loggedBatchIdInvalid) {
+                    console.error('[🤰]', 'Vector store file batch id is invalid; stopping polling', {
+                        vectorStoreId,
+                        expectedBatchId,
+                        returnedBatchId,
+                        rawVectorStoreId,
+                        logLabel,
+                    });
+                    loggedBatchIdInvalid = true;
+                }
+                const batchIdMismatch = expectedBatchIdValid && returnedBatchIdValid && returnedBatchId !== expectedBatchId;
+                if (batchIdMismatch && !loggedBatchIdMismatch) {
+                    console.error('[🤰]', 'Vector store file batch id mismatch', {
+                        vectorStoreId,
+                        expectedBatchId,
+                        returnedBatchId,
+                        logLabel,
+                    });
+                    loggedBatchIdMismatch = true;
+                }
+                if (returnedBatchIdValid) {
+                    latestBatch = await vectorStores.fileBatches.retrieve(returnedBatchId, {
+                        vector_store_id: vectorStoreId,
+                    });
+                }
+                else {
+                    shouldPoll = false;
+                    continue;
+                }
+                const status = (_e = latestBatch.status) !== null && _e !== void 0 ? _e : 'unknown';
+                const fileCounts = (_f = latestBatch.file_counts) !== null && _f !== void 0 ? _f : {};
+                const progressKey = JSON.stringify(fileCounts);
+                const statusCountsKey = `${status}-${progressKey}`;
+                const isProgressing = progressKey !== lastProgressKey;
+                if (isProgressing) {
+                    lastProgressAtMs = nowMs;
+                    lastProgressKey = progressKey;
+                }
+                if (this.options.isVerbose &&
+                    (statusCountsKey !== lastCountsKey || nowMs - lastLogAtMs >= progressLogIntervalMs)) {
+                    console.info('[🤰]', 'Vector store file batch status', {
+                        vectorStoreId,
+                        batchId: returnedBatchId,
+                        status,
+                        fileCounts,
+                        elapsedMs: nowMs - pollStartedAtMs,
+                        logLabel,
+                    });
+                    lastCountsKey = statusCountsKey;
+                    lastLogAtMs = nowMs;
+                }
+                if (status === 'in_progress' &&
+                    nowMs - lastProgressAtMs >= VECTOR_STORE_STALL_LOG_THRESHOLD_MS &&
+                    nowMs - lastDiagnosticsAtMs >= diagnosticsIntervalMs) {
+                    lastDiagnosticsAtMs = nowMs;
+                    await this.logVectorStoreFileBatchDiagnostics({
+                        client,
+                        vectorStoreId,
+                        batchId: returnedBatchId,
+                        uploadedFiles,
+                        logLabel,
+                        reason: 'stalled',
+                    });
+                }
+                if (status === 'completed') {
+                    if (this.options.isVerbose) {
+                        console.info('[🤰]', 'Vector store file batch completed', {
+                            vectorStoreId,
+                            batchId: returnedBatchId,
+                            fileCounts,
+                            elapsedMs: nowMs - pollStartedAtMs,
+                            logLabel,
+                        });
+                    }
+                    shouldPoll = false;
+                    continue;
+                }
+                if (status === 'failed') {
+                    console.error('[🤰]', 'Vector store file batch completed with failures', {
+                        vectorStoreId,
+                        batchId: returnedBatchId,
+                        fileCounts,
+                        elapsedMs: nowMs - pollStartedAtMs,
+                        logLabel,
+                    });
+                    await this.logVectorStoreFileBatchDiagnostics({
+                        client,
+                        vectorStoreId,
+                        batchId: returnedBatchId,
+                        uploadedFiles,
+                        logLabel,
+                        reason: 'failed',
+                    });
+                    shouldPoll = false;
+                    continue;
+                }
+                if (status === 'cancelled') {
+                    console.error('[🤰]', 'Vector store file batch did not complete', {
+                        vectorStoreId,
+                        batchId: returnedBatchId,
+                        status,
+                        fileCounts,
+                        elapsedMs: nowMs - pollStartedAtMs,
+                        logLabel,
+                    });
+                    await this.logVectorStoreFileBatchDiagnostics({
+                        client,
+                        vectorStoreId,
+                        batchId: returnedBatchId,
+                        uploadedFiles,
+                        logLabel,
+                        reason: 'failed',
+                    });
+                    shouldPoll = false;
+                    continue;
+                }
+                if (nowMs - pollStartedAtMs >= uploadTimeoutMs) {
+                    console.error('[🤰]', 'Timed out waiting for vector store file batch', {
+                        vectorStoreId,
+                        batchId: returnedBatchId,
+                        fileCounts,
+                        elapsedMs: nowMs - pollStartedAtMs,
+                        uploadTimeoutMs,
+                        logLabel,
+                    });
+                    await this.logVectorStoreFileBatchDiagnostics({
+                        client,
+                        vectorStoreId,
+                        batchId: returnedBatchId,
+                        uploadedFiles,
+                        logLabel,
+                        reason: 'timeout',
+                    });
+                    if (this.shouldContinueOnVectorStoreStall()) {
+                        console.warn('[🤰]', 'Continuing despite vector store timeout as requested', {
+                            vectorStoreId,
+                            logLabel,
+                        });
+                        shouldPoll = false;
+                        continue;
+                    }
+                    try {
+                        const cancelBatchId = batchIdMismatch && returnedBatchId.startsWith('vsfb_') ? returnedBatchId : expectedBatchId;
+                        if (!cancelBatchId.startsWith('vsfb_')) {
+                            console.error('[🤰]', 'Skipping vector store file batch cancel (invalid batch id)', {
+                                vectorStoreId,
+                                batchId: cancelBatchId,
+                                logLabel,
+                            });
+                        }
+                        else {
+                            await vectorStores.fileBatches.cancel(cancelBatchId, {
+                                vector_store_id: vectorStoreId,
+                            });
+                        }
+                        if (this.options.isVerbose) {
+                            console.info('[🤰]', 'Cancelled vector store file batch after timeout', {
+                                vectorStoreId,
+                                batchId: batchIdMismatch && returnedBatchId.startsWith('vsfb_')
+                                    ? returnedBatchId
+                                    : expectedBatchId,
+                                ...(batchIdMismatch ? { returnedBatchId } : {}),
+                                logLabel,
+                            });
+                        }
+                    }
+                    catch (error) {
+                        assertsError(error);
+                        console.error('[🤰]', 'Failed to cancel vector store file batch after timeout', {
+                            vectorStoreId,
+                            batchId: expectedBatchId,
+                            ...(batchIdMismatch ? { returnedBatchId } : {}),
+                            logLabel,
+                            error: serializeError(error),
+                        });
+                    }
+                    shouldPoll = false;
+                    continue;
+                }
+                await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+            }
+            return latestBatch;
+        }
+        /**
+         * Creates a vector store and uploads knowledge sources, returning its ID.
+         */
+        async createVectorStoreWithKnowledgeSources(options) {
+            const { client, name, knowledgeSources, logLabel } = options;
+            const vectorStores = this.getVectorStoresApi(client);
+            const knowledgeSourcesCount = knowledgeSources.length;
+            const downloadTimeoutMs = this.getKnowledgeSourceDownloadTimeoutMs();
+            if (this.options.isVerbose) {
+                console.info('[🤰]', 'Creating vector store with knowledge sources', {
+                    name,
+                    knowledgeSourcesCount,
+                    downloadTimeoutMs,
+                    logLabel,
+                });
             }
-            const batch = await client.beta.vectorStores.fileBatches.create(vectorStoreId, {
-                file_ids: fileIds,
+            const vectorStore = await vectorStores.create({
+                name: `${name} Knowledge Base`,
             });
-            const expectedBatchId = batch.id;
-            const expectedBatchIdValid = expectedBatchId.startsWith('vsfb_');
-            if (!expectedBatchIdValid) {
-                console.error('[🤰]', 'Vector store file batch id looks invalid', {
+            const vectorStoreId = vectorStore.id;
+            if (this.options.isVerbose) {
+                console.info('[🤰]', 'Vector store created', {
                     vectorStoreId,
-                    batchId: expectedBatchId,
-                    batchVectorStoreId: batch.vector_store_id,
                     logLabel,
                 });
             }
-            else if (batch.vector_store_id !== vectorStoreId) {
-                console.error('[🤰]', 'Vector store file batch vector store id mismatch', {
-                    vectorStoreId,
-                    batchId: expectedBatchId,
-                    batchVectorStoreId: batch.vector_store_id,
-                    logLabel,
-                });
+            const fileStreams = [];
+            const skippedSources = [];
+            let totalBytes = 0;
+            const processingStartedAtMs = Date.now();
+            for (const [index, source] of knowledgeSources.entries()) {
+                try {
+                    const sourceType = source.startsWith('http') || source.startsWith('https') ? 'url' : 'file';
+                    if (this.options.isVerbose) {
+                        console.info('[🤰]', 'Processing knowledge source', {
+                            index: index + 1,
+                            total: knowledgeSourcesCount,
+                            source,
+                            sourceType,
+                            logLabel,
+                        });
+                    }
+                    // Check if it's a URL
+                    if (source.startsWith('http://') || source.startsWith('https://')) {
+                        const downloadResult = await this.downloadKnowledgeSourceFile({
+                            source,
+                            timeoutMs: downloadTimeoutMs,
+                            logLabel,
+                        });
+                        if (downloadResult) {
+                            fileStreams.push(downloadResult.file);
+                            totalBytes += downloadResult.sizeBytes;
+                        }
+                        else {
+                            skippedSources.push({ source, reason: 'download_failed' });
+                        }
+                    }
+                    else {
+                        skippedSources.push({ source, reason: 'unsupported_source_type' });
+                        if (this.options.isVerbose) {
+                            console.info('[🤰]', 'Skipping knowledge source (unsupported type)', {
+                                source,
+                                sourceType,
+                                logLabel,
+                            });
+                        }
+                        /*
+                        TODO: [🤰] Resolve problem with browser environment
+                        // Assume it's a local file path
+                        // Note: This will work in Node.js environment
+                        // For browser environments, this would need different handling
+                        const fs = await import('fs');
+                        const fileStream = fs.createReadStream(source);
+                        fileStreams.push(fileStream);
+                        */
+                    }
+                }
+                catch (error) {
+                    assertsError(error);
+                    skippedSources.push({ source, reason: 'processing_error' });
+                    console.error('[🤰]', 'Error processing knowledge source', {
+                        source,
+                        logLabel,
+                        error: serializeError(error),
+                    });
+                }
             }
             if (this.options.isVerbose) {
-                console.info('[🤰]', 'Created vector store file batch', {
-                    vectorStoreId,
-                    batchId: expectedBatchId,
-                    fileCount: fileIds.length,
+                console.info('[🤰]', 'Finished processing knowledge sources', {
+                    total: knowledgeSourcesCount,
+                    downloadedCount: fileStreams.length,
+                    skippedCount: skippedSources.length,
+                    totalBytes,
+                    elapsedMs: Date.now() - processingStartedAtMs,
+                    skippedSamples: skippedSources.slice(0, 3),
                     logLabel,
                 });
             }
-            const pollStartedAtMs = Date.now();
-            const progressLogIntervalMs = Math.max(VECTOR_STORE_PROGRESS_LOG_INTERVAL_MIN_MS, pollIntervalMs);
-            const diagnosticsIntervalMs = Math.max(60000, pollIntervalMs * 5);
-            let lastStatus;
-            let lastCountsKey = '';
-            let lastProgressKey = '';
-            let lastLogAtMs = 0;
-            let lastProgressAtMs = pollStartedAtMs;
-            let lastDiagnosticsAtMs = pollStartedAtMs;
-            let latestBatch = batch;
-            let loggedBatchIdMismatch = false;
-            let shouldPoll = true;
-            while (shouldPoll) {
-                latestBatch = await client.beta.vectorStores.fileBatches.retrieve(vectorStoreId, expectedBatchId);
-                const counts = latestBatch.file_counts;
-                const countsKey = `${counts.completed}/${counts.failed}/${counts.in_progress}/${counts.cancelled}/${counts.total}`;
-                const nowMs = Date.now();
-                const returnedBatchId = latestBatch.id;
-                // [🤰] Note: Sometimes OpenAI returns Vector Store object instead of Batch object, or IDs get swapped.
-                // We only consider it a mismatch if the returned ID looks like a Batch ID.
-                const batchIdMismatch = returnedBatchId !== expectedBatchId && returnedBatchId.startsWith('vsfb_');
-                const diagnosticsBatchId = batchIdMismatch && returnedBatchId.startsWith('vsfb_') ? returnedBatchId : expectedBatchId;
-                const shouldLog = this.options.isVerbose &&
-                    (latestBatch.status !== lastStatus ||
-                        countsKey !== lastCountsKey ||
-                        nowMs - lastLogAtMs >= progressLogIntervalMs);
-                if (batchIdMismatch && !loggedBatchIdMismatch) {
-                    console.error('[🤰]', 'Vector store file batch id mismatch', {
+            if (fileStreams.length > 0) {
+                if (this.options.isVerbose) {
+                    console.info('[🤰]', 'Uploading files to vector store', {
                         vectorStoreId,
-                        expectedBatchId,
-                        returnedBatchId,
-                        status: latestBatch.status,
-                        fileCounts: counts,
+                        fileCount: fileStreams.length,
+                        totalBytes,
+                        maxConcurrency: this.getKnowledgeSourceUploadMaxConcurrency(),
+                        pollIntervalMs: this.getKnowledgeSourceUploadPollIntervalMs(),
+                        uploadTimeoutMs: this.getKnowledgeSourceUploadTimeoutMs(),
                         logLabel,
                     });
-                    loggedBatchIdMismatch = true;
-                }
-                if (countsKey !== lastProgressKey) {
-                    lastProgressKey = countsKey;
-                    lastProgressAtMs = nowMs;
                 }
-                if (shouldLog) {
-                    console.info('[🤰]', 'Vector store file batch status', {
+                try {
+                    await this.uploadKnowledgeSourceFilesToVectorStore({
+                        client,
                         vectorStoreId,
-                        batchId: expectedBatchId,
-                        ...(batchIdMismatch ? { returnedBatchId } : {}),
-                        status: latestBatch.status,
-                        fileCounts: counts,
-                        elapsedMs: nowMs - pollStartedAtMs,
+                        files: fileStreams,
+                        totalBytes,
                         logLabel,
                     });
-                    // [🤰] If there are in-progress files for a long time, log their details
-                    if (counts.in_progress > 0 && nowMs - lastProgressAtMs > VECTOR_STORE_STALL_LOG_THRESHOLD_MS) {
-                        await this.logVectorStoreFileBatchDiagnostics({
-                            client,
-                            vectorStoreId,
-                            batchId: diagnosticsBatchId,
-                            uploadedFiles,
-                            logLabel,
-                            reason: 'stalled',
-                        });
-                    }
-                    lastStatus = latestBatch.status;
-                    lastCountsKey = countsKey;
-                    lastLogAtMs = nowMs;
                 }
-                if (nowMs - lastProgressAtMs >= diagnosticsIntervalMs &&
-                    nowMs - lastDiagnosticsAtMs >= diagnosticsIntervalMs) {
-                    lastDiagnosticsAtMs = nowMs;
-                    await this.logVectorStoreFileBatchDiagnostics({
-                        client,
+                catch (error) {
+                    assertsError(error);
+                    console.error('[🤰]', 'Error uploading files to vector store', {
                         vectorStoreId,
-                        batchId: diagnosticsBatchId,
-                        uploadedFiles,
                         logLabel,
-                        reason: 'stalled',
+                        error: serializeError(error),
                     });
                 }
-                if (latestBatch.status === 'completed') {
-                    if (this.options.isVerbose) {
-                        console.info('[🤰]', 'Vector store file batch completed', {
-                            vectorStoreId,
-                            batchId: expectedBatchId,
-                            ...(batchIdMismatch ? { returnedBatchId } : {}),
-                            fileCounts: latestBatch.file_counts,
-                            elapsedMs: Date.now() - uploadStartedAtMs,
-                            logLabel,
-                        });
-                    }
-                    if (latestBatch.file_counts.failed > 0) {
-                        console.error('[🤰]', 'Vector store file batch completed with failures', {
-                            vectorStoreId,
-                            batchId: expectedBatchId,
-                            ...(batchIdMismatch ? { returnedBatchId } : {}),
-                            fileCounts: latestBatch.file_counts,
-                            logLabel,
-                        });
-                        await this.logVectorStoreFileBatchDiagnostics({
-                            client,
-                            vectorStoreId,
-                            batchId: diagnosticsBatchId,
-                            uploadedFiles,
-                            logLabel,
-                            reason: 'failed',
-                        });
-                    }
-                    shouldPoll = false;
-                    continue;
+            }
+            else if (this.options.isVerbose) {
+                console.info('[🤰]', 'No knowledge source files to upload', {
+                    vectorStoreId,
+                    skippedCount: skippedSources.length,
+                    logLabel,
+                });
+            }
+            return {
+                vectorStoreId,
+                uploadedFileCount: fileStreams.length,
+                skippedCount: skippedSources.length,
+                totalBytes,
+            };
+        }
+    }
+
+    const DEFAULT_AGENT_KIT_MODEL_NAME = 'gpt-5.2';
+    /**
+     * Execution tools for OpenAI AgentKit (Agents SDK).
+     *
+     * @public exported from `@promptbook/openai`
+     */
+    class OpenAiAgentKitExecutionTools extends OpenAiVectorStoreHandler {
+        /**
+         * Creates OpenAI AgentKit execution tools.
+         */
+        constructor(options) {
+            var _a;
+            if (options.isProxied) {
+                throw new NotYetImplementedError(`Proxy mode is not yet implemented for OpenAI AgentKit`);
+            }
+            super(options);
+            this.preparedAgentKitAgent = null;
+            this.agentKitModelName = (_a = options.agentKitModelName) !== null && _a !== void 0 ? _a : DEFAULT_AGENT_KIT_MODEL_NAME;
+        }
+        get title() {
+            return 'OpenAI AgentKit';
+        }
+        get description() {
+            return 'Use OpenAI AgentKit for agent-style chat with tools and knowledge';
+        }
+        /**
+         * Calls OpenAI AgentKit with a chat prompt (non-streaming).
+         */
+        async callChatModel(prompt) {
+            return this.callChatModelStream(prompt, () => { });
+        }
+        /**
+         * Calls OpenAI AgentKit with a chat prompt (streaming).
+         */
+        async callChatModelStream(prompt, onProgress) {
+            const { content, parameters, modelRequirements } = prompt;
+            if (modelRequirements.modelVariant !== 'CHAT') {
+                throw new PipelineExecutionError('Use callChatModel only for CHAT variant');
+            }
+            for (const key of ['maxTokens', 'modelName', 'seed', 'temperature']) {
+                if (modelRequirements[key] !== undefined) {
+                    throw new NotYetImplementedError(`In \`OpenAiAgentKitExecutionTools\` you cannot specify \`${key}\``);
+                }
+            }
+            const rawPromptContent = templateParameters(content, {
+                ...parameters,
+                modelName: this.agentKitModelName,
+            });
+            const preparedAgentKitAgent = await this.prepareAgentKitAgent({
+                name: (prompt.title || 'Agent'),
+                instructions: modelRequirements.systemMessage || '',
+                knowledgeSources: modelRequirements.knowledgeSources,
+                tools: 'tools' in prompt && Array.isArray(prompt.tools) ? prompt.tools : modelRequirements.tools,
+            });
+            return this.callChatModelStreamWithPreparedAgent({
+                openAiAgentKitAgent: preparedAgentKitAgent.agent,
+                prompt,
+                rawPromptContent,
+                onProgress,
+            });
+        }
+        /**
+         * Returns a prepared AgentKit agent when the server wants to manage caching externally.
+         */
+        getPreparedAgentKitAgent() {
+            return this.preparedAgentKitAgent;
+        }
+        /**
+         * Stores a prepared AgentKit agent for later reuse by external cache managers.
+         */
+        setPreparedAgentKitAgent(preparedAgent) {
+            this.preparedAgentKitAgent = preparedAgent;
+        }
+        /**
+         * Creates a new tools instance bound to a prepared AgentKit agent.
+         */
+        getPreparedAgentTools(preparedAgent) {
+            const tools = new OpenAiAgentKitExecutionTools(this.agentKitOptions);
+            tools.setPreparedAgentKitAgent(preparedAgent);
+            return tools;
+        }
+        /**
+         * Prepares an AgentKit agent with optional knowledge sources and tool definitions.
+         */
+        async prepareAgentKitAgent(options) {
+            var _a, _b;
+            const { name, instructions, knowledgeSources, tools, vectorStoreId: cachedVectorStoreId, storeAsPrepared, } = options;
+            await this.ensureAgentKitDefaults();
+            if (this.options.isVerbose) {
+                console.info('[🤰]', 'Preparing OpenAI AgentKit agent', {
+                    name,
+                    instructionsLength: instructions.length,
+                    knowledgeSourcesCount: (_a = knowledgeSources === null || knowledgeSources === void 0 ? void 0 : knowledgeSources.length) !== null && _a !== void 0 ? _a : 0,
+                    toolsCount: (_b = tools === null || tools === void 0 ? void 0 : tools.length) !== null && _b !== void 0 ? _b : 0,
+                });
+            }
+            let vectorStoreId = cachedVectorStoreId;
+            if (!vectorStoreId && knowledgeSources && knowledgeSources.length > 0) {
+                const vectorStoreResult = await this.createVectorStoreWithKnowledgeSources({
+                    client: await this.getClient(),
+                    name,
+                    knowledgeSources,
+                    logLabel: 'agentkit preparation',
+                });
+                vectorStoreId = vectorStoreResult.vectorStoreId;
+            }
+            else if (vectorStoreId && this.options.isVerbose) {
+                console.info('[🤰]', 'Using cached vector store for AgentKit agent', {
+                    name,
+                    vectorStoreId,
+                });
+            }
+            const agentKitTools = this.buildAgentKitTools({ tools, vectorStoreId });
+            const openAiAgentKitAgent = new agents.Agent({
+                name,
+                model: this.agentKitModelName,
+                instructions: instructions || 'You are a helpful assistant.',
+                tools: agentKitTools,
+            });
+            const preparedAgent = {
+                agent: openAiAgentKitAgent,
+                vectorStoreId,
+            };
+            if (storeAsPrepared) {
+                this.setPreparedAgentKitAgent(preparedAgent);
+            }
+            if (this.options.isVerbose) {
+                console.info('[🤰]', 'OpenAI AgentKit agent ready', {
+                    name,
+                    model: this.agentKitModelName,
+                    toolCount: agentKitTools.length,
+                    hasVectorStore: Boolean(vectorStoreId),
+                });
+            }
+            return preparedAgent;
+        }
+        /**
+         * Ensures the AgentKit SDK is wired to the OpenAI client and API key.
+         */
+        async ensureAgentKitDefaults() {
+            const client = await this.getClient();
+            agents.setDefaultOpenAIClient(client);
+            const apiKey = this.agentKitOptions.apiKey;
+            if (apiKey && typeof apiKey === 'string') {
+                agents.setDefaultOpenAIKey(apiKey);
+            }
+        }
+        /**
+         * Builds the tool list for AgentKit, including hosted file search when applicable.
+         */
+        buildAgentKitTools(options) {
+            var _a;
+            const { tools, vectorStoreId } = options;
+            const agentKitTools = [];
+            if (vectorStoreId) {
+                agentKitTools.push(agents.fileSearchTool(vectorStoreId));
+            }
+            if (tools && tools.length > 0) {
+                const scriptTools = this.resolveScriptTools();
+                for (const toolDefinition of tools) {
+                    agentKitTools.push(agents.tool({
+                        name: toolDefinition.name,
+                        description: toolDefinition.description,
+                        parameters: toolDefinition.parameters
+                            ? {
+                                ...toolDefinition.parameters,
+                                additionalProperties: false,
+                                required: (_a = toolDefinition.parameters.required) !== null && _a !== void 0 ? _a : [],
+                            }
+                            : undefined,
+                        strict: false,
+                        execute: async (input, runContext, details) => {
+                            var _a, _b, _c;
+                            const scriptTool = scriptTools[0];
+                            const functionName = toolDefinition.name;
+                            const calledAt = $getCurrentDate();
+                            const callId = (_a = details === null || details === void 0 ? void 0 : details.toolCall) === null || _a === void 0 ? void 0 : _a.callId;
+                            const functionArgs = input !== null && input !== void 0 ? input : {};
+                            if (this.options.isVerbose) {
+                                console.info('[🤰]', 'Executing AgentKit tool', {
+                                    functionName,
+                                    callId,
+                                    calledAt,
+                                });
+                            }
+                            try {
+                                return await scriptTool.execute({
+                                    scriptLanguage: 'javascript',
+                                    script: `
+                                        const args = ${JSON.stringify(functionArgs)};
+                                        return await ${functionName}(args);
+                                    `,
+                                    parameters: (_c = (_b = runContext === null || runContext === void 0 ? void 0 : runContext.context) === null || _b === void 0 ? void 0 : _b.parameters) !== null && _c !== void 0 ? _c : {},
+                                });
+                            }
+                            catch (error) {
+                                assertsError(error);
+                                const serializedError = serializeError(error);
+                                const errorMessage = spaceTrim__default["default"]((block) => `
+
+                                        The invoked tool \`${functionName}\` failed with error:
+
+                                        \`\`\`json
+                                        ${block(JSON.stringify(serializedError, null, 4))}
+                                        \`\`\`
+
+                                    `);
+                                console.error('[🤰]', 'AgentKit tool execution failed', {
+                                    functionName,
+                                    callId,
+                                    error: serializedError,
+                                });
+                                return errorMessage;
+                            }
+                        },
+                    }));
                 }
-                if (latestBatch.status === 'failed' || latestBatch.status === 'cancelled') {
-                    console.error('[🤰]', 'Vector store file batch did not complete', {
-                        vectorStoreId,
-                        batchId: expectedBatchId,
-                        ...(batchIdMismatch ? { returnedBatchId } : {}),
-                        status: latestBatch.status,
-                        fileCounts: latestBatch.file_counts,
-                        elapsedMs: Date.now() - uploadStartedAtMs,
-                        logLabel,
-                    });
-                    await this.logVectorStoreFileBatchDiagnostics({
-                        client,
-                        vectorStoreId,
-                        batchId: diagnosticsBatchId,
-                        uploadedFiles,
-                        logLabel,
-                        reason: 'failed',
+            }
+            return agentKitTools;
+        }
+        /**
+         * Resolves the configured script tools for tool execution.
+         */
+        resolveScriptTools() {
+            const executionTools = this.options.executionTools;
+            if (!executionTools || !executionTools.script) {
+                throw new PipelineExecutionError(`Model requested tools but no executionTools.script were provided in OpenAiAgentKitExecutionTools options`);
+            }
+            return Array.isArray(executionTools.script) ? executionTools.script : [executionTools.script];
+        }
+        /**
+         * Runs a prepared AgentKit agent and streams results back to the caller.
+         */
+        async callChatModelStreamWithPreparedAgent(options) {
+            var _a, _b, _c, _d;
+            const { openAiAgentKitAgent, prompt, onProgress } = options;
+            const rawPromptContent = (_a = options.rawPromptContent) !== null && _a !== void 0 ? _a : templateParameters(prompt.content, {
+                ...prompt.parameters,
+                modelName: this.agentKitModelName,
+            });
+            const start = $getCurrentDate();
+            let latestContent = '';
+            const toolCalls = [];
+            const toolCallIndexById = new Map();
+            const inputItems = await this.buildAgentKitInputItems(prompt, rawPromptContent);
+            const rawRequest = {
+                agentName: openAiAgentKitAgent.name,
+                input: inputItems,
+            };
+            const streamResult = await agents.run(openAiAgentKitAgent, inputItems, {
+                stream: true,
+                context: { parameters: prompt.parameters },
+            });
+            for await (const event of streamResult) {
+                if (event.type === 'raw_model_stream_event' && ((_b = event.data) === null || _b === void 0 ? void 0 : _b.type) === 'output_text_delta') {
+                    latestContent += event.data.delta;
+                    onProgress({
+                        content: latestContent,
+                        modelName: this.agentKitModelName,
+                        timing: { start, complete: $getCurrentDate() },
+                        usage: UNCERTAIN_USAGE,
+                        rawPromptContent: rawPromptContent,
+                        rawRequest: null,
+                        rawResponse: {},
                     });
-                    shouldPoll = false;
                     continue;
                 }
-                if (nowMs - pollStartedAtMs >= uploadTimeoutMs) {
-                    console.error('[🤰]', 'Timed out waiting for vector store file batch', {
-                        vectorStoreId,
-                        batchId: expectedBatchId,
-                        ...(batchIdMismatch ? { returnedBatchId } : {}),
-                        fileCounts: latestBatch.file_counts,
-                        elapsedMs: nowMs - pollStartedAtMs,
-                        uploadTimeoutMs,
-                        logLabel,
-                    });
-                    await this.logVectorStoreFileBatchDiagnostics({
-                        client,
-                        vectorStoreId,
-                        batchId: diagnosticsBatchId,
-                        uploadedFiles,
-                        logLabel,
-                        reason: 'timeout',
-                    });
-                    if (this.shouldContinueOnVectorStoreStall()) {
-                        console.warn('[🤰]', 'Continuing despite vector store timeout as requested', {
-                            vectorStoreId,
-                            logLabel,
+                if (event.type === 'run_item_stream_event') {
+                    const rawItem = (_c = event.item) === null || _c === void 0 ? void 0 : _c.rawItem;
+                    if (event.name === 'tool_called' && (rawItem === null || rawItem === void 0 ? void 0 : rawItem.type) === 'function_call') {
+                        const toolCall = {
+                            name: rawItem.name,
+                            arguments: rawItem.arguments,
+                            rawToolCall: rawItem,
+                            createdAt: $getCurrentDate(),
+                        };
+                        toolCallIndexById.set(rawItem.callId, toolCalls.length);
+                        toolCalls.push(toolCall);
+                        onProgress({
+                            content: latestContent,
+                            modelName: this.agentKitModelName,
+                            timing: { start, complete: $getCurrentDate() },
+                            usage: UNCERTAIN_USAGE,
+                            rawPromptContent: rawPromptContent,
+                            rawRequest: null,
+                            rawResponse: {},
+                            toolCalls: [toolCall],
                         });
-                        shouldPoll = false;
-                        continue;
                     }
-                    try {
-                        const cancelBatchId = batchIdMismatch && returnedBatchId.startsWith('vsfb_') ? returnedBatchId : expectedBatchId;
-                        if (!cancelBatchId.startsWith('vsfb_')) {
-                            console.error('[🤰]', 'Skipping vector store file batch cancel (invalid batch id)', {
-                                vectorStoreId,
-                                batchId: cancelBatchId,
-                                logLabel,
-                            });
-                        }
-                        else {
-                            await client.beta.vectorStores.fileBatches.cancel(vectorStoreId, cancelBatchId);
-                        }
-                        if (this.options.isVerbose) {
-                            console.info('[🤰]', 'Cancelled vector store file batch after timeout', {
-                                vectorStoreId,
-                                batchId: batchIdMismatch && returnedBatchId.startsWith('vsfb_')
-                                    ? returnedBatchId
-                                    : expectedBatchId,
-                                ...(batchIdMismatch ? { returnedBatchId } : {}),
-                                logLabel,
+                    if (event.name === 'tool_output' && (rawItem === null || rawItem === void 0 ? void 0 : rawItem.type) === 'function_call_result') {
+                        const index = toolCallIndexById.get(rawItem.callId);
+                        const result = this.formatAgentKitToolOutput(rawItem.output);
+                        if (index !== undefined) {
+                            const existingToolCall = toolCalls[index];
+                            const completedToolCall = {
+                                ...existingToolCall,
+                                result,
+                                rawToolCall: rawItem,
+                            };
+                            toolCalls[index] = completedToolCall;
+                            onProgress({
+                                content: latestContent,
+                                modelName: this.agentKitModelName,
+                                timing: { start, complete: $getCurrentDate() },
+                                usage: UNCERTAIN_USAGE,
+                                rawPromptContent: rawPromptContent,
+                                rawRequest: null,
+                                rawResponse: {},
+                                toolCalls: [completedToolCall],
                             });
                         }
                     }
-                    catch (error) {
-                        assertsError(error);
-                        console.error('[🤰]', 'Failed to cancel vector store file batch after timeout', {
-                            vectorStoreId,
-                            batchId: expectedBatchId,
-                            ...(batchIdMismatch ? { returnedBatchId } : {}),
-                            logLabel,
-                            error: serializeError(error),
+                }
+            }
+            await streamResult.completed;
+            const complete = $getCurrentDate();
+            const finalContent = ((_d = streamResult.finalOutput) !== null && _d !== void 0 ? _d : latestContent);
+            const finalResult = {
+                content: finalContent,
+                modelName: this.agentKitModelName,
+                timing: { start, complete },
+                usage: UNCERTAIN_USAGE,
+                rawPromptContent: rawPromptContent,
+                rawRequest,
+                rawResponse: { runResult: streamResult },
+                toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+            };
+            onProgress(finalResult);
+            return finalResult;
+        }
+        /**
+         * Builds AgentKit input items from the prompt and optional thread.
+         */
+        async buildAgentKitInputItems(prompt, rawPromptContent) {
+            var _a;
+            const inputItems = [];
+            if ('thread' in prompt && Array.isArray(prompt.thread)) {
+                for (const message of prompt.thread) {
+                    const sender = message.sender;
+                    const content = (_a = message.content) !== null && _a !== void 0 ? _a : '';
+                    if (sender === 'assistant' || sender === 'agent') {
+                        inputItems.push({
+                            role: 'assistant',
+                            status: 'completed',
+                            content: [{ type: 'output_text', text: content }],
+                        });
+                    }
+                    else {
+                        inputItems.push({
+                            role: 'user',
+                            content,
                         });
                     }
-                    shouldPoll = false;
-                    continue;
                 }
-                await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
             }
-            return latestBatch;
+            const userContent = await this.buildAgentKitUserContent(prompt, rawPromptContent);
+            inputItems.push({
+                role: 'user',
+                content: userContent,
+            });
+            return inputItems;
         }
         /**
-         * Creates a vector store and uploads knowledge sources, returning its ID.
+         * Builds the user message content for AgentKit runs, including file inputs when provided.
          */
-        async createVectorStoreWithKnowledgeSources(options) {
-            const { client, name, knowledgeSources, logLabel } = options;
-            const knowledgeSourcesCount = knowledgeSources.length;
-            const downloadTimeoutMs = this.getKnowledgeSourceDownloadTimeoutMs();
+        async buildAgentKitUserContent(prompt, rawPromptContent) {
+            if ('files' in prompt && Array.isArray(prompt.files) && prompt.files.length > 0) {
+                const fileItems = await Promise.all(prompt.files.map(async (file) => {
+                    const arrayBuffer = await file.arrayBuffer();
+                    const base64 = Buffer.from(arrayBuffer).toString('base64');
+                    return {
+                        type: 'input_image',
+                        image: `data:${file.type};base64,${base64}`,
+                    };
+                }));
+                return [{ type: 'input_text', text: rawPromptContent }, ...fileItems];
+            }
+            return rawPromptContent;
+        }
+        /**
+         * Normalizes AgentKit tool outputs into a string for Promptbook tool call results.
+         */
+        formatAgentKitToolOutput(output) {
+            if (typeof output === 'string') {
+                return output;
+            }
+            if (output && typeof output === 'object') {
+                const textOutput = output;
+                if (textOutput.type === 'text' && typeof textOutput.text === 'string') {
+                    return textOutput.text;
+                }
+            }
+            return JSON.stringify(output !== null && output !== void 0 ? output : null);
+        }
+        /**
+         * Returns AgentKit-specific options.
+         */
+        get agentKitOptions() {
+            return this.options;
+        }
+        /**
+         * Discriminant for type guards.
+         */
+        get discriminant() {
+            return DISCRIMINANT$1;
+        }
+        /**
+         * Type guard to check if given `LlmExecutionTools` are instanceof `OpenAiAgentKitExecutionTools`.
+         */
+        static isOpenAiAgentKitExecutionTools(llmExecutionTools) {
+            return llmExecutionTools.discriminant === DISCRIMINANT$1;
+        }
+    }
+    /**
+     * Discriminant for type guards.
+     *
+     * @private const of `OpenAiAgentKitExecutionTools`
+     */
+    const DISCRIMINANT$1 = 'OPEN_AI_AGENT_KIT_V1';
+
+    /**
+     * Uploads files to OpenAI and returns their IDs
+     *
+     * @private utility for `OpenAiAssistantExecutionTools` and `OpenAiCompatibleExecutionTools`
+     */
+    async function uploadFilesToOpenAi(client, files) {
+        const fileIds = [];
+        for (const file of files) {
+            // Note: OpenAI API expects a File object or a ReadStream
+            // In browser environment, we can pass the File object directly
+            // In Node.js environment, we might need to convert it or use a different approach
+            // But since `Prompt.files` already contains `File` objects, we try to pass them directly
+            const uploadedFile = await client.files.create({
+                file: file,
+                purpose: 'assistants',
+            });
+            fileIds.push(uploadedFile.id);
+        }
+        return fileIds;
+    }
+
+    /**
+     * Execution Tools for calling OpenAI API Assistants
+     *
+     * This is useful for calling OpenAI API with a single assistant, for more wide usage use `OpenAiExecutionTools`.
+     *
+     * Note: [🦖] There are several different things in Promptbook:
+     * - `Agent` - which represents an AI Agent with its source, memories, actions, etc. Agent is a higher-level abstraction which is internally using:
+     * - `LlmExecutionTools` - which wraps one or more LLM models and provides an interface to execute them
+     * - `AgentLlmExecutionTools` - which is a specific implementation of `LlmExecutionTools` that wraps another LlmExecutionTools and applies agent-specific system prompts and requirements
+     * - `OpenAiAssistantExecutionTools` - which is a specific implementation of `LlmExecutionTools` for OpenAI models with assistant capabilities, recommended for usage in `Agent` or `AgentLlmExecutionTools`
+     * - `RemoteAgent` - which is an `Agent` that connects to a Promptbook Agents Server
+     *
+     * @deprecated Use `OpenAiAgentKitExecutionTools` instead.
+     * @public exported from `@promptbook/openai`
+     */
+    class OpenAiAssistantExecutionTools extends OpenAiVectorStoreHandler {
+        /**
+         * Creates OpenAI Execution Tools.
+         *
+         * @param options which are relevant are directly passed to the OpenAI client
+         */
+        constructor(options) {
+            var _a;
+            if (options.isProxied) {
+                throw new NotYetImplementedError(`Proxy mode is not yet implemented for OpenAI assistants`);
+            }
+            super(options);
+            this.isCreatingNewAssistantsAllowed = false;
+            this.assistantId = options.assistantId;
+            this.isCreatingNewAssistantsAllowed = (_a = options.isCreatingNewAssistantsAllowed) !== null && _a !== void 0 ? _a : false;
+            if (this.assistantId === null && !this.isCreatingNewAssistantsAllowed) {
+                throw new NotAllowed(`Assistant ID is null and creating new assistants is not allowed - this configuration does not make sense`);
+            }
+            // <- TODO: !!! `OpenAiAssistantExecutionToolsOptions` - Allow `assistantId: null` together with `isCreatingNewAssistantsAllowed: true`
+            // TODO: [👱] Make limiter same as in `OpenAiExecutionTools`
+        }
+        get title() {
+            return 'OpenAI Assistant';
+        }
+        get description() {
+            return 'Use single assistant provided by OpenAI';
+        }
+        /**
+         * Calls OpenAI API to use a chat model.
+         */
+        async callChatModel(prompt) {
+            return this.callChatModelStream(prompt, () => { });
+        }
+        /**
+         * Calls OpenAI API to use a chat model with streaming.
+         */
+        async callChatModelStream(prompt, onProgress) {
+            var _a, _b, _c, _d, _e, _f;
             if (this.options.isVerbose) {
-                console.info('[🤰]', 'Creating vector store with knowledge sources', {
-                    name,
-                    knowledgeSourcesCount,
-                    downloadTimeoutMs,
-                    logLabel,
-                });
+                console.info('💬 OpenAI callChatModel call', { prompt });
+            }
+            const { content, parameters, modelRequirements /*, format*/ } = prompt;
+            const client = await this.getClient();
+            // TODO: [☂] Use here more modelRequirements
+            if (modelRequirements.modelVariant !== 'CHAT') {
+                throw new PipelineExecutionError('Use callChatModel only for CHAT variant');
+            }
+            // TODO: [👨‍👨‍👧‍👧] Remove:
+            for (const key of ['maxTokens', 'modelName', 'seed', 'temperature']) {
+                if (modelRequirements[key] !== undefined) {
+                    throw new NotYetImplementedError(`In \`OpenAiAssistantExecutionTools\` you cannot specify \`${key}\``);
+                }
             }
-            const vectorStore = await client.beta.vectorStores.create({
-                name: `${name} Knowledge Base`,
+            /*
+            TODO: [👨‍👨‍👧‍👧] Implement all of this for Assistants
+            const modelName = modelRequirements.modelName || this.getDefaultChatModel().modelName;
+            const modelSettings = {
+                model: modelName,
+
+                temperature: modelRequirements.temperature,
+
+                // <- TODO: [🈁] Use `seed` here AND/OR use is `isDeterministic` for entire execution tools
+                // <- Note: [🧆]
+            } as OpenAI.Chat.Completions.CompletionCreateParamsNonStreaming; // <- TODO: Guard here types better
+
+            if (format === 'JSON') {
+                modelSettings.response_format = {
+                    type: 'json_object',
+                };
+            }
+            */
+            // <- TODO: [🚸] Not all models are compatible with JSON mode
+            //        > 'response_format' of type 'json_object' is not supported with this model.
+            const rawPromptContent = templateParameters(content, {
+                ...parameters,
+                modelName: 'assistant',
+                //          <- [🧠] What is the best value here
             });
-            const vectorStoreId = vectorStore.id;
-            if (this.options.isVerbose) {
-                console.info('[🤰]', 'Vector store created', {
-                    vectorStoreId,
-                    logLabel,
-                });
+            // Build thread messages: include previous thread messages + current user message
+            const threadMessages = [];
+            // TODO: [🈹] Maybe this should not be here but in other place, look at commit 39d705e75e5bcf7a818c3af36bc13e1c8475c30c
+            // Add previous messages from thread (if any)
+            if ('thread' in prompt && Array.isArray(prompt.thread)) {
+                const previousMessages = prompt.thread.map((msg) => ({
+                    role: (msg.sender === 'assistant' ? 'assistant' : 'user'),
+                    content: msg.content,
+                }));
+                threadMessages.push(...previousMessages);
             }
-            const fileStreams = [];
-            const skippedSources = [];
-            let totalBytes = 0;
-            const processingStartedAtMs = Date.now();
-            for (const [index, source] of knowledgeSources.entries()) {
-                try {
-                    const sourceType = source.startsWith('http') || source.startsWith('https') ? 'url' : 'file';
-                    if (this.options.isVerbose) {
-                        console.info('[🤰]', 'Processing knowledge source', {
-                            index: index + 1,
-                            total: knowledgeSourcesCount,
-                            source,
-                            sourceType,
-                            logLabel,
-                        });
-                    }
-                    // Check if it's a URL
-                    if (source.startsWith('http://') || source.startsWith('https://')) {
-                        const downloadResult = await this.downloadKnowledgeSourceFile({
-                            source,
-                            timeoutMs: downloadTimeoutMs,
-                            logLabel,
-                        });
-                        if (downloadResult) {
-                            fileStreams.push(downloadResult.file);
-                            totalBytes += downloadResult.sizeBytes;
-                        }
-                        else {
-                            skippedSources.push({ source, reason: 'download_failed' });
+            // Always add the current user message
+            const currentUserMessage = {
+                role: 'user',
+                content: rawPromptContent,
+            };
+            if ('files' in prompt && Array.isArray(prompt.files) && prompt.files.length > 0) {
+                const fileIds = await uploadFilesToOpenAi(client, prompt.files);
+                currentUserMessage.attachments = fileIds.map((fileId) => ({
+                    file_id: fileId,
+                    tools: [{ type: 'file_search' }, { type: 'code_interpreter' }],
+                }));
+            }
+            threadMessages.push(currentUserMessage);
+            // Check if tools are being used - if so, use non-streaming mode
+            const hasTools = modelRequirements.tools !== undefined && modelRequirements.tools.length > 0;
+            const start = $getCurrentDate();
+            let complete;
+            // [🐱‍🚀] When tools are present, we need to use the non-streaming Runs API
+            // because streaming doesn't support tool execution flow properly
+            if (hasTools) {
+                onProgress({
+                    content: '',
+                    modelName: 'assistant',
+                    timing: { start, complete: $getCurrentDate() },
+                    usage: UNCERTAIN_USAGE,
+                    rawPromptContent,
+                    rawRequest: null,
+                    rawResponse: null,
+                });
+                const rawRequest = {
+                    assistant_id: this.assistantId,
+                    thread: {
+                        messages: threadMessages,
+                    },
+                    tools: mapToolsToOpenAi(modelRequirements.tools),
+                };
+                if (this.options.isVerbose) {
+                    console.info(colors__default["default"].bgWhite('rawRequest (non-streaming with tools)'), JSON.stringify(rawRequest, null, 4));
+                }
+                // Create thread and run
+                let run = (await client.beta.threads.createAndRun(rawRequest));
+                const completedToolCalls = [];
+                const toolCallStartedAt = new Map();
+                // Poll until run completes or requires action
+                while (run.status === 'queued' || run.status === 'in_progress' || run.status === 'requires_action') {
+                    if (run.status === 'requires_action' && ((_a = run.required_action) === null || _a === void 0 ? void 0 : _a.type) === 'submit_tool_outputs') {
+                        // Execute tools
+                        const toolCalls = run.required_action.submit_tool_outputs.tool_calls;
+                        const toolOutputs = [];
+                        for (const toolCall of toolCalls) {
+                            if (toolCall.type === 'function') {
+                                const functionName = toolCall.function.name;
+                                const functionArgs = JSON.parse(toolCall.function.arguments);
+                                const calledAt = $getCurrentDate();
+                                if (toolCall.id) {
+                                    toolCallStartedAt.set(toolCall.id, calledAt);
+                                }
+                                onProgress({
+                                    content: '',
+                                    modelName: 'assistant',
+                                    timing: { start, complete: $getCurrentDate() },
+                                    usage: UNCERTAIN_USAGE,
+                                    rawPromptContent,
+                                    rawRequest: null,
+                                    rawResponse: null,
+                                    toolCalls: [
+                                        {
+                                            name: functionName,
+                                            arguments: toolCall.function.arguments,
+                                            result: '',
+                                            rawToolCall: toolCall,
+                                            createdAt: calledAt,
+                                        },
+                                    ],
+                                });
+                                if (this.options.isVerbose) {
+                                    console.info(`🔧 Executing tool: ${functionName}`, functionArgs);
+                                }
+                                // Get execution tools for script execution
+                                const executionTools = this.options
+                                    .executionTools;
+                                if (!executionTools || !executionTools.script) {
+                                    throw new PipelineExecutionError(`Model requested tool '${functionName}' but no executionTools.script were provided in OpenAiAssistantExecutionTools options`);
+                                }
+                                // TODO: [DRY] Use some common tool caller (similar to OpenAiCompatibleExecutionTools)
+                                const scriptTools = Array.isArray(executionTools.script)
+                                    ? executionTools.script
+                                    : [executionTools.script];
+                                let functionResponse;
+                                let errors;
+                                try {
+                                    const scriptTool = scriptTools[0]; // <- TODO: [🧠] Which script tool to use?
+                                    functionResponse = await scriptTool.execute({
+                                        scriptLanguage: 'javascript',
+                                        script: `
+                                        const args = ${JSON.stringify(functionArgs)};
+                                        return await ${functionName}(args);
+                                    `,
+                                        parameters: prompt.parameters,
+                                    });
+                                    if (this.options.isVerbose) {
+                                        console.info(`✅ Tool ${functionName} executed:`, functionResponse);
+                                    }
+                                }
+                                catch (error) {
+                                    assertsError(error);
+                                    const serializedError = serializeError(error);
+                                    errors = [serializedError];
+                                    functionResponse = spaceTrim__default["default"]((block) => `
+                                    
+                                        The invoked tool \`${functionName}\` failed with error:
+                                        
+                                        \`\`\`json
+                                        ${block(JSON.stringify(serializedError, null, 4))}
+                                        \`\`\`
+
+                                    `);
+                                    console.error(colors__default["default"].bgRed(`❌ Error executing tool ${functionName}:`));
+                                    console.error(error);
+                                }
+                                toolOutputs.push({
+                                    tool_call_id: toolCall.id,
+                                    output: functionResponse,
+                                });
+                                completedToolCalls.push({
+                                    name: functionName,
+                                    arguments: toolCall.function.arguments,
+                                    result: functionResponse,
+                                    rawToolCall: toolCall,
+                                    createdAt: toolCall.id ? toolCallStartedAt.get(toolCall.id) || calledAt : calledAt,
+                                    errors,
+                                });
+                            }
                         }
+                        // Submit tool outputs
+                        run = (await client.beta.threads.runs.submitToolOutputs(run.thread_id, run.id, {
+                            tool_outputs: toolOutputs,
+                        }));
                     }
                     else {
-                        skippedSources.push({ source, reason: 'unsupported_source_type' });
-                        if (this.options.isVerbose) {
-                            console.info('[🤰]', 'Skipping knowledge source (unsupported type)', {
-                                source,
-                                sourceType,
-                                logLabel,
-                            });
-                        }
-                        /*
-                        TODO: [?????] Resolve problem with browser environment
-                        // Assume it's a local file path
-                        // Note: This will work in Node.js environment
-                        // For browser environments, this would need different handling
-                        const fs = await import('fs');
-                        const fileStream = fs.createReadStream(source);
-                        fileStreams.push(fileStream);
-                        */
+                        // Wait a bit before polling again
+                        await new Promise((resolve) => setTimeout(resolve, 500));
+                        run = (await client.beta.threads.runs.retrieve(run.thread_id, run.id));
                     }
                 }
-                catch (error) {
-                    assertsError(error);
-                    skippedSources.push({ source, reason: 'processing_error' });
-                    console.error('[🤰]', 'Error processing knowledge source', {
-                        source,
-                        logLabel,
-                        error: serializeError(error),
-                    });
+                if (run.status !== 'completed') {
+                    throw new PipelineExecutionError(`Assistant run failed with status: ${run.status}`);
+                }
+                // Get messages from the thread
+                const messages = await client.beta.threads.messages.list(run.thread_id);
+                const assistantMessages = messages.data.filter((msg) => msg.role === 'assistant');
+                if (assistantMessages.length === 0) {
+                    throw new PipelineExecutionError('No assistant messages found after run completion');
+                }
+                const lastMessage = assistantMessages[0];
+                const textContent = lastMessage.content.find((c) => c.type === 'text');
+                if (!textContent || textContent.type !== 'text') {
+                    throw new PipelineExecutionError('No text content in assistant response');
                 }
+                complete = $getCurrentDate();
+                const resultContent = textContent.text.value;
+                const usage = UNCERTAIN_USAGE;
+                // Progress callback with final result
+                const finalChunk = {
+                    content: resultContent,
+                    modelName: 'assistant',
+                    timing: { start, complete },
+                    usage,
+                    rawPromptContent,
+                    rawRequest,
+                    rawResponse: { run, messages: messages.data },
+                    toolCalls: completedToolCalls.length > 0 ? completedToolCalls : undefined,
+                };
+                onProgress(finalChunk);
+                return exportJson({
+                    name: 'promptResult',
+                    message: `Result of \`OpenAiAssistantExecutionTools.callChatModelStream\` (with tools)`,
+                    order: [],
+                    value: finalChunk,
+                });
             }
+            // Streaming mode (without tools)
+            const rawRequest = {
+                // TODO: [👨‍👨‍👧‍👧] ...modelSettings,
+                // TODO: [👨‍👨‍👧‍👧][🧠] What about system message for assistants, does it make sense - combination of OpenAI assistants with Promptbook Personas
+                assistant_id: this.assistantId,
+                thread: {
+                    messages: threadMessages,
+                },
+                tools: modelRequirements.tools === undefined ? undefined : mapToolsToOpenAi(modelRequirements.tools),
+                // <- TODO: Add user identification here> user: this.options.user,
+            };
             if (this.options.isVerbose) {
-                console.info('[🤰]', 'Finished processing knowledge sources', {
-                    total: knowledgeSourcesCount,
-                    downloadedCount: fileStreams.length,
-                    skippedCount: skippedSources.length,
-                    totalBytes,
-                    elapsedMs: Date.now() - processingStartedAtMs,
-                    skippedSamples: skippedSources.slice(0, 3),
-                    logLabel,
-                });
+                console.info(colors__default["default"].bgWhite('rawRequest (streaming)'), JSON.stringify(rawRequest, null, 4));
             }
-            if (fileStreams.length > 0) {
+            const stream = await client.beta.threads.createAndRunStream(rawRequest);
+            stream.on('connect', () => {
                 if (this.options.isVerbose) {
-                    console.info('[🤰]', 'Uploading files to vector store', {
-                        vectorStoreId,
-                        fileCount: fileStreams.length,
-                        totalBytes,
-                        maxConcurrency: this.getKnowledgeSourceUploadMaxConcurrency(),
-                        pollIntervalMs: this.getKnowledgeSourceUploadPollIntervalMs(),
-                        uploadTimeoutMs: this.getKnowledgeSourceUploadTimeoutMs(),
-                        logLabel,
-                    });
+                    console.info('connect', stream.currentEvent);
                 }
-                try {
-                    await this.uploadKnowledgeSourceFilesToVectorStore({
-                        client,
-                        vectorStoreId,
-                        files: fileStreams,
-                        totalBytes,
-                        logLabel,
-                    });
+            });
+            stream.on('textDelta', (textDelta, snapshot) => {
+                if (this.options.isVerbose && textDelta.value) {
+                    console.info('textDelta', textDelta.value);
                 }
-                catch (error) {
-                    assertsError(error);
-                    console.error('[🤰]', 'Error uploading files to vector store', {
-                        vectorStoreId,
-                        logLabel,
-                        error: serializeError(error),
-                    });
+                const chunk = {
+                    content: snapshot.value,
+                    modelName: 'assistant',
+                    timing: {
+                        start,
+                        complete: $getCurrentDate(),
+                    },
+                    usage: UNCERTAIN_USAGE,
+                    rawPromptContent,
+                    rawRequest,
+                    rawResponse: snapshot,
+                };
+                onProgress(chunk);
+            });
+            stream.on('messageCreated', (message) => {
+                if (this.options.isVerbose) {
+                    console.info('messageCreated', message);
+                }
+            });
+            stream.on('messageDone', (message) => {
+                if (this.options.isVerbose) {
+                    console.info('messageDone', message);
                 }
+            });
+            // TODO: [🐱‍🚀] Handle tool calls in assistants
+            // Note: OpenAI Assistant streaming with tool calls requires special handling.
+            // The stream will pause when a tool call is needed, and we need to:
+            // 1. Wait for the run to reach 'requires_action' status
+            // 2. Execute the tool calls
+            // 3. Submit tool outputs via a separate API call (not on the stream)
+            // 4. Continue the run
+            // This requires switching to non-streaming mode or using the Runs API directly.
+            // For now, tools with assistants should use the non-streaming chat completions API instead.
+            const rawResponse = await stream.finalMessages();
+            if (this.options.isVerbose) {
+                console.info(colors__default["default"].bgWhite('rawResponse'), JSON.stringify(rawResponse, null, 4));
             }
-            else if (this.options.isVerbose) {
-                console.info('[🤰]', 'No knowledge source files to upload', {
-                    vectorStoreId,
-                    skippedCount: skippedSources.length,
-                    logLabel,
-                });
+            if (rawResponse.length !== 1) {
+                throw new PipelineExecutionError(`There is NOT 1 BUT ${rawResponse.length} finalMessages from OpenAI`);
             }
-            return {
-                vectorStoreId,
-                uploadedFileCount: fileStreams.length,
-                skippedCount: skippedSources.length,
-                totalBytes,
-            };
+            if (rawResponse[0].content.length !== 1) {
+                throw new PipelineExecutionError(`There is NOT 1 BUT ${rawResponse[0].content.length} finalMessages content from OpenAI`);
+            }
+            if (((_b = rawResponse[0].content[0]) === null || _b === void 0 ? void 0 : _b.type) !== 'text') {
+                throw new PipelineExecutionError(`There is NOT 'text' BUT ${(_c = rawResponse[0].content[0]) === null || _c === void 0 ? void 0 : _c.type} finalMessages content type from OpenAI`);
+            }
+            let resultContent = (_d = rawResponse[0].content[0]) === null || _d === void 0 ? void 0 : _d.text.value;
+            // Process annotations to replace file IDs with filenames
+            if ((_e = rawResponse[0].content[0]) === null || _e === void 0 ? void 0 : _e.text.annotations) {
+                const annotations = (_f = rawResponse[0].content[0]) === null || _f === void 0 ? void 0 : _f.text.annotations;
+                // Map to store file ID -> filename to avoid duplicate requests
+                const fileIdToName = new Map();
+                for (const annotation of annotations) {
+                    if (annotation.type === 'file_citation') {
+                        const fileId = annotation.file_citation.file_id;
+                        let filename = fileIdToName.get(fileId);
+                        if (!filename) {
+                            try {
+                                const file = await client.files.retrieve(fileId);
+                                filename = file.filename;
+                                fileIdToName.set(fileId, filename);
+                            }
+                            catch (error) {
+                                console.error(`Failed to retrieve file info for ${fileId}`, error);
+                                // Fallback to "Source" or keep original if fetch fails
+                                filename = 'Source';
+                            }
+                        }
+                        if (filename && resultContent) {
+                            // Replace the citation marker with filename
+                            // Regex to match the second part of the citation: 【id†source】 -> 【id†filename】
+                            // Note: annotation.text contains the exact marker like 【4:0†source】
+                            const newText = annotation.text.replace(/†.*?】/, `†${filename}】`);
+                            resultContent = resultContent.replace(annotation.text, newText);
+                        }
+                    }
+                }
+            }
+            // eslint-disable-next-line prefer-const
+            complete = $getCurrentDate();
+            const usage = UNCERTAIN_USAGE;
+            // <- TODO: [🥘] Compute real usage for assistant
+            //       ?> const usage = computeOpenAiUsage(content, resultContent || '', rawResponse);
+            if (resultContent === null) {
+                throw new PipelineExecutionError('No response message from OpenAI');
+            }
+            return exportJson({
+                name: 'promptResult',
+                message: `Result of \`OpenAiAssistantExecutionTools.callChatModelStream\``,
+                order: [],
+                value: {
+                    content: resultContent,
+                    modelName: 'assistant',
+                    // <- TODO: [🥘] Detect used model in assistant
+                    //       ?> model: rawResponse.model || modelName,
+                    timing: {
+                        start,
+                        complete,
+                    },
+                    usage,
+                    rawPromptContent,
+                    rawRequest,
+                    rawResponse,
+                    // <- [🗯]
+                },
+            });
+        }
+        /*
+        public async playground() {
+            const client = await this.getClient();
+
+            // List all assistants
+            const assistants = await client.beta.assistants.list();
+         
+            // Get details of a specific assistant
+            const assistantId = 'asst_MO8fhZf4dGloCfXSHeLcIik0';
+            const assistant = await client.beta.assistants.retrieve(assistantId);
+
+            // Update an assistant
+            const updatedAssistant = await client.beta.assistants.update(assistantId, {
+                name: assistant.name + '(M)',
+                description: 'Updated description via Promptbook',
+                metadata: {
+                    [Math.random().toString(36).substring(2, 15)]: new Date().toISOString(),
+                },
+            });
+      
+            await forEver();
+        }
+        */
+        /**
+         * Get an existing assistant tool wrapper
+         */
+        getAssistant(assistantId) {
+            return new OpenAiAssistantExecutionTools({
+                ...this.options,
+                isCreatingNewAssistantsAllowed: this.isCreatingNewAssistantsAllowed,
+                assistantId,
+            });
         }
         async createNewAssistant(options) {
             var _a, _b, _c;
@@ -24680,6 +25178,7 @@
      * - `LlmExecutionTools` - which wraps one or more LLM models and provides an interface to execute them
      * - `AgentLlmExecutionTools` - which is a specific implementation of `LlmExecutionTools` that wraps another LlmExecutionTools and applies agent-specific system prompts and requirements
      * - `OpenAiAssistantExecutionTools` - (Deprecated) which is a specific implementation of `LlmExecutionTools` for OpenAI models with assistant capabilities
+     * - `OpenAiAgentKitExecutionTools` - which is a specific implementation of `LlmExecutionTools` backed by OpenAI AgentKit
      * - `RemoteAgent` - which is an `Agent` that connects to a Promptbook Agents Server
      *
      * @public exported from `@promptbook/core`
@@ -24814,6 +25313,7 @@
          * Calls the chat model with agent-specific system prompt and requirements with streaming
          */
         async callChatModelStream(prompt, onProgress) {
+            var _a, _b;
             // Ensure we're working with a chat prompt
             if (prompt.modelRequirements.modelVariant !== 'CHAT') {
                 throw new Error('AgentLlmExecutionTools only supports chat prompts');
@@ -24841,7 +25341,75 @@
                 }, // Cast to avoid readonly mismatch from spread
             };
             console.log('!!!! promptWithAgentModelRequirements:', promptWithAgentModelRequirements);
-            if (OpenAiAssistantExecutionTools.isOpenAiAssistantExecutionTools(this.options.llmTools)) {
+            if (OpenAiAgentKitExecutionTools.isOpenAiAgentKitExecutionTools(this.options.llmTools)) {
+                const requirementsHash = cryptoJs.SHA256(JSON.stringify(modelRequirements)).toString();
+                const vectorStoreHash = cryptoJs.SHA256(JSON.stringify((_a = modelRequirements.knowledgeSources) !== null && _a !== void 0 ? _a : [])).toString();
+                const cachedVectorStore = AgentLlmExecutionTools.vectorStoreCache.get(this.title);
+                const cachedAgentKit = AgentLlmExecutionTools.agentKitAgentCache.get(this.title);
+                let preparedAgentKit = this.options.assistantPreparationMode === 'external'
+                    ? this.options.llmTools.getPreparedAgentKitAgent()
+                    : null;
+                const vectorStoreId = (preparedAgentKit === null || preparedAgentKit === void 0 ? void 0 : preparedAgentKit.vectorStoreId) ||
+                    (cachedVectorStore && cachedVectorStore.requirementsHash === vectorStoreHash
+                        ? cachedVectorStore.vectorStoreId
+                        : undefined);
+                if (!preparedAgentKit && cachedAgentKit && cachedAgentKit.requirementsHash === requirementsHash) {
+                    if (this.options.isVerbose) {
+                        console.info('[🤰]', 'Using cached OpenAI AgentKit agent', {
+                            agent: this.title,
+                        });
+                    }
+                    preparedAgentKit = {
+                        agent: cachedAgentKit.agent,
+                        vectorStoreId: cachedAgentKit.vectorStoreId,
+                    };
+                }
+                if (!preparedAgentKit) {
+                    if (this.options.isVerbose) {
+                        console.info('[🤰]', 'Preparing OpenAI AgentKit agent', {
+                            agent: this.title,
+                        });
+                    }
+                    if (!vectorStoreId && ((_b = modelRequirements.knowledgeSources) === null || _b === void 0 ? void 0 : _b.length)) {
+                        emitAssistantPreparationProgress({
+                            onProgress,
+                            prompt,
+                            modelName: this.modelName,
+                            phase: 'Creating knowledge base',
+                        });
+                    }
+                    emitAssistantPreparationProgress({
+                        onProgress,
+                        prompt,
+                        modelName: this.modelName,
+                        phase: 'Preparing AgentKit agent',
+                    });
+                    preparedAgentKit = await this.options.llmTools.prepareAgentKitAgent({
+                        name: this.title,
+                        instructions: modelRequirements.systemMessage || '',
+                        knowledgeSources: modelRequirements.knowledgeSources,
+                        tools: modelRequirements.tools ? [...modelRequirements.tools] : undefined,
+                        vectorStoreId,
+                    });
+                }
+                if (preparedAgentKit.vectorStoreId) {
+                    AgentLlmExecutionTools.vectorStoreCache.set(this.title, {
+                        vectorStoreId: preparedAgentKit.vectorStoreId,
+                        requirementsHash: vectorStoreHash,
+                    });
+                }
+                AgentLlmExecutionTools.agentKitAgentCache.set(this.title, {
+                    agent: preparedAgentKit.agent,
+                    requirementsHash,
+                    vectorStoreId: preparedAgentKit.vectorStoreId,
+                });
+                underlyingLlmResult = await this.options.llmTools.callChatModelStreamWithPreparedAgent({
+                    openAiAgentKitAgent: preparedAgentKit.agent,
+                    prompt: promptWithAgentModelRequirements,
+                    onProgress,
+                });
+            }
+            else if (OpenAiAssistantExecutionTools.isOpenAiAssistantExecutionTools(this.options.llmTools)) {
                 // ... deprecated path ...
                 const requirementsHash = cryptoJs.SHA256(JSON.stringify(modelRequirements)).toString();
                 const cached = AgentLlmExecutionTools.assistantCache.get(this.title);
@@ -24966,6 +25534,10 @@
             return agentResult;
         }
     }
+    /**
+     * Cached AgentKit agents to avoid rebuilding identical instances.
+     */
+    AgentLlmExecutionTools.agentKitAgentCache = new Map();
     /**
      * Cache of OpenAI assistants to avoid creating duplicates
      */
@@ -25047,6 +25619,7 @@
      * - `LlmExecutionTools` - which wraps one or more LLM models and provides an interface to execute them
      * - `AgentLlmExecutionTools` - which is a specific implementation of `LlmExecutionTools` that wraps another LlmExecutionTools and applies agent-specific system prompts and requirements
      * - `OpenAiAssistantExecutionTools` - (Deprecated) which is a specific implementation of `LlmExecutionTools` for OpenAI models with assistant capabilities
+     * - `OpenAiAgentKitExecutionTools` - which is a specific implementation of `LlmExecutionTools` backed by OpenAI AgentKit
      * - `RemoteAgent` - which is an `Agent` that connects to a Promptbook Agents Server
      *
      * @public exported from `@promptbook/core`
@@ -25417,7 +25990,8 @@
      * - `Agent` - which represents an AI Agent with its source, memories, actions, etc. Agent is a higher-level abstraction which is internally using:
      * - `LlmExecutionTools` - which wraps one or more LLM models and provides an interface to execute them
      * - `AgentLlmExecutionTools` - which is a specific implementation of `LlmExecutionTools` that wraps another LlmExecutionTools and applies agent-specific system prompts and requirements
-     * - `OpenAiAssistantExecutionTools` - which is a specific implementation of `LlmExecutionTools` for OpenAI models with assistant capabilities, recommended for usage in `Agent` or `AgentLlmExecutionTools`
+     * - `OpenAiAssistantExecutionTools` - (Deprecated) which is a specific implementation of `LlmExecutionTools` for OpenAI models with assistant capabilities
+     * - `OpenAiAgentKitExecutionTools` - which is a specific implementation of `LlmExecutionTools` backed by OpenAI AgentKit
      * - `RemoteAgent` - which is an `Agent` that connects to a Promptbook Agents Server
      *
      * @public exported from `@promptbook/core`
@@ -25581,26 +26155,7 @@
                 };
             };
             const getToolCallKey = (toolCall) => {
-                var _a;
-                const rawId = (_a = toolCall.rawToolCall) === null || _a === void 0 ? void 0 : _a.id;
-                if (rawId) {
-                    return `id:${rawId}`;
-                }
-                const argsKey = (() => {
-                    if (typeof toolCall.arguments === 'string') {
-                        return toolCall.arguments;
-                    }
-                    if (!toolCall.arguments) {
-                        return '';
-                    }
-                    try {
-                        return JSON.stringify(toolCall.arguments);
-                    }
-                    catch (_a) {
-                        return '';
-                    }
-                })();
-                return `${toolCall.name}:${toolCall.createdAt || ''}:${argsKey}`;
+                return getToolCallIdentity(toolCall);
             };
             const mergeToolCall = (existing, incoming) => {
                 const incomingResult = incoming.result;