supercompat 3.1.0 → 3.4.0

package/dist/index.cjs

@@ -435,10 +435,16 @@ var storageRequestHandlers = function(param) {
     var storage = param.storage, runAdapter = param.runAdapter, client = param.client;
     if (!storage) return {};
     if (!runAdapter) return {};
+    var wrappedClient = supercompat({
+        client: client
+    });
     var result = storage({
-        runAdapter: (0, import_radash.partob)(runAdapter, {
-            client: client
-        })
+        runAdapter: _object_spread_props(_object_spread({}, runAdapter), {
+            handleRun: (0, import_radash.partob)(runAdapter.handleRun, {
+                client: wrappedClient
+            })
+        }),
+        client: wrappedClient
     });
     return result.requestHandlers;
 };
@@ -3452,179 +3458,106 @@ var toolCallsData = function(param) {
     return newToolCalls;
 };
 var completionsRunAdapter = function() {
-    return /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(param) {
-            var clientAdapter, run3, onEvent2, getMessages2, client, opts, _tmp, providerResponse, e, _e_cause, _e_message, _e_cause_message, message, toolCallsRunStep, currentContent, currentToolCalls, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, chunk, _chunk_choices, choices, choice, delta, _delta_content, err;
-            return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        clientAdapter = param.client, run3 = param.run, onEvent2 = param.onEvent, getMessages2 = param.getMessages;
-                        if (run3.status !== "queued") return [
-                            2
-                        ];
-                        client = supercompat({
-                            client: clientAdapter
-                        });
-                        onEvent2({
-                            event: "thread.run.in_progress",
-                            data: _object_spread_props(_object_spread({}, run3), {
-                                status: "in_progress"
-                            })
-                        });
-                        _tmp = {};
-                        return [
-                            4,
-                            messages({
-                                run: run3,
-                                getMessages: getMessages2
-                            })
-                        ];
-                    case 1:
-                        opts = _object_spread.apply(void 0, [
-                            (_tmp.messages = _state.sent(), _tmp.model = run3.model, _tmp.stream = true, _tmp.response_format = run3.response_format, _tmp),
-                            (0, import_radash6.isEmpty)(run3.tools) ? {} : {
-                                tools: run3.tools
-                            }
-                        ]);
-                        _state.label = 2;
-                    case 2:
-                        _state.trys.push([
-                            2,
-                            4,
-                            ,
-                            5
-                        ]);
-                        return [
-                            4,
-                            client.chat.completions.create(opts)
-                        ];
-                    case 3:
-                        providerResponse = _state.sent();
-                        return [
-                            3,
-                            5
-                        ];
-                    case 4:
-                        e = _state.sent();
-                        console.error(e);
-                        return [
-                            2,
+    return {
+        handleRun: /*#__PURE__*/ function() {
+            var _ref = _async_to_generator(function(param) {
+                var client, run3, onEvent2, getMessages2, opts, _tmp, providerResponse, e, _e_cause, _e_message, _e_cause_message, message, toolCallsRunStep, currentContent, currentToolCalls, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, chunk, _chunk_choices, choices, choice, delta, _delta_content, err;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            client = param.client, run3 = param.run, onEvent2 = param.onEvent, getMessages2 = param.getMessages;
+                            if (run3.status !== "queued") return [
+                                2
+                            ];
                             onEvent2({
-                                event: "thread.run.failed",
+                                event: "thread.run.in_progress",
                                 data: _object_spread_props(_object_spread({}, run3), {
-                                    failed_at: (0, import_dayjs.default)().unix(),
-                                    status: "in_progress",
-                                    last_error: {
-                                        code: "server_error",
-                                        message: "".concat((_e_message = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message !== void 0 ? _e_message : "", " ").concat((_e_cause_message = e === null || e === void 0 ? void 0 : (_e_cause = e.cause) === null || _e_cause === void 0 ? void 0 : _e_cause.message) !== null && _e_cause_message !== void 0 ? _e_cause_message : "")
-                                    }
-                                })
-                            })
-                        ];
-                    case 5:
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.created",
-                                data: {
-                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                    object: "thread.message",
-                                    completed_at: null,
-                                    run_id: run3.id,
-                                    created_at: (0, import_dayjs.default)().unix(),
-                                    assistant_id: run3.assistant_id,
-                                    incomplete_at: null,
-                                    incomplete_details: null,
-                                    metadata: {},
-                                    attachments: [],
-                                    thread_id: run3.thread_id,
-                                    content: [
-                                        {
-                                            text: {
-                                                value: "",
-                                                annotations: []
-                                            },
-                                            type: "text"
-                                        }
-                                    ],
-                                    role: "assistant",
                                     status: "in_progress"
+                                })
+                            });
+                            _tmp = {};
+                            return [
+                                4,
+                                messages({
+                                    run: run3,
+                                    getMessages: getMessages2
+                                })
+                            ];
+                        case 1:
+                            opts = _object_spread.apply(void 0, [
+                                (_tmp.messages = _state.sent(), _tmp.model = run3.model, _tmp.stream = true, _tmp.response_format = run3.response_format, _tmp),
+                                (0, import_radash6.isEmpty)(run3.tools) ? {} : {
+                                    tools: run3.tools
                                 }
-                            })
-                        ];
-                    case 6:
-                        message = _state.sent();
-                        onEvent2({
-                            event: "thread.run.step.created",
-                            data: {
-                                id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                object: "thread.run.step",
-                                run_id: run3.id,
-                                assistant_id: run3.assistant_id,
-                                thread_id: run3.thread_id,
-                                type: "message_creation",
-                                status: "completed",
-                                completed_at: (0, import_dayjs.default)().unix(),
-                                created_at: (0, import_dayjs.default)().unix(),
-                                expired_at: null,
-                                last_error: null,
-                                metadata: {},
-                                failed_at: null,
-                                cancelled_at: null,
-                                usage: null,
-                                step_details: {
-                                    type: "message_creation",
-                                    message_creation: {
-                                        message_id: message.id
+                            ]);
+                            _state.label = 2;
+                        case 2:
+                            _state.trys.push([
+                                2,
+                                4,
+                                ,
+                                5
+                            ]);
+                            return [
+                                4,
+                                client.chat.completions.create(opts)
+                            ];
+                        case 3:
+                            providerResponse = _state.sent();
+                            return [
+                                3,
+                                5
+                            ];
+                        case 4:
+                            e = _state.sent();
+                            console.error(e);
+                            return [
+                                2,
+                                onEvent2({
+                                    event: "thread.run.failed",
+                                    data: _object_spread_props(_object_spread({}, run3), {
+                                        failed_at: (0, import_dayjs.default)().unix(),
+                                        status: "in_progress",
+                                        last_error: {
+                                            code: "server_error",
+                                            message: "".concat((_e_message = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message !== void 0 ? _e_message : "", " ").concat((_e_cause_message = e === null || e === void 0 ? void 0 : (_e_cause = e.cause) === null || _e_cause === void 0 ? void 0 : _e_cause.message) !== null && _e_cause_message !== void 0 ? _e_cause_message : "")
+                                        }
+                                    })
+                                })
+                            ];
+                        case 5:
+                            return [
+                                4,
+                                onEvent2({
+                                    event: "thread.message.created",
+                                    data: {
+                                        id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                        object: "thread.message",
+                                        completed_at: null,
+                                        run_id: run3.id,
+                                        created_at: (0, import_dayjs.default)().unix(),
+                                        assistant_id: run3.assistant_id,
+                                        incomplete_at: null,
+                                        incomplete_details: null,
+                                        metadata: {},
+                                        attachments: [],
+                                        thread_id: run3.thread_id,
+                                        content: [
+                                            {
+                                                text: {
+                                                    value: "",
+                                                    annotations: []
+                                                },
+                                                type: "text"
+                                            }
+                                        ],
+                                        role: "assistant",
+                                        status: "in_progress"
                                     }
-                                }
-                            }
-                        });
-                        currentContent = "";
-                        _iteratorAbruptCompletion = false, _didIteratorError = false;
-                        _state.label = 7;
-                    case 7:
-                        _state.trys.push([
-                            7,
-                            15,
-                            16,
-                            21
-                        ]);
-                        _iterator = _async_iterator(providerResponse);
-                        _state.label = 8;
-                    case 8:
-                        return [
-                            4,
-                            _iterator.next()
-                        ];
-                    case 9:
-                        if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
-                            3,
-                            14
-                        ];
-                        _value = _step.value;
-                        chunk = _value;
-                        choices = (_chunk_choices = chunk.choices) !== null && _chunk_choices !== void 0 ? _chunk_choices : [];
-                        choice = choices[0];
-                        if (!choice) return [
-                            3,
-                            13
-                        ];
-                        delta = choice.delta;
-                        if (delta.content) {
-                            ;
-                            currentContent = "".concat(currentContent).concat((_delta_content = delta.content) !== null && _delta_content !== void 0 ? _delta_content : "");
-                        }
-                        if (!delta.tool_calls) return [
-                            3,
-                            12
-                        ];
-                        if (!!toolCallsRunStep) return [
-                            3,
-                            11
-                        ];
-                        return [
-                            4,
+                                })
+                            ];
+                        case 6:
+                            message = _state.sent();
                             onEvent2({
                                 event: "thread.run.step.created",
                                 data: {
@@ -3633,9 +3566,9 @@ var completionsRunAdapter = function() {
                                     run_id: run3.id,
                                     assistant_id: run3.assistant_id,
                                     thread_id: run3.thread_id,
-                                    type: "tool_calls",
-                                    status: "in_progress",
-                                    completed_at: null,
+                                    type: "message_creation",
+                                    status: "completed",
+                                    completed_at: (0, import_dayjs.default)().unix(),
                                     created_at: (0, import_dayjs.default)().unix(),
                                     expired_at: null,
                                     last_error: null,
@@ -3644,170 +3577,242 @@ var completionsRunAdapter = function() {
                                     cancelled_at: null,
                                     usage: null,
                                     step_details: {
-                                        type: "tool_calls",
-                                        tool_calls: []
+                                        type: "message_creation",
+                                        message_creation: {
+                                            message_id: message.id
+                                        }
                                     }
                                 }
-                            })
-                        ];
-                    case 10:
-                        toolCallsRunStep = _state.sent();
-                        _state.label = 11;
-                    case 11:
-                        onEvent2({
-                            event: "thread.run.step.delta",
-                            data: {
-                                object: "thread.run.step.delta",
-                                run_id: run3.id,
-                                id: toolCallsRunStep.id,
-                                delta: {
-                                    step_details: {
+                            });
+                            currentContent = "";
+                            _iteratorAbruptCompletion = false, _didIteratorError = false;
+                            _state.label = 7;
+                        case 7:
+                            _state.trys.push([
+                                7,
+                                15,
+                                16,
+                                21
+                            ]);
+                            _iterator = _async_iterator(providerResponse);
+                            _state.label = 8;
+                        case 8:
+                            return [
+                                4,
+                                _iterator.next()
+                            ];
+                        case 9:
+                            if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
+                                3,
+                                14
+                            ];
+                            _value = _step.value;
+                            chunk = _value;
+                            choices = (_chunk_choices = chunk.choices) !== null && _chunk_choices !== void 0 ? _chunk_choices : [];
+                            choice = choices[0];
+                            if (!choice) return [
+                                3,
+                                13
+                            ];
+                            delta = choice.delta;
+                            if (delta.content) {
+                                ;
+                                currentContent = "".concat(currentContent).concat((_delta_content = delta.content) !== null && _delta_content !== void 0 ? _delta_content : "");
+                            }
+                            if (!delta.tool_calls) return [
+                                3,
+                                12
+                            ];
+                            if (!!toolCallsRunStep) return [
+                                3,
+                                11
+                            ];
+                            return [
+                                4,
+                                onEvent2({
+                                    event: "thread.run.step.created",
+                                    data: {
+                                        id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                        object: "thread.run.step",
+                                        run_id: run3.id,
+                                        assistant_id: run3.assistant_id,
+                                        thread_id: run3.thread_id,
                                         type: "tool_calls",
-                                        tool_calls: delta.tool_calls.map(function(tc) {
-                                            return _object_spread({
-                                                id: (0, import_radash6.uid)(24),
-                                                type: "function"
-                                            }, tc);
-                                        })
+                                        status: "in_progress",
+                                        completed_at: null,
+                                        created_at: (0, import_dayjs.default)().unix(),
+                                        expired_at: null,
+                                        last_error: null,
+                                        metadata: {},
+                                        failed_at: null,
+                                        cancelled_at: null,
+                                        usage: null,
+                                        step_details: {
+                                            type: "tool_calls",
+                                            tool_calls: []
+                                        }
                                     }
-                                }
-                            }
-                        });
-                        currentToolCalls = toolCallsData({
-                            prevToolCalls: currentToolCalls,
-                            delta: delta
-                        });
-                        _state.label = 12;
-                    case 12:
-                        if (delta.content) {
+                                })
+                            ];
+                        case 10:
+                            toolCallsRunStep = _state.sent();
+                            _state.label = 11;
+                        case 11:
                             onEvent2({
-                                event: "thread.message.delta",
+                                event: "thread.run.step.delta",
                                 data: {
-                                    id: message.id,
+                                    object: "thread.run.step.delta",
+                                    run_id: run3.id,
+                                    id: toolCallsRunStep.id,
                                     delta: {
-                                        content: [
-                                            {
-                                                type: "text",
-                                                index: 0,
-                                                text: {
-                                                    value: delta.content
-                                                }
-                                            }
-                                        ]
+                                        step_details: {
+                                            type: "tool_calls",
+                                            tool_calls: delta.tool_calls.map(function(tc) {
+                                                return _object_spread({
+                                                    id: (0, import_radash6.uid)(24),
+                                                    type: "function"
+                                                }, tc);
+                                            })
+                                        }
                                     }
                                 }
                             });
-                        }
-                        _state.label = 13;
-                    case 13:
-                        _iteratorAbruptCompletion = false;
-                        return [
-                            3,
-                            8
-                        ];
-                    case 14:
-                        return [
-                            3,
-                            21
-                        ];
-                    case 15:
-                        err = _state.sent();
-                        _didIteratorError = true;
-                        _iteratorError = err;
-                        return [
-                            3,
-                            21
-                        ];
-                    case 16:
-                        _state.trys.push([
-                            16,
-                            ,
-                            19,
-                            20
-                        ]);
-                        if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
-                            3,
-                            18
-                        ];
-                        return [
-                            4,
-                            _iterator.return()
-                        ];
-                    case 17:
-                        _state.sent();
-                        _state.label = 18;
-                    case 18:
-                        return [
-                            3,
-                            20
-                        ];
-                    case 19:
-                        if (_didIteratorError) {
-                            throw _iteratorError;
-                        }
-                        return [
-                            7
-                        ];
-                    case 20:
-                        return [
-                            7
-                        ];
-                    case 21:
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.completed",
-                                data: _object_spread_props(_object_spread({}, message), {
-                                    status: "completed",
-                                    content: [
-                                        {
-                                            text: {
-                                                value: currentContent,
-                                                annotations: []
-                                            },
-                                            type: "text"
+                            currentToolCalls = toolCallsData({
+                                prevToolCalls: currentToolCalls,
+                                delta: delta
+                            });
+                            _state.label = 12;
+                        case 12:
+                            if (delta.content) {
+                                onEvent2({
+                                    event: "thread.message.delta",
+                                    data: {
+                                        id: message.id,
+                                        delta: {
+                                            content: [
+                                                {
+                                                    type: "text",
+                                                    index: 0,
+                                                    text: {
+                                                        value: delta.content
+                                                    }
+                                                }
+                                            ]
                                         }
-                                    ],
-                                    tool_calls: currentToolCalls
-                                })
-                            })
-                        ];
-                    case 22:
-                        message = _state.sent();
-                        if ((0, import_radash6.isEmpty)(message.toolCalls)) {
+                                    }
+                                });
+                            }
+                            _state.label = 13;
+                        case 13:
+                            _iteratorAbruptCompletion = false;
                             return [
-                                2,
+                                3,
+                                8
+                            ];
+                        case 14:
+                            return [
+                                3,
+                                21
+                            ];
+                        case 15:
+                            err = _state.sent();
+                            _didIteratorError = true;
+                            _iteratorError = err;
+                            return [
+                                3,
+                                21
+                            ];
+                        case 16:
+                            _state.trys.push([
+                                16,
+                                ,
+                                19,
+                                20
+                            ]);
+                            if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
+                                3,
+                                18
+                            ];
+                            return [
+                                4,
+                                _iterator.return()
+                            ];
+                        case 17:
+                            _state.sent();
+                            _state.label = 18;
+                        case 18:
+                            return [
+                                3,
+                                20
+                            ];
+                        case 19:
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                            return [
+                                7
+                            ];
+                        case 20:
+                            return [
+                                7
+                            ];
+                        case 21:
+                            return [
+                                4,
                                 onEvent2({
-                                    event: "thread.run.completed",
-                                    data: _object_spread_props(_object_spread({}, run3), {
+                                    event: "thread.message.completed",
+                                    data: _object_spread_props(_object_spread({}, message), {
                                         status: "completed",
-                                        completed_at: (0, import_dayjs.default)().unix()
+                                        content: [
+                                            {
+                                                text: {
+                                                    value: currentContent,
+                                                    annotations: []
+                                                },
+                                                type: "text"
+                                            }
+                                        ],
+                                        tool_calls: currentToolCalls
                                     })
                                 })
                             ];
-                        }
-                        return [
-                            2,
-                            onEvent2({
-                                event: "thread.run.requires_action",
-                                data: _object_spread_props(_object_spread({}, run3), {
-                                    status: "requires_action",
-                                    required_action: {
-                                        type: "submit_tool_outputs",
-                                        submit_tool_outputs: {
-                                            tool_calls: message.toolCalls
+                        case 22:
+                            message = _state.sent();
+                            if ((0, import_radash6.isEmpty)(message.toolCalls)) {
+                                return [
+                                    2,
+                                    onEvent2({
+                                        event: "thread.run.completed",
+                                        data: _object_spread_props(_object_spread({}, run3), {
+                                            status: "completed",
+                                            completed_at: (0, import_dayjs.default)().unix()
+                                        })
+                                    })
+                                ];
+                            }
+                            return [
+                                2,
+                                onEvent2({
+                                    event: "thread.run.requires_action",
+                                    data: _object_spread_props(_object_spread({}, run3), {
+                                        status: "requires_action",
+                                        required_action: {
+                                            type: "submit_tool_outputs",
+                                            submit_tool_outputs: {
+                                                tool_calls: message.toolCalls
+                                            }
                                         }
-                                    }
+                                    })
                                 })
-                            })
-                        ];
-                }
+                            ];
+                    }
+                });
             });
