supercompat 3.1.0 → 3.3.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
         })
     };
 };
@@ -5472,39 +5477,48 @@ var messageContentBlocks2 = function(param) {
     ];
 };
 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, metadata, 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, 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 [
+                            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) {
@@ -5552,10 +5566,10 @@ 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:
@@ -5567,14 +5581,14 @@ var get14 = function(param) {
                         }, 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 +5603,7 @@ var get14 = function(param) {
                         return [
                             4,
                             fetchResponsesForItems({
-                                openai: openai,
+                                client: client,
                                 items: itemsWithRunIds
                             })
                         ];
@@ -5601,6 +5615,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 +5665,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 +5679,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 +5777,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 +5815,9 @@ var get15 = function(param) {
     }();
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/post.ts
-var import_radash18 = require("radash");
+var import_radash17 = require("radash");
 var import_dayjs11 = __toESM(require("dayjs"), 1);
-var import_radash19 = require("radash");
+var import_radash18 = require("radash");
 // src/lib/responses/serializeResponseAsRun.ts
 var serializeStatus = function(param) {
     var response = param.response;
@@ -6036,9 +6045,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 +6155,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 +6173,7 @@ function _saveResponseItemsToConversationMetadata() {
                     });
                     return [
                         4,
-                        openai.conversations.update(threadId, {
+                        client.conversations.update(threadId, {
                             metadata: updated
                         })
                     ];
@@ -6202,11 +6211,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 +6223,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_radash18.assign);
+                        _tmp = [
+                            {},
+                            defaultAssistant
+                        ];
                         return [
                             4,
-                            openai.responses.create(_object_spread_props(_object_spread({
+                            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,
+                            client.responses.create(_object_spread_props(_object_spread({
                                 conversation: threadId,
                                 instructions: instructions,
                                 model: model,
@@ -6233,7 +6257,7 @@ var post17 = function(param) {
                                 input: createResponseItems
                             }))
                         ];
-                    case 1:
+                    case 2:
                         response = _state.sent();
                         readableStream = new ReadableStream({
                             start: function start(controller) {
@@ -6250,7 +6274,7 @@ var post17 = function(param) {
                                                 ]);
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
                                                         threadId: threadId,
                                                         response: response,
                                                         onEvent: /*#__PURE__*/ function() {
@@ -6280,7 +6304,7 @@ var post17 = function(param) {
                                                 event = {
                                                     event: "thread.run.failed",
                                                     data: {
-                                                        id: (0, import_radash18.uid)(24),
+                                                        id: (0, import_radash17.uid)(24),
                                                         failed_at: (0, import_dayjs11.default)().unix(),
                                                         last_error: {
                                                             code: "server_error",
@@ -6305,7 +6329,7 @@ var post17 = function(param) {
                         });
                         if (!stream) return [
                             3,
-                            2
+                            3
                         ];
                         return [
                             2,
@@ -6315,7 +6339,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 +6347,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 +6375,7 @@ var post17 = function(param) {
                                 }
                             })
                         ];
-                    case 5:
+                    case 6:
                         return [
                             2
                         ];
@@ -6365,14 +6389,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 +6401,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 +6412,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 +6447,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 +6746,13 @@ function _pMap() {
 }
 var pMapSkip = Symbol("skip");
 // src/adapters/storage/responsesStorageAdapter/threads/runs/steps/get.ts
-var import_radash21 = require("radash");
+var import_radash20 = require("radash");
 // src/lib/items/serializeItemAsRunStep.ts
 var import_dayjs12 = __toESM(require("dayjs"), 1);
-var import_radash20 = require("radash");
+var import_radash19 = 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_radash19.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_radash19.uid)(18));
     var base = {
         id: itemId,
         object: "thread.run.step",
@@ -6795,10 +6823,10 @@ function serializeItemAsRunStep(param) {
 }
 // src/adapters/storage/responsesStorageAdapter/threads/runs/steps/get.ts
 var get17 = 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 _this, url, _url_pathname_match, threadId, runId, response, functionCalls, functionCallOutputsResponses, functionCallOutputs, nonFcItems, data, _id;
+            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:
@@ -6806,7 +6834,7 @@ var get17 = function(param) {
                         _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)
+                            client.responses.retrieve(runId)
                         ];
                     case 1:
                         response = _state.sent();
@@ -6823,7 +6851,7 @@ var get17 = function(param) {
                                             case 0:
                                                 return [
                                                     4,
-                                                    openai.conversations.items.list(threadId, {
+                                                    client.conversations.items.list(threadId, {
                                                         after: functionCall.id,
                                                         order: "asc"
                                                     })
@@ -6847,9 +6875,12 @@ var get17 = function(param) {
                     case 2:
                         functionCallOutputsResponses = _state.sent();
                         functionCallOutputs = functionCallOutputsResponses.filter(Boolean);
-                        nonFcItems = response.output.filter(function(item) {
-                            return item.type !== "function_call";
-                        });
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 3:
+                        openaiAssistant = _state.sent();
                         data = response.output.flatMap(function(item) {
                             var step = serializeItemAsRunStep({
                                 item: item,
@@ -6885,7 +6916,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_radash20.last)(response.output)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
                             }), {
                                 status: 200,
                                 headers: {
@@ -6903,11 +6934,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 +6965,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 +6981,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 +7004,7 @@ var post18 = function(param) {
                                 tools: openaiAssistant.tools
                             })))
                         ];
-                    case 2:
+                    case 3:
                         response = _state.sent();
                         readableStream = new ReadableStream({
                             start: function start(controller) {
@@ -6995,7 +7032,7 @@ var post18 = function(param) {
                                                 });
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
                                                         threadId: threadId,
                                                         response: response,
                                                         onEvent: /*#__PURE__*/ function() {
@@ -7042,37 +7079,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 +7136,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,51 +7158,44 @@ 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)
         };
@@ -7156,7 +7203,7 @@ var responsesStorageAdapter = function(param) {
 };
 // src/adapters/run/responsesRunAdapter/index.ts
 var import_dayjs13 = __toESM(require("dayjs"), 1);
-var import_radash22 = require("radash");
+var import_radash21 = require("radash");
 var serializeToolCalls2 = function(param) {
     var toolCalls = param.toolCalls;
     return toolCalls.map(function(toolCall) {
@@ -7171,14 +7218,41 @@ 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, 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, toolCall, err, e, _tmp23, _tmp24;
             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 = {};
                         itemIds = [];
@@ -7186,18 +7260,18 @@ var responsesRunAdapter = function(param) {
                     case 1:
                         _state.trys.push([
                             1,
-                            42,
-                            44,
-                            47
+                            53,
+                            56,
+                            59
                         ]);
                         _iteratorAbruptCompletion = false, _didIteratorError = false;
                         _state.label = 2;
                     case 2:
                         _state.trys.push([
                             2,
-                            35,
-                            36,
-                            41
+                            46,
+                            47,
+                            52
                         ]);
                         _iterator = _async_iterator(response);
                         _state.label = 3;
@@ -7209,7 +7283,7 @@ var responsesRunAdapter = function(param) {
                     case 4:
                         if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
                             3,
-                            34
+                            45
                         ];
                         _value = _step.value;
                         event = _value;
@@ -7223,79 +7297,97 @@ 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
+                                    32
                                 ];
                             case "response.function_call_arguments.delta":
                                 return [
                                     3,
-                                    30
+                                    41
                                 ];
                         }
                         return [
                             3,
-                            32
+                            43
                         ];
                     case 5:
                         responseCreatedResponse = event.response;
+                        _tmp = {
+                            event: "thread.run.created"
+                        };
+                        _tmp1 = {
+                            response: event.response
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.created",
-                                data: serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                })
-                            })
+                            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,
-                            33
+                            44
                         ];
-                    case 7:
+                    case 8:
+                        _tmp2 = {
+                            event: "thread.run.in_progress"
+                        };
+                        _tmp3 = {
+                            response: event.response
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.in_progress",
-                                data: serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 8:
+                    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,
-                            33
+                            44
                         ];
-                    case 9:
+                    case 11:
                         itemIds = event.response.output.filter(function(o) {
                             return o.id;
                         }).map(function(o) {
@@ -7306,71 +7398,104 @@ var responsesRunAdapter = function(param) {
                         });
                         if (!(toolCalls2.length > 0)) return [
                             3,
-                            11
+                            14
+                        ];
+                        _tmp4 = {
+                            event: "thread.run.requires_action"
+                        };
+                        _tmp5 = [
+                            {}
                         ];
+                        _tmp6 = {
+                            response: event.response
+                        };
                         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
-                                            })
+                            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 10:
+                    case 13:
                         _state.sent();
                         return [
                             3,
-                            13
+                            17
                         ];
-                    case 11:
+                    case 14:
+                        _tmp7 = {
+                            event: "thread.run.completed"
+                        };
+                        _tmp8 = {
+                            response: event.response
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.completed",
-                                data: serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 12:
+                    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 = 13;
-                    case 13:
+                        _state.label = 17;
+                    case 17:
                         return [
                             3,
-                            33
+                            44
                         ];
-                    case 14:
+                    case 18:
+                        _tmp9 = {
+                            event: "thread.run.failed"
+                        };
+                        _tmp10 = {
+                            response: event.response
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.failed",
-                                data: serializeResponseAsRun({
-                                    response: event.response,
-                                    assistantId: openaiAssistant.id
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 15:
+                    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,
-                            33
+                            44
                         ];
-                    case 16:
+                    case 21:
                         return [
                             4,
                             onEvent2({
@@ -7391,153 +7516,196 @@ var responsesRunAdapter = function(param) {
                                 }
                             })
                         ];
-                    case 17:
+                    case 22:
                         _state.sent();
                         return [
                             3,
-                            33
+                            44
                         ];
-                    case 18:
+                    case 23:
                         if (!(event.item.type === "message")) return [
                             3,
-                            21
+                            28
                         ];
+                        _tmp11 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp12 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
                         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
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 19:
+                    case 24:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp11.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp12.openaiAssistant = _state.sent(), _tmp12.runId = responseCreatedResponse.id, _tmp12.status = "in_progress", _tmp12.completedAt = null, _tmp12)
+                                ]), _tmp11)
+                            ])
+                        ];
+                    case 25:
                         _state.sent();
+                        _tmp13 = {
+                            event: "thread.message.created"
+                        };
+                        _tmp14 = {
+                            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 26:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp13.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp14.openaiAssistant = _state.sent(), _tmp14.createdAt = (0, import_dayjs13.default)().unix(), _tmp14.runId = responseCreatedResponse.id, _tmp14.status = "in_progress", _tmp14)
+                                ]), _tmp13)
+                            ])
+                        ];
+                    case 27:
                         _state.sent();
                         return [
                             3,
-                            23
+                            31
                         ];
-                    case 21:
+                    case 28:
                         if (!(event.item.type === "function_call")) return [
                             3,
-                            23
+                            31
                         ];
                         toolCalls[event.item.id] = event.item;
+                        _tmp15 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp16 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.step.created",
-                                data: serializeItemAsRunStep({
-                                    item: event.item,
-                                    items: [],
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    runId: responseCreatedResponse.id
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 22:
+                    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();
-                        _state.label = 23;
-                    case 23:
+                        _state.label = 31;
+                    case 31:
                         if (event.item.id) itemIds.push(event.item.id);
                         return [
                             3,
-                            33
+                            44
                         ];
-                    case 24:
+                    case 32:
                         if (!(event.item.type === "message")) return [
                             3,
-                            27
+                            37
                         ];
+                        _tmp17 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp18 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.step.completed",
-                                data: serializeItemAsRunStep({
-                                    item: event.item,
-                                    items: [],
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    runId: responseCreatedResponse.id
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 25:
+                    case 33:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp17.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp18.openaiAssistant = _state.sent(), _tmp18.runId = responseCreatedResponse.id, _tmp18)
+                                ]), _tmp17)
+                            ])
+                        ];
+                    case 34:
                         _state.sent();
