supercompat 3.1.0-beta.5 → 3.3.0

package/dist/index.js

@@ -198,6 +198,10 @@ function _sliced_to_array(arr, i) {
 function _to_consumable_array(arr) {
     return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -322,10 +326,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: partob(runAdapter, {
-            client: client
-        })
+        runAdapter: _object_spread_props(_object_spread({}, runAdapter), {
+            handleRun: partob(runAdapter.handleRun, {
+                client: wrappedClient
+            })
+        }),
+        client: wrappedClient
     });
     return result.requestHandlers;
 };
@@ -349,21 +359,53 @@ var findRequestHandler = function(param) {
     }
 };
 // src/supercompatFetch/originalFetch.ts
-var originalFetch = function(param) {
-    var args = param.args, client = param.client;
-    var _client_client;
-    if ((_client_client = client.client) === null || _client_client === void 0 ? void 0 : _client_client.fetch) {
-        var _args = _sliced_to_array(args, 2), url = _args[0], options = _args[1];
-        var headers = _object_spread_props(_object_spread({}, options.headers), {
-            authorization: client.client.defaultHeaders().Authorization
+var originalFetch = /*#__PURE__*/ function() {
+    var _ref = _async_to_generator(function(param) {
+        var args, client, _client_client, _args, url, options, clientHeaders, newOptions;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    args = param.args, client = param.client;
+                    if (!((_client_client = client.client) === null || _client_client === void 0 ? void 0 : _client_client.fetch)) return [
+                        3,
+                        2
+                    ];
+                    _args = _sliced_to_array(args, 2), url = _args[0], options = _args[1];
+                    return [
+                        4,
+                        client.client.buildHeaders({
+                            options: {},
+                            method: args[1].method.toLowerCase(),
+                            bodyHeaders: args[1].headers,
+                            retryCount: 0
+                        })
+                    ];
+                case 1:
+                    clientHeaders = _state.sent();
+                    clientHeaders.set("Authorization", "Bearer ".concat(client.client.apiKey));
+                    newOptions = _object_spread_props(_object_spread({}, options), {
+                        headers: clientHeaders
+                    });
+                    return [
+                        2,
+                        client.client.fetch(url, newOptions)
+                    ];
+                case 2:
+                    return [
+                        2,
+                        fetch.apply(void 0, _to_consumable_array(args))
+                    ];
+                case 3:
+                    return [
+                        2
+                    ];
+            }
         });
-        return client.client.fetch(url, _object_spread_props(_object_spread({}, options), {
-            headers: headers
-        }));
-    } else {
-        return fetch.apply(void 0, _to_consumable_array(args));
-    }
-};
+    });
+    return function originalFetch(_) {
+        return _ref.apply(this, arguments);
+    };
+}();
 // src/supercompatFetch/index.ts
 var supercompatFetch = function(param) {
     var client = param.client, storage = param.storage, runAdapter = param.runAdapter;
@@ -3175,11 +3217,11 @@ var serializeMessage3 = function(param) {
             message: message
         })
     ];