-        });
-        return function(_) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+            return function(_) {
+                return _ref.apply(this, arguments);
+            };
+        }()
+    };
 };
 // src/lib/messages/messagesRegexp.ts
 var messagesRegexp = "^/(?:v1|/?openai)/threads/([^/]+)/messages$";
@@ -4628,7 +4633,7 @@ var post12 = function(param) {
                                                 ]);
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
                                                         run: data,
                                                         onEvent: onEvent({
                                                             controller: _object_spread_props(_object_spread({}, controller), {
@@ -5077,7 +5082,7 @@ var post13 = function(param) {
                                                 run3 = _state.sent();
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
                                                         run: serializeRun({
                                                             run: run3
                                                         }),
@@ -5137,7 +5142,7 @@ var post13 = function(param) {
                                                     case 0:
                                                         return [
                                                             4,
-                                                            runAdapter({
+                                                            runAdapter.handleRun({
                                                                 run: serializeRun({
                                                                     run: run3
                                                                 }),
@@ -5308,7 +5313,7 @@ var serializeThread2 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/post.ts
 var post15 = function(param) {
-    var openai = param.openai;
+    var client = param.client;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString, options) {
             var body, messages4, metadata, conversation;
@@ -5320,7 +5325,7 @@ var post15 = function(param) {
                         metadata = body.metadata || {};
                         return [
                             4,
-                            openai.conversations.create({
+                            client.conversations.create({
                                 metadata: metadata,
                                 items: messages4.map(function(message) {
                                     return {
@@ -5359,10 +5364,10 @@ var post15 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/index.ts
 var threads2 = function(param) {
-    var openai = param.openai;
+    var client = param.client;
     return {
         post: post15({
-            openai: openai
+            client: client
         })
     };
 };
@@ -5373,34 +5378,71 @@ var import_radash14 = require("radash");
 var import_radash13 = require("radash");
 var serializeContent2 = function(param) {
     var item = param.item;
-    if (item.type !== "message") return [];
-    return item.content.map(function(contentBlock) {
-        if (contentBlock.type === "input_text") {
-            return {
-                type: "text",
-                text: {
-                    value: contentBlock.text,
-                    annotations: []
-                }
-            };
-        } else if (contentBlock.type === "output_text") {
-            return {
-                type: "text",
-                text: {
-                    value: contentBlock.text,
-                    annotations: []
+    if (item.type === "message") {
+        return item.content.map(function(contentBlock) {
+            if (contentBlock.type === "input_text") {
+                return {
+                    type: "text",
+                    text: {
+                        value: contentBlock.text,
+                        annotations: []
+                    }
+                };
+            } else if (contentBlock.type === "output_text") {
+                return {
+                    type: "text",
+                    text: {
+                        value: contentBlock.text,
+                        annotations: []
+                    }
+                };
+            } else if (contentBlock.type === "input_image") {
+                return {
+                    type: "image_file",
+                    image_file: {
+                        file_id: contentBlock.file_id,
+                        detail: "auto"
+                    }
+                };
+            }
+            return null;
+        }).filter(Boolean);
+    } else if (item.type === "image_generation_call") {
+        if (!item.result) return [];
+        return [
+            {
+                type: "image_url",
+                image_url: {
+                    url: "data:image/".concat(item.output_format, ";base64,").concat(item.result),
+                    detail: "auto"
                 }
-            };
-        }
-        return null;
-    }).filter(Boolean);
+            }
+        ];
+    } else {
+        return [];
+    }
 };
 var serializeAttachments = function(param) {
     var item = param.item;
-    return [];
+    if (item.type !== "message") return [];
+    var inputFiles = item.content.filter(function(contentBlock) {
+        return contentBlock.type === "input_file" && contentBlock.file_id;
+    });
+    return inputFiles.map(function(inputFile) {
+        return {
+            file_id: inputFile.file_id
+        };
+    });
 };
 var serializeMetadata = function(param) {
     var item = param.item;
+    if (item.type === "image_generation_call") {
+        return {
+            item: JSON.stringify(_object_spread_props(_object_spread({}, item), {
+                result: "truncated"
+            }))
+        };
+    }
     return {
         item: JSON.stringify(item)
     };
@@ -5431,8 +5473,7 @@ var serializeItemAsMessage = function(param) {
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/messages/post.ts
-var import_radash15 = require("radash");
-var messageContentBlocks2 = function(param) {
+var contentBlocksFromContent = function(param) {
     var content = param.content;
     if ((0, import_radash14.isArray)(content)) {
         return content.map(function(item) {
@@ -5471,40 +5512,65 @@ var messageContentBlocks2 = function(param) {
         }
     ];
 };
+var contentBlocksFromAttachments = function(param) {
+    var attachments = param.attachments;
+    return attachments.map(function(attachment) {
+        return {
+            type: "input_file",
+            file_id: attachment.file_id
+        };
+    });
+};
+var messageContentBlocks2 = function(param) {
+    var content = param.content, attachments = param.attachments;
+    return _to_consumable_array(contentBlocksFromContent({
+        content: content
+    })).concat(_to_consumable_array(contentBlocksFromAttachments({
+        attachments: attachments
+    })));
+};
 var post16 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant, createResponseItems = param.createResponseItems;
+    var runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString, options) {
-            var url, _url_pathname_match, threadId, body, role, content, metadata, item;
+            var url, _url_pathname_match, threadId, body, role, content, _body_attachments, attachments, item, openaiAssistant;
             return _ts_generator(this, function(_state) {
-                url = new URL(urlString);
-                _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(messagesRegexp)), 2), threadId = _url_pathname_match[1];
-                body = JSON.parse(options.body);
-                role = body.role, content = body.content, metadata = body.metadata;
-                item = {
-                    id: "msg_".concat((0, import_radash15.uid)(24)),
-                    status: "in_progress",
-                    type: "message",
-                    role: role,
-                    content: messageContentBlocks2({
-                        content: content
-                    })
-                };
-                createResponseItems.push(item);
-                return [
-                    2,
-                    new Response(JSON.stringify(serializeItemAsMessage({
-                        item: item,
-                        threadId: threadId,
-                        openaiAssistant: openaiAssistant,
-                        createdAt: (0, import_dayjs10.default)().unix()
-                    })), {
-                        status: 200,
-                        headers: {
-                            "Content-Type": "application/json"
-                        }
-                    })
-                ];
+                switch(_state.label){
+                    case 0:
+                        url = new URL(urlString);
+                        _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(messagesRegexp)), 2), threadId = _url_pathname_match[1];
+                        body = JSON.parse(options.body);
+                        role = body.role, content = body.content, _body_attachments = body.attachments, attachments = _body_attachments === void 0 ? [] : _body_attachments;
+                        item = {
+                            type: "message",
+                            role: role,
+                            content: messageContentBlocks2({
+                                content: content,
+                                attachments: attachments
+                            })
+                        };
+                        createResponseItems.push(item);
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 1:
+                        openaiAssistant = _state.sent();
+                        return [
+                            2,
+                            new Response(JSON.stringify(serializeItemAsMessage({
+                                item: item,
+                                threadId: threadId,
+                                openaiAssistant: openaiAssistant,
+                                createdAt: (0, import_dayjs10.default)().unix()
+                            })), {
+                                status: 200,
+                                headers: {
+                                    "Content-Type": "application/json"
+                                }
+                            })
+                        ];
+                }
             });
         });
         return function(urlString, options) {
@@ -5513,7 +5579,7 @@ var post16 = function(param) {
     }();
 };
 // src/adapters/storage/responsesStorageAdapter/threads/messages/get.ts
-var import_radash16 = require("radash");
+var import_radash15 = require("radash");
 // src/lib/items/responseId.ts
 function responseId(param) {
     var conversation = param.conversation, itemId = param.itemId;
@@ -5552,29 +5618,29 @@ function responseId(param) {
 }
 // src/adapters/storage/responsesStorageAdapter/threads/messages/get.ts
 var get14 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant;
+    var client = param.client, runAdapter = param.runAdapter;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var url, _url_pathname_match, threadId, _ref, limit, order, after, conversation, sortOrder, items, itemsWithRunIds, responseMap, timestampedItems;
+            var url, _url_pathname_match, threadId, _ref, limit, order, after, conversation, sortOrder, items, itemsWithRunIds, responseMap, timestampedItems, openaiAssistant;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(messagesRegexp)), 2), threadId = _url_pathname_match[1];
-                        _ref = (0, import_radash16.assign)({
+                        _ref = (0, import_radash15.assign)({
                             limit: "20",
                             order: "desc"
                         }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
                         return [
                             4,
-                            openai.conversations.retrieve(threadId)
+                            client.conversations.retrieve(threadId)
                         ];
                     case 1:
                         conversation = _state.sent();
                         sortOrder = order === "asc" ? "asc" : "desc";
                         return [
                             4,
-                            openai.conversations.items.list(threadId, {
+                            client.conversations.items.list(threadId, {
                                 limit: parseInt(limit, 10),
                                 after: after,
                                 order: sortOrder
@@ -5589,7 +5655,7 @@ var get14 = function(param) {
                         return [
                             4,
                             fetchResponsesForItems({
-                                openai: openai,
+                                client: client,
                                 items: itemsWithRunIds
                             })
                         ];
@@ -5601,6 +5667,12 @@ var get14 = function(param) {
                             sortOrder: sortOrder,
                             conversationCreatedAt: conversation.created_at
                         });
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 4:
+                        openaiAssistant = _state.sent();
                         return [
                             2,
                             new Response(JSON.stringify({
@@ -5645,11 +5717,11 @@ var mapItemsWithRunIds = function(param) {
 };
 var fetchResponsesForItems = /*#__PURE__*/ function() {
     var _ref = _async_to_generator(function(param) {
-        var openai, items, responseIds, results, map;
+        var client, items, responseIds, results, map;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    openai = param.openai, items = param.items;
+                    client = param.client, items = param.items;
                     responseIds = Array.from(new Set(items.map(function(param) {
                         var runId = param.runId;
                         return runId;
@@ -5659,7 +5731,7 @@ var fetchResponsesForItems = /*#__PURE__*/ function() {
                     return [
                         4,
                         Promise.allSettled(responseIds.map(function(id) {
-                            return openai.responses.retrieve(id);
+                            return client.responses.retrieve(id);
                         }))
                     ];
                 case 1:
@@ -5757,34 +5829,23 @@ var assignTimestamps = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/messages/index.ts
 var messages3 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant, createResponseItems = param.createResponseItems;
+    var client = param.client, runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
     return {
         post: post16({
-            openai: openai,
-            openaiAssistant: openaiAssistant,
+            runAdapter: runAdapter,
             createResponseItems: createResponseItems
         }),
         get: get14({
-            openai: openai,
-            openaiAssistant: openaiAssistant
+            client: client,
+            runAdapter: runAdapter
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/get.ts
-var import_radash17 = require("radash");
-var get15 = function(param) {
-    var prisma = param.prisma;
+var get15 = function() {
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var url, _url_pathname_match, threadId, _ref, limit, order, after, pageSize;
             return _ts_generator(this, function(_state) {
-                url = new URL(urlString);
-                _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(runsRegexp)), 2), threadId = _url_pathname_match[1];
-                _ref = (0, import_radash17.assign)({
-                    limit: "20",
-                    order: "desc"
-                }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
-                pageSize = parseInt(limit, 10);
                 return [
                     2,
                     new Response(JSON.stringify({
@@ -5806,9 +5867,9 @@ var get15 = function(param) {
     }();
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/post.ts
-var import_radash18 = require("radash");
+var import_radash16 = require("radash");
 var import_dayjs11 = __toESM(require("dayjs"), 1);
-var import_radash19 = require("radash");
+var import_radash17 = require("radash");
 // src/lib/responses/serializeResponseAsRun.ts
 var serializeStatus = function(param) {
     var response = param.response;
@@ -6036,9 +6097,9 @@ function tryPackPairs(param) {
                     itemIds: _to_consumable_array(e.itemIds)
                 };
             });
-            var last6 = next[next.length - 1];
-            if (last6 && last6.responseId === responseId2) {
-                last6.itemIds.push(itemId);
+            var last5 = next[next.length - 1];
+            if (last5 && last5.responseId === responseId2) {
+                last5.itemIds.push(itemId);
             } else {
                 next.push({
                     responseId: responseId2,
@@ -6146,14 +6207,14 @@ function saveResponseItemsToConversationMetadata(_) {
 }
 function _saveResponseItemsToConversationMetadata() {
     _saveResponseItemsToConversationMetadata = _async_to_generator(function(param) {
-        var openai, threadId, responseId2, itemIds, conversation, updated;
+        var client, threadId, responseId2, itemIds, conversation, updated;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    openai = param.openai, threadId = param.threadId, responseId2 = param.responseId, itemIds = param.itemIds;
+                    client = param.client, threadId = param.threadId, responseId2 = param.responseId, itemIds = param.itemIds;
                     return [
                         4,
-                        openai.conversations.retrieve(threadId)
+                        client.conversations.retrieve(threadId)
                     ];
                 case 1:
                     conversation = _state.sent();
@@ -6164,7 +6225,7 @@ function _saveResponseItemsToConversationMetadata() {
                     });
                     return [
                         4,
-                        openai.conversations.update(threadId, {
+                        client.conversations.update(threadId, {
                             metadata: updated
                         })
                     ];
@@ -6202,11 +6263,11 @@ var defaultAssistant = {
     }
 };
 var post17 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
+    var client = param.client, runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString, options) {
             var url, _url_pathname_match, threadId, body, assistant_id, stream, _ref, model, instructions, // additional_instructions,
-            tools, metadata, response_format, truncation_strategy, response, readableStream, _response_output, itemIds, data;
+            tools, metadata, response_format, truncation_strategy, _, _tmp, response, readableStream, _response_output, itemIds, data;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -6214,10 +6275,25 @@ var post17 = function(param) {
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(runsRegexp)), 2), threadId = _url_pathname_match[1];
                         body = JSON.parse(options.body);
                         assistant_id = body.assistant_id, stream = body.stream;
-                        _ref = (0, import_radash19.assign)(_object_spread({}, defaultAssistant, openaiAssistant), body), model = _ref.model, instructions = _ref.instructions, tools = _ref.tools, metadata = _ref.metadata, response_format = _ref.response_format, truncation_strategy = _ref.truncation_strategy;
+                        _ = (0, import_radash17.assign);
+                        _tmp = [
+                            {},
+                            defaultAssistant
+                        ];
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 1:
+                        _ref = _.apply(void 0, [
+                            _object_spread.apply(void 0, _tmp.concat([
+                                _state.sent()
+                            ])),
+                            body
+                        ]), model = _ref.model, instructions = _ref.instructions, tools = _ref.tools, metadata = _ref.metadata, response_format = _ref.response_format, truncation_strategy = _ref.truncation_strategy;
                         return [
                             4,
-                            openai.responses.create(_object_spread_props(_object_spread({
+                            client.responses.create(_object_spread_props(_object_spread({
                                 conversation: threadId,
                                 instructions: instructions,
                                 model: model,
@@ -6233,7 +6309,7 @@ var post17 = function(param) {
                                 input: createResponseItems
                             }))
                         ];
-                    case 1:
+                    case 2:
                         response = _state.sent();
                         readableStream = new ReadableStream({
                             start: function start(controller) {
@@ -6250,7 +6326,7 @@ var post17 = function(param) {
                                                 ]);
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
                                                         threadId: threadId,
                                                         response: response,
                                                         onEvent: /*#__PURE__*/ function() {
@@ -6280,7 +6356,7 @@ var post17 = function(param) {
                                                 event = {
                                                     event: "thread.run.failed",
                                                     data: {
-                                                        id: (0, import_radash18.uid)(24),
+                                                        id: (0, import_radash16.uid)(24),
                                                         failed_at: (0, import_dayjs11.default)().unix(),
                                                         last_error: {
                                                             code: "server_error",
@@ -6305,7 +6381,7 @@ var post17 = function(param) {
                         });
                         if (!stream) return [
                             3,
-                            2
+                            3
                         ];
                         return [
                             2,
@@ -6315,7 +6391,7 @@ var post17 = function(param) {
                                 }
                             })
                         ];
-                    case 2:
+                    case 3:
                         itemIds = ((_response_output = response.output) !== null && _response_output !== void 0 ? _response_output : []).filter(function(o) {
                             return o.id;
                         }).map(function(o) {
@@ -6323,21 +6399,21 @@ var post17 = function(param) {
                         });
                         if (!(itemIds.length > 0)) return [
                             3,
-                            4
+                            5
                         ];
                         return [
                             4,
                             saveResponseItemsToConversationMetadata({
-                                openai: openai,
+                                client: client,
                                 threadId: threadId,
                                 responseId: response.id,
                                 itemIds: itemIds
                             })
                         ];
-                    case 3:
-                        _state.sent();
-                        _state.label = 4;
                     case 4:
+                        _state.sent();
+                        _state.label = 5;
+                    case 5:
                         data = serializeResponseAsRun({
                             response: response,
                             assistantId: assistant_id
@@ -6351,7 +6427,7 @@ var post17 = function(param) {
                                 }
                             })
                         ];
-                    case 5:
+                    case 6:
                         return [
                             2
                         ];
@@ -6365,14 +6441,11 @@ var post17 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/index.ts
 var runs2 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
+    var client = param.client, runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
     return {
-        get: get15({
-            openai: openai
-        }),
+        get: get15(),
         post: post17({
-            openai: openai,
-            openaiAssistant: openaiAssistant,
+            client: client,
             createResponseItems: createResponseItems,
             runAdapter: runAdapter
         })
@@ -6380,10 +6453,10 @@ var runs2 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/run/get.ts
 var get16 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant;
+    var client = param.client, runAdapter = param.runAdapter;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var url, _url_pathname_match, _threadId, runId, response, data;
+            var url, _url_pathname_match, _threadId, runId, response, data, _tmp;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -6391,14 +6464,21 @@ var get16 = function(param) {
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(runRegexp)), 3), _threadId = _url_pathname_match[1], runId = _url_pathname_match[2];
                         return [
                             4,
-                            openai.responses.retrieve(runId)
+                            client.responses.retrieve(runId)
                         ];
                     case 1:
                         response = _state.sent();
-                        data = serializeResponseAsRun({
-                            response: response,
-                            assistantId: openaiAssistant.id
-                        });
+                        _tmp = {
+                            response: response
+                        };
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 2:
+                        data = serializeResponseAsRun.apply(void 0, [
+                            (_tmp.assistantId = _state.sent().id, _tmp)
+                        ]);
                         return [
                             2,
                             new Response(JSON.stringify(data), {
@@ -6419,11 +6499,11 @@ var get16 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/run/index.ts
 var run2 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter;
+    var client = param.client, runAdapter = param.runAdapter;
     return {
         get: get16({
-            openai: openai,
-            openaiAssistant: openaiAssistant
+            client: client,
+            runAdapter: runAdapter
         })
     };
 };
@@ -6718,13 +6798,13 @@ function _pMap() {
 }
 var pMapSkip = Symbol("skip");
 // src/adapters/storage/responsesStorageAdapter/threads/runs/steps/get.ts
-var import_radash21 = require("radash");
+var import_radash19 = require("radash");
 // src/lib/items/serializeItemAsRunStep.ts
 var import_dayjs12 = __toESM(require("dayjs"), 1);
-var import_radash20 = require("radash");
+var import_radash18 = require("radash");
 function serializeItemAsRunStep(param) {
-    var item = param.item, items = param.items, threadId = param.threadId, openaiAssistant = param.openaiAssistant, _param_runId = param.runId, runId = _param_runId === void 0 ? "run_".concat((0, import_radash20.uid)(24)) : _param_runId, tmp = param.status, status3 = tmp === void 0 ? "completed" : tmp, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? (0, import_dayjs12.default)().unix() : _param_completedAt;
-    var itemId = typeof item.id === "string" ? item.id : "item_".concat((0, import_radash20.uid)(18));
+    var item = param.item, items = param.items, threadId = param.threadId, openaiAssistant = param.openaiAssistant, _param_runId = param.runId, runId = _param_runId === void 0 ? "run_".concat((0, import_radash18.uid)(24)) : _param_runId, tmp = param.status, status3 = tmp === void 0 ? "completed" : tmp, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? (0, import_dayjs12.default)().unix() : _param_completedAt;
+    var itemId = typeof item.id === "string" ? item.id : "item_".concat((0, import_radash18.uid)(18));
     var base = {
         id: itemId,
         object: "thread.run.step",
@@ -6780,6 +6860,22 @@ function serializeItemAsRunStep(param) {
             }
         });
     }
+    if (item.type === "image_generation_call") {
+        return _object_spread_props(_object_spread({}, base), {
+            type: "message_creation",
+            step_details: {
+                type: "message_creation",
+                message_creation: {
+                    message_id: itemId
+                }
+            },
+            metadata: {
+                item: JSON.stringify(_object_spread_props(_object_spread({}, item), {
+                    result: "truncated"
+                }))
+            }
+        });
+    }
     return _object_spread_props(_object_spread({}, base), {
         type: "message_creation",
         step_details: {
@@ -6793,88 +6889,418 @@ function serializeItemAsRunStep(param) {
         }
     });
 }
-// src/adapters/storage/responsesStorageAdapter/threads/runs/steps/get.ts
-var get17 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant;
-    return /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(urlString) {
-            var _this, url, _url_pathname_match, threadId, runId, response, functionCalls, functionCallOutputsResponses, functionCallOutputs, nonFcItems, data, _id;
-            return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        url = new URL(urlString);
-                        _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(stepsRegexp)), 3), threadId = _url_pathname_match[1], runId = _url_pathname_match[2];
-                        return [
-                            4,
-                            openai.responses.retrieve(runId)
-                        ];
-                    case 1:
-                        response = _state.sent();
-                        functionCalls = response.output.filter(function(item) {
-                            return item.type === "function_call";
-                        });
-                        return [
-                            4,
-                            pMap(functionCalls, /*#__PURE__*/ function() {
-                                var _ref = _async_to_generator(function(functionCall) {
-                                    var items;
-                                    return _ts_generator(this, function(_state) {
-                                        switch(_state.label){
-                                            case 0:
-                                                return [
-                                                    4,
-                                                    openai.conversations.items.list(threadId, {
-                                                        after: functionCall.id,
-                                                        order: "asc"
-                                                    })
-                                                ];
-                                            case 1:
-                                                items = _state.sent();
-                                                return [
-                                                    2,
-                                                    items.data.find(function(item) {
-                                                        return item.type === "function_call_output" && item.call_id === functionCall.call_id;
-                                                    })
-                                                ];
-                                        }
-                                    });
-                                });
-                                return function(functionCall) {
-                                    return _ref.apply(this, arguments);
-                                };
-                            }())
-                        ];
-                    case 2:
-                        functionCallOutputsResponses = _state.sent();
-                        functionCallOutputs = functionCallOutputsResponses.filter(Boolean);
-                        nonFcItems = response.output.filter(function(item) {
-                            return item.type !== "function_call";
-                        });
-                        data = response.output.flatMap(function(item) {
-                            var step = serializeItemAsRunStep({
-                                item: item,
-                                items: functionCallOutputs,
-                                threadId: threadId,
-                                openaiAssistant: openaiAssistant,
-                                runId: response.id
-                            });
-                            if (item.type === "function_call") {
-                                var synthCreation = {
-                                    id: "mc".concat(item.id),
-                                    run_id: response.id,
-                                    status: "completed",
-                                    completed_at: step.created_at,
-                                    step_details: {
-                                        type: "message_creation",
-                                        message_creation: {
-                                            message_id: item.id
-                                        }
-                                    }
-                                };
-                                return [
-                                    synthCreation,
-                                    step
-                                ];
+// src/lib/items/serializeItemAsImageGenerationRunStep.ts
+var import_dayjs13 = __toESM(require("dayjs"), 1);
+var serializeStatus2 = function(param) {
+    var item = param.item;
+    if (item.status === "generating") {
+        return "in_progress";
+    }
+    return item.status;
+};
+var serializeItemAsImageGenerationRunStep = function(param) {
+    var item = param.item, openaiAssistant = param.openaiAssistant, threadId = param.threadId, runId = param.runId, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? (0, import_dayjs13.default)().unix() : _param_completedAt;
+    var toolCall = {
+        id: "ftc".concat(item.id),
+        type: "function",
+        function: {
+            name: "image_generation",
+            arguments: "{}",
+            output: JSON.stringify({
+                status: item.status,
+                background: item.background,
+                output_format: item.output_format,
+                quality: item.quality,
+                result: item.result,
+                size: item.size,
+                revised_prompt: item.revised_prompt
+            })
+        }
+    };
+    return {
+        id: "fc".concat(item.id),
+        object: "thread.run.step",
+        created_at: (0, import_dayjs13.default)().unix(),
+        assistant_id: openaiAssistant.id,
+        thread_id: threadId,
+        run_id: runId,
+        status: serializeStatus2({
+            item: item
+        }),
+        last_error: null,
+        expired_at: null,
+        cancelled_at: null,
+        failed_at: null,
+        completed_at: completedAt,
+        metadata: {},
+        usage: null,
+        type: "tool_calls",
+        step_details: {
+            type: "tool_calls",
+            tool_calls: [
+                toolCall
+            ]
+        }
+    };
+};
+// src/lib/items/serializeItemAsWebSearchRunStep.ts
+var import_dayjs14 = __toESM(require("dayjs"), 1);
+var serializeStatus3 = function(param) {
+    var item = param.item;
+    if (item.status === "searching") {
+        return "in_progress";
+    }
+    return item.status;
+};
+var serializeItemAsWebSearchRunStep = function(param) {
+    var item = param.item, openaiAssistant = param.openaiAssistant, threadId = param.threadId, runId = param.runId, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? (0, import_dayjs14.default)().unix() : _param_completedAt;
+    var toolCall = {
+        id: "ftc".concat(item.id),
+        type: "function",
+        function: {
+            name: "web_search",
+            arguments: JSON.stringify({
+                action: item.action
+            }),
+            output: JSON.stringify({
+                status: item.status
+            })
+        }
+    };
+    return {
+        id: "fc".concat(item.id),
+        object: "thread.run.step",
+        created_at: (0, import_dayjs14.default)().unix(),
+        assistant_id: openaiAssistant.id,
+        thread_id: threadId,
+        run_id: runId,
+        status: serializeStatus3({
+            item: item
+        }),
+        last_error: null,
+        expired_at: null,
+        cancelled_at: null,
+        failed_at: null,
+        completed_at: completedAt,
+        metadata: {},
+        usage: null,
+        type: "tool_calls",
+        step_details: {
+            type: "tool_calls",
+            tool_calls: [
+                toolCall
+            ]
+        }
+    };
+};
+// src/lib/items/serializeItemAsMcpListToolsRunStep.ts
+var import_dayjs15 = __toESM(require("dayjs"), 1);
+var serializeStatus4 = function(param) {
+    var item = param.item;
+    if (item.error) {
+        return "failed";
+    }
+    return "completed";
+};
+var serializeItemAsMcpListToolsRunStep = function(param) {
+    var item = param.item, openaiAssistant = param.openaiAssistant, threadId = param.threadId, runId = param.runId, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? (0, import_dayjs15.default)().unix() : _param_completedAt;
+    var toolCall = {
+        id: "ftc".concat(item.id),
+        type: "function",
+        function: {
+            name: "mcp_list_tools",
+            arguments: JSON.stringify({
+                server_label: item.server_label
+            }),
+            output: JSON.stringify(_object_spread({
+                tools: item.tools
+            }, item.error && {
+                error: item.error
+            }))
+        }
+    };
+    return {
+        id: "fc".concat(item.id),
+        object: "thread.run.step",
+        created_at: (0, import_dayjs15.default)().unix(),
+        assistant_id: openaiAssistant.id,
+        thread_id: threadId,
+        run_id: runId,
+        status: serializeStatus4({
+            item: item
+        }),
+        last_error: null,
+        expired_at: null,
+        cancelled_at: null,
+        failed_at: null,
+        completed_at: completedAt,
+        metadata: {},
+        usage: null,
+        type: "tool_calls",
+        step_details: {
+            type: "tool_calls",
+            tool_calls: [
+                toolCall
+            ]
+        }
+    };
+};
+// src/lib/items/serializeItemAsMcpCallRunStep.ts
+var import_dayjs16 = __toESM(require("dayjs"), 1);
+var serializeStatus5 = function(param) {
+    var item = param.item;
+    if (item.error) {
+        return "failed";
+    }
+    return "completed";
+};
+var serializeItemAsMcpCallRunStep = function(param) {
+    var item = param.item, openaiAssistant = param.openaiAssistant, threadId = param.threadId, runId = param.runId, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? (0, import_dayjs16.default)().unix() : _param_completedAt;
+    var _item_output, _ref;
+    var toolCall = {
+        id: "ftc".concat(item.id),
+        type: "function",
+        function: {
+            name: item.name,
+            arguments: item.arguments,
+            server_label: item.server_label,
+            output: (_ref = (_item_output = item.output) !== null && _item_output !== void 0 ? _item_output : item.error) !== null && _ref !== void 0 ? _ref : null
+        }
+    };
+    return {
+        id: "fc".concat(item.id),
+        object: "thread.run.step",
+        created_at: (0, import_dayjs16.default)().unix(),
+        assistant_id: openaiAssistant.id,
+        thread_id: threadId,
+        run_id: runId,
+        status: serializeStatus5({
+            item: item
+        }),
+        last_error: item.error ? {
+            code: "server_error",
+            message: item.error
+        } : null,
+        expired_at: null,
+        cancelled_at: null,
+        failed_at: item.error ? (0, import_dayjs16.default)().unix() : null,
+        completed_at: item.error ? null : completedAt,
+        metadata: {},
+        usage: null,
+        type: "tool_calls",
+        step_details: {
+            type: "tool_calls",
+            tool_calls: [
+                toolCall
+            ]
+        }
+    };
+};
+// src/lib/items/serializeItemAsCodeInterpreterCallRunStep.ts
+var import_dayjs17 = __toESM(require("dayjs"), 1);
+var serializeStatus6 = function(param) {
+    var item = param.item;
+    if (item.status === "incomplete") {
+        return "in_progress";
+    } else if (item.status === "interpreting") {
+        return "in_progress";
+    }
+    return item.status;
+};
+var serializeOutput = function(param) {
+    var output = param.output;
+    return {
+        type: output.type,
+        logs: output.logs
+    };
+};
+var serializeOutputs = function(param) {
+    var item = param.item;
+    if (!item.outputs) return [];
+    return item.outputs.filter(function(o) {
+        return o.type === "logs";
+    }).map(function(output) {
+        return serializeOutput({
+            output: output
+        });
+    });
+};
+var serializeItemAsCodeInterpreterCallRunStep = function(param) {
+    var item = param.item, openaiAssistant = param.openaiAssistant, threadId = param.threadId, runId = param.runId, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? (0, import_dayjs17.default)().unix() : _param_completedAt;
+    var _item_code;
+    var toolCall = {
+        id: "citc".concat(item.id),
+        type: "code_interpreter",
+        code_interpreter: {
+            input: (_item_code = item.code) !== null && _item_code !== void 0 ? _item_code : "",
+            outputs: serializeOutputs({
+                item: item
+            })
+        }
+    };
+    return {
+        id: "fc".concat(item.id),
+        object: "thread.run.step",
+        created_at: (0, import_dayjs17.default)().unix(),
+        assistant_id: openaiAssistant.id,
+        thread_id: threadId,
+        run_id: runId,
+        status: serializeStatus6({
+            item: item
+        }),
+        last_error: null,
+        expired_at: null,
+        cancelled_at: null,
+        failed_at: null,
+        completed_at: completedAt,
+        metadata: {
+            item: JSON.stringify(item)
+        },
+        usage: null,
+        type: "tool_calls",
+        step_details: {
+            type: "tool_calls",
+            tool_calls: [
+                toolCall
+            ]
+        }
+    };
+};
+// src/adapters/storage/responsesStorageAdapter/threads/runs/steps/get.ts
+var get17 = function(param) {
+    var client = param.client, runAdapter = param.runAdapter;
+    return /*#__PURE__*/ function() {
+        var _ref = _async_to_generator(function(urlString) {
+            var _this, url, _url_pathname_match, threadId, runId, response, functionCalls, functionCallOutputsResponses, functionCallOutputs, openaiAssistant, data, _id;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        url = new URL(urlString);
+                        _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(stepsRegexp)), 3), threadId = _url_pathname_match[1], runId = _url_pathname_match[2];
+                        return [
+                            4,
+                            client.responses.retrieve(runId)
+                        ];
+                    case 1:
+                        response = _state.sent();
+                        functionCalls = response.output.filter(function(item) {
+                            return item.type === "function_call";
+                        });
+                        return [
+                            4,
+                            pMap(functionCalls, /*#__PURE__*/ function() {
+                                var _ref = _async_to_generator(function(functionCall) {
+                                    var items;
+                                    return _ts_generator(this, function(_state) {
+                                        switch(_state.label){
+                                            case 0:
+                                                return [
+                                                    4,
+                                                    client.conversations.items.list(threadId, {
+                                                        after: functionCall.id,
+                                                        order: "asc"
+                                                    })
+                                                ];
+                                            case 1:
+                                                items = _state.sent();
+                                                return [
+                                                    2,
+                                                    items.data.find(function(item) {
+                                                        return item.type === "function_call_output" && item.call_id === functionCall.call_id;
+                                                    })
+                                                ];
+                                        }
+                                    });
+                                });
+                                return function(functionCall) {
+                                    return _ref.apply(this, arguments);
+                                };
+                            }())
+                        ];
+                    case 2:
+                        functionCallOutputsResponses = _state.sent();
+                        functionCallOutputs = functionCallOutputsResponses.filter(Boolean);
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 3:
+                        openaiAssistant = _state.sent();
+                        data = response.output.flatMap(function(item) {
+                            var step = serializeItemAsRunStep({
+                                item: item,
+                                items: functionCallOutputs,
+                                threadId: threadId,
+                                openaiAssistant: openaiAssistant,
+                                runId: response.id
+                            });
+                            if (item.type === "function_call") {
+                                var synthCreation = {
+                                    id: "mc".concat(item.id),
+                                    run_id: response.id,
+                                    status: "completed",
+                                    completed_at: step.created_at,
+                                    step_details: {
+                                        type: "message_creation",
+                                        message_creation: {
+                                            message_id: item.id
+                                        }
+                                    }
+                                };
+                                return [
+                                    synthCreation,
+                                    step
+                                ];
+                            } else if (item.type === "image_generation_call") {
+                                return [
+                                    serializeItemAsImageGenerationRunStep({
+                                        item: item,
+                                        openaiAssistant: openaiAssistant,
+                                        threadId: threadId,
+                                        runId: response.id
+                                    }),
+                                    step
+                                ];
+                            } else if (item.type === "web_search_call") {
+                                return [
+                                    serializeItemAsWebSearchRunStep({
+                                        item: item,
+                                        openaiAssistant: openaiAssistant,
+                                        threadId: threadId,
+                                        runId: response.id
+                                    }),
+                                    step
+                                ];
+                            } else if (item.type === "mcp_list_tools") {
+                                return [
+                                    serializeItemAsMcpListToolsRunStep({
+                                        item: item,
+                                        openaiAssistant: openaiAssistant,
+                                        threadId: threadId,
+                                        runId: response.id
+                                    }),
+                                    step
+                                ];
+                            } else if (item.type === "mcp_call") {
+                                return [
+                                    serializeItemAsMcpCallRunStep({
+                                        item: item,
+                                        openaiAssistant: openaiAssistant,
+                                        threadId: threadId,
+                                        runId: response.id
+                                    }),
+                                    step
+                                ];
+                            } else if (item.type === "code_interpreter_call") {
+                                return [
+                                    serializeItemAsCodeInterpreterCallRunStep({
+                                        item: item,
+                                        openaiAssistant: openaiAssistant,
+                                        threadId: threadId,
+                                        runId: response.id
+                                    }),
+                                    step
+                                ];
                             }
                             return [
                                 step
@@ -6885,7 +7311,7 @@ var get17 = function(param) {
                             new Response(JSON.stringify({
                                 data: data,
                                 has_more: false,
-                                last_id: (_id = (_this = (0, import_radash21.last)(response.output)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
+                                last_id: (_id = (_this = (0, import_radash19.last)(response.output)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
                             }), {
                                 status: 200,
                                 headers: {
@@ -6903,11 +7329,11 @@ var get17 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/steps/index.ts
 var steps2 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant;
+    var client = param.client, runAdapter = param.runAdapter;
     return {
         get: get17({
-            openai: openai,
-            openaiAssistant: openaiAssistant
+            client: client,
+            runAdapter: runAdapter
         })
     };
 };
@@ -6934,10 +7360,10 @@ var getFunctionCallOutputItems = function(param) {
     });
 };
 var post18 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter;
+    var client = param.client, runAdapter = param.runAdapter;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString, options) {
-            var url, _url_pathname_match, threadId, runId, body, tool_outputs, stream, functionCallOutputItems, previousResponse, response, readableStream;
+            var url, _url_pathname_match, threadId, runId, body, tool_outputs, stream, functionCallOutputItems, previousResponse, openaiAssistant, response, readableStream;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -6950,13 +7376,19 @@ var post18 = function(param) {
                         });
                         return [
                             4,
-                            openai.responses.retrieve(runId)
+                            client.responses.retrieve(runId)
                         ];
                     case 1:
                         previousResponse = _state.sent();
                         return [
                             4,
-                            openai.responses.create(_object_spread({
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 2:
+                        openaiAssistant = _state.sent();
+                        return [
+                            4,
+                            client.responses.create(_object_spread({
                                 conversation: threadId,
                                 input: functionCallOutputItems,
                                 instructions: openaiAssistant.instructions,
@@ -6967,7 +7399,7 @@ var post18 = function(param) {
                                 tools: openaiAssistant.tools
                             })))
                         ];
-                    case 2:
+                    case 3:
                         response = _state.sent();
                         readableStream = new ReadableStream({
                             start: function start(controller) {
@@ -6995,7 +7427,7 @@ var post18 = function(param) {
                                                 });
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
                                                         threadId: threadId,
                                                         response: response,
                                                         onEvent: /*#__PURE__*/ function() {
@@ -7042,37 +7474,55 @@ var post18 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/submitToolOutputs/index.ts
 var submitToolOutputs2 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter;
+    var client = param.client, runAdapter = param.runAdapter;
     return {
         post: post18({
-            openai: openai,
-            openaiAssistant: openaiAssistant,
-            // @ts-ignore-next-line
+            client: client,
             runAdapter: runAdapter
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/assistants/get.ts
 var get18 = function(param) {
-    var openaiAssistant = param.openaiAssistant;
+    var runAdapter = param.runAdapter;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
+            var _, _1, _tmp;
             return _ts_generator(this, function(_state) {
-                return [
-                    2,
-                    new Response(JSON.stringify({
-                        data: [
-                            openaiAssistant
-                        ],
-                        has_more: false,
-                        last_id: openaiAssistant.id
-                    }), {
-                        status: 200,
-                        headers: {
-                            "Content-Type": "application/json"
-                        }
-                    })
-                ];
+                switch(_state.label){
+                    case 0:
+                        _ = Response.bind;
+                        _1 = JSON.stringify;
+                        _tmp = {};
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 1:
+                        _tmp.data = [
+                            _state.sent()
+                        ], _tmp.has_more = false;
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 2:
+                        return [
+                            2,
+                            new (_.apply(Response, [
+                                void 0,
+                                _1.apply(JSON, [
+                                    (_tmp.last_id = _state.sent().id, _tmp)
+                                ]),
+                                {
+                                    status: 200,
+                                    headers: {
+                                        "Content-Type": "application/json"
+                                    }
+                                }
+                            ]))
+                        ];
+                }
             });
         });
         return function(urlString) {
@@ -7081,8 +7531,7 @@ var get18 = function(param) {
     }();
 };
 // src/adapters/storage/responsesStorageAdapter/assistants/post.ts
-var post19 = function(param) {
-    var _openaiAssistant = param.openaiAssistant;
+var post19 = function() {
     return /*#__PURE__*/ _async_to_generator(function() {
         return _ts_generator(this, function(_state) {
             return [
@@ -7104,59 +7553,52 @@ var post19 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/assistants/index.ts
 var assistants2 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant;
+    var runAdapter = param.runAdapter;
     return {
         get: get18({
-            openaiAssistant: openaiAssistant
+            runAdapter: runAdapter
         }),
-        post: post19({
-            openaiAssistant: openaiAssistant
-        })
+        post: post19()
     };
 };
 // src/adapters/storage/responsesStorageAdapter/index.ts
-var responsesStorageAdapter = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant;
+var responsesStorageAdapter = function() {
     var createResponseItems = [];
     return function(param) {
-        var runAdapter = param.runAdapter;
+        var runAdapter = param.runAdapter, client = param.client;
         var _obj;
         return {
             requestHandlers: (_obj = {
                 "^/(?:v1|/?openai)/assistants$": assistants2({
-                    openai: openai,
-                    openaiAssistant: openaiAssistant
+                    runAdapter: runAdapter
                 }),
                 "^/(?:v1|/?openai)/threads$": threads2({
-                    openai: openai
+                    client: client
                 })
             }, _define_property(_obj, messagesRegexp, messages3({
-                openai: openai,
-                openaiAssistant: openaiAssistant,
+                client: client,
+                runAdapter: runAdapter,
                 createResponseItems: createResponseItems
             })), _define_property(_obj, runsRegexp, runs2({
-                openai: openai,
-                openaiAssistant: openaiAssistant,
+                client: client,
                 runAdapter: runAdapter,
                 createResponseItems: createResponseItems
             })), _define_property(_obj, runRegexp, run2({
-                openai: openai,
-                openaiAssistant: openaiAssistant,
+                client: client,
                 runAdapter: runAdapter
             })), _define_property(_obj, stepsRegexp, steps2({
-                openai: openai,
-                openaiAssistant: openaiAssistant
+                client: client,
+                runAdapter: runAdapter
             })), _define_property(_obj, submitToolOutputsRegexp, submitToolOutputs2({
-                openai: openai,
-                openaiAssistant: openaiAssistant,
+                client: client,
                 runAdapter: runAdapter
             })), _obj)
         };
     };
 };
 // src/adapters/run/responsesRunAdapter/index.ts
-var import_dayjs13 = __toESM(require("dayjs"), 1);
-var import_radash22 = require("radash");
+var import_dayjs18 = __toESM(require("dayjs"), 1);
+var import_radash20 = require("radash");
 var serializeToolCalls2 = function(param) {
     var toolCalls = param.toolCalls;
     return toolCalls.map(function(toolCall) {
@@ -7171,33 +7613,62 @@ var serializeToolCalls2 = function(param) {
     });
 };
 var responsesRunAdapter = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant;
-    return /*#__PURE__*/ function() {
+    var getDirectOpenaiAssistant = param.getOpenaiAssistant;
+    var cachedOpenaiAssistant = null;
+    var getOpenaiAssistant = /*#__PURE__*/ function() {
+        var _ref = _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        if (cachedOpenaiAssistant) return [
+                            2,
+                            cachedOpenaiAssistant
+                        ];
+                        return [
+                            4,
+                            getDirectOpenaiAssistant()
+                        ];
+                    case 1:
+                        cachedOpenaiAssistant = _state.sent();
+                        return [
+                            2,
+                            cachedOpenaiAssistant
+                        ];
+                }
+            });
+        });
+        return function getOpenaiAssistant() {
+            return _ref.apply(this, arguments);
+        };
+    }();
+    var handleRun = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(param) {
-            var threadId, response, onEvent2, responseCreatedResponse, toolCalls, itemIds, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, event, _, toolCalls2, toolCall, err, e;
+            var client, threadId, response, onEvent2, responseCreatedResponse, toolCalls, mcpCalls, codeInterpreterCalls, itemIds, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, event, _, _tmp, _tmp1, _tmp2, _tmp3, toolCalls2, _tmp4, _tmp5, _tmp6, _tmp7, _tmp8, _tmp9, _tmp10, _tmp11, _tmp12, _tmp13, _tmp14, _tmp15, _tmp16, _tmp17, _tmp18, _tmp19, _tmp20, _tmp21, _tmp22, _tmp23, _tmp24, _tmp25, _tmp26, _tmp27, _tmp28, _tmp29, _tmp30, _tmp31, _tmp32, _tmp33, _tmp34, _tmp35, _tmp36, _tmp37, _tmp38, _tmp39, _tmp40, _tmp41, _tmp42, _tmp43, _tmp44, _tmp45, _tmp46, _tmp47, _tmp48, _tmp49, _tmp50, _tmp51, _tmp52, _tmp53, _tmp54, _tmp55, _tmp56, _tmp57, _tmp58, _tmp59, _tmp60, _tmp61, _tmp62, _tmp63, _tmp64, _tmp65, _tmp66, _tmp67, _tmp68, _tmp69, _tmp70, _tmp71, _tmp72, _tmp73, _tmp74, _tmp75, _tmp76, _tmp77, _tmp78, _tmp79, _tmp80, _tmp81, _tmp82, toolCall, mcpCall, _tmp83, _tmp84, _tmp85, _tmp86, err, e, _tmp87, _tmp88;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        threadId = param.threadId, response = param.response, onEvent2 = param.onEvent;
+                        client = param.client, threadId = param.threadId, response = param.response, onEvent2 = param.onEvent;
                         responseCreatedResponse = null;
                         toolCalls = {};
+                        mcpCalls = {};
+                        codeInterpreterCalls = {};
                         itemIds = [];
                         _state.label = 1;
                     case 1:
                         _state.trys.push([
                             1,
-                            42,
-                            44,
-                            47
+                            131,
+                            134,
+                            137
                         ]);
                         _iteratorAbruptCompletion = false, _didIteratorError = false;
                         _state.label = 2;
                     case 2:
                         _state.trys.push([
                             2,
-                            35,
-                            36,
-                            41
+                            124,
+                            125,
+                            130
                         ]);
                         _iterator = _async_iterator(response);
                         _state.label = 3;
@@ -7209,7 +7680,7 @@ var responsesRunAdapter = function(param) {
                     case 4:
                         if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
                             3,
-                            34
+                            123
                         ];
                         _value = _step.value;
                         event = _value;
@@ -7223,339 +7694,1244 @@ var responsesRunAdapter = function(param) {
                             case "response.in_progress":
                                 return [
                                     3,
-                                    7
+                                    8
                                 ];
                             case "response.completed":
                                 return [
                                     3,
-                                    9
+                                    11
                                 ];
                             case "response.failed":
                                 return [
                                     3,
-                                    14
+                                    18
                                 ];
                             case "response.output_text.delta":
                                 return [
                                     3,
-                                    16
+                                    21
                                 ];
                             case "response.output_item.added":
                                 return [
                                     3,
-                                    18
+                                    23
                                 ];
                             case "response.output_item.done":
                                 return [
                                     3,
-                                    24
+                                    67
                                 ];
                             case "response.function_call_arguments.delta":
                                 return [
                                     3,
-                                    30
+                                    111
+                                ];
+                            case "response.mcp_call_arguments.delta":
+                                return [
+                                    3,
+                                    113
+                                ];
+                            case "response.image_generation_call.in_progress":
+                                return [
+                                    3,
+                                    115
+                                ];
+                            case "response.image_generation_call.generating":
+                                return [
+                                    3,
+                                    115
+                                ];
+                            case "response.image_generation_call.partial_image":
+                                return [
+                                    3,
+                                    118
                                 ];
                         }
                         return [
-                            3,
-                            32
+                            3,
+                            121
+                        ];
+                    case 5:
+                        responseCreatedResponse = event.response;
+                        _tmp = {
+                            event: "thread.run.created"
+                        };
+                        _tmp1 = {
+                            response: event.response
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 6:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp.data = serializeResponseAsRun.apply(void 0, [
+                                    (_tmp1.assistantId = _state.sent().id, _tmp1)
+                                ]), _tmp)
+                            ])
+                        ];
+                    case 7:
+                        _state.sent();
+                        return [
+                            3,
+                            122
+                        ];
+                    case 8:
+                        _tmp2 = {
+                            event: "thread.run.in_progress"
+                        };
+                        _tmp3 = {
+                            response: event.response
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 9:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp2.data = serializeResponseAsRun.apply(void 0, [
+                                    (_tmp3.assistantId = _state.sent().id, _tmp3)
+                                ]), _tmp2)
+                            ])
+                        ];
+                    case 10:
+                        _state.sent();
+                        return [
+                            3,
+                            122
+                        ];
+                    case 11:
+                        itemIds = event.response.output.filter(function(o) {
+                            return o.id;
+                        }).map(function(o) {
+                            return o.id;
+                        });
+                        toolCalls2 = event.response.output.filter(function(o) {
+                            return o.type === "function_call";
+                        });
+                        if (!(toolCalls2.length > 0)) return [
+                            3,
+                            14
+                        ];
+                        _tmp4 = {
+                            event: "thread.run.requires_action"
+                        };
+                        _tmp5 = [
+                            {}
+                        ];
+                        _tmp6 = {
+                            response: event.response
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 12:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp4.data = _object_spread.apply(void 0, _tmp5.concat([
+                                    serializeResponseAsRun.apply(void 0, [
+                                        (_tmp6.assistantId = _state.sent().id, _tmp6)
+                                    ]),
+                                    {
+                                        status: "requires_action",
+                                        required_action: {
+                                            type: "submit_tool_outputs",
+                                            submit_tool_outputs: {
+                                                tool_calls: serializeToolCalls2({
+                                                    toolCalls: toolCalls2
+                                                })
+                                            }
+                                        }
+                                    }
+                                ])), _tmp4)
+                            ])
+                        ];
+                    case 13:
+                        _state.sent();
+                        return [
+                            3,
+                            17
+                        ];
+                    case 14:
+                        _tmp7 = {
+                            event: "thread.run.completed"
+                        };
+                        _tmp8 = {
+                            response: event.response
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 15:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp7.data = serializeResponseAsRun.apply(void 0, [
+                                    (_tmp8.assistantId = _state.sent().id, _tmp8)
+                                ]), _tmp7)
+                            ])
+                        ];
+                    case 16:
+                        _state.sent();
+                        _state.label = 17;
+                    case 17:
+                        return [
+                            3,
+                            122
+                        ];
+                    case 18:
+                        _tmp9 = {
+                            event: "thread.run.failed"
+                        };
+                        _tmp10 = {
+                            response: event.response
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 19:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp9.data = serializeResponseAsRun.apply(void 0, [
+                                    (_tmp10.assistantId = _state.sent().id, _tmp10)
+                                ]), _tmp9)
+                            ])
+                        ];
+                    case 20:
+                        _state.sent();
+                        return [
+                            3,
+                            122
+                        ];
+                    case 21:
+                        return [
+                            4,
+                            onEvent2({
+                                event: "thread.message.delta",
+                                data: {
+                                    id: event.item_id,
+                                    delta: {
+                                        content: [
+                                            {
+                                                type: "text",
+                                                index: event.content_index,
+                                                text: {
+                                                    value: event.delta
+                                                }
+                                            }
+                                        ]
+                                    }
+                                }
+                            })
+                        ];
+                    case 22:
+                        _state.sent();
+                        return [
+                            3,
+                            122
+                        ];
+                    case 23:
+                        if (!(event.item.type === "message")) return [
+                            3,
+                            28
+                        ];
+                        _tmp11 = {
+                            event: "thread.message.created"
+                        };
+                        _tmp12 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 24:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp11.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp12.openaiAssistant = _state.sent(), _tmp12.createdAt = (0, import_dayjs18.default)().unix(), _tmp12.runId = responseCreatedResponse.id, _tmp12.status = "in_progress", _tmp12)
+                                ]), _tmp11)
+                            ])
+                        ];
+                    case 25:
+                        _state.sent();
+                        _tmp13 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp14 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 26:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp13.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp14.openaiAssistant = _state.sent(), _tmp14.runId = responseCreatedResponse.id, _tmp14.status = "in_progress", _tmp14.completedAt = null, _tmp14)
+                                ]), _tmp13)
+                            ])
+                        ];
+                    case 27:
+                        _state.sent();
+                        return [
+                            3,
+                            66
+                        ];
+                    case 28:
+                        if (!(event.item.type === "function_call")) return [
+                            3,
+                            31
+                        ];
+                        toolCalls[event.item.id] = event.item;
+                        _tmp15 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp16 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 29:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp15.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp16.openaiAssistant = _state.sent(), _tmp16.runId = responseCreatedResponse.id, _tmp16)
+                                ]), _tmp15)
+                            ])
+                        ];
+                    case 30:
+                        _state.sent();
+                        return [
+                            3,
+                            66
+                        ];
+                    case 31:
+                        if (!(event.item.type === "image_generation_call")) return [
+                            3,
+                            38
+                        ];
+                        _tmp17 = {
+                            event: "thread.message.created"
+                        };
+                        _tmp18 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 32:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp17.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp18.openaiAssistant = _state.sent(), _tmp18.createdAt = (0, import_dayjs18.default)().unix(), _tmp18.runId = responseCreatedResponse.id, _tmp18.status = "in_progress", _tmp18)
+                                ]), _tmp17)
+                            ])
+                        ];
+                    case 33:
+                        _state.sent();
+                        _tmp19 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp20 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 34:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp19.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp20.openaiAssistant = _state.sent(), _tmp20.runId = responseCreatedResponse.id, _tmp20.status = "in_progress", _tmp20.completedAt = null, _tmp20)
+                                ]), _tmp19)
+                            ])
+                        ];
+                    case 35:
+                        _state.sent();
+                        _tmp21 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp22 = {
+                            item: event.item
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 36:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp21.data = serializeItemAsImageGenerationRunStep.apply(void 0, [
+                                    (_tmp22.openaiAssistant = _state.sent(), _tmp22.threadId = threadId, _tmp22.runId = responseCreatedResponse.id, _tmp22.completedAt = null, _tmp22)
+                                ]), _tmp21)
+                            ])
+                        ];
+                    case 37:
+                        _state.sent();
+                        return [
+                            3,
+                            66
+                        ];
+                    case 38:
+                        if (!(event.item.type === "web_search_call")) return [
+                            3,
+                            45
+                        ];
+                        _tmp23 = {
+                            event: "thread.message.created"
+                        };
+                        _tmp24 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 39:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp23.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp24.openaiAssistant = _state.sent(), _tmp24.createdAt = (0, import_dayjs18.default)().unix(), _tmp24.runId = responseCreatedResponse.id, _tmp24.status = "in_progress", _tmp24)
+                                ]), _tmp23)
+                            ])
+                        ];
+                    case 40:
+                        _state.sent();
+                        _tmp25 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp26 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 41:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp25.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp26.openaiAssistant = _state.sent(), _tmp26.runId = responseCreatedResponse.id, _tmp26.status = "in_progress", _tmp26.completedAt = null, _tmp26)
+                                ]), _tmp25)
+                            ])
+                        ];
+                    case 42:
+                        _state.sent();
+                        _tmp27 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp28 = {
+                            item: event.item
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 43:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp27.data = serializeItemAsWebSearchRunStep.apply(void 0, [
+                                    (_tmp28.openaiAssistant = _state.sent(), _tmp28.threadId = threadId, _tmp28.runId = responseCreatedResponse.id, _tmp28.completedAt = null, _tmp28)
+                                ]), _tmp27)
+                            ])
+                        ];
+                    case 44:
+                        _state.sent();
+                        return [
+                            3,
+                            66
+                        ];
+                    case 45:
+                        if (!(event.item.type === "mcp_list_tools")) return [
+                            3,
+                            52
+                        ];
+                        _tmp29 = {
+                            event: "thread.message.created"
+                        };
+                        _tmp30 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 46:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp29.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp30.openaiAssistant = _state.sent(), _tmp30.createdAt = (0, import_dayjs18.default)().unix(), _tmp30.runId = responseCreatedResponse.id, _tmp30.status = "in_progress", _tmp30)
+                                ]), _tmp29)
+                            ])
+                        ];
+                    case 47:
+                        _state.sent();
+                        _tmp31 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp32 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 48:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp31.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp32.openaiAssistant = _state.sent(), _tmp32.runId = responseCreatedResponse.id, _tmp32.status = "in_progress", _tmp32.completedAt = null, _tmp32)
+                                ]), _tmp31)
+                            ])
+                        ];
+                    case 49:
+                        _state.sent();
+                        _tmp33 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp34 = {
+                            item: event.item
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 50:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp33.data = serializeItemAsMcpListToolsRunStep.apply(void 0, [
+                                    (_tmp34.openaiAssistant = _state.sent(), _tmp34.threadId = threadId, _tmp34.runId = responseCreatedResponse.id, _tmp34.completedAt = null, _tmp34)
+                                ]), _tmp33)
+                            ])
+                        ];
+                    case 51:
+                        _state.sent();
+                        return [
+                            3,
+                            66
+                        ];
+                    case 52:
+                        if (!(event.item.type === "mcp_call")) return [
+                            3,
+                            59
+                        ];
+                        mcpCalls[event.item.id] = event.item;
+                        _tmp35 = {
+                            event: "thread.message.created"
+                        };
+                        _tmp36 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 53:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp35.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp36.openaiAssistant = _state.sent(), _tmp36.createdAt = (0, import_dayjs18.default)().unix(), _tmp36.runId = responseCreatedResponse.id, _tmp36.status = "in_progress", _tmp36)
+                                ]), _tmp35)
+                            ])
+                        ];
+                    case 54:
+                        _state.sent();
+                        _tmp37 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp38 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 55:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp37.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp38.openaiAssistant = _state.sent(), _tmp38.runId = responseCreatedResponse.id, _tmp38.status = "in_progress", _tmp38.completedAt = null, _tmp38)
+                                ]), _tmp37)
+                            ])
+                        ];
+                    case 56:
+                        _state.sent();
+                        _tmp39 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp40 = {
+                            item: event.item
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 57:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp39.data = serializeItemAsMcpCallRunStep.apply(void 0, [
+                                    (_tmp40.openaiAssistant = _state.sent(), _tmp40.threadId = threadId, _tmp40.runId = responseCreatedResponse.id, _tmp40.completedAt = null, _tmp40)
+                                ]), _tmp39)
+                            ])
+                        ];
+                    case 58:
+                        _state.sent();
+                        return [
+                            3,
+                            66
+                        ];
+                    case 59:
+                        if (!(event.item.type === "code_interpreter_call")) return [
+                            3,
+                            66
+                        ];
+                        codeInterpreterCalls[event.item.id] = event.item;
+                        _tmp41 = {
+                            event: "thread.message.created"
+                        };
+                        _tmp42 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 60:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp41.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp42.openaiAssistant = _state.sent(), _tmp42.createdAt = (0, import_dayjs18.default)().unix(), _tmp42.runId = responseCreatedResponse.id, _tmp42.status = "in_progress", _tmp42)
+                                ]), _tmp41)
+                            ])
+                        ];
+                    case 61:
+                        _state.sent();
+                        _tmp43 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp44 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 62:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp43.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp44.openaiAssistant = _state.sent(), _tmp44.runId = responseCreatedResponse.id, _tmp44.status = "in_progress", _tmp44.completedAt = null, _tmp44)
+                                ]), _tmp43)
+                            ])
+                        ];
+                    case 63:
+                        _state.sent();
+                        _tmp45 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp46 = {
+                            item: event.item
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 64:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp45.data = serializeItemAsCodeInterpreterCallRunStep.apply(void 0, [
+                                    (_tmp46.openaiAssistant = _state.sent(), _tmp46.threadId = threadId, _tmp46.runId = responseCreatedResponse.id, _tmp46.completedAt = null, _tmp46)
+                                ]), _tmp45)
+                            ])
+                        ];
+                    case 65:
+                        _state.sent();
+                        _state.label = 66;
+                    case 66:
+                        if (event.item.id) itemIds.push(event.item.id);
+                        return [
+                            3,
+                            122
+                        ];
+                    case 67:
+                        if (!(event.item.type === "message")) return [
+                            3,
+                            72
+                        ];
+                        _tmp47 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp48 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 68:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp47.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp48.openaiAssistant = _state.sent(), _tmp48.runId = responseCreatedResponse.id, _tmp48)
+                                ]), _tmp47)
+                            ])
+                        ];
+                    case 69:
+                        _state.sent();
+                        _tmp49 = {
+                            event: "thread.message.completed"
+                        };
+                        _tmp50 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 70:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp49.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp50.openaiAssistant = _state.sent(), _tmp50.createdAt = (0, import_dayjs18.default)().unix(), _tmp50.runId = responseCreatedResponse.id, _tmp50)
+                                ]), _tmp49)
+                            ])
+                        ];
+                    case 71:
+                        _state.sent();
+                        return [
+                            3,
+                            110
+                        ];
+                    case 72:
+                        if (!(event.item.type === "function_call")) return [
+                            3,
+                            75
+                        ];
+                        toolCalls[event.item.id] = event.item;
+                        _tmp51 = {
+                            event: "thread.run.step.in_progress"
+                        };
+                        _tmp52 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 73:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp51.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp52.openaiAssistant = _state.sent(), _tmp52.runId = responseCreatedResponse.id, _tmp52)
+                                ]), _tmp51)
+                            ])
+                        ];
+                    case 74:
+                        _state.sent();
+                        return [
+                            3,
+                            110
+                        ];
+                    case 75:
+                        if (!(event.item.type === "image_generation_call")) return [
+                            3,
+                            82
+                        ];
+                        _tmp53 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp54 = {
+                            item: event.item
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 76:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp53.data = serializeItemAsImageGenerationRunStep.apply(void 0, [
+                                    (_tmp54.openaiAssistant = _state.sent(), _tmp54.threadId = threadId, _tmp54.runId = responseCreatedResponse.id, _tmp54)
+                                ]), _tmp53)
+                            ])
+                        ];
+                    case 77:
+                        _state.sent();
+                        _tmp55 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp56 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 78:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp55.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp56.openaiAssistant = _state.sent(), _tmp56.runId = responseCreatedResponse.id, _tmp56)
+                                ]), _tmp55)
+                            ])
+                        ];
+                    case 79:
+                        _state.sent();
+                        _tmp57 = {
+                            event: "thread.message.completed"
+                        };
+                        _tmp58 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 80:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp57.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp58.openaiAssistant = _state.sent(), _tmp58.createdAt = (0, import_dayjs18.default)().unix(), _tmp58.runId = responseCreatedResponse.id, _tmp58)
+                                ]), _tmp57)
+                            ])
+                        ];
+                    case 81:
+                        _state.sent();
+                        return [
+                            3,
+                            110
+                        ];
+                    case 82:
+                        if (!(event.item.type === "web_search_call")) return [
+                            3,
+                            89
+                        ];
+                        _tmp59 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp60 = {
+                            item: event.item
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 83:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp59.data = serializeItemAsWebSearchRunStep.apply(void 0, [
+                                    (_tmp60.openaiAssistant = _state.sent(), _tmp60.threadId = threadId, _tmp60.runId = responseCreatedResponse.id, _tmp60)
+                                ]), _tmp59)
+                            ])
+                        ];
+                    case 84:
+                        _state.sent();
+                        _tmp61 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp62 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
                         ];