+                        _tmp19 = {
+                            event: "thread.message.completed"
+                        };
+                        _tmp20 = {
+                            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 35:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp19.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp20.openaiAssistant = _state.sent(), _tmp20.createdAt = (0, import_dayjs13.default)().unix(), _tmp20.runId = responseCreatedResponse.id, _tmp20)
+                                ]), _tmp19)
+                            ])
+                        ];
+                    case 36:
                         _state.sent();
                         return [
                             3,
-                            29
+                            40
                         ];
-                    case 27:
+                    case 37:
                         if (!(event.item.type === "function_call")) return [
                             3,
-                            29
+                            40
                         ];
                         toolCalls[event.item.id] = event.item;
+                        _tmp21 = {
+                            event: "thread.run.step.in_progress"
+                        };
+                        _tmp22 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.step.in_progress",
-                                data: serializeItemAsRunStep({
-                                    item: event.item,
-                                    items: [],
-                                    threadId: threadId,
-                                    openaiAssistant: openaiAssistant,
-                                    runId: responseCreatedResponse.id
-                                })
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 28:
+                    case 38:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp21.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp22.openaiAssistant = _state.sent(), _tmp22.runId = responseCreatedResponse.id, _tmp22)
+                                ]), _tmp21)
+                            ])
+                        ];
+                    case 39:
                         _state.sent();