-    var run4 = message.run;
-    if (!run4) return result;
+    var run3 = message.run;
+    if (!run3) return result;
     var messageToolCalls = ((_message_metadata = message.metadata) === null || _message_metadata === void 0 ? void 0 : _message_metadata.toolCalls) || [];
     messageToolCalls.forEach(function(tc) {
-        var runStep = run4.runSteps.find(function(rs) {
+        var runStep = run3.runSteps.find(function(rs) {
             if (rs.type !== "tool_calls") return false;
             return rs.step_details.tool_calls.some(function(rsTc) {
                 if (rsTc.type !== "function") return false;
@@ -3200,15 +3242,15 @@ var serializeMessage3 = function(param) {
 // src/adapters/run/completionsRunAdapter/messages/index.ts
 var messages = /*#__PURE__*/ function() {
     var _ref = _async_to_generator(function(param) {
-        var run4, getMessages2, _, _1;
+        var run3, getMessages2, _, _1;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    run4 = param.run, getMessages2 = param.getMessages;
-                    _1 = (_ = _to_consumable_array(run4.instructions ? [
+                    run3 = param.run, getMessages2 = param.getMessages;
+                    _1 = (_ = _to_consumable_array(run3.instructions ? [
                         {
                             role: "system",
-                            content: run4.instructions
+                            content: run3.instructions
                         }
                     ] : [])).concat;
                     return [
@@ -3306,190 +3348,117 @@ var toolCallsData = function(param) {
     return newToolCalls;
 };
 var completionsRunAdapter = function() {
-    return /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(param) {
-            var clientAdapter, run4, 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, run4 = param.run, onEvent2 = param.onEvent, getMessages2 = param.getMessages;
-                        if (run4.status !== "queued") return [
-                            2
-                        ];
-                        client = supercompat({
-                            client: clientAdapter
-                        });
-                        onEvent2({
-                            event: "thread.run.in_progress",
-                            data: _object_spread_props(_object_spread({}, run4), {
-                                status: "in_progress"
-                            })
-                        });
-                        _tmp = {};
-                        return [
-                            4,
-                            messages({
-                                run: run4,
-                                getMessages: getMessages2
-                            })
-                        ];
-                    case 1:
-                        opts = _object_spread.apply(void 0, [
-                            (_tmp.messages = _state.sent(), _tmp.model = run4.model, _tmp.stream = true, _tmp.response_format = run4.response_format, _tmp),
-                            isEmpty2(run4.tools) ? {} : {
-                                tools: run4.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,
-                            onEvent2({
-                                event: "thread.run.failed",
-                                data: _object_spread_props(_object_spread({}, run4), {
-                                    failed_at: dayjs().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,
+    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.message.created",
-                                data: {
-                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                    object: "thread.message",
-                                    completed_at: null,
-                                    run_id: run4.id,
-                                    created_at: dayjs().unix(),
-                                    assistant_id: run4.assistant_id,
-                                    incomplete_at: null,
-                                    incomplete_details: null,
-                                    metadata: {},
-                                    attachments: [],
-                                    thread_id: run4.thread_id,
-                                    content: [
-                                        {
-                                            text: {
-                                                value: "",
-                                                annotations: []
-                                            },
-                                            type: "text"
-                                        }
-                                    ],
-                                    role: "assistant",
+                                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),
+                                isEmpty2(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: run4.id,
-                                assistant_id: run4.assistant_id,
-                                thread_id: run4.thread_id,
-                                type: "message_creation",
-                                status: "completed",
-                                completed_at: dayjs().unix(),
-                                created_at: dayjs().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: dayjs().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: dayjs().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: {
                                     id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
                                     object: "thread.run.step",
-                                    run_id: run4.id,
-                                    assistant_id: run4.assistant_id,
-                                    thread_id: run4.thread_id,
-                                    type: "tool_calls",
-                                    status: "in_progress",
-                                    completed_at: null,
+                                    run_id: run3.id,
+                                    assistant_id: run3.assistant_id,
+                                    thread_id: run3.thread_id,
+                                    type: "message_creation",
+                                    status: "completed",
+                                    completed_at: dayjs().unix(),
                                     created_at: dayjs().unix(),
                                     expired_at: null,
                                     last_error: null,
@@ -3498,170 +3467,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: run4.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: uid2(24),
-                                                type: "function"
-                                            }, tc);
-                                        })
+                                        status: "in_progress",
+                                        completed_at: null,
+                                        created_at: dayjs().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: uid2(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"
-                                        }
-                                    ],
-                                    tool_calls: currentToolCalls
-                                })
-                            })
-                        ];
-                    case 22:
-                        message = _state.sent();
-                        if (isEmpty2(message.toolCalls)) {
-                            return [
-                                2,
+                            currentToolCalls = toolCallsData({
+                                prevToolCalls: currentToolCalls,
+                                delta: delta
+                            });
+                            _state.label = 12;
+                        case 12:
+                            if (delta.content) {
                                 onEvent2({
-                                    event: "thread.run.completed",
-                                    data: _object_spread_props(_object_spread({}, run4), {
-                                        status: "completed",
-                                        completed_at: dayjs().unix()
+                                    event: "thread.message.delta",
+                                    data: {
+                                        id: message.id,
+                                        delta: {
+                                            content: [
+                                                {
+                                                    type: "text",
+                                                    index: 0,
+                                                    text: {
+                                                        value: delta.content
+                                                    }
+                                                }
+                                            ]
+                                        }
+                                    }
+                                });
+                            }
+                            _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"
+                                            }
+                                        ],
+                                        tool_calls: currentToolCalls
                                     })
                                 })
                             ];
-                        }
-                        return [
-                            2,
-                            onEvent2({
-                                event: "thread.run.requires_action",
-                                data: _object_spread_props(_object_spread({}, run4), {
-                                    status: "requires_action",
-                                    required_action: {
-                                        type: "submit_tool_outputs",
-                                        submit_tool_outputs: {
-                                            tool_calls: message.toolCalls
+                        case 22:
+                            message = _state.sent();
+                            if (isEmpty2(message.toolCalls)) {
+                                return [
+                                    2,
+                                    onEvent2({
+                                        event: "thread.run.completed",
+                                        data: _object_spread_props(_object_spread({}, run3), {
+                                            status: "completed",
+                                            completed_at: dayjs().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$";
@@ -3945,26 +3986,26 @@ import { assign as assign4 } from "radash";
 // src/adapters/storage/prismaStorageAdapter/threads/runs/serializeRun.ts
 import dayjs5 from "dayjs";
 var serializeRun = function(param) {
-    var run4 = param.run;
+    var run3 = param.run;
     return {
-        id: run4.id,
+        id: run3.id,
         object: "thread.run",
-        created_at: dayjs5(run4.createdAt).unix(),
-        thread_id: run4.threadId,
-        assistant_id: run4.assistantId,
-        status: run4.status.toLowerCase(),
-        required_action: run4.requiredAction,
-        last_error: run4.lastError,
-        expires_at: dayjs5(run4.expiresAt).unix(),
-        started_at: run4.startedAt ? dayjs5(run4.startedAt).unix() : null,
-        cancelled_at: run4.cancelledAt ? dayjs5(run4.cancelledAt).unix() : null,
-        failed_at: run4.failedAt ? dayjs5(run4.failedAt).unix() : null,
-        completed_at: run4.completedAt ? dayjs5(run4.completedAt).unix() : null,
-        model: run4.model,
-        instructions: run4.instructions,
-        tools: run4.tools,
-        metadata: run4.metadata,
-        usage: run4.usage,
+        created_at: dayjs5(run3.createdAt).unix(),
+        thread_id: run3.threadId,
+        assistant_id: run3.assistantId,
+        status: run3.status.toLowerCase(),
+        required_action: run3.requiredAction,
+        last_error: run3.lastError,
+        expires_at: dayjs5(run3.expiresAt).unix(),
+        started_at: run3.startedAt ? dayjs5(run3.startedAt).unix() : null,
+        cancelled_at: run3.cancelledAt ? dayjs5(run3.cancelledAt).unix() : null,
+        failed_at: run3.failedAt ? dayjs5(run3.failedAt).unix() : null,
+        completed_at: run3.completedAt ? dayjs5(run3.completedAt).unix() : null,
+        model: run3.model,
+        instructions: run3.instructions,
+        tools: run3.tools,
+        metadata: run3.metadata,
+        usage: run3.usage,
         truncation_strategy: {
             type: "auto"
         },
@@ -4018,9 +4059,9 @@ var get11 = function(param) {
                         return [
                             2,
                             new Response(JSON.stringify({
-                                data: runs3.map(function(run4) {
+                                data: runs3.map(function(run3) {
                                     return serializeRun({
-                                        run: run4
+                                        run: run3
                                     });
                                 }),
                                 has_more: runsPlusOne.length > pageSize,
@@ -4333,33 +4374,33 @@ var onEvent = function(param) {
 };
 // src/adapters/storage/prismaStorageAdapter/threads/runs/getMessages.ts
 var getTake = function(param) {
-    var run4 = param.run;
-    if (run4.truncationStrategy.type === "auto") {
+    var run3 = param.run;
+    if (run3.truncationStrategy.type === "auto") {
         return null;
     }
-    if (run4.truncationStrategy.type === "last_messages") {
-        if (!run4.truncationStrategy.last_messages) {
+    if (run3.truncationStrategy.type === "last_messages") {
+        if (!run3.truncationStrategy.last_messages) {
             throw new Error("Truncation strategy last_messages is required");
         }
-        return -run4.truncationStrategy.last_messages;
+        return -run3.truncationStrategy.last_messages;
     }
-    throw new Error("Unsupported truncation strategy type: ".concat(run4.truncationStrategy.type));
+    throw new Error("Unsupported truncation strategy type: ".concat(run3.truncationStrategy.type));
 };
 var getMessages = function(param) {
-    var prisma = param.prisma, run4 = param.run;
+    var prisma = param.prisma, run3 = param.run;
     return /*#__PURE__*/ _async_to_generator(function() {
         var take, messages4;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     take = getTake({
-                        run: run4
+                        run: run3
                     });
                     return [
                         4,
                         prisma.message.findMany(_object_spread({
                             where: {
-                                threadId: run4.threadId
+                                threadId: run3.threadId
                             },
                             include: {
                                 run: {
@@ -4405,7 +4446,7 @@ var post12 = function(param) {
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString, options) {
             var url, _url_pathname_match, threadId, body, assistant_id, stream, assistant, _assign5, model, instructions, // additional_instructions,
-            tools, metadata, response_format, truncation_strategy, run4, data, readableStream;
+            tools, metadata, response_format, truncation_strategy, run3, data, readableStream;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -4463,9 +4504,9 @@ var post12 = function(param) {
                             })
                         ];
                     case 2:
-                        run4 = _state.sent();
+                        run3 = _state.sent();
                         data = serializeRun({
-                            run: run4
+                            run: run3
                         });
                         readableStream = new ReadableStream({
                             start: function start(controller) {
@@ -4482,7 +4523,7 @@ var post12 = function(param) {
                                                 ]);
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
                                                         run: data,
                                                         onEvent: onEvent({
                                                             controller: _object_spread_props(_object_spread({}, controller), {
@@ -4494,7 +4535,7 @@ var post12 = function(param) {
                                                         }),
                                                         getMessages: getMessages({
                                                             prisma: prisma,
-                                                            run: run4
+                                                            run: run3
                                                         })
                                                     })
                                                 ];
@@ -4517,7 +4558,7 @@ var post12 = function(param) {
                                                 })({
                                                     event: "thread.run.failed",
                                                     data: {
-                                                        id: run4.id,
+                                                        id: run3.id,
                                                         failed_at: dayjs7().unix(),
                                                         last_error: {
                                                             code: "server_error",
@@ -4588,7 +4629,7 @@ var get12 = function(param) {
     var prisma = param.prisma;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var url, _url_pathname_match, threadId, runId, run4;
+            var url, _url_pathname_match, threadId, runId, run3;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -4604,11 +4645,11 @@ var get12 = function(param) {
                             })
                         ];
                     case 1:
-                        run4 = _state.sent();
+                        run3 = _state.sent();
                         return [
                             2,
                             new Response(JSON.stringify(serializeRun({
-                                run: run4
+                                run: run3
                             })), {
                                 status: 200,
                                 headers: {
@@ -4626,7 +4667,7 @@ var get12 = function(param) {
     }();
 };
 // src/adapters/storage/prismaStorageAdapter/threads/run/index.ts
-var run2 = function(param) {
+var run = function(param) {
     var prisma = param.prisma, runAdapter = param.runAdapter;
     return {
         get: get12({
@@ -4879,7 +4920,7 @@ var post13 = function(param) {
     var prisma = param.prisma, 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, readableStream, run4;
+            var url, _url_pathname_match, threadId, runId, body, tool_outputs, stream, readableStream, run3;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -4894,7 +4935,7 @@ var post13 = function(param) {
                         readableStream = new ReadableStream({
                             start: function start(controller) {
                                 return _async_to_generator(function() {
-                                    var run4;
+                                    var run3;
                                     return _ts_generator(this, function(_state) {
                                         switch(_state.label){
                                             case 0:
@@ -4928,12 +4969,12 @@ var post13 = function(param) {
                                                     })
                                                 ];
                                             case 1:
-                                                run4 = _state.sent();
+                                                run3 = _state.sent();
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
                                                         run: serializeRun({
-                                                            run: run4
+                                                            run: run3
                                                         }),
                                                         onEvent: onEvent({
                                                             controller: _object_spread_props(_object_spread({}, controller), {
@@ -4945,7 +4986,7 @@ var post13 = function(param) {
                                                         }),
                                                         getMessages: getMessages({
                                                             prisma: prisma,
-                                                            run: run4
+                                                            run: run3
                                                         })
                                                     })
                                                 ];
@@ -4979,7 +5020,7 @@ var post13 = function(param) {
                             })
                         ];
                     case 2:
-                        run4 = _state.sent();
+                        run3 = _state.sent();
                         return [
                             4,
                             new Promise(function(resolve) {
@@ -4991,9 +5032,9 @@ var post13 = function(param) {
                                                     case 0:
                                                         return [
                                                             4,
-                                                            runAdapter({
+                                                            runAdapter.handleRun({
                                                                 run: serializeRun({
-                                                                    run: run4
+                                                                    run: run3
                                                                 }),
                                                                 onEvent: onEvent({
                                                                     controller: _object_spread_props(_object_spread({}, controller), {
@@ -5005,7 +5046,7 @@ var post13 = function(param) {
                                                                 }),
                                                                 getMessages: getMessages({
                                                                     prisma: prisma,
-                                                                    run: run4
+                                                                    run: run3
                                                                 })
                                                             })
                                                         ];
@@ -5027,7 +5068,7 @@ var post13 = function(param) {
                         _state.sent();
                         return [
                             2,
-                            new Response(JSON.stringify(run4), {
+                            new Response(JSON.stringify(run3), {
                                 status: 200,
                                 headers: {
                                     "Content-Type": "application/json"
@@ -5136,7 +5177,7 @@ var prismaStorageAdapter = function(param) {
             })), _define_property(_obj, runsRegexp, runs({
                 prisma: prisma,
                 runAdapter: runAdapter
-            })), _define_property(_obj, runRegexp, run2({
+            })), _define_property(_obj, runRegexp, run({
                 prisma: prisma,
                 runAdapter: runAdapter
             })), _define_property(_obj, stepsRegexp, steps({
@@ -5149,13 +5190,12 @@ var prismaStorageAdapter = function(param) {
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/serializeThread.ts
-import dayjs10 from "dayjs";
 var serializeThread2 = function(param) {
     var conversation = param.conversation;
     return {
         id: conversation.id,
         object: "thread",
-        created_at: dayjs10(conversation.created_at).unix(),
+        created_at: conversation.created_at,
         metadata: conversation.metadata,
         // TODO
         tool_resources: null
@@ -5163,7 +5203,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;
@@ -5175,7 +5215,7 @@ var post15 = function(param) {
                         metadata = body.metadata || {};
                         return [
                             4,
-                            openai.conversations.create({
+                            client.conversations.create({
                                 metadata: metadata,
                                 items: messages4.map(function(message) {
                                     return {
@@ -5214,18 +5254,17 @@ 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
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/messages/post.ts
-import dayjs12 from "dayjs";
+import dayjs10 from "dayjs";
 import { isArray as isArray3 } from "radash";
-// src/adapters/storage/responsesStorageAdapter/threads/messages/serializeMessage.ts
-import dayjs11 from "dayjs";
+// src/lib/items/serializeItemAsMessage.ts
 import { uid as uid3 } from "radash";
 var serializeContent2 = function(param) {
     var item = param.item;
@@ -5257,14 +5296,16 @@ var serializeAttachments = function(param) {
 };
 var serializeMetadata = function(param) {
     var item = param.item;
-    return {};
+    return {
+        item: JSON.stringify(item)
+    };
 };
-var serializeMessage5 = function(param) {
-    var item = param.item, initialCreatedAt = param.initialCreatedAt, index = param.index, threadId = param.threadId;
+var serializeItemAsMessage = function(param) {
+    var item = param.item, threadId = param.threadId, openaiAssistant = param.openaiAssistant, createdAt = param.createdAt, _param_runId = param.runId, runId = _param_runId === void 0 ? null : _param_runId, tmp = param.status, status3 = tmp === void 0 ? "completed" : tmp;
     return {
         id: item.id || uid3(24),
         object: "thread.message",
-        created_at: dayjs11(initialCreatedAt).add(index, "seconds").unix(),
+        created_at: createdAt,
         thread_id: threadId,
         completed_at: null,
         incomplete_at: null,
@@ -5273,18 +5314,19 @@ var serializeMessage5 = function(param) {
         content: serializeContent2({
             item: item
         }),
-        assistant_id: null,
-        run_id: null,
+        assistant_id: item.role === "assistant" ? openaiAssistant.id : null,
+        run_id: runId,
         attachments: serializeAttachments({
             item: item
         }),
-        status: typeof item.status === "string" ? item.status : "completed",
+        status: typeof item.status === "string" ? item.status : status3,
         metadata: serializeMetadata({
             item: item
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/messages/post.ts
+import { uid as uid4 } from "radash";
 var messageContentBlocks2 = function(param) {
     var content = param.content;
     if (isArray3(content)) {
@@ -5325,10 +5367,10 @@ var messageContentBlocks2 = function(param) {
     ];
 };
 var post16 = function(param) {
-    var openai = param.openai;
+    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, items;
+            var url, _url_pathname_match, threadId, body, role, content, metadata, item, openaiAssistant;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -5336,29 +5378,29 @@ var post16 = function(param) {
                         _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(uid4(24)),
+                            status: "in_progress",
+                            type: "message",
+                            role: role,
+                            content: messageContentBlocks2({
+                                content: content
+                            })
+                        };
+                        createResponseItems.push(item);
                         return [
                             4,
-                            openai.conversations.items.create(threadId, {
-                                items: [
-                                    {
-                                        type: "message",
-                                        role: role,
-                                        content: messageContentBlocks2({
-                                            content: content
-                                        })
-                                    }
-                                ]
-                            })
+                            runAdapter.getOpenaiAssistant()
                         ];
                     case 1:
-                        items = _state.sent();
+                        openaiAssistant = _state.sent();
                         return [
                             2,
-                            new Response(JSON.stringify(serializeMessage5({
-                                item: items.data[0],
+                            new Response(JSON.stringify(serializeItemAsMessage({
+                                item: item,
                                 threadId: threadId,
-                                initialCreatedAt: dayjs12().subtract(1, "seconds").format(),
-                                index: 0
+                                openaiAssistant: openaiAssistant,
+                                createdAt: dayjs10().unix()
                             })), {
                                 status: 200,
                                 headers: {
@@ -5376,12 +5418,48 @@ var post16 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/messages/get.ts
 import { assign as assign7 } from "radash";
-import dayjs13 from "dayjs";
+// src/lib/items/responseId.ts
+function responseId(param) {
+    var conversation = param.conversation, itemId = param.itemId;
+    if (!conversation.metadata) return null;
+    var metadata = conversation.metadata;
+    var keys = Object.keys(metadata).map(function(k) {
+        var m = /^responseItemsMap(\d+)$/.exec(k);
+        return m ? {
+            key: k,
+            idx: Number(m[1])
+        } : null;
+    }).filter(function(x) {
+        return !!x;
+    }).sort(function(a, b) {
+        return a.idx - b.idx;
+    });
+    for(var i = keys.length - 1; i >= 0; i--){
+        var raw = metadata[keys[i].key];
+        if (!raw || raw === "[]") continue;
+        var arr = [];
+        try {
+            arr = JSON.parse(raw);
+            if (!Array.isArray(arr)) continue;
+        } catch (e) {
+            continue;
+        }
+        for(var j = arr.length - 1; j >= 0; j--){
+            var _entry_itemIds;
+            var entry = arr[j];
+            if (entry === null || entry === void 0 ? void 0 : (_entry_itemIds = entry.itemIds) === null || _entry_itemIds === void 0 ? void 0 : _entry_itemIds.includes(itemId)) {
+                return entry.responseId || null;
+            }
+        }
+    }
+    return null;
+}
+// src/adapters/storage/responsesStorageAdapter/threads/messages/get.ts
 var get14 = function(param) {
-    var openai = param.openai;
+    var client = param.client, runAdapter = param.runAdapter;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var url, _url_pathname_match, threadId, _assign7, limit, order, after, items, initialCreatedAt;
+            var url, _url_pathname_match, threadId, _assign7, limit, order, after, conversation, sortOrder, items, itemsWithRunIds, responseMap, timestampedItems, openaiAssistant;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -5393,24 +5471,57 @@ var get14 = function(param) {
                         }, Object.fromEntries(url.searchParams)), limit = _assign7.limit, order = _assign7.order, after = _assign7.after;
                         return [
                             4,
-                            openai.conversations.items.list(threadId, {
-                                limit: parseInt(limit),
+                            client.conversations.retrieve(threadId)
+                        ];
+                    case 1:
+                        conversation = _state.sent();
+                        sortOrder = order === "asc" ? "asc" : "desc";
+                        return [
+                            4,
+                            client.conversations.items.list(threadId, {
+                                limit: parseInt(limit, 10),
                                 after: after,
-                                order: order
+                                order: sortOrder
                             })
                         ];
-                    case 1:
+                    case 2:
                         items = _state.sent();
-                        initialCreatedAt = dayjs13().subtract(items.data.length, "seconds").format();
+                        itemsWithRunIds = mapItemsWithRunIds({
+                            conversation: conversation,
+                            items: items.data
+                        });
+                        return [
+                            4,
+                            fetchResponsesForItems({
+                                client: client,
+                                items: itemsWithRunIds
+                            })
+                        ];
+                    case 3:
+                        responseMap = _state.sent();
+                        timestampedItems = assignTimestamps({
+                            items: itemsWithRunIds,
+                            responseMap: responseMap,
+                            sortOrder: sortOrder,
+                            conversationCreatedAt: conversation.created_at
+                        });
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 4:
+                        openaiAssistant = _state.sent();
                         return [
                             2,
                             new Response(JSON.stringify({
-                                data: items.data.map(function(item, index) {
-                                    return serializeMessage5({
+                                data: timestampedItems.map(function(param) {
+                                    var item = param.item, runId = param.runId, assignedTimestamp = param.assignedTimestamp;
+                                    return serializeItemAsMessage({
                                         item: item,
-                                        initialCreatedAt: initialCreatedAt,
-                                        index: index,
-                                        threadId: threadId
+                                        threadId: threadId,
+                                        openaiAssistant: openaiAssistant,
+                                        createdAt: assignedTimestamp,
+                                        runId: runId
                                     });
                                 }),
                                 has_more: items.has_more,
@@ -5430,34 +5541,162 @@ var get14 = function(param) {
         };
     }();
 };
+var mapItemsWithRunIds = function(param) {
+    var conversation = param.conversation, items = param.items;
+    return items.map(function(item) {
+        return {
+            item: item,
+            runId: item.id ? responseId({
+                conversation: conversation,
+                itemId: item.id
+            }) : null
+        };
+    });
+};
+var fetchResponsesForItems = /*#__PURE__*/ function() {
+    var _ref = _async_to_generator(function(param) {
+        var client, items, responseIds, results, map;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    client = param.client, items = param.items;
+                    responseIds = Array.from(new Set(items.map(function(param) {
+                        var runId = param.runId;
+                        return runId;
+                    }).filter(function(id) {
+                        return Boolean(id);
+                    })));
+                    return [
+                        4,
+                        Promise.allSettled(responseIds.map(function(id) {
+                            return client.responses.retrieve(id);
+                        }))
+                    ];
+                case 1:
+                    results = _state.sent();
+                    map = /* @__PURE__ */ new Map();
+                    results.forEach(function(result, index) {
+                        if (result.status === "fulfilled") {
+                            map.set(responseIds[index], result.value);
+                        }
+                    });
+                    return [
+                        2,
+                        map
+                    ];
+            }
+        });
+    });
+    return function fetchResponsesForItems(_) {
+        return _ref.apply(this, arguments);
+    };
+}();
+var assignTimestamps = function(param) {
+    var items = param.items, responseMap = param.responseMap, sortOrder = param.sortOrder, conversationCreatedAt = param.conversationCreatedAt;
+    var itemsWithTimestamps = items.map(function(entry) {
+        var _responseMap_get;
+        var _responseMap_get_created_at;
+        return _object_spread_props(_object_spread({}, entry), {
+            timestamp: entry.runId ? (_responseMap_get_created_at = (_responseMap_get = responseMap.get(entry.runId)) === null || _responseMap_get === void 0 ? void 0 : _responseMap_get.created_at) !== null && _responseMap_get_created_at !== void 0 ? _responseMap_get_created_at : null : null,
+            assignedTimestamp: 0
+        });
+    });
+    var fallbackTimestampForIndex = function(index) {
+        return sortOrder === "asc" ? conversationCreatedAt + index : conversationCreatedAt + (itemsWithTimestamps.length - index);
+    };
+    var findNextKnownTimestamp = function(startIndex) {
+        for(var i = startIndex; i < itemsWithTimestamps.length; i += 1){
+            var candidate = itemsWithTimestamps[i];
+            if (candidate.timestamp != null) {
+                return {
+                    index: i,
+                    timestamp: candidate.timestamp
+                };
+            }
+        }
+        return null;
+    };
+    if (sortOrder === "asc") {
+        var lastAssigned = null;
+        itemsWithTimestamps.forEach(function(entry, index) {
+            var nextValue = entry.timestamp;
+            if (nextValue == null) {
+                if (lastAssigned != null) {
+                    nextValue = lastAssigned + 1;
+                } else {
+                    var nextKnown = findNextKnownTimestamp(index + 1);
+                    if (nextKnown) {
+                        var gap = nextKnown.index - index;
+                        nextValue = nextKnown.timestamp - gap;
+                    } else {
+                        nextValue = fallbackTimestampForIndex(index);
+                    }
+                }
+            }
+            if (lastAssigned != null && nextValue <= lastAssigned) {
+                nextValue = lastAssigned + 1;
+            }
+            entry.assignedTimestamp = nextValue;
+            lastAssigned = nextValue;
+        });
+    } else {
+        var lastAssigned1 = null;
+        itemsWithTimestamps.forEach(function(entry, index) {
+            var nextValue = entry.timestamp;
+            if (nextValue == null) {
+                if (lastAssigned1 != null) {
+                    nextValue = lastAssigned1 - 1;
+                } else {
+                    var nextKnown = findNextKnownTimestamp(index + 1);
+                    if (nextKnown) {
+                        var gap = nextKnown.index - index;
+                        nextValue = nextKnown.timestamp + gap;
+                    } else {
+                        nextValue = fallbackTimestampForIndex(index);
+                    }
+                }
+            }
+            if (lastAssigned1 != null && nextValue >= lastAssigned1) {
+                nextValue = lastAssigned1 - 1;
+            }
+            entry.assignedTimestamp = nextValue;
+            lastAssigned1 = nextValue;
+        });
+    }
+    return itemsWithTimestamps;
+};
 // src/adapters/storage/responsesStorageAdapter/threads/messages/index.ts
 var messages3 = function(param) {
-    var openai = param.openai;
+    var client = param.client, runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
     return {
         post: post16({
-            openai: openai
+            runAdapter: runAdapter,
+            createResponseItems: createResponseItems
         }),
         get: get14({
-            openai: openai
+            client: client,
+            runAdapter: runAdapter
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/get.ts
-import { assign as assign8 } from "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, _assign8, 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];
-                _assign8 = assign8({
-                    limit: "20",
-                    order: "desc"
-                }, Object.fromEntries(url.searchParams)), limit = _assign8.limit, order = _assign8.order, after = _assign8.after;
-                pageSize = parseInt(limit, 10);
-                throw new Error("Not implemented");
+                return [
+                    2,
+                    new Response(JSON.stringify({
+                        data: [],
+                        has_more: false,
+                        last_id: null
+                    }), {
+                        status: 200,
+                        headers: {
+                            "Content-Type": "application/json"
+                        }
+                    })
+                ];
             });
         });
         return function(urlString) {
@@ -5466,39 +5705,101 @@ var get15 = function(param) {
     }();
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/post.ts
-import { uid as uid4 } from "radash";
-import dayjs15 from "dayjs";
-import { assign as assign9 } from "radash";
-// src/adapters/storage/responsesStorageAdapter/threads/runs/serializeRun.ts
-import dayjs14 from "dayjs";
-var serializeRun2 = function(param) {
+import { uid as uid5 } from "radash";
+import dayjs11 from "dayjs";
+import { assign as assign8 } from "radash";
+// src/lib/responses/serializeResponseAsRun.ts
+var serializeStatus = function(param) {
+    var response = param.response;
+    var _response_status;
+    if (response.error) return "failed";
+    var _response_status_toLowerCase;
+    return (_response_status_toLowerCase = (_response_status = response.status) === null || _response_status === void 0 ? void 0 : _response_status.toLowerCase()) !== null && _response_status_toLowerCase !== void 0 ? _response_status_toLowerCase : "completed";
+};
+var serializeUsage = function(param) {
+    var response = param.response;
+    var _response_usage, _response_usage1, _response_usage2;
+    var _response_usage_input_tokens, _response_usage_output_tokens, _response_usage_total_tokens;
+    return {
+        prompt_tokens: (_response_usage_input_tokens = (_response_usage = response.usage) === null || _response_usage === void 0 ? void 0 : _response_usage.input_tokens) !== null && _response_usage_input_tokens !== void 0 ? _response_usage_input_tokens : 0,
+        completion_tokens: (_response_usage_output_tokens = (_response_usage1 = response.usage) === null || _response_usage1 === void 0 ? void 0 : _response_usage1.output_tokens) !== null && _response_usage_output_tokens !== void 0 ? _response_usage_output_tokens : 0,
+        total_tokens: (_response_usage_total_tokens = (_response_usage2 = response.usage) === null || _response_usage2 === void 0 ? void 0 : _response_usage2.total_tokens) !== null && _response_usage_total_tokens !== void 0 ? _response_usage_total_tokens : 0
+    };
+};
+var findPendingToolCalls = function(param) {
     var response = param.response;
+    var _response_output;
+    var toolCalls = ((_response_output = response.output) !== null && _response_output !== void 0 ? _response_output : []).filter(function(item) {
+        return item.type === "function_call";
+    });
+    if (toolCalls.length === 0) return [];
+    var _response_output1;
+    var completedCallIds = new Set(((_response_output1 = response.output) !== null && _response_output1 !== void 0 ? _response_output1 : []).filter(function(item) {
+        return item.type === "function_call_output";
+    }).map(function(item) {
+        return item.call_id;
+    }).filter(function(id) {
+        return Boolean(id);
+    }));
+    return toolCalls.filter(function(call) {
+        return !completedCallIds.has(call.call_id);
+    });
+};
+var serializeToolCalls = function(param) {
+    var toolCalls = param.toolCalls;
+    return toolCalls.map(function(toolCall) {
+        return {
+            id: toolCall.call_id,
+            type: "function",
+            function: {
+                name: toolCall.name,
+                arguments: toolCall.arguments
+            }
+        };
+    });
+};
+var serializeResponseAsRun = function(param) {
+    var response = param.response, assistantId = param.assistantId;
+    var pendingToolCalls = findPendingToolCalls({
+        response: response
+    });
+    var status3 = pendingToolCalls.length > 0 ? "requires_action" : serializeStatus({
+        response: response
+    });
     return {
-        id: run.id,
+        id: response.id,
         object: "thread.run",
-        created_at: dayjs14(run.createdAt).unix(),
-        thread_id: run.threadId,
-        assistant_id: run.assistantId,
-        status: run.status.toLowerCase(),
-        required_action: run.requiredAction,
-        last_error: run.lastError,
-        expires_at: dayjs14(run.expiresAt).unix(),
-        started_at: run.startedAt ? dayjs14(run.startedAt).unix() : null,
-        cancelled_at: run.cancelledAt ? dayjs14(run.cancelledAt).unix() : null,
-        failed_at: run.failedAt ? dayjs14(run.failedAt).unix() : null,
-        completed_at: run.completedAt ? dayjs14(run.completedAt).unix() : null,
-        model: run.model,
-        instructions: run.instructions,
-        tools: run.tools,
-        metadata: run.metadata,
-        usage: run.usage,
+        created_at: response.created_at,
+        thread_id: response.conversation.id,
+        assistant_id: assistantId,
+        status: status3,
+        required_action: pendingToolCalls.length > 0 ? {
+            type: "submit_tool_outputs",
+            submit_tool_outputs: {
+                tool_calls: serializeToolCalls({
+                    toolCalls: pendingToolCalls
+                })
+            }
+        } : null,
+        last_error: response.error,
+        expires_at: response.created_at,
+        started_at: response.created_at,
+        cancelled_at: null,
+        failed_at: response.error ? response.created_at : null,
+        completed_at: status3 === "completed" ? response.created_at : null,
+        model: response.model,
+        instructions: "",
+        tools: [],
+        metadata: response.metadata,
+        usage: serializeUsage({
+            response: response
+        }),
         truncation_strategy: {
             type: "auto"
         },
         response_format: {
             type: "text"
         },
-        // TODO
         incomplete_details: null,
         max_completion_tokens: null,
         max_prompt_tokens: null,
@@ -5506,69 +5807,347 @@ var serializeRun2 = function(param) {
         parallel_tool_calls: true
     };
 };
-// src/adapters/storage/responsesStorageAdapter/threads/runs/post.ts
-var serializeTools2 = function(param) {
-    var tools = param.tools;
-    if (!(tools === null || tools === void 0 ? void 0 : tools.length)) return {};
-    return {
-        tools: tools.map(function(tool) {
-            return _object_spread({
-                type: tool.type
-            }, tool[tool.type] || {});
-        })
-    };
-};
-var defaultAssistant = {
-    model: "",
-    instructions: "",
-    additional_instructions: null,
-    truncation_strategy: {
-        type: "auto"
-    },
-    response_format: {
-        type: "text"
+// src/lib/responses/saveResponseItemsToConversationMetadata.ts
+var BUCKET_PREFIX = "responseItemsMap";
+var MAX_BUCKETS = 16;
+var MAX_VALUE_LENGTH = 512;
+function parseBucket(param) {
+    var value = param.value;
+    if (!value || value === "[]") return [];
+    try {
+        var arr = JSON.parse(value);
+        return Array.isArray(arr) ? arr : [];
+    } catch (e) {
+        return [];
     }
-};
-var post17 = function(param) {
-    var openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter;
-    return /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(urlString, options) {
-            var url, _url_pathname_match, threadId, body, assistant_id, stream, _assign9, model, instructions, // additional_instructions,
-            tools, metadata, response_format, truncation_strategy, response, readableStream, data;
-            return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        url = new URL(urlString);
-                        _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(runsRegexp)), 2), threadId = _url_pathname_match[1];
-                        body = JSON.parse(options.body);
-                        assistant_id = body.assistant_id, stream = body.stream;
-                        console.dir({
-                            runsPort: true,
-                            body: body
-                        }, {
-                            depth: null
-                        });
-                        _assign9 = assign9(_object_spread({}, defaultAssistant, openaiAssistant), body), model = _assign9.model, instructions = _assign9.instructions, tools = _assign9.tools, metadata = _assign9.metadata, response_format = _assign9.response_format, truncation_strategy = _assign9.truncation_strategy;
-                        return [
-                            4,
-                            openai.responses.create(_object_spread_props(_object_spread({
-                                conversation: threadId,
-                                instructions: instructions,
-                                model: model,
-                                metadata: metadata,
-                                stream: stream
-                            }, serializeTools2({
-                                tools: tools
-                            })), {
-                                truncation: truncation_strategy.type,
-                                text: {
-                                    format: response_format
-                                },
-                                input: ""
-                            }))
-                        ];
-                    case 1:
-                        response = _state.sent();
+}
+function serializeBucket(param) {
+    var entries = param.entries;
+    return JSON.stringify(entries);
+}
+function bucketKey(param) {
+    var index = param.index;
+    return "".concat(BUCKET_PREFIX).concat(index);
+}
+function listBucketIndices(param) {
+    var metadata = param.metadata;
+    return Object.keys(metadata).map(function(k) {
+        var m = new RegExp("^".concat(BUCKET_PREFIX, "(\\d+)$")).exec(k);
+        return m ? Number(m[1]) : -1;
+    }).filter(function(i) {
+        return i >= 0;
+    }).sort(function(a, b) {
+        return a - b;
+    });
+}
+function parseAllPairs(param) {
+    var metadata = param.metadata;
+    var indices = listBucketIndices({
+        metadata: metadata
+    });
+    var pairs = [];
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = indices[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var idx = _step.value;
+            var key = bucketKey({
+                index: idx
+            });
+            var entries = parseBucket({
+                value: metadata[key]
+            });
+            var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+            try {
+                for(var _iterator1 = entries[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                    var e = _step1.value;
+                    var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = undefined;
+                    try {
+                        for(var _iterator2 = e.itemIds[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true){
+                            var iid = _step2.value;
+                            pairs.push({
+                                responseId: e.responseId,
+                                itemId: iid
+                            });
+                        }
+                    } catch (err) {
+                        _didIteratorError2 = true;
+                        _iteratorError2 = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+                                _iterator2.return();
+                            }
+                        } finally{
+                            if (_didIteratorError2) {
+                                throw _iteratorError2;
+                            }
+                        }
+                    }
+                }
+            } catch (err) {
+                _didIteratorError1 = true;
+                _iteratorError1 = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                        _iterator1.return();
+                    }
+                } finally{
+                    if (_didIteratorError1) {
+                        throw _iteratorError1;
+                    }
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return pairs;
+}
+function tryPackPairs(param) {
+    var baseMetadata = param.baseMetadata, pairs = param.pairs;
+    var newBuckets = [];
+    var currentEntries = [];
+    var flush = function() {
+        newBuckets.push(serializeBucket({
+            entries: currentEntries
+        }));
+        currentEntries = [];
+    };
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = pairs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _step.value, responseId2 = _step_value.responseId, itemId = _step_value.itemId;
+            var next = currentEntries.map(function(e) {
+                return {
+                    responseId: e.responseId,
+                    itemIds: _to_consumable_array(e.itemIds)
+                };
+            });
+            var last5 = next[next.length - 1];
+            if (last5 && last5.responseId === responseId2) {
+                last5.itemIds.push(itemId);
+            } else {
+                next.push({
+                    responseId: responseId2,
+                    itemIds: [
+                        itemId
+                    ]
+                });
+            }
+            var candidate = serializeBucket({
+                entries: next
+            });
+            if (candidate.length <= MAX_VALUE_LENGTH) {
+                currentEntries = next;
+                continue;
+            }
+            flush();
+            if (newBuckets.length >= MAX_BUCKETS) {
+                return {
+                    success: false,
+                    newMetadata: baseMetadata
+                };
+            }
+            currentEntries = [
+                {
+                    responseId: responseId2,
+                    itemIds: [
+                        itemId
+                    ]
+                }
+            ];
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    if (currentEntries.length > 0) flush();
+    var result = {};
+    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+    try {
+        for(var _iterator1 = Object.entries(baseMetadata)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+            var _step_value1 = _sliced_to_array(_step1.value, 2), k = _step_value1[0], v = _step_value1[1];
+            if (!k.startsWith(BUCKET_PREFIX)) result[k] = v;
+        }
+    } catch (err) {
+        _didIteratorError1 = true;
+        _iteratorError1 = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                _iterator1.return();
+            }
+        } finally{
+            if (_didIteratorError1) {
+                throw _iteratorError1;
+            }
+        }
+    }
+    newBuckets.forEach(function(val, i) {
+        if (val && val !== "[]") result[bucketKey({
+            index: i
+        })] = val;
+    });
+    return {
+        success: true,
+        newMetadata: result
+    };
+}
+function appendItemIdsToConversationMetadata(param) {
+    var metadata = param.metadata, responseId2 = param.responseId, itemIds = param.itemIds;
+    var base = _object_spread({}, metadata || {});
+    var existing = parseAllPairs({
+        metadata: base
+    });
+    var nextPairs = existing.concat(itemIds.map(function(id) {
+        return {
+            responseId: responseId2,
+            itemId: id
+        };
+    }));
+    var working = nextPairs;
+    while(true){
+        var _tryPackPairs = tryPackPairs({
+            baseMetadata: base,
+            pairs: working
+        }), success = _tryPackPairs.success, newMetadata = _tryPackPairs.newMetadata;
+        if (success) return newMetadata;
+        if (working.length === 0) {
+            throw new Error("responseItemsMap: cannot pack even a single item into 16 buckets");
+        }
+        working = working.slice(1);
+    }
+}
+function saveResponseItemsToConversationMetadata(_) {
+    return _saveResponseItemsToConversationMetadata.apply(this, arguments);
+}
+function _saveResponseItemsToConversationMetadata() {
+    _saveResponseItemsToConversationMetadata = _async_to_generator(function(param) {
+        var client, threadId, responseId2, itemIds, conversation, updated;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    client = param.client, threadId = param.threadId, responseId2 = param.responseId, itemIds = param.itemIds;
+                    return [
+                        4,
+                        client.conversations.retrieve(threadId)
+                    ];
+                case 1:
+                    conversation = _state.sent();
+                    updated = appendItemIdsToConversationMetadata({
+                        metadata: conversation.metadata,
+                        responseId: responseId2,
+                        itemIds: itemIds
+                    });
+                    return [
+                        4,
+                        client.conversations.update(threadId, {
+                            metadata: updated
+                        })
+                    ];
+                case 2:
+                    _state.sent();
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return _saveResponseItemsToConversationMetadata.apply(this, arguments);
+}
+// src/adapters/storage/responsesStorageAdapter/threads/runs/post.ts
+var serializeTools2 = function(param) {
+    var tools = param.tools;
+    if (!(tools === null || tools === void 0 ? void 0 : tools.length)) return {};
+    return {
+        tools: tools.map(function(tool) {
+            return _object_spread({
+                type: tool.type
+            }, tool[tool.type] || {});
+        })
+    };
+};
+var defaultAssistant = {
+    model: "",
+    instructions: "",
+    additional_instructions: null,
+    truncation_strategy: {
+        type: "auto"
+    },
+    response_format: {
+        type: "text"
+    }
+};
+var post17 = function(param) {
+    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, _assign8, model, instructions, // additional_instructions,
+            tools, metadata, response_format, truncation_strategy, _tmp, response, readableStream, _response_output, itemIds, data;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        url = new URL(urlString);
+                        _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(runsRegexp)), 2), threadId = _url_pathname_match[1];
+                        body = JSON.parse(options.body);
+                        assistant_id = body.assistant_id, stream = body.stream;
+                        _tmp = [
+                            {},
+                            defaultAssistant
+                        ];
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 1:
+                        _assign8 = assign8.apply(void 0, [
+                            _object_spread.apply(void 0, _tmp.concat([
+                                _state.sent()
+                            ])),
+                            body
+                        ]), model = _assign8.model, instructions = _assign8.instructions, tools = _assign8.tools, metadata = _assign8.metadata, response_format = _assign8.response_format, truncation_strategy = _assign8.truncation_strategy;
+                        return [
+                            4,
+                            client.responses.create(_object_spread_props(_object_spread({
+                                conversation: threadId,
+                                instructions: instructions,
+                                model: model,
+                                metadata: metadata,
+                                stream: stream
+                            }, serializeTools2({
+                                tools: tools
+                            })), {
+                                truncation: truncation_strategy.type,
+                                text: {
+                                    format: response_format
+                                },
+                                input: createResponseItems
+                            }))
+                        ];
+                    case 2:
+                        response = _state.sent();
                         readableStream = new ReadableStream({
                             start: function start(controller) {
                                 return _async_to_generator(function() {
@@ -5584,7 +6163,8 @@ var post17 = function(param) {
                                                 ]);
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
+                                                        threadId: threadId,
                                                         response: response,
                                                         onEvent: /*#__PURE__*/ function() {
                                                             var _ref = _async_to_generator(function(event) {
@@ -5613,8 +6193,8 @@ var post17 = function(param) {
                                                 event = {
                                                     event: "thread.run.failed",
                                                     data: {
-                                                        id: uid4(24),
-                                                        failed_at: dayjs15().unix(),
+                                                        id: uid5(24),
+                                                        failed_at: dayjs11().unix(),
                                                         last_error: {
                                                             code: "server_error",
                                                             message: "".concat((_error_message = error === null || error === void 0 ? void 0 : error.message) !== null && _error_message !== void 0 ? _error_message : "", " ").concat((_error_cause_message = error === null || error === void 0 ? void 0 : (_error_cause = error.cause) === null || _error_cause === void 0 ? void 0 : _error_cause.message) !== null && _error_cause_message !== void 0 ? _error_cause_message : "")
@@ -5636,29 +6216,55 @@ var post17 = function(param) {
                                 })();
                             }
                         });
-                        if (stream) {
-                            return [
-                                2,
-                                new Response(readableStream, {
-                                    headers: {
-                                        "Content-Type": "text/event-stream"
-                                    }
-                                })
-                            ];
-                        } else {
-                            data = serializeRun2({
-                                response: response
-                            });
-                            return [
-                                2,
-                                new Response(JSON.stringify(data), {
-                                    status: 200,
-                                    headers: {
-                                        "Content-Type": "application/json"
-                                    }
-                                })
-                            ];
-                        }
+                        if (!stream) return [
+                            3,
+                            3
+                        ];
+                        return [
+                            2,
+                            new Response(readableStream, {
+                                headers: {
+                                    "Content-Type": "text/event-stream"
+                                }
+                            })
+                        ];
+                    case 3:
+                        itemIds = ((_response_output = response.output) !== null && _response_output !== void 0 ? _response_output : []).filter(function(o) {
+                            return o.id;
+                        }).map(function(o) {
+                            return o.id;
+                        });
+                        if (!(itemIds.length > 0)) return [
+                            3,
+                            5
+                        ];
+                        return [
+                            4,
+                            saveResponseItemsToConversationMetadata({
+                                client: client,
+                                threadId: threadId,
+                                responseId: response.id,
+                                itemIds: itemIds
+                            })
+                        ];
+                    case 4:
+                        _state.sent();
+                        _state.label = 5;
+                    case 5:
+                        data = serializeResponseAsRun({
+                            response: response,
+                            assistantId: assistant_id
+                        });
+                        return [
+                            2,
+                            new Response(JSON.stringify(data), {
+                                status: 200,
+                                headers: {
+                                    "Content-Type": "application/json"
+                                }
+                            })
+                        ];
+                    case 6:
                         return [
                             2
                         ];
@@ -5672,28 +6278,55 @@ 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;
+    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
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/run/get.ts
 var get16 = function(param) {
-    var openai = param.openai;
+    var client = param.client, runAdapter = param.runAdapter;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var url, _url_pathname_match, threadId, runId;
+            var url, _url_pathname_match, _threadId, runId, response, data, _tmp;
             return _ts_generator(this, function(_state) {
-                url = new URL(urlString);
-                _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(runRegexp)), 3), threadId = _url_pathname_match[1], runId = _url_pathname_match[2];
-                throw new Error("Not implemented");
+                switch(_state.label){
+                    case 0:
+                        url = new URL(urlString);
+                        _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,
+                            client.responses.retrieve(runId)
+                        ];
+                    case 1:
+                        response = _state.sent();
+                        _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), {
+                                status: 200,
+                                headers: {
+                                    "Content-Type": "application/json",
+                                    "openai-poll-after-ms": "5000"
+                                }
+                            })
+                        ];
+                }
             });
         });
         return function(urlString) {
@@ -5702,49 +6335,330 @@ var get16 = function(param) {
     }();
 };
 // src/adapters/storage/responsesStorageAdapter/threads/run/index.ts
-var run3 = function(param) {
-    var openai = param.openai, runAdapter = param.runAdapter;
+var run2 = function(param) {
+    var client = param.client, runAdapter = param.runAdapter;
     return {
         get: get16({
-            openai: openai
+            client: client,
+            runAdapter: runAdapter
         })
     };
 };
+function pMap(iterable, mapper) {
+    return _pMap.apply(this, arguments);
+}
+function _pMap() {
+    _pMap = // ../../node_modules/p-map/index.js
+    _async_to_generator(function(iterable, mapper) {
+        var _ref, _ref_concurrency, concurrency, _ref_stopOnError, stopOnError, signal;
+        var _arguments = arguments;
+        return _ts_generator(this, function(_state) {
+            _ref = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {}, _ref_concurrency = _ref.concurrency, concurrency = _ref_concurrency === void 0 ? Number.POSITIVE_INFINITY : _ref_concurrency, _ref_stopOnError = _ref.stopOnError, stopOnError = _ref_stopOnError === void 0 ? true : _ref_stopOnError, signal = _ref.signal;
+            return [
+                2,
+                new Promise(function(resolve_, reject_) {
+                    if (iterable[Symbol.iterator] === void 0 && iterable[Symbol.asyncIterator] === void 0) {
+                        throw new TypeError("Expected `input` to be either an `Iterable` or `AsyncIterable`, got (".concat(typeof iterable === "undefined" ? "undefined" : _type_of(iterable), ")"));
+                    }
+                    if (typeof mapper !== "function") {
+                        throw new TypeError("Mapper function is required");
+                    }
+                    if (!(Number.isSafeInteger(concurrency) && concurrency >= 1 || concurrency === Number.POSITIVE_INFINITY)) {
+                        throw new TypeError("Expected `concurrency` to be an integer from 1 and up or `Infinity`, got `".concat(concurrency, "` (").concat(typeof concurrency === "undefined" ? "undefined" : _type_of(concurrency), ")"));
+                    }
+                    var result = [];
+                    var errors = [];
+                    var skippedIndexesMap = /* @__PURE__ */ new Map();
+                    var isRejected = false;
+                    var isResolved = false;
+                    var isIterableDone = false;
+                    var resolvingCount = 0;
+                    var currentIndex = 0;
+                    var iterator = iterable[Symbol.iterator] === void 0 ? iterable[Symbol.asyncIterator]() : iterable[Symbol.iterator]();
+                    var signalListener = function() {
+                        reject(signal.reason);
+                    };
+                    var cleanup = function() {
+                        signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", signalListener);
+                    };
+                    var resolve = function(value) {
+                        resolve_(value);
+                        cleanup();
+                    };
+                    var reject = function(reason) {
+                        isRejected = true;
+                        isResolved = true;
+                        reject_(reason);
+                        cleanup();
+                    };
+                    if (signal) {
+                        if (signal.aborted) {
+                            reject(signal.reason);
+                        }
+                        signal.addEventListener("abort", signalListener, {
+                            once: true
+                        });
+                    }
+                    var next = /*#__PURE__*/ function() {
+                        var _ref = _async_to_generator(function() {
+                            var nextItem, index, pureResult, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, index2, value;
+                            return _ts_generator(this, function(_state) {
+                                switch(_state.label){
+                                    case 0:
+                                        if (isResolved) {
+                                            return [
+                                                2
+                                            ];
+                                        }
+                                        return [
+                                            4,
+                                            iterator.next()
+                                        ];
+                                    case 1:
+                                        nextItem = _state.sent();
+                                        index = currentIndex;
+                                        currentIndex++;
+                                        if (nextItem.done) {
+                                            isIterableDone = true;
+                                            if (resolvingCount === 0 && !isResolved) {
+                                                if (!stopOnError && errors.length > 0) {
+                                                    reject(new AggregateError(errors));
+                                                    return [
+                                                        2
+                                                    ];
+                                                }
+                                                isResolved = true;
+                                                if (skippedIndexesMap.size === 0) {
+                                                    resolve(result);
+                                                    return [
+                                                        2
+                                                    ];
+                                                }
+                                                pureResult = [];
+                                                _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                                try {
+                                                    for(_iterator = result.entries()[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                                                        _step_value = _sliced_to_array(_step.value, 2), index2 = _step_value[0], value = _step_value[1];
+                                                        if (skippedIndexesMap.get(index2) === pMapSkip) {
+                                                            continue;
+                                                        }
+                                                        pureResult.push(value);
+                                                    }
+                                                } catch (err) {
+                                                    _didIteratorError = true;
+                                                    _iteratorError = err;
+                                                } finally{
+                                                    try {
+                                                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                                            _iterator.return();
+                                                        }
+                                                    } finally{
+                                                        if (_didIteratorError) {
+                                                            throw _iteratorError;
+                                                        }
+                                                    }
+                                                }
+                                                resolve(pureResult);
+                                            }
+                                            return [
+                                                2
+                                            ];
+                                        }
+                                        resolvingCount++;
+                                        _async_to_generator(function() {
+                                            var element, value, error, error2;
+                                            return _ts_generator(this, function(_state) {
+                                                switch(_state.label){
+                                                    case 0:
+                                                        _state.trys.push([
+                                                            0,
+                                                            4,
+                                                            ,
+                                                            10
+                                                        ]);
+                                                        return [
+                                                            4,
+                                                            nextItem.value
+                                                        ];
+                                                    case 1:
+                                                        element = _state.sent();
+                                                        if (isResolved) {
+                                                            return [
+                                                                2
+                                                            ];
+                                                        }
+                                                        return [
+                                                            4,
+                                                            mapper(element, index)
+                                                        ];
+                                                    case 2:
+                                                        value = _state.sent();
+                                                        if (value === pMapSkip) {
+                                                            skippedIndexesMap.set(index, value);
+                                                        }
+                                                        result[index] = value;
+                                                        resolvingCount--;
+                                                        return [
+                                                            4,
+                                                            next()
+                                                        ];
+                                                    case 3:
+                                                        _state.sent();
+                                                        return [
+                                                            3,
+                                                            10
+                                                        ];
+                                                    case 4:
+                                                        error = _state.sent();
+                                                        if (!stopOnError) return [
+                                                            3,
+                                                            5
+                                                        ];
+                                                        reject(error);
+                                                        return [
+                                                            3,
+                                                            9
+                                                        ];
+                                                    case 5:
+                                                        errors.push(error);
+                                                        resolvingCount--;
+                                                        _state.label = 6;
+                                                    case 6:
+                                                        _state.trys.push([
+                                                            6,
+                                                            8,
+                                                            ,
+                                                            9
+                                                        ]);
+                                                        return [
+                                                            4,
+                                                            next()
+                                                        ];
+                                                    case 7:
+                                                        _state.sent();
+                                                        return [
+                                                            3,
+                                                            9
+                                                        ];
+                                                    case 8:
+                                                        error2 = _state.sent();
+                                                        reject(error2);
+                                                        return [
+                                                            3,
+                                                            9
+                                                        ];
+                                                    case 9:
+                                                        return [
+                                                            3,
+                                                            10
+                                                        ];
+                                                    case 10:
+                                                        return [
+                                                            2
+                                                        ];
+                                                }
+                                            });
+                                        })();
+                                        return [
+                                            2
+                                        ];
+                                }
+                            });
+                        });
+                        return function next() {
+                            return _ref.apply(this, arguments);
+                        };
+                    }();
+                    _async_to_generator(function() {
+                        var index, error;
+                        return _ts_generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    index = 0;
+                                    _state.label = 1;
+                                case 1:
+                                    if (!(index < concurrency)) return [
+                                        3,
+                                        7
+                                    ];
+                                    _state.label = 2;
+                                case 2:
+                                    _state.trys.push([
+                                        2,
+                                        4,
+                                        ,
+                                        5
+                                    ]);
+                                    return [
+                                        4,
+                                        next()
+                                    ];
+                                case 3:
+                                    _state.sent();
+                                    return [
+                                        3,
+                                        5
+                                    ];
+                                case 4:
+                                    error = _state.sent();
+                                    reject(error);
+                                    return [
+                                        3,
+                                        7
+                                    ];
+                                case 5:
+                                    if (isIterableDone || isRejected) {
+                                        return [
+                                            3,
+                                            7
+                                        ];
+                                    }
+                                    _state.label = 6;
+                                case 6:
+                                    index++;
+                                    return [
+                                        3,
+                                        1
+                                    ];
+                                case 7:
+                                    return [
+                                        2
+                                    ];
+                            }
+                        });
+                    })();
+                })
+            ];
+        });
+    });
+    return _pMap.apply(this, arguments);
+}
+var pMapSkip = Symbol("skip");
 // src/adapters/storage/responsesStorageAdapter/threads/runs/steps/get.ts
-import { assign as assign10, last as last5 } from "radash";
-// src/adapters/storage/responsesStorageAdapter/threads/runs/steps/serializeRunStep.ts
-import dayjs16 from "dayjs";
-import { uid as uid5 } from "radash";
-var isConvMessage = function(i) {
-    return "type" in i && i.type === "message";
-};
-var isConvFn = function(i) {
-    return "type" in i && i.type === "function_call";
-};
-function serializeRunStep2(param) {
-    var item = param.item, threadId = param.threadId;
-    var now = dayjs16().unix();
-    var assistantId = "asst_".concat(uid5(24));
-    var runId = "run_".concat(uid5(24));
-    var itemId = typeof item.id === "string" ? item.id : "item_".concat(uid5(18));
+import { last as last4 } from "radash";
+// src/lib/items/serializeItemAsRunStep.ts
+import dayjs12 from "dayjs";
+import { uid as uid6 } from "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(uid6(24)) : _param_runId, tmp = param.status, status3 = tmp === void 0 ? "completed" : tmp, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? dayjs12().unix() : _param_completedAt;
+    var itemId = typeof item.id === "string" ? item.id : "item_".concat(uid6(18));
     var base = {
         id: itemId,
-        // <- always string
         object: "thread.run.step",
-        created_at: now,
-        assistant_id: assistantId,
+        created_at: dayjs12().unix(),
+        assistant_id: openaiAssistant.id,
         thread_id: threadId,
         run_id: runId,
-        status: "completed",
+        status: status3,
         last_error: null,
         expired_at: null,
         cancelled_at: null,
         failed_at: null,
-        completed_at: now,
+        completed_at: completedAt,
         metadata: {},
         usage: null
     };
-    if (isConvMessage(item)) {
+    if (item.type === "message") {
         return _object_spread_props(_object_spread({}, base), {
             type: "message_creation",
             step_details: {
@@ -5760,16 +6674,17 @@ function serializeRunStep2(param) {
             } : {}
         });
     }
-    if (isConvFn(item)) {
-        var fn = item;
+    if (item.type === "function_call") {
+        var functionCallOutput = items.find(function(i) {
+            return i.type === "function_call_output" && i.call_id === item.call_id;
+        });
         var toolCall = {
-            // prefer itemId; if your client also exposes a separate call_id, you could fall back to it
-            id: itemId,
+            id: item.call_id,
             type: "function",
             function: {
-                name: fn.name,
-                arguments: fn.arguments,
-                output: null
+                name: item.name,
+                arguments: item.arguments,
+                output: functionCallOutput ? functionCallOutput.output : null
             }
         };
         return _object_spread_props(_object_spread({}, base), {
@@ -5789,44 +6704,108 @@ function serializeRunStep2(param) {
             message_creation: {
                 message_id: itemId
             }
+        },
+        metadata: {
+            item: JSON.stringify(item)
         }
     });
 }
 // src/adapters/storage/responsesStorageAdapter/threads/runs/steps/get.ts
 var get17 = function(param) {
-    var openai = param.openai;
+    var client = param.client, runAdapter = param.runAdapter;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var _last5, url, _url_pathname_match, threadId, runId, _assign10, limit, order, after, items, _last5_id;
+            var _last4, url, _url_pathname_match, threadId, runId, response, functionCalls, functionCallOutputsResponses, functionCallOutputs, openaiAssistant, data, _last4_id;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(stepsRegexp)), 3), threadId = _url_pathname_match[1], runId = _url_pathname_match[2];
-                        _assign10 = assign10({
-                            limit: "20",
-                            order: "desc"
-                        }, Object.fromEntries(url.searchParams)), limit = _assign10.limit, order = _assign10.order, after = _assign10.after;
                         return [
                             4,
-                            openai.conversations.items.list(threadId, {
-                                limit: parseInt(limit),
-                                after: after,
-                                order: order
-                            })
+                            client.responses.retrieve(runId)
+                        ];
+                    case 1:
+                        response = _state.sent();
+                        functionCalls = response.output.filter(function(item) {
+                            return item.type === "function_call";
+                        });
+                        return [
+                            4,
+                            pMap(functionCalls, /*#__PURE__*/ function() {
+                                var _ref = _async_to_generator(function(functionCall) {
+                                    var items;
+                                    return _ts_generator(this, function(_state) {
+                                        switch(_state.label){
+                                            case 0:
+                                                return [
+                                                    4,
+                                                    client.conversations.items.list(threadId, {
+                                                        after: functionCall.id,
+                                                        order: "asc"
+                                                    })
+                                                ];
+                                            case 1:
+                                                items = _state.sent();
+                                                return [
+                                                    2,
+                                                    items.data.find(function(item) {
+                                                        return item.type === "function_call_output" && item.call_id === functionCall.call_id;
+                                                    })
+                                                ];
+                                        }
+                                    });
+                                });
+                                return function(functionCall) {
+                                    return _ref.apply(this, arguments);
+                                };
+                            }())
+                        ];
+                    case 2:
+                        functionCallOutputsResponses = _state.sent();
+                        functionCallOutputs = functionCallOutputsResponses.filter(Boolean);
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
                         ];
-                    case 1:
-                        items = _state.sent();
+                    case 3:
+                        openaiAssistant = _state.sent();
+                        data = response.output.flatMap(function(item) {
+                            var step = serializeItemAsRunStep({
+                                item: item,
+                                items: functionCallOutputs,
+                                threadId: threadId,
+                                openaiAssistant: openaiAssistant,
+                                runId: response.id
+                            });
+                            if (item.type === "function_call") {
+                                var synthCreation = {
+                                    id: "mc".concat(item.id),
+                                    run_id: response.id,
+                                    status: "completed",
+                                    completed_at: step.created_at,
+                                    step_details: {
+                                        type: "message_creation",
+                                        message_creation: {
+                                            message_id: item.id
+                                        }
+                                    }
+                                };
+                                return [
+                                    synthCreation,
+                                    step
+                                ];
+                            }
+                            return [
+                                step
+                            ];
+                        });
                         return [
                             2,
                             new Response(JSON.stringify({
-                                data: items.data.map(function(item) {
-                                    return serializeRunStep2({
-                                        item: item
-                                    });
-                                }),
-                                has_more: items.has_more,
-                                last_id: (_last5_id = (_last5 = last5(items.data)) === null || _last5 === void 0 ? void 0 : _last5.id) !== null && _last5_id !== void 0 ? _last5_id : null
+                                data: data,
+                                has_more: false,
+                                last_id: (_last4_id = (_last4 = last4(response.output)) === null || _last4 === void 0 ? void 0 : _last4.id) !== null && _last4_id !== void 0 ? _last4_id : null
                             }), {
                                 status: 200,
                                 headers: {
@@ -5844,10 +6823,11 @@ var get17 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/steps/index.ts
 var steps2 = function(param) {
-    var openai = param.openai;
+    var client = param.client, runAdapter = param.runAdapter;
     return {
         get: get17({
-            openai: openai
+            client: client,
+            runAdapter: runAdapter
         })
     };
 };
@@ -5863,7 +6843,7 @@ var serializeTools3 = function(param) {
         })
     };
 };
-var serializeInput = function(param) {
+var getFunctionCallOutputItems = function(param) {
     var tool_outputs = param.tool_outputs;
     return tool_outputs.map(function(toolOutput) {
         return {
@@ -5874,10 +6854,10 @@ var serializeInput = 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, 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:
@@ -5885,18 +6865,26 @@ var post18 = function(param) {
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(submitToolOutputsRegexp)), 3), threadId = _url_pathname_match[1], runId = _url_pathname_match[2];
                         body = JSON.parse(options.body);
                         tool_outputs = body.tool_outputs, stream = body.stream;
-                        console.dir({
-                            body: body
-                        }, {
-                            depth: null
+                        functionCallOutputItems = getFunctionCallOutputItems({
+                            tool_outputs: tool_outputs
                         });
                         return [
                             4,
-                            openai.responses.create(_object_spread({
+                            client.responses.retrieve(runId)
+                        ];
+                    case 1:
+                        previousResponse = _state.sent();
+                        return [
+                            4,
+                            runAdapter.getOpenaiAssistant()
+                        ];
+                    case 2:
+                        openaiAssistant = _state.sent();
+                        return [
+                            4,
+                            client.responses.create(_object_spread({
                                 conversation: threadId,
-                                input: serializeInput({
-                                    tool_outputs: tool_outputs
-                                }),
+                                input: functionCallOutputItems,
                                 instructions: openaiAssistant.instructions,
                                 model: openaiAssistant.model,
                                 // metadata,
@@ -5905,7 +6893,7 @@ var post18 = function(param) {
                                 tools: openaiAssistant.tools
                             })))
                         ];
-                    case 1:
+                    case 3:
                         response = _state.sent();
                         readableStream = new ReadableStream({
                             start: function start(controller) {
@@ -5913,11 +6901,29 @@ var post18 = function(param) {
                                     return _ts_generator(this, function(_state) {
                                         switch(_state.label){
                                             case 0:
+                                                functionCallOutputItems.forEach(function(item) {
+                                                    var functionCallItem = previousResponse.output.find(function(i) {
+                                                        return i.type === "function_call" && i.call_id === item.call_id;
+                                                    });
+                                                    if (!functionCallItem) {
+                                                        return;
+                                                    }
+                                                    controller.enqueue("data: ".concat(JSON.stringify({
+                                                        event: "thread.run.step.completed",
+                                                        data: serializeItemAsRunStep({
+                                                            item: functionCallItem,
+                                                            items: functionCallOutputItems,
+                                                            threadId: threadId,
+                                                            openaiAssistant: openaiAssistant,
+                                                            runId: runId
+                                                        })
+                                                    }), "\n\n"));
+                                                });
                                                 return [
                                                     4,
-                                                    runAdapter({
+                                                    runAdapter.handleRun({
+                                                        threadId: threadId,
                                                         response: response,
-                                                        // run: serializeRun({ run }),
                                                         onEvent: /*#__PURE__*/ function() {
                                                             var _ref = _async_to_generator(function(event) {
                                                                 return _ts_generator(this, function(_state) {
@@ -5962,387 +6968,220 @@ 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/post.ts
-var post19 = function(param) {
-    var openai = param.openai;
+// src/adapters/storage/responsesStorageAdapter/assistants/get.ts
+var get18 = function(param) {
+    var runAdapter = param.runAdapter;
     return /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(_url, options) {
-            var body, model, instructions;
+        var _ref = _async_to_generator(function(urlString) {
+            var _, _1, _tmp;
             return _ts_generator(this, function(_state) {
-                body = JSON.parse(options.body);
-                model = body.model, instructions = body.instructions;
-                throw new Error("Not implemented");
+                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(_url, options) {
+        return function(urlString) {
             return _ref.apply(this, arguments);
         };
     }();
 };
+// src/adapters/storage/responsesStorageAdapter/assistants/post.ts
+var post19 = function() {
+    return /*#__PURE__*/ _async_to_generator(function() {
+        return _ts_generator(this, function(_state) {
+            return [
+                2,
+                new Response(JSON.stringify({
+                    error: {
+                        message: "Assistant creation is not implemented for the Responses storage adapter.",
+                        type: "not_implemented"
+                    }
+                }), {
+                    status: 501,
+                    headers: {
+                        "Content-Type": "application/json"
+                    }
+                })
+            ];
+        });
+    });
+};
 // src/adapters/storage/responsesStorageAdapter/assistants/index.ts
 var assistants2 = function(param) {
-    var openai = param.openai;
+    var runAdapter = param.runAdapter;
     return {
-        post: post19({
-            openai: openai
-        })
+        get: get18({
+            runAdapter: runAdapter
+        }),
+        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
+                "^/(?:v1|/?openai)/assistants$": assistants2({
+                    runAdapter: runAdapter
                 }),
                 "^/(?:v1|/?openai)/threads$": threads2({
-                    openai: openai
+                    client: client
                 })
             }, _define_property(_obj, messagesRegexp, messages3({
-                openai: openai
+                client: client,
+                runAdapter: runAdapter,
+                createResponseItems: createResponseItems
             })), _define_property(_obj, runsRegexp, runs2({
-                openai: openai,
-                openaiAssistant: openaiAssistant,
-                runAdapter: runAdapter
-            })), _define_property(_obj, runRegexp, run3({
-                openai: openai,
+                client: client,
+                runAdapter: runAdapter,
+                createResponseItems: createResponseItems
+            })), _define_property(_obj, runRegexp, run2({
+                client: client,
                 runAdapter: runAdapter
             })), _define_property(_obj, stepsRegexp, steps2({
-                openai: openai
+                client: client,
+                runAdapter: runAdapter
             })), _define_property(_obj, submitToolOutputsRegexp, submitToolOutputs2({
-                openai: openai,
-                openaiAssistant: openaiAssistant,
+                client: client,
                 runAdapter: runAdapter
             })), _obj)
         };
     };
 };
 // src/adapters/run/responsesRunAdapter/index.ts
-import dayjs17 from "dayjs";
-import { uid as uid6 } from "radash";
-var responsesRunAdapter = function() {
-    return /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(param) {
-            var response, onEvent2, now, runId, threadId, asstId, model, msg, itemToCallId, callsById, callOrder, toolCallsStepId, sawToolCalls, ensureToolCallsStep, emitTextDelta, getOrCreateToolCall, emitToolArgsDelta, completeToolCallsStep, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, evt, _evt_response, t, finalCalls, _evt_error, _evt_error1, delta, finalText, item, itemId, callId, name, itemId1, argsDelta, maybeName, callId1, fallbackCallId, effectiveCallId, tc, err, e;
+import dayjs13 from "dayjs";
+import { uid as uid7 } from "radash";
+var serializeToolCalls2 = function(param) {
+    var toolCalls = param.toolCalls;
+    return toolCalls.map(function(toolCall) {
+        return {
+            id: toolCall.call_id,
+            type: "function",
+            function: {
+                name: toolCall.name,
+                arguments: toolCall.arguments
+            }
+        };
+    });
+};
+var responsesRunAdapter = function(param) {
+    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:
-                        response = param.response, onEvent2 = param.onEvent;
-                        now = dayjs17().unix();
-                        runId = "run_".concat(uid6(18));
-                        threadId = "thread_".concat(uid6(18));
-                        asstId = "asst_".concat(uid6(18));
-                        model = "unknown";
-                        msg = {
-                            id: "msg_".concat(uid6(18)),
-                            object: "thread.message",
-                            role: "assistant",
-                            thread_id: threadId,
-                            run_id: runId,
-                            assistant_id: asstId,
-                            created_at: now,
-                            status: "in_progress",
-                            content: [
-                                {
-                                    type: "text",
-                                    text: {
-                                        value: "",
-                                        annotations: []
-                                    }
-                                }
-                            ]
-                        };
-                        itemToCallId = /* @__PURE__ */ new Map();
-                        callsById = /* @__PURE__ */ new Map();
-                        callOrder = [];
-                        toolCallsStepId = null;
-                        sawToolCalls = false;
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.created",
-                                data: {
-                                    id: runId,
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: asstId,
-                                    created_at: now,
-                                    status: "queued",
-                                    model: model
-                                }
-                            })
+                        if (cachedOpenaiAssistant) return [
+                            2,
+                            cachedOpenaiAssistant
                         ];
-                    case 1:
-                        _state.sent();
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.in_progress",
-                                data: {
-                                    id: runId,
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: asstId,
-                                    created_at: now,
-                                    status: "in_progress",
-                                    model: model
-                                }
-                            })
+                            getDirectOpenaiAssistant()
                         ];
-                    case 2:
-                        _state.sent();
+                    case 1:
+                        cachedOpenaiAssistant = _state.sent();
                         return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.created",
-                                data: msg
-                            })
+                            2,
+                            cachedOpenaiAssistant
                         ];
-                    case 3:
-                        _state.sent();
-                        ensureToolCallsStep = /*#__PURE__*/ function() {
-                            var _ref = _async_to_generator(function() {
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            if (toolCallsStepId) return [
-                                                2
-                                            ];
-                                            toolCallsStepId = "step_".concat(uid6(18));
-                                            return [
-                                                4,
-                                                onEvent2({
-                                                    event: "thread.run.step.created",
-                                                    data: {
-                                                        id: toolCallsStepId,
-                                                        object: "thread.run.step",
-                                                        run_id: runId,
-                                                        assistant_id: asstId,
-                                                        thread_id: threadId,
-                                                        type: "tool_calls",
-                                                        status: "in_progress",
-                                                        created_at: dayjs17().unix(),
-                                                        completed_at: null,
-                                                        step_details: {
-                                                            type: "tool_calls",
-                                                            tool_calls: []
-                                                        }
-                                                    }
-                                                })
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            });
-                            return function ensureToolCallsStep() {
-                                return _ref.apply(this, arguments);
-                            };
-                        }();
-                        emitTextDelta = /*#__PURE__*/ function() {
-                            var _ref = _async_to_generator(function(chunk) {
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            if (!chunk) return [
-                                                2
-                                            ];
-                                            return [
-                                                4,
-                                                onEvent2({
-                                                    event: "thread.message.delta",
-                                                    data: {
-                                                        id: msg.id,
-                                                        delta: {
-                                                            content: [
-                                                                {
-                                                                    type: "text",
-                                                                    index: 0,
-                                                                    text: {
-                                                                        value: chunk
-                                                                    }
-                                                                }
-                                                            ]
-                                                        }
-                                                    }
-                                                })
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            msg.content[0].text.value += chunk;
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            });
-                            return function emitTextDelta(chunk) {
-                                return _ref.apply(this, arguments);
-                            };
-                        }();
-                        getOrCreateToolCall = function(callId, name) {
-                            var tc = callsById.get(callId);
-                            if (!tc) {
-                                tc = {
-                                    id: callId,
-                                    type: "function",
-                                    function: {
-                                        name: name || "unknown_function",
-                                        arguments: ""
-                                    }
-                                };
-                                callsById.set(callId, tc);
-                                callOrder.push(callId);
-                            } else if (name && tc.function.name === "unknown_function") {
-                                tc.function.name = name;
-                            }
-                            return tc;
-                        };
-                        emitToolArgsDelta = /*#__PURE__*/ function() {
-                            var _ref = _async_to_generator(function(callId, name, argsDelta) {
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            if (!toolCallsStepId) return [
-                                                2
-                                            ];
-                                            return [
-                                                4,
-                                                onEvent2({
-                                                    event: "thread.run.step.delta",
-                                                    data: {
-                                                        object: "thread.run.step.delta",
-                                                        run_id: runId,
-                                                        id: toolCallsStepId,
-                                                        delta: {
-                                                            step_details: {
-                                                                type: "tool_calls",
-                                                                tool_calls: [
-                                                                    {
-                                                                        id: callId,
-                                                                        // IMPORTANT: stable call_id in deltas too
-                                                                        type: "function",
-                                                                        function: {
-                                                                            name: name,
-                                                                            arguments: argsDelta || ""
-                                                                        }
-                                                                    }
-                                                                ]
-                                                            }
-                                                        }
-                                                    }
-                                                })
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            });
-                            return function emitToolArgsDelta(callId, name, argsDelta) {
-                                return _ref.apply(this, arguments);
-                            };
-                        }();
-                        completeToolCallsStep = /*#__PURE__*/ function() {
-                            var _ref = _async_to_generator(function() {
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            if (!toolCallsStepId) return [
-                                                2
-                                            ];
-                                            return [
-                                                4,
-                                                onEvent2({
-                                                    event: "thread.run.step.completed",
-                                                    data: {
-                                                        id: toolCallsStepId,
-                                                        object: "thread.run.step",
-                                                        run_id: runId,
-                                                        assistant_id: asstId,
-                                                        thread_id: threadId,
-                                                        type: "tool_calls",
-                                                        status: "completed",
-                                                        created_at: now,
-                                                        completed_at: dayjs17().unix(),
-                                                        step_details: {
-                                                            type: "tool_calls",
-                                                            tool_calls: callOrder.map(function(cid) {
-                                                                return callsById.get(cid);
-                                                            })
-                                                        }
-                                                    }
-                                                })
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            });
-                            return function completeToolCallsStep() {
-                                return _ref.apply(this, arguments);
-                            };
-                        }();
-                        _state.label = 4;
-                    case 4:
+                }
+            });
+        });
+        return function getOpenaiAssistant() {
+            return _ref.apply(this, arguments);
+        };
+    }();
+    var handleRun = /*#__PURE__*/ function() {
+        var _ref = _async_to_generator(function(param) {
+            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:
+                        client = param.client, threadId = param.threadId, response = param.response, onEvent2 = param.onEvent;
+                        responseCreatedResponse = null;
+                        toolCalls = {};
+                        itemIds = [];
+                        _state.label = 1;
+                    case 1:
                         _state.trys.push([
-                            4,
-                            41,
-                            ,
-                            43
+                            1,
+                            53,
+                            56,
+                            59
                         ]);
                         _iteratorAbruptCompletion = false, _didIteratorError = false;
-                        _state.label = 5;
-                    case 5:
+                        _state.label = 2;
+                    case 2:
                         _state.trys.push([
-                            5,
-                            34,
-                            35,
-                            40
+                            2,
+                            46,
+                            47,
+                            52
                         ]);
                         _iterator = _async_iterator(response);
-                        _state.label = 6;
-                    case 6:
+                        _state.label = 3;
+                    case 3:
                         return [
                             4,
                             _iterator.next()
                         ];
-                    case 7:
+                    case 4:
                         if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
                             3,
-                            33
+                            45
                         ];
                         _value = _step.value;
-                        evt = _value;
-                        t = evt === null || evt === void 0 ? void 0 : evt.type;
-                        if (evt === null || evt === void 0 ? void 0 : (_evt_response = evt.response) === null || _evt_response === void 0 ? void 0 : _evt_response.model) model = evt.response.model;
-                        switch(t){
+                        event = _value;
+                        _ = event.type;
+                        switch(_){
                             case "response.created":
                                 return [
                                     3,
-                                    8
+                                    5
                                 ];
                             case "response.in_progress":
                                 return [
@@ -6352,363 +7191,573 @@ var responsesRunAdapter = function() {
                             case "response.completed":
                                 return [
                                     3,
-                                    9
-                                ];
-                            case "response.error":
-                                return [
-                                    3,
-                                    16
+                                    11
                                 ];
-                            case "response.output_text.delta":
+                            case "response.failed":
                                 return [
                                     3,
                                     18
                                 ];
-                            case "response.output_text.done":
+                            case "response.output_text.delta":
                                 return [
                                     3,
-                                    20
+                                    21
                                 ];
                             case "response.output_item.added":
                                 return [
                                     3,
                                     23
                                 ];
-                            case "response.output_item.done":
-                                return [
-                                    3,
-                                    26
-                                ];
-                            case "response.function_call_arguments.delta":
+                            case "response.output_item.done":
                                 return [
                                     3,
-                                    27
+                                    32
                                 ];
-                            case "response.function_call_arguments.done":
+                            case "response.function_call_arguments.delta":
                                 return [
                                     3,
-                                    30
+                                    41
                                 ];
                         }
                         return [
                             3,
-                            31
+                            43
                         ];
-                    case 8:
+                    case 5:
+                        responseCreatedResponse = event.response;
+                        _tmp = {
+                            event: "thread.run.created"
+                        };
+                        _tmp1 = {
+                            response: event.response
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 6:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp.data = serializeResponseAsRun.apply(void 0, [
+                                    (_tmp1.assistantId = _state.sent().id, _tmp1)
+                                ]), _tmp)
+                            ])
+                        ];
+                    case 7:
+                        _state.sent();
                         return [
                             3,
-                            32
+                            44
+                        ];
+                    case 8:
+                        _tmp2 = {
+                            event: "thread.run.in_progress"
+                        };
+                        _tmp3 = {
+                            response: event.response
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
                         ];
                     case 9:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.message.completed",
-                                data: _object_spread_props(_object_spread({}, msg), {
-                                    status: "completed"
-                                })
-                            })
+                            onEvent2.apply(void 0, [
+                                (_tmp2.data = serializeResponseAsRun.apply(void 0, [
+                                    (_tmp3.assistantId = _state.sent().id, _tmp3)
+                                ]), _tmp2)
+                            ])
                         ];
                     case 10:
                         _state.sent();
-                        if (!sawToolCalls) return [
+                        return [
+                            3,
+                            44
+                        ];
+                    case 11:
+                        itemIds = event.response.output.filter(function(o) {
+                            return o.id;
+                        }).map(function(o) {
+                            return o.id;
+                        });
+                        toolCalls2 = event.response.output.filter(function(o) {
+                            return o.type === "function_call";
+                        });
+                        if (!(toolCalls2.length > 0)) return [
                             3,
-                            13
+                            14
+                        ];
+                        _tmp4 = {
+                            event: "thread.run.requires_action"
+                        };
+                        _tmp5 = [
+                            {}
                         ];
+                        _tmp6 = {
+                            response: event.response
+                        };
                         return [
                             4,
-                            completeToolCallsStep()
+                            getOpenaiAssistant()
                         ];
-                    case 11:
-                        _state.sent();
-                        finalCalls = callOrder.map(function(cid) {
-                            return callsById.get(cid);
-                        }).filter(Boolean);
+                    case 12:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.requires_action",
-                                data: {
-                                    id: runId,
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: asstId,
-                                    status: "requires_action",
-                                    required_action: {
-                                        type: "submit_tool_outputs",
-                                        submit_tool_outputs: {
-                                            // IMPORTANT: these must be keyed by stable call_id
-                                            tool_calls: finalCalls
+                            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 12:
+                    case 13:
                         _state.sent();
                         return [
                             3,
-                            15
+                            17
                         ];
-                    case 13:
+                    case 14:
+                        _tmp7 = {
+                            event: "thread.run.completed"
+                        };
+                        _tmp8 = {
+                            response: event.response
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.completed",
-                                data: {
-                                    id: runId,
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: asstId,
-                                    status: "completed",
-                                    completed_at: dayjs17().unix()
-                                }
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 14:
-                        _state.sent();
-                        _state.label = 15;
                     case 15:
                         return [
-                            3,
-                            32
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp7.data = serializeResponseAsRun.apply(void 0, [
+                                    (_tmp8.assistantId = _state.sent().id, _tmp8)
+                                ]), _tmp7)
+                            ])
                         ];
                     case 16:
+                        _state.sent();
+                        _state.label = 17;
+                    case 17:
+                        return [
+                            3,
+                            44
+                        ];
+                    case 18:
+                        _tmp9 = {
+                            event: "thread.run.failed"
+                        };
+                        _tmp10 = {
+                            response: event.response
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
+                        ];
+                    case 19:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp9.data = serializeResponseAsRun.apply(void 0, [
+                                    (_tmp10.assistantId = _state.sent().id, _tmp10)
+                                ]), _tmp9)
+                            ])
+                        ];
+                    case 20:
+                        _state.sent();
+                        return [
+                            3,
+                            44
+                        ];
+                    case 21:
                         return [
                             4,
                             onEvent2({
-                                event: "thread.run.failed",
+                                event: "thread.message.delta",
                                 data: {
-                                    id: runId,
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: asstId,
-                                    status: "failed",
-                                    failed_at: dayjs17().unix(),
-                                    last_error: {
-                                        code: (evt === null || evt === void 0 ? void 0 : (_evt_error = evt.error) === null || _evt_error === void 0 ? void 0 : _evt_error.code) || "server_error",
-                                        message: (evt === null || evt === void 0 ? void 0 : (_evt_error1 = evt.error) === null || _evt_error1 === void 0 ? void 0 : _evt_error1.message) || "Unknown error"
+                                    id: event.item_id,
+                                    delta: {
+                                        content: [
+                                            {
+                                                type: "text",
+                                                index: event.output_index - 1,
+                                                text: {
+                                                    value: event.delta
+                                                }
+                                            }
+                                        ]
                                     }
                                 }
                             })
                         ];
-                    case 17:
+                    case 22:
                         _state.sent();
                         return [
                             3,
-                            32
+                            44
                         ];
-                    case 18:
-                        delta = typeof (evt === null || evt === void 0 ? void 0 : evt.delta) === "string" ? evt.delta : "";
+                    case 23:
+                        if (!(event.item.type === "message")) return [
+                            3,
+                            28
+                        ];
+                        _tmp11 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp12 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
                         return [
                             4,
-                            emitTextDelta(delta)
+                            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,
+                            getOpenaiAssistant()
+                        ];
+                    case 26:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp13.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp14.openaiAssistant = _state.sent(), _tmp14.createdAt = dayjs13().unix(), _tmp14.runId = responseCreatedResponse.id, _tmp14.status = "in_progress", _tmp14)
+                                ]), _tmp13)
+                            ])
+                        ];
+                    case 27:
                         _state.sent();
                         return [
                             3,
-                            32
+                            31
                         ];
-                    case 20:
-                        finalText = typeof (evt === null || evt === void 0 ? void 0 : evt.text) === "string" ? evt.text : "";
-                        if (!finalText) return [
+                    case 28:
+                        if (!(event.item.type === "function_call")) return [
                             3,
-                            22
+                            31
                         ];
+                        toolCalls[event.item.id] = event.item;
+                        _tmp15 = {
+                            event: "thread.run.step.created"
+                        };
+                        _tmp16 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
                         return [
                             4,
-                            emitTextDelta(finalText)
+                            getOpenaiAssistant()
                         ];
-                    case 21:
+                    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 = 22;
-                    case 22:
+                        _state.label = 31;
+                    case 31:
+                        if (event.item.id) itemIds.push(event.item.id);
                         return [
                             3,
-                            32
+                            44
                         ];
-                    case 23:
-                        item = evt === null || evt === void 0 ? void 0 : evt.item;
-                        if (!((item === null || item === void 0 ? void 0 : item.type) === "function_call")) return [
+                    case 32:
+                        if (!(event.item.type === "message")) return [
                             3,
-                            25
+                            37
                         ];
-                        itemId = item === null || item === void 0 ? void 0 : item.id;
-                        callId = item === null || item === void 0 ? void 0 : item.call_id;
-                        name = item === null || item === void 0 ? void 0 : item.name;
-                        if (!(itemId && callId)) return [
-                            3,
-                            25
+                        _tmp17 = {
+                            event: "thread.run.step.completed"
+                        };
+                        _tmp18 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
+                        return [
+                            4,
+                            getOpenaiAssistant()
                         ];
-                        itemToCallId.set(itemId, callId);
-                        getOrCreateToolCall(callId, name);
+                    case 33:
                         return [
                             4,
-                            ensureToolCallsStep()
+                            onEvent2.apply(void 0, [
+                                (_tmp17.data = serializeItemAsRunStep.apply(void 0, [
+                                    (_tmp18.openaiAssistant = _state.sent(), _tmp18.runId = responseCreatedResponse.id, _tmp18)
+                                ]), _tmp17)
+                            ])
                         ];
-                    case 24:
+                    case 34:
                         _state.sent();
-                        sawToolCalls = true;
-                        _state.label = 25;
-                    case 25:
+                        _tmp19 = {
+                            event: "thread.message.completed"
+                        };
+                        _tmp20 = {
+                            item: event.item,
+                            threadId: threadId
+                        };
                         return [
-                            3,
-                            32
+                            4,
+                            getOpenaiAssistant()
                         ];
-                    case 26:
+                    case 35:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp19.data = serializeItemAsMessage.apply(void 0, [
+                                    (_tmp20.openaiAssistant = _state.sent(), _tmp20.createdAt = dayjs13().unix(), _tmp20.runId = responseCreatedResponse.id, _tmp20)
+                                ]), _tmp19)
+                            ])
+                        ];
+                    case 36:
+                        _state.sent();
                         return [
                             3,
-                            32
+                            40
                         ];
-                    case 27:
-                        itemId1 = evt === null || evt === void 0 ? void 0 : evt.item_id;
-                        argsDelta = typeof (evt === null || evt === void 0 ? void 0 : evt.delta) === "string" ? evt.delta : "";
-                        maybeName = typeof (evt === null || evt === void 0 ? void 0 : evt.name) === "string" ? evt.name : void 0;
-                        if (!itemId1) return [
+                    case 37:
+                        if (!(event.item.type === "function_call")) return [
                             3,
-                            32
+                            40
                         ];
-                        callId1 = itemToCallId.get(itemId1);
-                        if (!callId1) {
-                            fallbackCallId = evt === null || evt === void 0 ? void 0 : evt.call_id;
-                            if (!fallbackCallId) return [
-                                3,
-                                32
-                            ];
-                            itemToCallId.set(itemId1, fallbackCallId);
-                        }
-                        effectiveCallId = itemToCallId.get(itemId1);
-                        tc = getOrCreateToolCall(effectiveCallId, maybeName);
-                        tc.function.arguments += argsDelta;
-                        if (maybeName && tc.function.name === "unknown_function") {
-                            tc.function.name = maybeName;
-                        }
+                        toolCalls[event.item.id] = event.item;
+                        _tmp21 = {
+                            event: "thread.run.step.in_progress"
+                        };
+                        _tmp22 = {
+                            item: event.item,
+                            items: [],
+                            threadId: threadId
+                        };
                         return [
                             4,
-                            ensureToolCallsStep()
+                            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();
-                        sawToolCalls = true;
+                        _state.label = 40;
+                    case 40:
+                        return [
+                            3,
+                            44
+                        ];
+                    case 41:
+                        toolCall = toolCalls[event.item_id];
+                        if (!toolCall) return [
+                            3,
+                            44
+                        ];
                         return [
                             4,
-                            emitToolArgsDelta(effectiveCallId, tc.function.name, argsDelta)
+                            onEvent2({
+                                event: "thread.run.step.delta",
+                                data: {
+                                    id: event.item_id,
+                                    object: "thread.run.step.delta",
+                                    delta: {
+                                        step_details: {
+                                            type: "tool_calls",
+                                            tool_calls: [
+                                                {
+                                                    id: toolCall.call_id,
+                                                    type: "function",
+                                                    index: event.output_index,
+                                                    function: {
+                                                        name: toolCall.name,
+                                                        arguments: event.delta,
+                                                        output: null
+                                                    }
+                                                }
+                                            ]
+                                        }
+                                    }
+                                }
+                            })
                         ];
-                    case 29:
+                    case 42:
                         _state.sent();
                         return [
                             3,
-                            32
+                            44
                         ];
-                    case 30:
-                        {
-                            return [
-                                3,
-                                32
-                            ];
-                        }
-                        _state.label = 31;
-                    case 31:
+                    case 43:
                         return [
                             3,
-                            32
+                            44
                         ];
-                    case 32:
+                    case 44:
                         _iteratorAbruptCompletion = false;
                         return [
                             3,
-                            6
+                            3
                         ];
-                    case 33:
+                    case 45:
                         return [
                             3,
-                            40
+                            52
                         ];
-                    case 34:
+                    case 46:
                         err = _state.sent();
                         _didIteratorError = true;
                         _iteratorError = err;
                         return [
                             3,
-                            40
+                            52
                         ];
-                    case 35:
+                    case 47:
                         _state.trys.push([
-                            35,
+                            47,
                             ,
-                            38,
-                            39
+                            50,
+                            51
                         ]);
                         if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
                             3,
-                            37
+                            49
                         ];
                         return [
                             4,
                             _iterator.return()
                         ];
-                    case 36:
+                    case 48:
                         _state.sent();
-                        _state.label = 37;
-                    case 37:
+                        _state.label = 49;
+                    case 49:
                         return [
                             3,
-                            39
+                            51
                         ];
-                    case 38:
+                    case 50:
                         if (_didIteratorError) {
                             throw _iteratorError;
                         }
                         return [
                             7
                         ];
-                    case 39:
+                    case 51:
                         return [
                             7
                         ];
-                    case 40:
+                    case 52:
                         return [
                             3,
-                            43
+                            59
                         ];
-                    case 41:
+                    case 53:
                         e = _state.sent();
+                        _tmp23 = {
+                            event: "thread.run.failed"
+                        };
+                        _tmp24 = {
+                            id: (responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) || "run_".concat(uid7(18)),
+                            object: "thread.run",
+                            thread_id: threadId
+                        };
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.failed",
-                                data: {
-                                    id: runId,
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: asstId,
-                                    status: "failed",
-                                    failed_at: dayjs17().unix(),
-                                    last_error: {
-                                        code: "server_error",
-                                        message: String((e === null || e === void 0 ? void 0 : e.message) || e || "Unknown error")
-                                    }
-                                }
-                            })
+                            getOpenaiAssistant()
                         ];
-                    case 42:
+                    case 54:
+                        return [
+                            4,
+                            onEvent2.apply(void 0, [
+                                (_tmp23.data = (_tmp24.assistant_id = _state.sent().id, _tmp24.status = "failed", _tmp24.failed_at = dayjs13().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,
-                            43
+                            59
                         ];
-                    case 43:
+                    case 56:
+                        if (!((responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) && itemIds.length > 0)) return [
+                            3,
+                            58
+                        ];
+                        return [
+                            4,
+                            saveResponseItemsToConversationMetadata({
+                                client: client,
+                                threadId: threadId,
+                                responseId: responseCreatedResponse.id,
+                                itemIds: itemIds
+                            })
+                        ];
+                    case 57:
+                        _state.sent();
+                        _state.label = 58;
+                    case 58:
+                        return [
+                            7
+                        ];
+                    case 59:
                         return [
                             2
                         ];
                 }
             });
         });
-        return function(_) {
+        return function handleRun(_) {
             return _ref.apply(this, arguments);
         };
     }();
+    return {
+        handleRun: handleRun,
+        getOpenaiAssistant: getOpenaiAssistant
+    };
 };
 export { anthropicClientAdapter, azureOpenaiClientAdapter, completionsRunAdapter, googleClientAdapter, groqClientAdapter, humirisClientAdapter, mistralClientAdapter, ollamaClientAdapter, openaiClientAdapter, perplexityClientAdapter, prismaStorageAdapter, responsesRunAdapter, responsesStorageAdapter, supercompat, togetherClientAdapter };
 //# sourceMappingURL=index.js.map