-                    case 5:
-                        responseCreatedResponse = event.response;
+                    case 85:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.created",
-                                data: serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                })
-                            })
+                            onEvent2.apply(void 0, [
+                                (_tmp61.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp62.openaiAssistant = _state.sent(), _tmp62.runId = responseCreatedResponse.id, _tmp62)
+                                ]), _tmp61)
+                            ])
                         ];
-                    case 6:
+                    case 86:
                         _state.sent();
+                        _tmp63 = {
+                            event: "thread.message.completed"
+                        };
+                        _tmp64 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
                         return [
-                            3,
-                            33
+                            4,
+                            getOpenaiAssistant()
                         ];
-                    case 7:
+                    case 87:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.in_progress",
-                                data: serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                })
-                            })
+                            onEvent2.apply(void 0, [
+                                (_tmp63.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp64.openaiAssistant = _state.sent(), _tmp64.createdAt = (0, import_dayjs18.default)().unix(), _tmp64.runId = responseCreatedResponse.id, _tmp64)
+                                ]), _tmp63)
+                            ])
                         ];
-                    case 8:
+                    case 88:
                         _state.sent();
                         return [
                             3,
-                            33
+                            110
                         ];
-                    case 9:
-                        itemIds = event.response.output.filter(function(o) {
-                            return o.id;
-                        }).map(function(o) {
-                            return o.id;
-                        });
-                        toolCalls2 = event.response.output.filter(function(o) {
-                            return o.type === "function_call";
-                        });
-                        if (!(toolCalls2.length > 0)) return [
+                    case 89:
+                        if (!(event.item.type === "mcp_list_tools")) return [
                             3,
-                            11
+                            96
+                        ];
+                        _tmp65 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp66 = {
+                            item: event.item
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
                         ];
+                    case 90:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.requires_action",
-                                data: _object_spread({}, serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                }), {
-                                    status: "requires_action",
-                                    required_action: {
-                                        type: "submit_tool_outputs",
-                                        submit_tool_outputs: {
-                                            tool_calls: serializeToolCalls2({
-                                                toolCalls: toolCalls2
-                                            })
-                                        }
-                                    }
-                                })
-                            })
+                            onEvent2.apply(void 0, [
+                                (_tmp65.data = serializeItemAsMcpListToolsRunStep.apply(void 0, [
+                                    (_tmp66.openaiAssistant = _state.sent(), _tmp66.threadId = threadId, _tmp66.runId = responseCreatedResponse.id, _tmp66)
+                                ]), _tmp65)
+                            ])
                         ];