-                        _state.label = 29;
-                    case 29:
+                        _state.label = 40;
+                    case 40:
                         return [
                             3,
-                            33
+                            44
                         ];
-                    case 30:
+                    case 41:
                         toolCall = toolCalls[event.item_id];
                         if (!toolCall) return [
                             3,
-                            33
+                            44
                         ];
                         return [
                             4,
@@ -7566,133 +7734,141 @@ var responsesRunAdapter = function(param) {
                                 }
                             })
                         ];
-                    case 31:
+                    case 42:
                         _state.sent();
                         return [
                             3,
-                            33
+                            44
                         ];
-                    case 32:
+                    case 43:
                         return [
                             3,
-                            33
+                            44
                         ];
-                    case 33:
+                    case 44:
                         _iteratorAbruptCompletion = false;
                         return [
                             3,
                             3
                         ];
-                    case 34:
+                    case 45:
                         return [
                             3,
-                            41
+                            52
                         ];
-                    case 35:
+                    case 46:
                         err = _state.sent();
                         _didIteratorError = true;
                         _iteratorError = err;
                         return [
                             3,
-                            41
+                            52
                         ];
-                    case 36:
+                    case 47:
                         _state.trys.push([
-                            36,
+                            47,
                             ,
-                            39,
-                            40
+                            50,
+                            51
                         ]);
                         if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
                             3,