-                    case 10:
+                    case 91:
                         _state.sent();
+                        _tmp67 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp68 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
                         return [
-                            3,
-                            13
+                            4,
+                            getOpenaiAssistant()
                         ];
-                    case 11:
+                    case 92:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.completed",
-                                data: serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                })
-                            })
+                            onEvent2.apply(void 0, [
+                                (_tmp67.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp68.openaiAssistant = _state.sent(), _tmp68.runId = responseCreatedResponse.id, _tmp68)
+                                ]), _tmp67)
+                            ])
                         ];
-                    case 12:
+                    case 93:
                         _state.sent();
-                        _state.label = 13;
-                    case 13:
+                        _tmp69 = {
+                            event: "thread.message.completed"
+                        };
+                        _tmp70 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
                         return [
-                            3,
-                            33
+                            4,
+                            getOpenaiAssistant()
                         ];
-                    case 14:
+                    case 94:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.failed",
-                                data: serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                })
-                            })
+                            onEvent2.apply(void 0, [
+                                (_tmp69.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp70.openaiAssistant = _state.sent(), _tmp70.createdAt = (0, import_dayjs18.default)().unix(), _tmp70.runId = responseCreatedResponse.id, _tmp70)
+                                ]), _tmp69)
+                            ])
                         ];
-                    case 15:
+                    case 95:
                         _state.sent();
                         return [
                             3,
-                            33
+                            110
                         ];
-                    case 16:
+                    case 96:
+                        if (!(event.item.type === "mcp_call")) return [
+                            3,
+                            103
+                        ];
+                        _tmp71 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp72 = {
+                            item: event.item
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.message.delta",
-                                data: {
-                                    id: event.item_id,
-                                    delta: {
-                                        content: [
-                                            {
-                                                type: "text",
-                                                index: event.output_index - 1,
-                                                text: {
-                                                    value: event.delta
-                                                }
-                                            }
-                                        ]
-                                    }
-                                }
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 17:
-                        _state.sent();
+                    case 97:
                         return [
-                            3,
-                            33
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp71.data = serializeItemAsMcpCallRunStep.apply(void 0, [
+                                    (_tmp72.openaiAssistant = _state.sent(), _tmp72.threadId = threadId, _tmp72.runId = responseCreatedResponse.id, _tmp72)
+                                ]), _tmp71)
+                            ])
                         ];
-                    case 18:
-                        if (!(event.item.type === "message")) return [
-                            3,
-                            21
+                    case 98:
+                        _state.sent();
+                        _tmp73 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp74 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
                         ];
+                    case 99:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.step.created",
-                                data: serializeItemAsRunStep({
-                                    item: event.item,
-                                    items: [],
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    runId: responseCreatedResponse.id,
-                                    status: "in_progress",
-                                    completedAt: null
-                                })
-                            })
+                            onEvent2.apply(void 0, [
+                                (_tmp73.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp74.openaiAssistant = _state.sent(), _tmp74.runId = responseCreatedResponse.id, _tmp74)
+                                ]), _tmp73)
+                            ])
                         ];