-                            38
+                            49
                         ];
                         return [
                             4,
                             _iterator.return()
                         ];
-                    case 37:
+                    case 48:
                         _state.sent();
-                        _state.label = 38;
-                    case 38:
+                        _state.label = 49;
+                    case 49:
                         return [
                             3,
-                            40
+                            51
                         ];
-                    case 39:
+                    case 50:
                         if (_didIteratorError) {
                             throw _iteratorError;
                         }
                         return [
                             7
                         ];
-                    case 40:
+                    case 51:
                         return [
                             7
                         ];
-                    case 41:
+                    case 52:
                         return [
                             3,
-                            47
+                            59
                         ];
-                    case 42:
+                    case 53:
                         e = _state.sent();
+                        _tmp23 = {
+                            event: "thread.run.failed"
+                        };
+                        _tmp24 = {
+                            id: (responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) || "run_".concat((0, import_radash21.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 54:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp23.data = (_tmp24.assistant_id = _state.sent().id, _tmp24.status = "failed", _tmp24.failed_at = (0, import_dayjs13.default)().unix(), _tmp24.last_error = {
+                                    code: "server_error",
+                                    message: String((e === null || e === void 0 ? void 0 : e.message) || e || "Unknown error")
+                                }, _tmp24), _tmp23)
+                            ])
+                        ];
+                    case 55:
                         _state.sent();
                         return [
                             3,
-                            47
+                            59
                         ];
-                    case 44:
+                    case 56:
                         if (!((responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) && itemIds.length > 0)) return [
                             3,
-                            46
+                            58
                         ];
                         return [
                             4,
                             saveResponseItemsToConversationMetadata({
-                                openai: openai,
+                                client: client,
                                 threadId: threadId,
                                 responseId: responseCreatedResponse.id,
                                 itemIds: itemIds
                             })
                         ];
-                    case 45:
+                    case 57:
                         _state.sent();
-                        _state.label = 46;
-                    case 46:
+                        _state.label = 58;
+                    case 58:
                         return [
                             7
                         ];
-                    case 47:
+                    case 59:
                         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 = {