-                    case 19:
+                    case 100:
                         _state.sent();
+                        _tmp75 = {
+                            event: "thread.message.completed"
+                        };
+                        _tmp76 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.message.created",
-                                data: serializeItemAsMessage({
-                                    item: event.item,
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    createdAt: (0, import_dayjs13.default)().unix(),
-                                    runId: responseCreatedResponse.id,
-                                    status: "in_progress"
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 20:
+                    case 101:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp75.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp76.openaiAssistant = _state.sent(), _tmp76.createdAt = (0, import_dayjs18.default)().unix(), _tmp76.runId = responseCreatedResponse.id, _tmp76)
+                                ]), _tmp75)
+                            ])
+                        ];
+                    case 102:
                         _state.sent();
                         return [
                             3,
-                            23
+                            110
                         ];
-                    case 21:
-                        if (!(event.item.type === "function_call")) return [
+                    case 103:
+                        if (!(event.item.type === "code_interpreter_call")) return [
                             3,
-                            23
+                            110
                         ];
-                        toolCalls[event.item.id] = event.item;
+                        _tmp77 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp78 = {
+                            item: event.item
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.step.created",
-                                data: serializeItemAsRunStep({
-                                    item: event.item,
-                                    items: [],
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    runId: responseCreatedResponse.id
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 22:
-                        _state.sent();
-                        _state.label = 23;
-                    case 23:
-                        if (event.item.id) itemIds.push(event.item.id);
+                    case 104:
                         return [
-                            3,
-                            33
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp77.data = serializeItemAsCodeInterpreterCallRunStep.apply(void 0, [
+                                    (_tmp78.openaiAssistant = _state.sent(), _tmp78.threadId = threadId, _tmp78.runId = responseCreatedResponse.id, _tmp78)
+                                ]), _tmp77)
+                            ])
                         ];
-                    case 24:
-                        if (!(event.item.type === "message")) return [
-                            3,
-                            27
+                    case 105:
+                        _state.sent();
+                        _tmp79 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp80 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
                         ];
+                    case 106:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.step.completed",
-                                data: serializeItemAsRunStep({
-                                    item: event.item,
-                                    items: [],
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    runId: responseCreatedResponse.id
-                                })
-                            })
+                            onEvent2.apply(void 0, [
+                                (_tmp79.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp80.openaiAssistant = _state.sent(), _tmp80.runId = responseCreatedResponse.id, _tmp80)
+                                ]), _tmp79)
+                            ])
                         ];
-                    case 25:
+                    case 107:
                         _state.sent();
+                        _tmp81 = {
+                            event: "thread.message.completed"
+                        };
+                        _tmp82 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.message.completed",
-                                data: serializeItemAsMessage({
-                                    item: event.item,
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    createdAt: (0, import_dayjs13.default)().unix(),
-                                    runId: responseCreatedResponse.id
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 26:
+                    case 108:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp81.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp82.openaiAssistant = _state.sent(), _tmp82.createdAt = (0, import_dayjs18.default)().unix(), _tmp82.runId = responseCreatedResponse.id, _tmp82)
+                                ]), _tmp81)
+                            ])
+                        ];
+                    case 109:
                         _state.sent();
+                        _state.label = 110;
+                    case 110:
                         return [
                             3,
-                            29
+                            122
                         ];
-                    case 27:
-                        if (!(event.item.type === "function_call")) return [
+                    case 111:
+                        toolCall = toolCalls[event.item_id];
+                        if (!toolCall) return [
                             3,
-                            29
+                            122
                         ];
-                        toolCalls[event.item.id] = event.item;
                         return [
                             4,
                             onEvent2({
-                                event: "thread.run.step.in_progress",
-                                data: serializeItemAsRunStep({
-                                    item: event.item,
-                                    items: [],
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    runId: responseCreatedResponse.id
-                                })
+                                event: "thread.run.step.delta",
+                                data: {
+                                    id: event.item_id,
+                                    object: "thread.run.step.delta",
+                                    delta: {
+                                        step_details: {
+                                            type: "tool_calls",
+                                            tool_calls: [
+                                                {
+                                                    id: toolCall.call_id,
+                                                    type: "function",
+                                                    index: event.output_index,
+                                                    function: {
+                                                        name: toolCall.name,
+                                                        arguments: event.delta,
+                                                        output: null
+                                                    }
+                                                }
+                                            ]
+                                        }
+                                    }
+                                }
                             })
                         ];
-                    case 28:
+                    case 112:
                         _state.sent();
-                        _state.label = 29;
-                    case 29:
                         return [
                             3,
-                            33
+                            122
                         ];
-                    case 30:
-                        toolCall = toolCalls[event.item_id];
-                        if (!toolCall) return [
+                    case 113:
+                        mcpCall = mcpCalls[event.item_id];
+                        if (!mcpCall) return [
                             3,
-                            33
+                            122
                         ];
                         return [
                             4,
                             onEvent2({
                                 event: "thread.run.step.delta",
                                 data: {
-                                    id: event.item_id,
+                                    id: "fc".concat(event.item_id),
                                     object: "thread.run.step.delta",
                                     delta: {
                                         step_details: {
                                             type: "tool_calls",
                                             tool_calls: [
                                                 {
-                                                    id: toolCall.call_id,
+                                                    id: "ftc".concat(mcpCall.id),
                                                     type: "function",
                                                     index: event.output_index,
                                                     function: {
-                                                        name: toolCall.name,
+                                                        name: mcpCall.name,
                                                         arguments: event.delta,
                                                         output: null
                                                     }
@@ -7566,133 +8942,220 @@ var responsesRunAdapter = function(param) {
                                 }
                             })
                         ];
-                    case 31:
+                    case 114:
                         _state.sent();
                         return [
                             3,
-                            33
+                            122
                         ];
-                    case 32:
+                    case 115:
+                        _tmp83 = {
+                            event: "thread.message.in_progress"
+                        };
+                        _tmp84 = {
+                            id: event.item_id,
+                            object: "thread.message",
+                            created_at: (0, import_dayjs18.default)().unix(),
+                            thread_id: threadId,
+                            completed_at: null,
+                            incomplete_at: null,
+                            incomplete_details: null,
+                            role: "assistant",
+                            content: []
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 116:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp83.data = (_tmp84.assistant_id = _state.sent().id, _tmp84.run_id = responseCreatedResponse.id, _tmp84.attachments = [], _tmp84.status = "in_progress", _tmp84.metadata = {
+                                    event: JSON.stringify(event)
+                                }, _tmp84), _tmp83)
+                            ])
+                        ];
+                    case 117:
+                        _state.sent();
                         return [
                             3,
-                            33
+                            122
                         ];
-                    case 33:
+                    case 118:
+                        _tmp85 = {
+                            event: "thread.message.in_progress"
+                        };
+                        _tmp86 = {
+                            id: event.item_id,
+                            object: "thread.message",
+                            created_at: (0, import_dayjs18.default)().unix(),
+                            thread_id: threadId,
+                            completed_at: null,
+                            incomplete_at: null,
+                            incomplete_details: null,
+                            role: "assistant",
+                            content: [
+                                {
+                                    type: "image_url",
+                                    image_url: {
+                                        url: "data:image/png;base64,".concat(event.partial_image_b64),
+                                        // url: `data:image/png;base64,truncated`,
+                                        detail: "auto"
+                                    }
+                                }
+                            ]
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 119:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp85.data = (_tmp86.assistant_id = _state.sent().id, _tmp86.run_id = responseCreatedResponse.id, _tmp86.attachments = [], _tmp86.status = "in_progress", _tmp86.metadata = {
+                                    event: JSON.stringify(_object_spread_props(_object_spread({}, event), {
+                                        partial_image_b64: "truncated"
+                                    }))
+                                }, _tmp86), _tmp85)
+                            ])
+                        ];
+                    case 120:
+                        _state.sent();
+                        return [
+                            3,
+                            122
+                        ];
+                    case 121:
+                        return [
+                            3,
+                            122
+                        ];
+                    case 122:
                         _iteratorAbruptCompletion = false;
                         return [
                             3,
                             3
                         ];
-                    case 34:
+                    case 123:
                         return [
                             3,
-                            41
+                            130
                         ];
-                    case 35:
+                    case 124:
                         err = _state.sent();
                         _didIteratorError = true;
                         _iteratorError = err;
                         return [
                             3,
-                            41
+                            130
                         ];
-                    case 36:
+                    case 125:
                         _state.trys.push([
-                            36,
+                            125,
                             ,
-                            39,
-                            40
+                            128,
+                            129
                         ]);
                         if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
                             3,
-                            38
+                            127
                         ];
                         return [
                             4,
                             _iterator.return()
                         ];
-                    case 37:
+                    case 126:
                         _state.sent();
-                        _state.label = 38;
-                    case 38:
+                        _state.label = 127;
+                    case 127:
                         return [
                             3,
-                            40
+                            129
                         ];
-                    case 39:
+                    case 128:
                         if (_didIteratorError) {
                             throw _iteratorError;
                         }
                         return [
                             7
                         ];
-                    case 40:
+                    case 129:
                         return [
                             7
                         ];
-                    case 41:
+                    case 130:
                         return [
                             3,
-                            47
+                            137
                         ];
-                    case 42:
+                    case 131:
                         e = _state.sent();
+                        _tmp87 = {
+                            event: "thread.run.failed"
+                        };
+                        _tmp88 = {
+                            id: (responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) || "run_".concat((0, import_radash20.uid)(18)),
+                            object: "thread.run",
+                            thread_id: threadId
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.failed",
-                                data: {
-                                    id: (responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) || "run_".concat((0, import_radash22.uid)(18)),
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: openaiAssistant.id,
-                                    status: "failed",
-                                    failed_at: (0, import_dayjs13.default)().unix(),
-                                    last_error: {
-                                        code: "server_error",
-                                        message: String((e === null || e === void 0 ? void 0 : e.message) || e || "Unknown error")
-                                    }
-                                }
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 43:
+                    case 132:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp87.data = (_tmp88.assistant_id = _state.sent().id, _tmp88.status = "failed", _tmp88.failed_at = (0, import_dayjs18.default)().unix(), _tmp88.last_error = {
+                                    code: "server_error",
+                                    message: String((e === null || e === void 0 ? void 0 : e.message) || e || "Unknown error")
+                                }, _tmp88), _tmp87)
+                            ])
+                        ];
+                    case 133:
                         _state.sent();
                         return [
                             3,
-                            47
+                            137
                         ];
-                    case 44:
+                    case 134:
                         if (!((responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) && itemIds.length > 0)) return [
                             3,
-                            46
+                            136
                         ];
                         return [
                             4,
                             saveResponseItemsToConversationMetadata({
-                                openai: openai,
+                                client: client,
                                 threadId: threadId,
                                 responseId: responseCreatedResponse.id,
                                 itemIds: itemIds
                             })
                         ];
-                    case 45:
+                    case 135:
                         _state.sent();
-                        _state.label = 46;
-                    case 46:
+                        _state.label = 136;
+                    case 136:
                         return [
                             7
                         ];
-                    case 47:
+                    case 137:
                         return [
                             2
                         ];
                 }
             });
         });
-        return function(_) {
+        return function handleRun(_) {
             return _ref.apply(this, arguments);
         };
     }();
+    return {
+        handleRun: handleRun,
+        getOpenaiAssistant: getOpenaiAssistant
+    };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {